Update for package distribution #955

Nightwalker-87 · 2020-05-10T13:18:56Z

Changes & additions:

New cpack package-config for DEB and RPM
Toolchain file for cross-building
Script to automate MinGW cross-building
Added file headers for .cmake files
Added dpkg and rpm to required pkgs
Removed deprecated debian pkg config settings
Update for travis build configuration:
--> Added builds for clang -m32 on arch: AMD64
--> Corrected invalid config settings
--> Added clang-9 builds for linux
--> Moved scripts to root directory
--> Added MinGW cross-test-build for linux
Updated steps for release preparation
Changed destination for binary archives
Added note on windows binary installation (Closes [install] Windows binary is configured to a hard-coded path #738) (Closes [doc] Windows binary installation instructions? #795)
Contributors now listed in separate file
Added version info for static library
Added package changelog files for deb & rpm
Added license & rules file for deb pkg
Removed unneeded commands in travis.sh
Removed -Wno-dev flag in Release target
cmake: Grouped udev and modprobe.d config
rpm package now relocatable (CPackRPM)
Tidy up install paths & directories:
-> modprobe.d & udev rules (both are now ON per default on Linux)
-> stlink-gui supplements
-> man pages
Fixed paths according to GNUInstallDirs
cmake: Restructured library config
Test files & gui now use shared library

- New cpack package-config for DEB and RPM - Toolchain file for cross-building - Script to automate MinGW cross-building - Added file headers for .cmake files - Added dpkg and rpm to required pkgs

- Added builds for clang -m32 on arch: AMD64 - Corrected invalid config settings - Added clang-9 builds for linux - Moved scripts to root directory - Added MinGW cross-test-build for linux

- Updated steps for release preparation - Changed destination for binary archives (Closes #798)

slyshykO

It is Ok for me

Nightwalker-87 · 2020-05-10T13:58:50Z

It is Ok for me

Wait - it's not ready yet ... 👀
... but you can do a cross-build on a debian-based system and unzip the windows binary on a windows installation to see if everything works.

slyshykO · 2020-05-10T14:05:12Z

Wait - it's not ready yet ...

Something else planned?

Nightwalker-87 · 2020-05-10T14:06:18Z

Only some minor fixes, that's why I opened a draft PR.

- Added note on windows binary installation - Contributors now listed in separate file (Closes #738) (Closes #795)

Nightwalker-87 · 2020-05-17T16:57:15Z

As @slyshykO reported, there is still an issue with a static linking to libssp on Windows when the binary package is generated via a debian cross-build which is not as expected. This needs a fix.

When building natively on Windows this issue does not occur, as I could verify by myself on a virtual machine. As of the current state of knowledge I can't make out any difference in the related cmake compilation routine in CMakeLists.txt.

If the reason is not found and nobody else is going to show any interest in this, cross-building for Windows will only generate non-functional binaries and thus will be useless...

- Simplified code - Added version info for static library

- Added package changelog files for deb & rpm - Added license file for deb pkg - Added rules file for deb pkg - Changed install subdirectory

Nightwalker-87 · 2020-05-18T13:40:04Z

@Vascom: How can we make the rpm package relocatable (universal)? I found there are still a few minor issues related to this for our package:

CPack: Create package
CMake Warning (dev) at /usr/share/cmake-3.16/Modules/Internal/CPack/CPackRPM.cmake:140 (message):
  CPackRPM:Warning: Path
  [$PATH_TO_FILE$]
  is not on one of the relocatable paths! Package will be partially
  relocatable.
Call Stack (most recent call first):
  /usr/share/cmake-3.16/Modules/Internal/CPack/CPackRPM.cmake:1008 (cpack_rpm_prepare_relocation_paths)
  /usr/share/cmake-3.16/Modules/Internal/CPack/CPackRPM.cmake:1879 (cpack_rpm_generate_package)
This warning is for project developers.  Use -Wno-dev to suppress it.

CPackRPM: Will use GENERATED spec file: /$USER-PATH$/stlink/build/Debug/_CPack_Packages/Linux/RPM/SPECS/stlink.spec

This relates to the following files:

/$USER-PATH$/stlink/build/Debug/install/etc/modprobe.d/stlink_v1.conf
/$USER-PATH$/stlink/build/Debug/install/etc/udev/rules.d/49-stlinkv1.rules
/$USER-PATH$/stlink/build/Debug/install/etc/udev/rules.d/49-stlinkv2-1.rules
/$USER-PATH$/stlink/build/Debug/install/etc/udev/rules.d/49-stlinkv2.rules
/$USER-PATH$/stlink/build/Debug/install/etc/udev/rules.d/49-stlinkv3.rules
/$USER-PATH$/stlink/build/Debug/install/include/stlink.h
/$USER-PATH$/stlink/build/Debug/install/include/stlink/backend.h
/$USER-PATH$/stlink/build/Debug/install/include/stlink/chipid.h
/$USER-PATH$/stlink/build/Debug/install/include/stlink/commands.h
/$USER-PATH$/stlink/build/Debug/install/include/stlink/flash_loader.h
/$USER-PATH$/stlink/build/Debug/install/include/stlink/reg.h
/$USER-PATH$/stlink/build/Debug/install/include/stlink/version.h
/$USER-PATH$/stlink/build/Debug/install/include/stm32.h
/$USER-PATH$/stlink/build/Debug/install/lib/libstlink.a
/$USER-PATH$/stlink/build/Debug/install/lib/libstlink.so
/$USER-PATH$/stlink/build/Debug/install/lib/libstlink.so.1
/$USER-PATH$/stlink/build/Debug/install/lib/libstlink.so.1.6.0
/$USER-PATH$/stlink/build/Debug/install/share/man/man1/st-flash.1
/$USER-PATH$/stlink/build/Debug/install/share/man/man1/st-info.1
/$USER-PATH$/stlink/build/Debug/install/share/man/man1/st-util.1

Do you or anyone else have an idea? It would be a nice to have, I think.

Vascom · 2020-05-18T14:49:01Z

It is bad idea to have one rpm package for many distros. All of them has differencies and this work should be done by maintrainers.

Nightwalker-87 · 2020-05-18T14:53:22Z

Well they can do as they like, but I am not willing to generate several rpm packages for a project release. Thus this package should be widely deployable.
I think I have also found a solution for the above in the meanwhile.

Vascom · 2020-05-18T14:58:29Z

You can not generate any.

Nightwalker-87 · 2020-05-18T15:09:33Z

You can not generate any.

We already do - with cmake ;-)

- Removed unneeded commands in travis.sh - Removed -Wno-dev flag in Release target - cmake: Grouped udev and modprobe.d config - rpm package now relocatable (CPackRPM)

Nightwalker-87 · 2020-05-18T16:57:02Z

@slyshykO @chenguokai: These were the outstanding changes still missing to conclude this PR.
Now this static linking of libssp is the last nut to crack...

Vascom · 2020-05-18T17:23:15Z

You can not generate any.

We already do - with cmake ;-)

I mean do it properly as every distro recommend and require.

Nightwalker-87 · 2020-05-18T17:33:19Z

That's why there are package maintainers, but that should not prevent us from providing a general-use rpm package here on our GitHub release page, as we do provide one for debian-based systems. Can we conclude this topic now? This is also not the right place to discuss this, BTW.

Vascom · 2020-05-18T17:36:48Z

Can we conclude this topic now? This is also not the right place to discuss this, BTW.

Yes.

Tidy up install paths & directories: -> modprobe.d & udev rules (both are now ON per default on Linux) -> stlink-gui supplements -> man pages - Fixed paths according to GNUInstallDirs - cmake: Restructured library config - Test files & gui now use shared library

Nightwalker-87 · 2020-05-19T12:20:32Z

@chenguokai Can you give it a test again on macOS? I've successfully compiled, installed and used the toolset executables on debian.
@slyshykO: Linking to libssp-0.dll on windows for cross-build binaries is still non-functional. I've decided not to fix this within this PR any more. It should be addressed separately. I may also leave that to others.

If there are no further significant issues I'd like to merge this PR now. It has become quite bulky already.

slyshykO · 2020-05-19T12:23:37Z

@Nightwalker-87
Can link libssp statically by changing only one line in the project
3d34ea5

Nightwalker-87 · 2020-05-19T12:28:57Z

Can link libssp statically by changing only one line in the project

Oh that is good news - I'm surprised it is achievable that easy. I tried that argument somewhere else before, what didn't work. Ok - wait let us finish and merge this PR first. Yours should follow subsequently then.

slyshykO · 2020-05-19T12:34:49Z

I'm surprised it is achievable that easy.

Looks easy but I, like you, tried many times before getting success on build :)

