fix build and deploy

huskyproject · Jul 17, 2018 · fb0109c · fb0109c
1 parent 69671b5
commit fb0109c
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,48 +1,84 @@
 language: c
 
-os:
-  - linux
-  - osx
 branches:
   only:
     - master
-compiler:
-  - gcc
-  - clang
+    - /^nltools-.*/
+matrix:
+  fast_finish: true
+  include:
+  - os: linux
+    env:
+    - MATRIX_EVAL="CC=gcc" CF=-DBUILD_SHARED_LIBS=OFF ARCH="x86_64"
+  - os: linux
+    env:
+    - MATRIX_EVAL="CC='gcc -m32'" CF="-DBUILD_SHARED_LIBS=OFF -DCMAKE_LIBRARY_PATH=/usr/lib32"
+      PACKAGES="gcc-multilib lib32z1-dev" ARCH="i686"
+  - os: osx
+    env:
+    - MATRIX_EVAL="CC=gcc" CF=-DBUILD_SHARED_LIBS=OFF ARCH="x86_64"
+  - os: osx
+    env:
+    - MATRIX_EVAL="CC='gcc -m32'" CF=-DBUILD_SHARED_LIBS=OFF ARCH="i686"
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y rpm; fi
   - git clone https://github.com/huskyproject/huskylib ~/build/huskyproject/huskylib
   - git clone https://github.com/huskyproject/smapi ~/build/huskyproject/smapi
   - git clone https://github.com/huskyproject/fidoconf ~/build/huskyproject/fidoconf
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/huskyproject/hptzip ~/build/huskyproject/hptzip; fi
+  - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends
+    --no-upgrade -qq $PACKAGES; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h
+    /usr/include; fi
 script:
+  - eval "${MATRIX_EVAL}"
   - cd  ~/build/huskyproject/huskylib
   - mkdir build
   - cd build
-  - cmake ..
+  - cmake .. ${CF}
   - cmake --build .
   - sudo make install
   - cd  ~/build/huskyproject/smapi
   - mkdir build
   - cd build
-  - cmake ..
+  - cmake .. ${CF}
   - cmake --build .
   - sudo make install
   - cd  ~/build/huskyproject/fidoconf
   - mkdir build
   - cd build
-  - cmake ..
+  - cmake .. ${CF}
   - cmake --build .
   - sudo make install
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd  ~/build/huskyproject/hptzip; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir build; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd build; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake ..; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake .. ${CF}; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake --build .; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo make install; fi
   - cd $TRAVIS_BUILD_DIR
   - mkdir build
   - cd build
