Revert "Release Windows packages (#5)"

BewareMyPower · BewareMyPower · commit 5ef4c11ea321 · 2022-10-28T09:51:08.000+08:00
This reverts commit 5c87deb.
diff --git a/.github/workflows/ci-build-binary-artifacts.yaml b/.github/workflows/ci-build-binary-artifacts.yaml
@@ -28,27 +28,82 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+
+  package-linux:
+    name: Build ${{matrix.pkg.name}} ${{matrix.cpu.platform}}
+    runs-on: ubuntu-22.04
+    timeout-minutes: 500
+
+    strategy:
+      fail-fast: false
+      matrix:
+        pkg:
+          - { name: 'RPM', type: 'rpm', path: 'pkg/rpm/RPMS' }
+          - { name: 'Deb', type: 'deb', path: 'pkg/deb/BUILD/DEB' }
+          - { name: 'Alpine', type: 'apk', path: 'pkg/apk/build' }
+        cpu:
+          - { arch: 'x86_64', platform: 'x86_64' }
+          - { arch: 'aarch64', platform: 'arm64' }
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Package Pulsar source
+        run: build-support/generate-source-archive.sh
+
+      - uses: docker/setup-buildx-action@v2
+      - run: build-support/copy-deps-versionfile.sh
+
+      - name: Build dependencies Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: ./pkg/${{matrix.pkg.type}}
+          load: true
+          tags: build:latest
+          platforms: linux/${{matrix.cpu.platform}}
+          build-args: PLATFORM=${{matrix.cpu.arch}}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build packages
+        run: pkg/${{matrix.pkg.type}}/docker-build-${{matrix.pkg.type}}-${{matrix.cpu.platform}}.sh build:latest
+
+      - name: Zip artifact
+        run: zip -r ${{matrix.pkg.type}}-${{matrix.cpu.platform}}.zip ${{matrix.pkg.path}}
+
+      - name: Upload binaries to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{matrix.pkg.type}}-${{matrix.cpu.platform}}.zip
+          asset_name: ${{matrix.pkg.type}}-${{matrix.cpu.platform}}.zip
+          tag: ${{ github.ref }}
+          overwrite: true
+
   package-windows:
     timeout-minutes: 120
     name: Build CPP Client on ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     env:
       VCPKG_ROOT: '${{ github.workspace }}/vcpkg'
-      INSTALL_DIR: 'C:\pulsar-cpp'
     strategy:
       fail-fast: false
       matrix:
         include:
           - name: 'Windows x64'
             os: windows-2022
-            triplet: x64-windows-static
+            triplet: x64-windows
             vcpkg_dir: 'C:\vcpkg'
             suffix: 'windows-win64'
             generator: 'Visual Studio 17 2022'
             arch: '-A x64'
           - name: 'Windows x86'
             os: windows-2022
-            triplet: x86-windows-static
+            triplet: x86-windows
             vcpkg_dir: 'C:\vcpkg'
             suffix: 'windows-win32'
             generator: 'Visual Studio 17 2022'
@@ -90,7 +145,7 @@ jobs:
         run: |
           ${{ env.VCPKG_ROOT }}\vcpkg.exe install --triplet ${{ matrix.triplet }} > dependencies.txt
 
-      - name: Build and package
+      - name: Configure and build
         shell: bash
         run: |
           BUILD_DIR=./build
@@ -99,15 +154,30 @@ jobs:
             -G "${{ matrix.generator }}" ${{ matrix.arch }} \
             -DBUILD_TESTS=OFF \
             -DVCPKG_TRIPLET=${{ matrix.triplet }} \
-            -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
             -S .
           cmake --build $BUILD_DIR --parallel --config Release
