Bundle package VS fix - Poco / Assimp (fix build folder and copy debug) (#511)

danoli3 · web-flow · commit b44684838f69 · 2025-03-04T20:32:48.000+11:00
* Actions just VS

* Poco - Full static and fix Build folder for split else bugs

* Default to MT not MD

* Actions out if artifacts false

* assimp copy folders

* calculate form and packages for bundled builds

* Cmake MT/MD in core

* calculate variable fix

* more calculate fixes for local builds
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -13,7 +13,7 @@ env:
   NO_FORCE: 1
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
   USE_ARTIFACT: true
-  DISABLE_WORKFLOW: "false"
+  DISABLE_WORKFLOW: "true"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
diff --git a/.github/workflows/build-emscripten.yml b/.github/workflows/build-emscripten.yml
@@ -18,7 +18,7 @@ env:
   USE_ARTIFACT: true
   PTHREADS_ENABLED: 1
   NO_FORCE: 1
-  DISABLE_WORKFLOW: "false"
+  DISABLE_WORKFLOW: "true"
 
 jobs:  
   pre-check:
diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
@@ -17,7 +17,7 @@ env:
   NO_FORCE: 1
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
   USE_ARTIFACT: true
-  DISABLE_WORKFLOW: "false"
+  DISABLE_WORKFLOW: "true"
 
 jobs:  
   pre-check:
diff --git a/.github/workflows/build-linux-cross.yml b/.github/workflows/build-linux-cross.yml
@@ -17,7 +17,7 @@ env:
   NO_FORCE: 1
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
   USE_ARTIFACT: false
-  DISABLE_WORKFLOW: "false"
+  DISABLE_WORKFLOW: "true"
 
 jobs:  
   pre-check:
diff --git a/.github/workflows/build-linux64.yml b/.github/workflows/build-linux64.yml
@@ -17,7 +17,7 @@ env:
   NO_FORCE: 1
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
   USE_ARTIFACT: true  
-  DISABLE_WORKFLOW: "false"
+  DISABLE_WORKFLOW: "true"
 
 jobs:  
   pre-check:
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -17,7 +17,7 @@ env:
   NO_FORCE: 1
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
   USE_ARTIFACT: true
-  DISABLE_WORKFLOW: "false"
+  DISABLE_WORKFLOW: "true"
 
 jobs:  
   pre-check:
diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml
@@ -17,7 +17,7 @@ env:
   NO_FORCE: 1
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
   USE_ARTIFACT: false
-  DISABLE_WORKFLOW: "false"
+  DISABLE_WORKFLOW: "true"
   
 jobs:  
   pre-check:
diff --git a/.github/workflows/build-tvos.yml b/.github/workflows/build-tvos.yml
@@ -17,7 +17,7 @@ env:
   NO_FORCE: 1
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
   USE_ARTIFACT: true
-  DISABLE_WORKFLOW: "false"
+  DISABLE_WORKFLOW: "true"
 
 jobs:  
   pre-check:
diff --git a/.github/workflows/build-vs2019-x64.yml b/.github/workflows/build-vs2019-x64.yml
@@ -18,7 +18,7 @@ env:
   NO_FORCE: 1
   VS_VER: 16
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
-  USE_ARTIFACT: true
+  USE_ARTIFACT: false
   DISABLE_WORKFLOW: "false"
 
 jobs:  
@@ -183,6 +183,7 @@ jobs:
           rm -f xout/*.tar.bz2 
           rm -f out/*.tar.bz2
     - name: List output directory1
+      if: env.USE_ARTIFACT == 'true'
       run: ls -lah out/
     - name: Build64
       working-directory: ${{env.GITHUB_WORKSPACE}}
diff --git a/.github/workflows/build-vs2022-arm64.yml b/.github/workflows/build-vs2022-arm64.yml
@@ -18,7 +18,7 @@ env:
   NO_FORCE: 1
   VS_VER: 17
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
-  USE_ARTIFACT: true 
+  USE_ARTIFACT: false
   DISABLE_WORKFLOW: "false"
 
 jobs:  
@@ -184,6 +184,7 @@ jobs:
           rm -f xout/*.tar.bz2 
           rm -f out/*.tar.bz2
     - name: List output directory1
+      if: env.USE_ARTIFACT == 'true'
       run: ls -lah out/
     - name: BuildARM64
       working-directory: ${{env.GITHUB_WORKSPACE}}
diff --git a/.github/workflows/build-vs2022-arm64ec.yml b/.github/workflows/build-vs2022-arm64ec.yml
@@ -187,6 +187,7 @@ jobs:
           # rm -f xout/*.tar.bz2
           # rm -f out/*.tar.bz2
     - name: List output directory1
+      if: env.USE_ARTIFACT == 'true'
       run: ls -lah out/
     - name: BuildARM64EC
       working-directory: ${{env.GITHUB_WORKSPACE}}
diff --git a/.github/workflows/build-vs2022-x64.yml b/.github/workflows/build-vs2022-x64.yml
@@ -18,7 +18,7 @@ env:
   NO_FORCE: 1
   VS_VER: 17
   GA_CI_SECRET: ${{ secrets.CI_SECRET }}
-  USE_ARTIFACT: true
+  USE_ARTIFACT: false
   DISABLE_WORKFLOW: "false"
 
 jobs:  
@@ -184,20 +184,21 @@ jobs:
           # rm -f xout/*.tar.bz2
           # rm -f out/*.tar.bz2
     - name: List output directory1
+      if: env.USE_ARTIFACT == 'true'
       run: ls -lah out/
     - name: Build64
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: scripts/build.sh
       env:
         BUNDLE: ${{ matrix.bundle }}
     - name: Package
-      if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
+      #if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' || contains(github.ref, 'refs/tags/'))
       working-directory: ${{ env.GITHUB_WORKSPACE }}
       run: scripts/package.sh
       env:
         BUNDLE: ${{ matrix.bundle }}
     - name: Upload binaries as Artifact
-      if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' )
+      #if: github.repository == 'openframeworks/apothecary' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding' )
       uses: actions/upload-artifact@v4
       env:
         release: ${{ env.RELEASE }}
diff --git a/apothecary/apothecary b/apothecary/apothecary
@@ -566,13 +566,19 @@ if [ "$TYPE" = "vs" ]; then
 
 
   if [ -z ${MULTITHREADED_TYPE+x} ]; then
-    MULTITHREADED_TYPE="MD"
+    MULTITHREADED_TYPE="MT"
   fi
   if [ $MULTITHREADED_TYPE == "MD" ]; then
     MT_TYPE="/MD"
+    MT_TYPE_CMAKE="MultiThreadedDLL"
+    export MT_TYPE_DEFINES="-DBUILD_WITH_STATIC_CRT=OFF -DUSE_STATIC_CRT=OFF -DCMAKE_MSVC_RUNTIME_LIBRARY=${MT_TYPE_CMAKE}"
+    export MT_TYPE_CASE="md"
     echoVerbose "MULTITHREADED_TYPE MD"
   elif [ $MULTITHREADED_TYPE == "MT" ]; then
     MT_TYPE="/MT"
+    MT_TYPE_CMAKE="MultiThreaded"
+    export MT_TYPE_DEFINES="-DBUILD_WITH_STATIC_CRT=ON -DUSE_STATIC_CRT=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=${MT_TYPE_CMAKE}"
+    export MT_TYPE_CASE="mt"
     echoVerbose "MULTITHREADED_TYPE MT"
   fi
 
diff --git a/apothecary/formulas/assimp.sh b/apothecary/formulas/assimp.sh
@@ -11,13 +11,15 @@ FORMULA_DEPENDS=("zlib")
 
 # define the version
 VER=5.4.3
-BUILD_ID=1
+BUILD_ID=2
 DEFINES=""
 
 # tools for git use
 GIT_URL=https://github.com/assimp/assimp
 GIT_TAG=
 
+DEFAULT_VS_STATIC=1
+
 # download the source code and unpack it into LIB_NAME
 function download() {
     . "$DOWNLOADER_SCRIPT"
@@ -128,10 +130,6 @@ function build() {
         ZLIB_INCLUDE_DIR="$LIBS_ROOT/zlib/include"
         ZLIB_LIBRARY="$LIBS_ROOT/zlib/lib/$TYPE/${PLATFORM}/zlib.lib"
 
-        mkdir -p "build_${TYPE}_${PLATFORM}"
-        cd "build_${TYPE}_${PLATFORM}"
-        find ./ -name "*.o" -type f -delete
-        rm -f CMakeCache.txt || true
         DEFINES="
             -DCMAKE_C_STANDARD=${C_STANDARD} \
             -DCMAKE_CXX_STANDARD=${CPP_STANDARD} \
@@ -149,33 +147,50 @@ function build() {
             DEFINES="$DEFINES -DASSIMP_NO_EXPORT=ON"
         fi
 
-        if [ $MULTITHREADED_TYPE == "MD" ]; then
-			sed -i 's/\/MT/\/MD/g; s/\/MTd/\/MDd/g' ../CMakeLists.txt
+        if [ "${ASSIMP_STATIC:-${DEFAULT_VS_STATIC}}" = "1" ]; then
+            DEFINES="${DEFINES} \
+            ${MT_TYPE_DEFINES} \
+            -DBUILD_SHARED_LIBS=OFF"
+            if [ $MULTITHREADED_TYPE == "MD" ]; then
+                sed -i 's/\/MT/\/MD/g; s/\/MTd/\/MDd/g' CMakeLists.txt
+            fi
+        else
+            DEFINES="${DEFINES} \
+            ${MT_TYPE_DEFINES} \
+            -DBUILD_SHARED_LIBS=ON"
         fi
-		
-		cmake .. ${DEFINES} \
-			-A "${PLATFORM}" \
-			${CMAKE_WIN_SDK} \
-			-G "${GENERATOR_NAME}" \
-			-DCMAKE_BUILD_TYPE=Debug \
-			-DCMAKE_INSTALL_PREFIX=Debug \
-			-DCMAKE_INSTALL_LIBDIR="lib" \
-            -DBUILD_SHARED_LIBS=OFF \
-            -DUSE_STATIC_CRT=ON \
-			-DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
-			-DCMAKE_C_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
-			-DCMAKE_CXX_FLAGS_DEBUG="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
-			-DCMAKE_C_FLAGS_DEBUG="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
-			-DCMAKE_PREFIX_PATH="${LIBS_ROOT}" \
-			-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-			-DCMAKE_MINIMUM_REQUIRED_VERSION=3.22 \
-			-DASSIMP_BUILD_ZLIB=OFF \
-			-DZLIB_ROOT=${ZLIB_ROOT} \
-			-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR} \
-			-DZLIB_LIBRARY=${ZLIB_LIBRARY}
-		cmake --build . --config Debug -j${PARALLEL_MAKE}
-		
-		rm -f CMakeCache.txt || true
+
+        mkdir -p "build_${TYPE}_${PLATFORM}_debug"
+        cd "build_${TYPE}_${PLATFORM}_debug"
+        find ./ -name "*.o" -type f -delete
+        rm -f CMakeCache.txt || true        
+
+        cmake .. ${DEFINES} \
+            -A "${PLATFORM}" \
+            ${CMAKE_WIN_SDK} \
+            -G "${GENERATOR_NAME}" \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DCMAKE_INSTALL_PREFIX=Debug \
+            -DCMAKE_INSTALL_LIBDIR="lib" \
+            -DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
+            -DCMAKE_C_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
+            -DCMAKE_CXX_FLAGS_DEBUG="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
+            -DCMAKE_C_FLAGS_DEBUG="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_DEBUG} ${EXCEPTION_FLAGS}" \
+            -DCMAKE_PREFIX_PATH="${LIBS_ROOT}" \
+            -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+            -DCMAKE_MINIMUM_REQUIRED_VERSION=3.22 \
+            -DASSIMP_BUILD_ZLIB=OFF \
+            -DZLIB_ROOT=${ZLIB_ROOT} \
+            -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIR} \
+            -DZLIB_LIBRARY=${ZLIB_LIBRARY}
+            cmake --build . --config Debug -j${PARALLEL_MAKE}
+            rm -f CMakeCache.txt || true
+
+        cd ..
+        mkdir -p "build_${TYPE}_${PLATFORM}_release"
+        cd "build_${TYPE}_${PLATFORM}_release"
+         find ./ -name "*.o" -type f -delete
+        rm -f CMakeCache.txt || true 
 
         cmake .. ${DEFINES} \
             -A "${PLATFORM}" \
@@ -184,8 +199,6 @@ function build() {
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX=Release \
             -DCMAKE_INSTALL_LIBDIR="lib" \
-            -DBUILD_SHARED_LIBS=OFF \
-            -DUSE_STATIC_CRT=ON \
             -DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_RELEASE}" \
             -DCMAKE_C_FLAGS="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_RELEASE} " \
             -DCMAKE_CXX_FLAGS_RELEASE="-DUSE_PTHREADS=1 ${VS_C_FLAGS} ${FLAGS_RELEASE} ${EXCEPTION_FLAGS}" \
@@ -293,7 +306,6 @@ function build() {
             -DANDROID_API=${ANDROID_API} \
             -DANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \
             -DCMAKE_PREFIX_PATH="${LIBS_ROOT}" \
-            -DBUILD_SHARED_LIBS=OFF \
             -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
             -DCMAKE_MINIMUM_REQUIRED_VERSION=3.22 \
             -DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 -fvisibility-inlines-hidden -std=c++${CPP_STANDARD} -frtti ${FLAG_RELEASE}" \
@@ -421,21 +433,20 @@ function copy() {
     # libs
     mkdir -p $1/lib/$TYPE
     if [ "$TYPE" == "vs" ]; then
-        cp -v -r build_${TYPE}_${PLATFORM}/include/* $1/include
-        mkdir -p $1/lib/$TYPE/$PLATFORM/
-        if [ "${ASSIMP_STATIC:-0}" = "1" ]; then
-            cp -v "build_${TYPE}_${PLATFORM}/lib/Release/assimp-vc${VC_VERSION}-mt.lib" $1/lib/$TYPE/$PLATFORM/libassimp.lib
+        cp -v -r build_${TYPE}_${PLATFORM}_release/include/* $1/include
+        mkdir -p $1/lib/$TYPE/$PLATFORM/Release
+        mkdir -p $1/lib/$TYPE/$PLATFORM/Debug
+        if [ "${ASSIMP_STATIC:-${DEFAULT_VS_STATIC}}" = "1" ]; then
+            cp -v "build_${TYPE}_${PLATFORM}_release/lib/Release/assimp-vc${VC_VERSION}-mt.lib" $1/lib/$TYPE/$PLATFORM/libassimp.lib
+            cp -v "build_${TYPE}_${PLATFORM}_debug/lib/Debug/assimp-vc${VC_VERSION}-mtd.lib" $1/lib/$TYPE/$PLATFORM/libassimpD.lib
             secure "$1/lib/$TYPE/$PLATFORM/libassimp.lib" "assimp.pkl" "$VERSION" "$DEFINES" "$BUILD_ID" "$FORMULA_DEPENDS"
         else
-            mkdir -p $1/lib/$TYPE/$PLATFORM/Debug
-            mkdir -p $1/lib/$TYPE/$PLATFORM/Release
-            # cp -v "build_${TYPE}_${PLATFORM}/bin/Release/assimp-vc${VC_VERSION}-mt.dll" $1/lib/$TYPE/$PLATFORM/Release/assimp-vc${VC_VERSION}-mt.dll
-            # cp -v "build_${TYPE}_${PLATFORM}/bin/Debug/assimp-vc${VC_VERSION}-mtd.dll" $1/lib/$TYPE/$PLATFORM/Debug/assimp-vc${VC_VERSION}-mtd.dll
-            cp -v "build_${TYPE}_${PLATFORM}/lib/Debug/assimp-vc${VC_VERSION}-mtd.lib" $1/lib/$TYPE/$PLATFORM/Debug/libassimpD.lib
-            cp -v "build_${TYPE}_${PLATFORM}/lib/Release/assimp-vc${VC_VERSION}-mt.lib" $1/lib/$TYPE/$PLATFORM/Release/libassimp.lib
+            cp -v "build_${TYPE}_${PLATFORM}_release/bin/Release/assimp-vc${VC_VERSION}-mt.dll" $1/lib/$TYPE/$PLATFORM/Release/assimp-vc${VC_VERSION}-mt.dll
+            cp -v "build_${TYPE}_${PLATFORM}_debug/bin/Debug/assimp-vc${VC_VERSION}-mtd.dll" $1/lib/$TYPE/$PLATFORM/Debug/assimp-vc${VC_VERSION}-mtd.dll
+            cp -v "build_${TYPE}_${PLATFORM}_debug/lib/Debug/assimp-vc${VC_VERSION}-mtd.lib" $1/lib/$TYPE/$PLATFORM/Debug/libassimpD.lib
+            cp -v "build_${TYPE}_${PLATFORM}_release/lib/Release/assimp-vc${VC_VERSION}-mt.lib" $1/lib/$TYPE/$PLATFORM/Release/libassimp.lib
             secure "$1/lib/$TYPE/$PLATFORM/libassimp.lib" "assimp.pkl" "$VERSION" "$DEFINES" "$BUILD_ID" "$FORMULA_DEPENDS"
         fi
-
     elif [[ "$TYPE" =~ ^(osx|ios|tvos|xros|catos|watchos|linux|msys2)$ ]]; then
         cp -v -r build_${TYPE}_${PLATFORM}/include/* $1/include
         mkdir -p $1/lib/$TYPE/$PLATFORM/
diff --git a/apothecary/formulas/opencv/opencv.sh b/apothecary/formulas/opencv/opencv.sh
@@ -357,8 +357,8 @@ function build() {
 
 		echoInfo "Building with OPENCV_STATIC"
 		export DEFINES="${DEFINES} \
-		-DBUILD_WITH_STATIC_CRT=ON \
-		-DUSE_STATIC_CRT=ON \
+		-DBUILD_WITH_STATIC_CRT=OFF \
+		-DUSE_STATIC_CRT=OFF \
 		-DBUILD_SHARED_LIBS=OFF"
 		if [ $MULTITHREADED_TYPE == "MD" ]; then
 			sed -i 's/\/MT/\/MD/g; s/\/MTd/\/MDd/g' ../CMakeLists.txt
diff --git a/apothecary/formulas/poco/poco.sh b/apothecary/formulas/poco/poco.sh
diff --git a/apothecary/formulas/pugixml.sh b/apothecary/formulas/pugixml.sh
diff --git a/apothecary/formulas/zlib/zlib.sh b/apothecary/formulas/zlib/zlib.sh
diff --git a/scripts/calculate_formulas.sh b/scripts/calculate_formulas.sh
diff --git a/scripts/package.sh b/scripts/package.sh