chenguokai · 2020-05-19T14:20:06Z

Edit: the first one is resolved on develop branch so not a problem actually. The below one, in my view, can be ignored for now. I will take care of it after merge.

Mostly good with one problem.

1.. cmake failed with with a simple version bump in MacPorts Portfile

...
-- Found libusb: /opt/local/lib/libusb-1.0.a  
-- Could NOT find PkgConfig (missing: PKG_CONFIG_EXECUTABLE) 
-- Looking for sys/mman.h
-- Looking for sys/mman.h - found
-- Looking for unistd.h
-- Looking for unistd.h - found
-- Looking for __stack_chk_fail in ssp
-- Looking for __stack_chk_fail in ssp - not found
-- STLINK_LIB_SHARED: stlink
-- PROJECT_VERSION_MAJOR: 
-- VERSION: ..
CMake Error at CMakeLists.txt:167 (set_target_properties):
  set_target_properties called with incorrect number of arguments.


-- STLINK_LIB_STATIC: stlink-static
-- PROJECT_VERSION_MAJOR: 
-- VERSION: ..
CMake Error at CMakeLists.txt:203 (set_target_properties):
  set_target_properties called with incorrect number of arguments.
...

The one could not be a problem since I only checked out dist branch which could have missed out some commits.

Nightwalker-87 · 2020-05-19T14:32:13Z

