don't build testzip and ziptool executables

virtualcell · May 27, 2024 · c8253cc · c8253cc
1 parent c51e79d
commit c8253cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -172,10 +172,6 @@ jobs:
           ./bin/VCellStoch_x64 || true
           echo "------ running smoldyn_x64 ------"
           ./bin/smoldyn_x64 || true
-          echo "------ running testzip ------"
-          ./bin/testzip || true
-          echo "------ running ziptool ------"
-          ./bin/ziptool || true
 
 #      - name: Setup tmate session
 #        uses: mxschmitt/action-tmate@v3
@@ -199,7 +195,6 @@ jobs:
             mingw-w64-clang-x86_64-boost
             mingw-w64-clang-x86_64-hdf5
             mingw-w64-clang-x86_64-libzip
-            mingw-w64-clang-x86_64-netcdf
             mingw-w64-clang-x86_64-zlib
             mingw-w64-clang-x86_64-libaec
 
@@ -245,10 +240,6 @@ jobs:
           echo "------ running FiniteVolume_x64 ------"
           ./bin/FiniteVolume_x64 || true
           echo
-          echo "------ running testzip ------"
-          ./bin/testzip || true
-          echo "------ running ziptool ------"
-          ./bin/ziptool || true
 
       - name: Install Linux Dependencies
         if: matrix.platform == 'ubuntu-latest'
@@ -294,10 +285,6 @@ jobs:
           echo "------ running FiniteVolume_x64 ------"
           ./bin/FiniteVolume_x64 || true
           echo
-          echo "------ running testzip ------"
-          ./bin/testzip || true
-          echo "------ running ziptool ------"
-          ./bin/ziptool || true
 
 
       - name: fix Macos shared object paths
@@ -306,7 +293,6 @@ jobs:
         run: |
           mkdir build/upload
           cd build/bin
-          rm testzip ziptool || true
           ls *_x64   | awk '{print $1}' | xargs -I '{}' otool -L '{}' | grep ")" | grep -v "build" | grep -v "System" | awk '{print $1}' | xargs -I '{}' cp -vn '{}' . || true
           ls *.dylib | awk '{print $1}' | xargs -I '{}' otool -L '{}' | grep ")" | grep -v "build" | grep -v "System" | awk '{print $1}' | xargs -I '{}' cp -vn '{}' . || true
           ls *.dylib | awk '{print $1}' | xargs -I '{}' otool -L '{}' | grep ")" | grep -v "build" | grep -v "System" | awk '{print $1}' | xargs -I '{}' cp -vn '{}' . || true
@@ -321,7 +307,6 @@ jobs:
         run: |
           mkdir build/upload
           cd build/bin
-          rm testzip ziptool || true
           ls *.exe | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep '=> /' | grep -v build | grep -iv windows | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
           ls *.dll | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep '=> /' | grep -v build | grep -iv windows | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
           ls *.dll | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep '=> /' | grep -v build | grep -iv windows | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
@@ -336,7 +321,6 @@ jobs:
         run: |
           mkdir build/upload
           cd build/bin
-          rm testzip ziptool || true
           ls *_x64   | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep "=> /" | grep -v "build" | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
           ls *.so    | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep "=> /" | grep -v "build" | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
           ls *.so    | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep "=> /" | grep -v "build" | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true

diff --git a/VCellZipUtils/CMakeLists.txt b/VCellZipUtils/CMakeLists.txt
@@ -28,11 +28,11 @@ add_library(vcellziputils STATIC ${SRC_FILES} ${HEADER_FILES})
 target_include_directories(vcellziputils INTERFACE include)
 target_link_libraries(vcellziputils ziptool_lib)
 
-add_executable(testzip ${TEST_SRC_FILES})
-target_link_libraries(testzip vcellziputils)
+#add_executable(testzip ${TEST_SRC_FILES})
+#target_link_libraries(testzip vcellziputils)
 
 
-install(TARGETS vcellziputils testzip
+install(TARGETS vcellziputils
 	ARCHIVE DESTINATION bin
 	RUNTIME DESTINATION bin)
 

diff --git a/libzip-1.2.0/src/CMakeLists.txt b/libzip-1.2.0/src/CMakeLists.txt
@@ -25,9 +25,9 @@ target_include_directories(ziptool_lib PUBLIC
 )
 #install(TARGETS ziptool_lib ARCHIVE DESTINATION lib)
 
-ADD_EXECUTABLE(ziptool ziptool_main.c)
-TARGET_LINK_LIBRARIES(ziptool ziptool_lib)
-INSTALL(TARGETS ziptool RUNTIME DESTINATION bin)
+#ADD_EXECUTABLE(ziptool ziptool_main.c)
+#TARGET_LINK_LIBRARIES(ziptool ziptool_lib)
+#INSTALL(TARGETS ziptool RUNTIME DESTINATION bin)
 
 #ADD_EXECUTABLE(hole hole.c ${SRC_EXTRA_FILES} source_hole.c)
 #TARGET_LINK_LIBRARIES(hole zip)