Merge pull request #434 from texane/deprecate_autotools

Deprecate autotools and fix versioning, build with MinGW

.appveyor.yml

@@ -0,0 +1,20 @@
+version: '{build}'
+environment:
+  matrix:
+  - GENERATOR: "MSYS Makefiles"
+    ARCH: i686 # this is for 32-bit MinGW-w64
+  - GENERATOR: "MSYS Makefiles"
+    ARCH: 64
+cache:
+  - i686-4.9.2-release-win32-sjlj-rt_v3-rev1.7z
+  - x86_64-4.9.2-release-win32-seh-rt_v3-rev1.7z
+build_script:
+- ps: |
+    mkdir build
+    cd build
+    if ($env:GENERATOR -ne "MSYS Makefiles") {
+      cmake .. -G"$env:GENERATOR"
+      cmake --build . --config Debug
+    }
+- cmd: |
+    if "%GENERATOR%"=="MSYS Makefiles" (C:\MinGW\msys\1.0\bin\sh --login /c/projects/stlink/scripts/appveyor-mingw.sh)

.travis.sh

@@ -5,24 +5,15 @@ ls -1 /usr/bin/clang*
 ls -1 /usr/bin/scan-build*
 echo "----"
 
-if [ "$TRAVIS_OS_NAME" != "osx" ]; then
+if [ "$TRAVIS_OS_NAME" == "linux" ]; then
 	sudo apt-get update -qq || true
 	sudo apt-get install -qq -y --no-install-recommends libusb-1.0.0-dev libgtk-3-dev
 else
 	brew install libusb
 fi
 
-if [ "$BUILD_SYSTEM" == "cmake" ]; then
-	mkdir build
-	cd build
-	cmake ..
-	make
-else
-	./autogen.sh
-	if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-		./configure
-	else
-		./configure --with-gtk-gui
-	fi
-	make
-fi
+echo "=== Building Debug"
+mkdir -p build/Debug && cd build/Debug && cmake -DCMAKE_BUILD_TYPE=Debug ../../ && make && make package && cd -
+
+echo "=== Building Release"
+mkdir -p build/Release && cd build/Release && cmake -DCMAKE_BUILD_TYPE=Release ../../ && make && make package && cd -

.travis.yml

@@ -3,21 +3,25 @@ language: c
 addons:
   apt:
     sources:
+#      - llvm-toolchain-precise-3.8
       - ubuntu-toolchain-r-test
     packages:
+      - clang
+#      - clang-3.8
       - g++-5
       - gcc-5
-      - clang
 script:
   - ./.travis.sh
 matrix:
   include:
     - os: linux
-       compiler: clang-3.8
-       env: "BUILD_SYSTEM=cmake"
+      compiler: clang
+#    - os: linux
+#      compiler: clang-3.8
     - os: linux
       compiler: gcc-5
-      env: "BUILD_SYSTEM=cmake"
+      compiler: gcc-5
+#    - os: linux
+#      compiler: clang-3.8
     - os: osx
       compiler: clang
-      env: "BUILD_SYSTEM=cmake"

.version

@@ -0,0 +1 @@
+2.0.0-dev

CMakeLists.txt

@@ -1,14 +1,58 @@
-project(stlink C)
 cmake_minimum_required(VERSION 2.8.7)
 
+project(stlink C)
 include(CheckCCompilerFlag)
 include(CheckIncludeFile)
 find_package(PkgConfig)
 
+if (POLICY CMP0042)
+	# Newer cmake on MacOS should use @rpath
+	cmake_policy (SET CMP0042 NEW)
+endif ()
+
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/cmake/modules")
 