-  - cmake ..
+  - cmake .. ${CF} -DCPACK_DEBIAN_PACKAGE_MAINTAINER=travis-ci
   - cmake --build .
   - cpack
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpack -G RPM; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cpack -G DEB; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then for file in *.rpm; do mv $file
+    $(basename $file .rpm).${ARCH}.rpm; done; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then for file in *.deb; do mv $file
+    $(basename $file .deb).${ARCH}.deb; done; fi
+  - for file in *.tar.gz; do mv $file $(basename $file .tar.gz).${ARCH}.tar.gz;
+    done
+deploy:
+  provider: releases
+  api_key: $GITHUB_OAUTH_TOKEN
+  file_glob: true
+  skip_cleanup: true
+  file: 
+    - $TRAVIS_BUILD_DIR/build/*.rpm
+    - $TRAVIS_BUILD_DIR/build/*.deb
+    - $TRAVIS_BUILD_DIR/build/*.tar.gz
+  on:
+    tags: true
+    branch: master
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8.11)
 PROJECT(nltools C)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+option(BUILD_SHARED_LIBS "Build shared libs" ON)
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)
   ADD_DEFINITIONS(-g -DDEBUG -D_DEBUG)
@@ -12,16 +13,30 @@ else(CMAKE_BUILD_TYPE MATCHES Debug)
 endif(CMAKE_BUILD_TYPE MATCHES Debug)
 
 if (MSVC)
+  if (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-D_DLL -D_MAKE_DLL)
+  else()
+    if(NOT "${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
+      set(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../hptzip/zlib-win32")
+    else()
+      set(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../hptzip/zlib-win64")
+    endif()
+    include(FindZLIB)
+  endif()
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../out/lib")
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../out/bin")
-  ADD_DEFINITIONS(-DWIN32 -D_WINDOWS -D_DLL -D_CONSOLE -D_MAKE_DLL  -D_CRT_SECURE_NO_WARNINGS)
+  ADD_DEFINITIONS(-DWIN32 -D_WINDOWS -D_CONSOLE -D_CRT_SECURE_NO_WARNINGS)
   include_directories("${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/h;${CMAKE_CURRENT_SOURCE_DIR}/../huskylib;${CMAKE_CURRENT_SOURCE_DIR}/../fidoconf;${CMAKE_CURRENT_SOURCE_DIR}/../smapi;")
   if(CMAKE_BUILD_TYPE MATCHES Debug)
     list( APPEND CMAKE_FIND_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../out/lib/Debug" )
   else(CMAKE_BUILD_TYPE MATCHES Debug)
     list( APPEND CMAKE_FIND_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../out/lib/Release" )
   endif(CMAKE_BUILD_TYPE MATCHES Debug)
 else ()
+  if (NOT BUILD_SHARED_LIBS)
+    SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+    include(FindZLIB)
+  endif()
   include_directories("h")
   ADD_DEFINITIONS(-Wall -DUNIX)
 endif (MSVC)
@@ -39,6 +54,10 @@ message("libhusky          : ${husky_LIB}")
 message("libfidoconfig     : ${fidoconfig_LIB}")
 message("libsmapi          : ${smapi_LIB}")
 message("hptzip            : ${hptzip_LIB}")
+if (NOT BUILD_SHARED_LIBS)
+  message("zlib              : ${ZLIB_LIBRARIES}")
+endif()
+message("Build shared      : ${BUILD_SHARED_LIBS}")
 message("Build type        : ${CMAKE_CONFIGURATION_TYPES}")
 message("-------------------------")
 
@@ -66,26 +85,35 @@ ADD_EXECUTABLE(nlupd
   src/julian.c
   src/nlfind.c
 )
-target_link_libraries(nldiff ${husky_LIB} ${fidoconfig_LIB} ${smapi_LIB})
-target_link_libraries(nlcrc ${husky_LIB} ${fidoconfig_LIB} ${smapi_LIB})
-target_link_libraries(ulc ${husky_LIB} ${fidoconfig_LIB} ${smapi_LIB})
-target_link_libraries(nlupd ${husky_LIB} ${fidoconfig_LIB} ${smapi_LIB})
+target_link_libraries(nldiff ${fidoconfig_LIB} ${smapi_LIB} ${husky_LIB})
+target_link_libraries(nlcrc ${fidoconfig_LIB} ${smapi_LIB} ${husky_LIB})
+target_link_libraries(ulc ${fidoconfig_LIB} ${smapi_LIB} ${husky_LIB})
+target_link_libraries(nlupd ${fidoconfig_LIB} ${smapi_LIB} ${husky_LIB})
 if (hptzip_LIB)
   ADD_DEFINITIONS(-DUSE_HPTZIP=1 -DNOUNCRYPT -DNOCRYPT)
   target_link_libraries(nlupd ${hptzip_LIB})
+  if (NOT BUILD_SHARED_LIBS)
+    target_link_libraries(nlupd ${ZLIB_LIBRARIES})
+  endif()
   if (MSVC)
     include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../hptzip")
+    if (NOT BUILD_SHARED_LIBS)
+      SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
+    endif()
   endif()
 endif(hptzip_LIB)
 
-if (NOT MSVC)
   INSTALL(TARGETS nldiff nlcrc ulc nlupd
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
   )
+if (NOT MSVC)
   set(CPACK_GENERATOR ${CPACK_GENERATOR} TGZ)
+else()
+  set(CPACK_GENERATOR ${CPACK_GENERATOR} 7Z)
 endif (NOT MSVC)
 
+set (CPACK_STRIP_FILES TRUE)
 set (CPACK_PACKAGE_VERSION_MAJOR "1")
 set (CPACK_PACKAGE_VERSION_MINOR "9")
 file(READ h/cvsdate.h CPACK_PACKAGE_VERSION_PATCH LIMIT 10 OFFSET 17)

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,21 +2,38 @@ version: '{build}'
 branches:
   only:
     - master
+    - /^nltools-.*/
 image:
   - Visual Studio 2017
 environment:
   matrix:
     - generator: Visual Studio 15 2017
+      cf: -DBUILD_SHARED_LIBS=OFF
+    - generator: Visual Studio 15 2017
+      cf: -DBUILD_SHARED_LIBS=ON
+    - generator: Visual Studio 15 2017 Win64
+      cf: -DBUILD_SHARED_LIBS=OFF
     - generator: Visual Studio 15 2017 Win64
+      cf: -DBUILD_SHARED_LIBS=ON
 install:
   - cmd: git clone https://github.com/huskyproject/huskylib  C:\projects\huskylib
   - cmd: git clone https://github.com/huskyproject/smapi  C:\projects\smapi
   - cmd: git clone https://github.com/huskyproject/fidoconf  C:\projects\fidoconf
   - cmd: git clone https://github.com/huskyproject/hptzip  C:\projects\hptzip
 build_script:
   - cmd: 
-      cd C:\projects\huskylib && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" && cmake --build . -- /P:Configuration=Release &&
-      cd C:\projects\smapi && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" && cmake --build . -- /P:Configuration=Release &&
-      cd C:\projects\fidoconf && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" && cmake --build . -- /P:Configuration=Release &&
-      cd C:\projects\hptzip && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" && cmake --build . -- /P:Configuration=Release &&
-      cd C:\projects\nltools && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" && cmake --build . -- /P:Configuration=Release
+      cd C:\projects\huskylib && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" "%CF%" && cmake --build . -- /P:Configuration=Release &&
+      cd C:\projects\smapi && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" "%CF%" && cmake --build . -- /P:Configuration=Release &&
+      cd C:\projects\fidoconf && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" "%CF%" && cmake --build . -- /P:Configuration=Release &&
+      cd C:\projects\hptzip && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" "%CF%" && cmake --build . -- /P:Configuration=Release &&
+      cd C:\projects\nltools && mkdir build && cd build && cmake --version &&  cmake .. -G "%GENERATOR%" "%CF%" && cmake --build . -- /P:Configuration=Release
+  - if ["%CF%"]==["-DBUILD_SHARED_LIBS=OFF"] (cpack)
+artifacts:
+  - path: build\*.7z
+    name: dist
+deploy:
+  provider: GitHub
+  artifact: dist
+  auth_token: $(GITHUB_OAUTH_TOKEN)
+  on:
+    appveyor_repo_tag: true