-          cmake --install $BUILD_DIR
-          cp dependencies.txt ${{ env.INSTALL_DIR }}
+
+      - name: Package
+        shell: bash
+        run: |
+          BUILD_DIR=./build
+          PACKAGE_DIR=./package
+          LIB_DIR=$PACKAGE_DIR/lib/Release
+          VCPKG_INSTALLED_DIR=$PACKAGE_DIR/vcpkg_installed
+          mkdir -p $PACKAGE_DIR
+          mkdir -p $LIB_DIR
+          mkdir -p $VCPKG_INSTALLED_DIR/${{ matrix.triplet }}
+          
+          cp dependencies.txt $PACKAGE_DIR
+          cp -r ./include $PACKAGE_DIR
+          cp -r $BUILD_DIR/include/ $PACKAGE_DIR
+          cp -r $BUILD_DIR/lib/Release/*.lib $LIB_DIR
+          cp -r $BUILD_DIR/lib/Release/*.dll $LIB_DIR
+          cp -r ./vcpkg_installed/${{ matrix.triplet }}/* $VCPKG_INSTALLED_DIR/${{ matrix.triplet }}
 
       - name: Zip artifact
         shell: bash
-        run: 7z a -tzip Windows-${{ matrix.triplet }}.zip ${{ env.INSTALL_DIR }}/*
+        run: 7z a -tzip Windows-${{ matrix.triplet }}.zip ./package
 
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
diff --git a/.github/workflows/ci-pr-validation.yaml b/.github/workflows/ci-pr-validation.yaml
@@ -81,7 +81,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       VCPKG_ROOT: '${{ github.workspace }}/vcpkg'
-      INSTALL_DIR: 'C:\pulsar-cpp'
     strategy:
       fail-fast: false
       matrix:
@@ -157,49 +156,24 @@ jobs:
             cmake --build ./build-0 --parallel --config Release
           fi
 
-      - name: Install static vcpkg packages
-        run: |
-          ${{ env.VCPKG_ROOT }}\vcpkg.exe install --triplet "${{ matrix.triplet }}-static"
-
-      - name: Configure (LINK_STATIC=ON)
+      - name: Configure (dynamic library only)
         shell: bash
         run: |
           if [ "$RUNNER_OS" == "Windows" ]; then
             cmake \
               -B ./build-1 \
               -G "${{ matrix.generator }}" ${{ matrix.arch }} \
               -DBUILD_TESTS=OFF \
-              -DVCPKG_TRIPLET="${{ matrix.triplet }}-static" \
-              -DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}" \
+              -DVCPKG_TRIPLET=${{ matrix.triplet }} \
+              -DBUILD_STATIC_LIB=OFF \
               -S .
           fi
 
-      - name: Install
+      - name: Compile
         shell: bash
         run: |
           if [ "$RUNNER_OS" == "Windows" ]; then
             cmake --build ./build-1 --parallel --config Release
-            cmake --install ./build-1
-          fi
-
-      - name: Test examples
-        shell: bash
-        run: |
-          if [ "$RUNNER_OS" == "Windows" ]; then
-            cd win-examples
-            cmake \
-              -G "${{ matrix.generator }}" ${{ matrix.arch }} \
-              -DLINK_STATIC=OFF \
-              -DCMAKE_PREFIX_PATH=${{ env.INSTALL_DIR }} \
-              -B build-dynamic
-            cmake --build build-dynamic --config Release
-            cmake \
-              -G "${{ matrix.generator }}" ${{ matrix.arch }} \
-              -DLINK_STATIC=ON \
-              -DCMAKE_PREFIX_PATH=${{ env.INSTALL_DIR }} \
-              -B build-static
-            cmake --build build-static --config Release
-            ./build-static/Release/win-example.exe
           fi
 
   package:
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,6 @@ message(STATUS "Pulsar Client version macro: ${PULSAR_CLIENT_VERSION_MACRO}")
 set(PVM_COMMENT "This is generated from Version.h.in by CMAKE. DO NOT EDIT DIRECTLY")
 configure_file(templates/Version.h.in include/pulsar/Version.h @ONLY)
 
-option(LINK_STATIC "Link against static libraries" OFF)
 if (VCPKG_TRIPLET)
     message(STATUS "Use vcpkg, triplet is ${VCPKG_TRIPLET}")
     set(CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/vcpkg_installed/${VCPKG_TRIPLET}")
@@ -45,13 +44,7 @@ if (VCPKG_TRIPLET)
         set(ZLIB_ROOT ${VCPKG_DEBUG_ROOT})
         set(OPENSSL_ROOT_DIR ${VCPKG_DEBUG_ROOT})
     endif ()
-    if (VCPKG_TRIPLET MATCHES ".*-static")
-        set(LINK_STATIC ON)
-    else ()
-        set(LINK_STATIC OFF)
-    endif ()
 endif()
-MESSAGE(STATUS "LINK_STATIC:  " ${LINK_STATIC})
 
 find_program(CCACHE_PROGRAM ccache)
 if(CCACHE_PROGRAM)
@@ -76,6 +69,9 @@ MESSAGE(STATUS "BUILD_WIRESHARK:  " ${BUILD_WIRESHARK})
 option(BUILD_PERF_TOOLS "Build Pulsar CLI perf producer/consumer" OFF)
 MESSAGE(STATUS "BUILD_PERF_TOOLS:  " ${BUILD_PERF_TOOLS})
 
+option(LINK_STATIC "Link against static libraries" OFF)
+MESSAGE(STATUS "LINK_STATIC:  " ${LINK_STATIC})
+
 option(USE_LOG4CXX "Build with Log4cxx support" OFF)
 MESSAGE(STATUS "USE_LOG4CXX:  " ${USE_LOG4CXX})
 
@@ -97,7 +93,7 @@ set(CMAKE_C_STANDARD 11)
 # https://stackoverflow.com/questions/10046114/in-cmake-how-can-i-test-if-the-compiler-is-clang
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     add_definitions(-DWIN32_LEAN_AND_MEAN -DNOGDI -D_WIN32_WINNT=0x0501 -D_CRT_SECURE_NO_WARNINGS)
-    add_compile_options(/wd4244 /wd4267 /wd4018 /wd4715 /wd4251 /wd4275 /wd4819)
+    add_compile_options(/wd4244 /wd4267 /wd4018 /wd4715 /wd4251 /wd4275)
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
     # ?? Don't have this to test with
 else() # GCC or Clang are mostly compatible:
@@ -172,7 +168,7 @@ if (NOT ZLIB_INCLUDE_DIRS OR NOT ZLIB_LIBRARIES)
     message(FATAL_ERROR "Could not find zlib")
 endif ()
 
-if (LINK_STATIC AND NOT VCPKG_TRIPLET)
+if (LINK_STATIC)
     find_library(LIB_ZSTD NAMES libzstd.a)
     message(STATUS "ZStd: ${LIB_ZSTD}")
     find_library(LIB_SNAPPY NAMES libsnappy.a)
@@ -199,29 +195,6 @@ if (LINK_STATIC AND NOT VCPKG_TRIPLET)
     if (MSVC)
         add_definitions(-DCURL_STATICLIB)
     endif()
-elseif (LINK_STATIC AND VCPKG_TRIPLET)
-    find_package(protobuf REQUIRED)
-    message(STATUS "Found protobuf static library: " ${Protobuf_LIBRARIES})
-    find_library(ZLIB_LIBRARIES NAMES zlib z)
-    if (ZLIB_LIBRARIES)
-        message(STATUS "Found zlib static library: " ${ZLIB_LIBRARIES})
-    else ()
-        message(FATAL_ERROR "Failed to find zlib static library")
-    endif ()
-    find_library(CURL_LIBRARIES NAMES libcurl)
-    if (CURL_LIBRARIES)
-        message(STATUS "Found libcurl: ${CURL_LIBRARIES}")
-    else ()
-        message(FATAL_ERROR "Cannot find libcurl")
-    endif ()
-    find_library(LIB_ZSTD zstd)
-    if (LIB_ZSTD)
-        message(STATUS "Found ZSTD library: ${LIB_ZSTD}")
-    endif ()
-    find_library(LIB_SNAPPY NAMES snappy)
-    if (LIB_SNAPPY)
-        message(STATUS "Found Snappy library: ${LIB_SNAPPY}")
-    endif ()
 else()
     if (MSVC AND (${CMAKE_BUILD_TYPE} STREQUAL Debug))
         find_library(LIB_ZSTD zstdd HINTS "${VCPKG_DEBUG_ROOT}/lib")
@@ -238,7 +211,7 @@ else()
         find_library(LOG4CXX_LIBRARY_PATH log4cxx)
         find_path(LOG4CXX_INCLUDE_PATH log4cxx/logger.h)
     endif (USE_LOG4CXX)
-endif ()
+endif (LINK_STATIC)
 
 if (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION LESS 69)
     # Boost System does not require linking since 1.69
@@ -247,15 +220,15 @@ if (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION LESS 69)
 endif()
 
 if (MSVC)
-    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} date_time)
+  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} date_time)
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
     # GCC 4.8.2 implementation of std::regex is buggy
     set(BOOST_COMPONENTS ${BOOST_COMPONENTS} regex)
     set(CMAKE_CXX_FLAGS " -DPULSAR_USE_BOOST_REGEX")
     MESSAGE(STATUS "Using Boost::Regex")
-elseif (CMAKE_COMPILER_IS_GNUCC)
+else()
     MESSAGE(STATUS "Using std::regex")
     # Turn on color error messages and show additional help with errors (only available in GCC v4.9+):
     add_compile_options(-fdiagnostics-show-option -fdiagnostics-color)
@@ -322,7 +295,7 @@ include_directories(
 
 set(COMMON_LIBS
   ${COMMON_LIBS}
-  ${CMAKE_THREAD_LIBS_INIT}
+  Threads::Threads
   ${Boost_REGEX_LIBRARY}
   ${Boost_SYSTEM_LIBRARY}
   ${Boost_DATE_TIME_LIBRARY}
@@ -334,25 +307,13 @@ set(COMMON_LIBS
   ${CMAKE_DL_LIBS}
 )
 
-if (MSVC)
-    set(COMMON_LIBS
-        ${COMMON_LIBS}
-        ${Boost_DATE_TIME_LIBRARY}
-        wldap32.lib
-        Normaliz.lib)
-    if (LINK_STATIC)
-        # add external dependencies of libcurl
-        set(COMMON_LIBS ${COMMON_LIBS} ws2_32.lib crypt32.lib)
-        # the default compile options have /MD, which cannot be used to build DLLs that link static libraries
-        string(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-        string(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
-        string(REGEX REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-        message(STATUS "CMAKE_CXX_FLAGS_DEBUG: " ${CMAKE_CXX_FLAGS_DEBUG})
-        message(STATUS "CMAKE_CXX_FLAGS_RELEASE: " ${CMAKE_CXX_FLAGS_RELEASE})
-        message(STATUS "CMAKE_CXX_FLAGS_RELWITHDEBINFO: " ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-    endif ()
-else()
+if (NOT MSVC)
     set(COMMON_LIBS ${COMMON_LIBS} m)
+else()
+    set(COMMON_LIBS
+    ${COMMON_LIBS}
+    wldap32.lib
+    Normaliz.lib)
 endif()
 
 if (USE_LOG4CXX)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -46,8 +46,6 @@ endif(NOT LIBRARY_VERSION)
 if (MSVC)
     find_package(dlfcn-win32 REQUIRED)
     set(CMAKE_DL_LIBS dlfcn-win32::dl psapi.lib)
-    get_target_property(dlfcn-win32_LIBRARY dlfcn-win32::dl IMPORTED_LOCATION_RELEASE)
-    message(STATUS "dlfcn-win32_LIBRARY: " ${dlfcn-win32_LIBRARY})
 endif(MSVC)
 
 
@@ -90,7 +88,7 @@ endif()
 # required dependencies except ssl
 if (LINK_STATIC AND BUILD_STATIC_LIB)
     if (MSVC)
-        set(COMMON_LIBS ${COMMON_LIBS} ${dlfcn-win32_LIBRARY})
+
         # This function is to remove either "debug" or "optimized" library names
         # out of the COMMON_LIBS list and return the sanitized list of libraries
         function(remove_libtype LIBLIST LIBTYPE OUTLIST)
diff --git a/win-examples/CMakeLists.txt b/win-examples/CMakeLists.txt
diff --git a/win-examples/example.cc b/win-examples/example.cc