+# Determine package version.
+find_package (Git QUIET)
+if (DEFINED ENV{TRAVIS_TAG} AND NOT "$ENV{TRAVIS_TAG}" STREQUAL "")
+	set (STLINK_PACKAGE_VERSION "$ENV{TRAVIS_TAG}")
+elseif (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+	# Working off a git repo, using git versioning
+
+	# Check if HEAD is pointing to a tag
+	execute_process (
+		COMMAND             "${GIT_EXECUTABLE}" describe --always
+		WORKING_DIRECTORY   "${PROJECT_SOURCE_DIR}"
+		OUTPUT_VARIABLE     STLINK_PACKAGE_VERSION
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+	# If the sources have been changed locally, add -dirty to the version.
+	execute_process (
+	COMMAND             "${GIT_EXECUTABLE}" diff --quiet
+	WORKING_DIRECTORY   "${PROJECT_SOURCE_DIR}"
+	RESULT_VARIABLE     res)
+
+	if (res EQUAL 1)
+		set (STLINK_PACKAGE_VERSION "${STLINK_PACKAGE_VERSION}-dirty")
+	endif()
+elseif (EXISTS ${PROJECT_SOURCE_DIR}/.version)
+	#  If git is not available (e.g. when building from source package)
+	#  we can extract the package version from .version file.
+	file (STRINGS .version STLINK_PACKAGE_VERSION)
+else ()
+	set (STLINK_PACKAGE_VERSION "Unknown")
+endif()
+
+if(WIN32)
+	find_package(7Zip REQUIRED)
+	message(STATUS "7Zip Location: " ${ZIP_LOCATION})
+endif()
+
 find_package(LibUSB REQUIRED)
-pkg_check_modules(gtk gtk+-3.0)
+if (NOT APPLE AND NOT WIN32)
+	find_package(PkgConfig)
+	pkg_check_modules(gtk gtk+-3.0)
+endif ()
 
 function(add_cflag_if_supported flag)
     string(REPLACE "-" "_" flagclean ${flag})
@@ -38,12 +82,19 @@ add_cflag_if_supported("-Wshorten-64-to-32")
 add_cflag_if_supported("-Wimplicit-function-declaration")
 add_cflag_if_supported("-Wredundant-decls")
 add_cflag_if_supported("-Wundef")
-add_cflag_if_supported("-fPIC")
+if (NOT MSYS OR MINGW)
+	add_cflag_if_supported("-fPIC")
+endif ()
+
+if (CMAKE_BUILD_TYPE STREQUAL "")
+	set (CMAKE_BUILD_TYPE "Debug")
+endif ()
 
 if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
 	include(CTest)
 	add_cflag_if_supported("-ggdb")
 	add_cflag_if_supported("-O0")
+	#set (STLINK_PACKAGE_VERSION "${STLINK_PACKAGE_VERSION}-debug")
 elseif()
 	add_cflag_if_supported("-O2")
 endif()
@@ -53,6 +104,8 @@ if (STLINK_HAVE_SYS_MMAN_H)
 	add_definitions(-DSTLINK_HAVE_SYS_MMAN_H)
 endif()
 
+message("Building ${PROJECT_NAME} ${STLINK_PACKAGE_VERSION}")
+
 set(STLINK_HEADERS
 	include/stlink.h
 	include/stlink/usb.h
@@ -72,6 +125,10 @@ set(STLINK_SOURCE
 	src/flash_loader.c
 )
 
+if (WIN32 OR MSYS OR MINGW)
+	set (STLINK_SOURCE "${STLINK_SOURCE};src/mmap.c;src/mingw/mingw.c") # TODO
+endif ()
+
 include_directories(${LIBUSB_INCLUDE_DIR})
 include_directories(include)
 include_directories(src/mingw)
@@ -86,7 +143,7 @@ if (APPLE)
 	find_library(CoreFoundation CoreFoundation)
 	find_library(IOKit IOKit)
 	target_link_libraries(${PROJECT_NAME} ${CoreFoundation} ${IOKit} ${ObjC})
-endif()
+endif ()
 
 add_executable(st-flash src/tools/flash.c)
 target_link_libraries(st-flash ${PROJECT_NAME})
@@ -98,7 +155,11 @@ add_executable(st-util src/gdbserver/gdb-remote.c
                        src/gdbserver/gdb-remote.h
                        src/gdbserver/gdb-server.c
                        src/gdbserver/gdb-server.h)
-target_link_libraries(st-util ${PROJECT_NAME})
+if (WIN32 OR MSYS OR MINGW)
+	target_link_libraries(st-util ${PROJECT_NAME} wsock32 ws2_32)
+else ()
+	target_link_libraries(st-util ${PROJECT_NAME})
+endif ()
 
 install(TARGETS ${PROJECT_NAME} st-flash st-util st-info
         RUNTIME DESTINATION bin
@@ -114,20 +175,22 @@ if(NOT MINGW)
           RUNTIME DESTINATION bin)
 endif()
 
-if(gtk_FOUND)
+if (NOT APPLE AND gtk_FOUND)
   include_directories(SYSTEM ${gtk_INCLUDE_DIRS})
   set(GUI_SOURCES src/tools/gui/stlink-gui.c
                   src/tools/gui/stlink-gui.h)
 
+  # TODO REMOVE whole stlink-gui-local target, fixup auto-search of ui file in implementation
   add_executable(stlink-gui-local ${GUI_SOURCES})
   set_target_properties(stlink-gui-local PROPERTIES
                         COMPILE_FLAGS -DSTLINK_UI_DIR=\\"${CMAKE_CURRENT_SOURCE_DIR}/gui\\")
   target_link_libraries(stlink-gui-local stlink ${gtk_LDFLAGS})
 
-  set(INSTALLED_UI_DIR ${CMAKE_INSTALL_PREFIX}/share)
+  set(INSTALLED_UI_DIR share/stlink)
   add_executable(stlink-gui ${GUI_SOURCES})
+  # TODO REMOVE, fixup auto-search of ui file in implementation
   set_target_properties(stlink-gui PROPERTIES
-                        COMPILE_FLAGS -DSTLINK_UI_DIR=\\"${INSTALLED_UI_DIR}\\")
+                        COMPILE_FLAGS -DSTLINK_UI_DIR=\\"${CMAKE_INSTALL_PREFIX}/${INSTALLED_UI_DIR}\\")
   target_link_libraries(stlink-gui stlink ${gtk_LDFLAGS})
 
   install(TARGETS stlink-gui
@@ -137,3 +200,16 @@ if(gtk_FOUND)
 endif()
 
 add_subdirectory(tests)
+
+set (CPACK_PACKAGE_NAME ${PROJECT_NAME})
+set (CPACK_PACKAGE_VERSION ${STLINK_PACKAGE_VERSION})
+set (CPACK_SOURCE_GENERATOR "TBZ2;ZIP")
+set (CPACK_SOURCE_IGNORE_FILES "/build/;/.git/;~$;${CPACK_SOURCE_IGNORE_FILES}")
+set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${STLINK_PACKAGE_VERSION}")
+if (APPLE)
+	set(CPACK_GENERATOR "ZIP")
+	file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/dist/osx")
+	set(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_BINARY_DIR}/dist/osx")
+endif ()
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+include (CPack)

ChangeLog

@@ -1,6 +1,15 @@
 Stlink ChangeLog
 ================
 
+v2.0.0
+======
+
+Ongoing development
+
+Major changes:
+
+* Deprecation of autotools (autoconf, automake)
+
 v1.2.0
 ======