Try:
execute_process(COMMAND bash -c "export LD_LIBRARY_PATH="${CMAKE_INSTALL_LIBDIR}" ")
(Note the change a the end!)
Here your version numbers were not read correctly, which is the reason why it failed. Git present? Version file present with the correct format? (This is not a big deal though, looks like something local, because I fixed that before.)

Nightwalker-87 · 2020-05-19T14:40:11Z

Thank you both @chenguokai & @slyshykO for reviewing this. 🥇

chenguokai · 2020-05-19T17:39:00Z

Try: execute_process(COMMAND bash -c "export LD_LIBRARY_PATH="${CMAKE_INSTALL_LIBDIR}" ") (Note the change a the end!)

Finally I figured out the problem here. Might be a MacPorts specific issue with one cmake flag set like -DCMAKE_MODULE_PATH="/opt/local/share/cmake/Modules" where the path /opt/local/share/cmake/Modules does not exist. I will ask the developers of MacPorts for more information about the path.

Edit: Not triggered by this, I forgot to remove my local modification before testing😅

Maybe we should ignore any external CMAKE_MODULE_PATH.

Nightwalker-87 · 2020-05-19T21:27:59Z

Edit: Not triggered by this, I forgot to remove my local modification before testing 😅

That will likely help... 😄

Nightwalker-87 added 5 commits April 29, 2020 16:24

Refactoring for package distribution

ce6ffe7

- New cpack package-config for DEB and RPM - Toolchain file for cross-building - Script to automate MinGW cross-building - Added file headers for .cmake files - Added dpkg and rpm to required pkgs

Removed deprecated debian pkg config settings

1f9724e

Simplified subdir structure for packaging

9b478a0

Updated travis CI test-builds

5e0e299

- Added builds for clang -m32 on arch: AMD64 - Corrected invalid config settings - Added clang-9 builds for linux - Moved scripts to root directory - Added MinGW cross-test-build for linux

Update for windows binary packaging

7bb34fc

