More changes to fix the CPack deploy jobs

3MFConsortium · Jun 3, 2024 · 8d4bd46 · 8d4bd46
1 parent 0e7bf1b
commit 8d4bd46
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -347,18 +347,18 @@ jobs:
       - name: Unpack the cpacked SDK
         run: |
           unzip lib3mf-${{ env.LIB3MF_VERSION }}-Linux.zip/lib3mf-${{ env.LIB3MF_VERSION }}-Linux.zip && ls -Rl
-      - name: Build CppDynamicNew
+      - name: Build CppDynamic - CPack (Linux)
         run: | 
-          sh SDK/CPackExamples/CppDynamicNew/GenerateMake.sh
-          cd SDK/CPackExamples/CppDynamicNew/build
+          sh SDK/CPackExamples/CppDynamic/GenerateMake.sh
+          cd SDK/CPackExamples/CppDynamic/build
           cmake --build .
-          ./Example_ExtractInfo ../../Examples/Files/Helix.3mf
-      - name: Build CppNew
+          ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf
+      - name: Build Cpp - CPack (Linux)
         run: |
-          sh SDK/CPackExamples/CppNew/GenerateMake.sh
-          cd SDK/CPackExamples/CppNew/build
+          sh SDK/CPackExamples/Cpp/GenerateMake.sh
+          cd SDK/CPackExamples/Cpp/build
           cmake --build .
-          ./Example_ExtractInfo ../../Examples/Files/Helix.3mf
+          ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf
       - name: Download lib3mf (Debian Linux)
         uses: actions/download-artifact@v2
         with:
@@ -373,18 +373,18 @@ jobs:
       - name: Install the debian package
         run: |
           sudo dpkg -i lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb/lib3mf-${{ env.LIB3MF_VERSION }}-Linux.deb
-      - name: Build CppDynamicNew (Debian)
+      - name: Build CppDynamic - CPack (Debian)
         run: |
-          sh SDK/CPackExamples/CppDynamicNew/GenerateMake.sh
-          cd SDK/CPackExamples/CppDynamicNew/build
+          sh SDK/CPackExamples/CppDynamic/GenerateMake.sh
+          cd SDK/CPackExamples/CppDynamic/build
           cmake --build .
-          ./Example_ExtractInfo ../../Examples/Files/Helix.3mf
-      - name: Build CppNew (Debian)
+          ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf
+      - name: Build Cpp - CPack (Debian)
         run: |
-          sh SDK/CPackExamples/CppNew/GenerateMake.sh
-          cd SDK/CPackExamples/CppNew/build
+          sh SDK/CPackExamples/Cpp/GenerateMake.sh
+          cd SDK/CPackExamples/Cpp/build
           cmake --build .
-          ./Example_ExtractInfo ../../Examples/Files/Helix.3mf
+          ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf
 
   deploy-windows:
     runs-on: windows-2019
@@ -424,18 +424,16 @@ jobs:
           unzip lib3mf-${{ env.LIB3MF_VERSION }}-Windows.zip/lib3mf-${{ env.LIB3MF_VERSION }}-Windows.zip
       - name: Build CppDynamic - CPack (Windows)
         run: | 
-          ./SDK/CPackExamples/CppDynamicNew/GenerateVS2019.bat
-          cd SDK/CPackExamples/CppDynamicNew/build
+          ./SDK/CPackExamples/CppDynamic/GenerateVS2019.bat
+          cd SDK/CPackExamples/CppDynamic/build
           cmake --build . --config Release
-          ls ../../
-          ./Release/Example_ExtractInfo.exe ../../Examples/Files/Helix.3mf
+          ./Release/Example_ExtractInfo.exe ../../../Examples/Files/Helix.3mf
       - name: Build Cpp - CPack (Windows)
         run: |
-          ./SDK/CPackExamples/CppNew/GenerateVS2019.bat
-          cd SDK/CPackExamples/CppNew/build
+          ./SDK/CPackExamples/Cpp/GenerateVS2019.bat
+          cd SDK/CPackExamples/Cpp/build
           cmake --build . --config Release
-          ls ../../
-          ./Release/Example_ExtractInfo.exe ../../Examples/Files/Helix.3mf
+          ./Release/Example_ExtractInfo.exe ../../../Examples/Files/Helix.3mf
 
   deploy-macos:
     runs-on: macos-latest
@@ -474,18 +472,18 @@ jobs:
       - name: Unpack the cpacked SDK (Darwin)
         run: |
           unzip lib3mf-${{ env.LIB3MF_VERSION }}-Darwin.zip/lib3mf-${{ env.LIB3MF_VERSION }}-Darwin.zip
-      - name: Build CppDynamicNew (Darwin)
+      - name: Build CppDynamic - CPack (Darwin)
         run: |
-          sh SDK/CPackExamples/CppDynamicNew/GenerateMake.sh
-          cd SDK/CPackExamples/CppDynamicNew/build
+          sh SDK/CPackExamples/CppDynamic/GenerateMake.sh
+          cd SDK/CPackExamples/CppDynamic/build
           cmake --build .
-          ./Example_ExtractInfo ../../Examples/Files/Helix.3mf
-      - name: Build CppNew (Darwin)
+          ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf
+      - name: Build Cpp - CPack (Darwin)
         run: |
-          sh SDK/CPackExamples/CppNew/GenerateMake.sh
-          cd SDK/CPackExamples/CppNew/build
+          sh SDK/CPackExamples/Cpp/GenerateMake.sh
+          cd SDK/CPackExamples/Cpp/build
           cmake --build .
-          ./Example_ExtractInfo ../../Examples/Files/Helix.3mf
+          ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf
 
 
   set-integration-tests-status:

