Merge pull request #53 from Ludwigstrasse/Development_Hananiah

【AL-82】Bridge the occt viewer to view system

Author: hananiahhsu

.github/workflows/c-cpp.yml

@@ -37,7 +37,30 @@ jobs:
           qtdeclarative5-dev \
           qtquickcontrols2-5-dev\
           python3 \
-          uuid-dev
+          uuid-dev \
+          build-essential ninja-build rsync pkg-config curl \
+          libgl1-mesa-dev libglu1-mesa-dev xorg-dev
+
+
+    - name: Build OCCT SDK (Linux)
+      run: |
+        set -e
+
+        # 防止 Windows 提交的 CRLF 让 Ubuntu 解释器看到 "sh\r" / "bash\r"
+        # （当前 CI 报错就是这个原因：/usr/bin/env: 'sh\r': No such file or directory）
+        if [ -d "AliceThirdParty/scripts" ]; then
+          find AliceThirdParty/scripts -maxdepth 1 -name "*.sh" -print0 | xargs -0 sed -i 's/\r$//'
+          chmod +x AliceThirdParty/scripts/*.sh
+        fi
+
+        # If OCCT SDK is not present in the repo snapshot, build it in CI and export into Externals/3rdParty.
+        if [ ! -f "Externals/3rdParty/sdk/linux-x64/Release/occt/lib/cmake/opencascade/OpenCASCADEConfig.cmake" ] && \
+           [ ! -f "Externals/3rdParty/sdk/linux-x64/Release/occt/cmake/OpenCASCADEConfig.cmake" ]; then
+          bash AliceThirdParty/scripts/build-occt.sh Release x64-linux
+          bash AliceThirdParty/scripts/export-occt-sdk.sh Release "$GITHUB_WORKSPACE"
+        else
+          echo "OCCT SDK already exists in Externals/3rdParty/sdk/linux-x64/Release/occt"
+        fi
 
 
        

.gitignore

@@ -1,4 +1,4 @@
 # ThirdParty SDK output (do NOT commit)
-Externals/3rdParty/sdk/**
-Externals/3rdParty/runtime/**
+Externals/3rdParty/sdk/msvc2022-x64-md/Debug/occt/data/*.*
+Externals/3rdParty/sdk/msvc2022-x64-md/Debug/occt/win64/vc14/bind/*.pdb
 Externals/3rdParty/install/**

.gitmodules

@@ -10,3 +10,7 @@
 	path = AliceThirdParty
 	url = git@github.com:Ludwigstrasse/AliceThirdParty.git
 	branch = main
+[submodule "Externals/3rdParty/sdk"]
+	path = Externals/3rdParty/sdk
+	url = git@github.com:Ludwigstrasse/AliceSdk.git
+	branch = main

Alice

@@ -64,7 +64,7 @@ echo %cd%
 echo "Start to cmake... ..."
 
 :: -B 指定工程的输出路径  -H 指定CMAKELIST.TXT的路径
-..\SolidDesigner\ToolChain\cmake\bin\cmake.exe -B ..\SolidDesigner_Build -H..\SolidDesigner -DCMAKE_GENERATOR_PLATFORM=x64 -G "Visual Studio 16 2019"
+..\SolidDesigner\ToolChain\cmake\bin\cmake.exe -B ..\SolidDesigner_Build -H..\SolidDesigner -DCMAKE_GENERATOR_PLATFORM=x64 -G "Visual Studio 17 2022"
 
 if errorlevel 1 (
     echo "CMake failed."
@@ -80,7 +80,7 @@ if %errorlevel% neq 0 (
     echo "devenv.exe is not running. Starting a new instance..."
     echo "Opening Visual Studio..."
     ::start "" "%VS140COMNTOOLS%\..\IDE\devenv.exe" "%cd%\SolidDesigner.sln"
-    start "" "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\IDE\\devenv.exe" "%cd%\SolidDesigner.sln"
+    start "" "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\IDE\\devenv.exe" "%cd%\SolidDesigner.sln"
 ) else (
     echo "devenv.exe is already running with PID %vs_pid%. Proceeding to open project..."
 )