- Updated steps for release preparation - Changed destination for binary archives (Closes #798)

Nightwalker-87 added os/windows general/documentation code/feature-request os/linux code/refactoring labels May 10, 2020

Nightwalker-87 added this to the v1.6.1 milestone May 10, 2020

Nightwalker-87 requested review from slyshykO and chenguokai May 10, 2020 13:18

Nightwalker-87 self-assigned this May 10, 2020

slyshykO approved these changes May 10, 2020

View reviewed changes

chenguokai approved these changes May 10, 2020

View reviewed changes

Updated documentation

06c66ed

- Added note on windows binary installation - Contributors now listed in separate file (Closes #738) (Closes #795)

This was linked to issues May 10, 2020

[install] Windows binary is configured to a hard-coded path #738

Closed

[distribution] binaries: Provide latest windows builds #798

Closed

[doc] Windows binary installation instructions? #795

Closed

Nightwalker-87 force-pushed the dist branch 2 times, most recently from 7faf9b1 to cde5a97 Compare May 17, 2020 17:41

Update for library linking

e3aa887

- Simplified code - Added version info for static library

Nightwalker-87 force-pushed the dist branch from cde5a97 to e3aa887 Compare May 17, 2020 22:51

Updated package & install configuration

97d3173

- Added package changelog files for deb & rpm - Added license file for deb pkg - Added rules file for deb pkg - Changed install subdirectory

Updated build settings

1b3200d

- Removed unneeded commands in travis.sh - Removed -Wno-dev flag in Release target - cmake: Grouped udev and modprobe.d config - rpm package now relocatable (CPackRPM)

Nightwalker-87 force-pushed the dist branch 2 times, most recently from ef8522f to a937f9e Compare May 19, 2020 00:38

Nightwalker-87 force-pushed the dist branch from a937f9e to 7ef0637 Compare May 19, 2020 09:31

Improved cmake-config for GUI build

5fc02ab

slyshykO approved these changes May 19, 2020

View reviewed changes

Nightwalker-87 requested a review from chenguokai May 19, 2020 12:29

Nightwalker-87 added the status/resolved label May 19, 2020

chenguokai approved these changes May 19, 2020

View reviewed changes

Nightwalker-87 merged commit da68271 into develop May 19, 2020

Nightwalker-87 deleted the dist branch May 19, 2020 14:38

stlink-org locked as resolved and limited conversation to collaborators Jun 28, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update for package distribution #955

Update for package distribution #955

Nightwalker-87 commented May 10, 2020 •

edited

Loading

slyshykO left a comment

Nightwalker-87 commented May 10, 2020 •

edited

Loading

slyshykO commented May 10, 2020

Nightwalker-87 commented May 10, 2020

Nightwalker-87 commented May 17, 2020

Nightwalker-87 commented May 18, 2020 •

edited

Loading

Vascom commented May 18, 2020

Nightwalker-87 commented May 18, 2020 •

edited

Loading

Vascom commented May 18, 2020

Nightwalker-87 commented May 18, 2020 •

edited

Loading

Nightwalker-87 commented May 18, 2020

Vascom commented May 18, 2020

Nightwalker-87 commented May 18, 2020 •

edited

Loading

Vascom commented May 18, 2020

Nightwalker-87 commented May 19, 2020

slyshykO commented May 19, 2020 •

edited

Loading

Nightwalker-87 commented May 19, 2020 •

edited

Loading

slyshykO commented May 19, 2020

chenguokai commented May 19, 2020 •

edited

Loading

Nightwalker-87 commented May 19, 2020

Nightwalker-87 commented May 19, 2020

chenguokai commented May 19, 2020 •

edited

Loading

Nightwalker-87 commented May 19, 2020

Update for package distribution #955

Update for package distribution #955

Conversation

Nightwalker-87 commented May 10, 2020 • edited Loading

slyshykO left a comment

Choose a reason for hiding this comment

Nightwalker-87 commented May 10, 2020 • edited Loading

slyshykO commented May 10, 2020

Nightwalker-87 commented May 10, 2020

Nightwalker-87 commented May 17, 2020

Nightwalker-87 commented May 18, 2020 • edited Loading

Vascom commented May 18, 2020

Nightwalker-87 commented May 18, 2020 • edited Loading

Vascom commented May 18, 2020

Nightwalker-87 commented May 18, 2020 • edited Loading

Nightwalker-87 commented May 18, 2020

Vascom commented May 18, 2020

Nightwalker-87 commented May 18, 2020 • edited Loading

Vascom commented May 18, 2020

Nightwalker-87 commented May 19, 2020

slyshykO commented May 19, 2020 • edited Loading

Nightwalker-87 commented May 19, 2020 • edited Loading

slyshykO commented May 19, 2020

chenguokai commented May 19, 2020 • edited Loading

Nightwalker-87 commented May 19, 2020

Nightwalker-87 commented May 19, 2020

chenguokai commented May 19, 2020 • edited Loading

Nightwalker-87 commented May 19, 2020

Nightwalker-87 commented May 10, 2020 •

edited

Loading

Nightwalker-87 commented May 10, 2020 •

edited

Loading

Nightwalker-87 commented May 18, 2020 •

edited

Loading

Nightwalker-87 commented May 18, 2020 •

edited

Loading

Nightwalker-87 commented May 18, 2020 •

edited

Loading

Nightwalker-87 commented May 18, 2020 •

edited

Loading

slyshykO commented May 19, 2020 •

edited

Loading

Nightwalker-87 commented May 19, 2020 •

edited

Loading

chenguokai commented May 19, 2020 •

edited

Loading

chenguokai commented May 19, 2020 •

edited

Loading