diff --git a/SDK/CPackExamples/CppNew/CMakeLists.txt → SDK/CPackExamples/Cpp/CMakeLists.txt b/SDK/CPackExamples/CppNew/CMakeLists.txt → SDK/CPackExamples/Cpp/CMakeLists.txt
diff --git a/...ackExamples/CppDynamicNew/GenerateMake.sh → SDK/CPackExamples/Cpp/GenerateMake.sh b/...ackExamples/CppDynamicNew/GenerateMake.sh → SDK/CPackExamples/Cpp/GenerateMake.sh
diff --git a/...Examples/CppDynamicNew/GenerateVS2015.bat → SDK/CPackExamples/Cpp/GenerateVS2015.bat b/...Examples/CppDynamicNew/GenerateVS2015.bat → SDK/CPackExamples/Cpp/GenerateVS2015.bat
diff --git a/...Examples/CppDynamicNew/GenerateVS2017.bat → SDK/CPackExamples/Cpp/GenerateVS2017.bat b/...Examples/CppDynamicNew/GenerateVS2017.bat → SDK/CPackExamples/Cpp/GenerateVS2017.bat
diff --git a/...Examples/CppDynamicNew/GenerateVS2019.bat → SDK/CPackExamples/Cpp/GenerateVS2019.bat b/...Examples/CppDynamicNew/GenerateVS2019.bat → SDK/CPackExamples/Cpp/GenerateVS2019.bat
diff --git a/...ackExamples/CppNew/Source/BeamLattice.cpp → SDK/CPackExamples/Cpp/Source/BeamLattice.cpp b/...ackExamples/CppNew/Source/BeamLattice.cpp → SDK/CPackExamples/Cpp/Source/BeamLattice.cpp
diff --git a/...CPackExamples/CppNew/Source/ColorCube.cpp → SDK/CPackExamples/Cpp/Source/ColorCube.cpp b/...CPackExamples/CppNew/Source/ColorCube.cpp → SDK/CPackExamples/Cpp/Source/ColorCube.cpp
diff --git a/...PackExamples/CppNew/Source/Components.cpp → SDK/CPackExamples/Cpp/Source/Components.cpp b/...PackExamples/CppNew/Source/Components.cpp → SDK/CPackExamples/Cpp/Source/Components.cpp
diff --git a/...CPackExamples/CppNew/Source/Converter.cpp → SDK/CPackExamples/Cpp/Source/Converter.cpp b/...CPackExamples/CppNew/Source/Converter.cpp → SDK/CPackExamples/Cpp/Source/Converter.cpp
diff --git a/SDK/CPackExamples/CppNew/Source/Cube.cpp → SDK/CPackExamples/Cpp/Source/Cube.cpp b/SDK/CPackExamples/CppNew/Source/Cube.cpp → SDK/CPackExamples/Cpp/Source/Cube.cpp
diff --git a/...ackExamples/CppNew/Source/ExtractInfo.cpp → SDK/CPackExamples/Cpp/Source/ExtractInfo.cpp b/...ackExamples/CppNew/Source/ExtractInfo.cpp → SDK/CPackExamples/Cpp/Source/ExtractInfo.cpp
diff --git a/...PackExamples/CppNew/Source/SecureCube.cpp → SDK/CPackExamples/Cpp/Source/SecureCube.cpp b/...PackExamples/CppNew/Source/SecureCube.cpp → SDK/CPackExamples/Cpp/Source/SecureCube.cpp
diff --git a/SDK/CPackExamples/CppNew/Source/Slice.cpp → SDK/CPackExamples/Cpp/Source/Slice.cpp b/SDK/CPackExamples/CppNew/Source/Slice.cpp → SDK/CPackExamples/Cpp/Source/Slice.cpp
diff --git a/...ackExamples/CppNew/Source/TextureCube.cpp → SDK/CPackExamples/Cpp/Source/TextureCube.cpp b/...ackExamples/CppNew/Source/TextureCube.cpp → SDK/CPackExamples/Cpp/Source/TextureCube.cpp
diff --git a/...PackExamples/CppDynamicNew/CMakeLists.txt → SDK/CPackExamples/CppDynamic/CMakeLists.txt b/...PackExamples/CppDynamicNew/CMakeLists.txt → SDK/CPackExamples/CppDynamic/CMakeLists.txt
diff --git a/SDK/CPackExamples/CppNew/GenerateMake.sh → SDK/CPackExamples/CppDynamic/GenerateMake.sh b/SDK/CPackExamples/CppNew/GenerateMake.sh → SDK/CPackExamples/CppDynamic/GenerateMake.sh
diff --git a/SDK/CPackExamples/CppNew/GenerateVS2015.bat → ...ackExamples/CppDynamic/GenerateVS2015.bat b/SDK/CPackExamples/CppNew/GenerateVS2015.bat → ...ackExamples/CppDynamic/GenerateVS2015.bat
diff --git a/SDK/CPackExamples/CppNew/GenerateVS2017.bat → ...ackExamples/CppDynamic/GenerateVS2017.bat b/SDK/CPackExamples/CppNew/GenerateVS2017.bat → ...ackExamples/CppDynamic/GenerateVS2017.bat
diff --git a/SDK/CPackExamples/CppNew/GenerateVS2019.bat → ...ackExamples/CppDynamic/GenerateVS2019.bat b/SDK/CPackExamples/CppNew/GenerateVS2019.bat → ...ackExamples/CppDynamic/GenerateVS2019.bat
diff --git a/...ples/CppDynamicNew/Source/ExtractInfo.cpp → ...xamples/CppDynamic/Source/ExtractInfo.cpp b/...ples/CppDynamicNew/Source/ExtractInfo.cpp → ...xamples/CppDynamic/Source/ExtractInfo.cpp