-
-
Notifications
You must be signed in to change notification settings - Fork 970
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into bug/3774/alternate-extra-wall-zero-infill
- Loading branch information
Showing
349 changed files
with
35,375 additions
and
5,197 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| { | ||
| "name": "OrcaSlicer", | ||
| "image": "mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04", | ||
| "runArgs": ["--env-file", "/tmp/devcontainer.env"], | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/desktop-lite:1": { | ||
| "password": "orca" | ||
| } | ||
| }, | ||
| "customizations": { | ||
| "vscode": { | ||
| "settings": { | ||
| "cmake.configureArgs": [ | ||
| "-DSLIC3R_GTK=3", | ||
| "-DBBL_RELEASE_TO_PUBLIC=1", | ||
| "-DBBL_INTERNAL_TESTING=0", | ||
| "-DSLIC3R_STATIC=1", | ||
| "-DCMAKE_PREFIX_PATH=${workspaceFolder}/deps/build/destdir/usr/local" | ||
| ], | ||
| "cmake.buildToolArgs": [ | ||
| "-l${containerEnv:CORES}" | ||
| ] | ||
| }, | ||
|
|
||
| // Add the IDs of extensions you want installed when the container is created. | ||
| "extensions": [ | ||
| "ms-vscode.cmake-tools", | ||
| "ms-vscode.cpptools-extension-pack" | ||
| ] | ||
| } | ||
| }, | ||
|
|
||
| "forwardPorts": [6080], | ||
| "portsAttributes": { | ||
| "6080": { | ||
| "label": "VNC web client (noVNC)", | ||
| "onAutoForward": "silent" | ||
| } | ||
| }, | ||
| "otherPortsAttributes": { | ||
| "onAutoForward": "ignore" | ||
| }, | ||
|
|
||
| "initializeCommand": { | ||
| "Setup Temporary Env File": "echo \"CORES=`nproc --all`\" > /tmp/devcontainer.env" | ||
| }, | ||
| "onCreateCommand": { | ||
| "Set postCreate executable flag": "chmod +x .devcontainer/postCreate.sh" | ||
| }, | ||
| "postCreateCommand": "sudo .devcontainer/postCreate.sh" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/bash | ||
| # Update and upgrade all system packages | ||
| apt update | ||
| apt upgrade -y | ||
|
|
||
| echo "-----------------------------------------" | ||
| echo "Running BuildLinux.sh with update flag..." | ||
| echo "-----------------------------------------" | ||
| ./BuildLinux.sh -u | ||
|
|
||
| echo "------------------------------" | ||
| echo "Installing missing packages..." | ||
| echo "------------------------------" | ||
| apt install -y libgl1-mesa-dev m4 autoconf libtool |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ jobs: | |
| env: | ||
| date: | ||
| ver: | ||
| ver_pure: | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
|
|
@@ -36,15 +37,14 @@ jobs: | |
| - name: Get the version and date on Ubuntu and macOS | ||
| if: inputs.os != 'windows-latest' | ||
| run: | | ||
| if [ "${{ github.ref }}" == "refs/heads/main" ]; then | ||
| ver="nightly$(date +'%y%m%d')" | ||
| elif [[ "${{ github.event_name }}" == "pull_request" ]]; then | ||
| ver="PR${{ github.event.number }}" | ||
| ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2) | ||
| if [[ "${{ github.event_name }}" == "pull_request" ]]; then | ||
| ver="PR-${{ github.event.number }}" | ||
| else | ||
| ver=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2) | ||
| ver=V$ver | ||
| ver=V$ver_pure | ||
| fi | ||
| echo "ver=$ver" >> $GITHUB_ENV | ||
| echo "ver_pure=$ver_pure" >> $GITHUB_ENV | ||
| echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV | ||
| shell: bash | ||
|
|
||
|
|
@@ -56,9 +56,7 @@ jobs: | |
| $eventName = "${{ github.event_name }}" | ||
| $prNumber = "${{ github.event.number }}" | ||
| if ($ref -eq 'refs/heads/main') { | ||
| $ver = "nightly" + $date.Substring(2) | ||
| } elseif ($eventName -eq 'pull_request') { | ||
| if ($eventName -eq 'pull_request') { | ||
| $ver = "PR" + $prNumber | ||
| } else { | ||
| $versionContent = Get-Content version.inc -Raw | ||
|
|
@@ -130,6 +128,17 @@ jobs: | |
| name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }} | ||
| path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg | ||
|
|
||
| - name: Deploy Mac release | ||
| if: github.ref == 'refs/heads/main' && inputs.os == 'macos-12' | ||
| uses: WebFreak001/[email protected] | ||
| with: | ||
| upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} | ||
| release_id: 137995723 | ||
| asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg | ||
| asset_name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg | ||
| asset_content_type: application/octet-stream | ||
| max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted | ||
|
|
||
| # Windows | ||
| - name: setup MSVC | ||
| if: inputs.os == 'windows-latest' | ||
|
|
@@ -185,6 +194,28 @@ jobs: | |
| name: PDB | ||
| path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z | ||
|
|
||
| - name: Deploy Windows release portable | ||
| if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' | ||
| uses: WebFreak001/[email protected] | ||
| with: | ||
| upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} | ||
| release_id: 137995723 | ||
| asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip | ||
| asset_name: OrcaSlicer_Windows_${{ env.ver }}_portable.zip | ||
| asset_content_type: application/x-zip-compressed | ||
| max_releases: 1 | ||
|
|
||
| - name: Deploy Windows release installer | ||
| if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' | ||
| uses: WebFreak001/[email protected] | ||
| with: | ||
| upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} | ||
| release_id: 137995723 | ||
| asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe | ||
| asset_name: OrcaSlicer_Windows_Installer_${{ env.ver }}.exe | ||
| asset_content_type: application/x-msdownload | ||
| max_releases: 1 | ||
|
|
||
| # Ubuntu | ||
| - name: Install dependencies | ||
| if: inputs.os == 'ubuntu-20.04' | ||
|
|
@@ -211,11 +242,23 @@ jobs: | |
| shell: bash | ||
| run: | | ||
| ./BuildLinux.sh -isr | ||
| chmod +x ./build/OrcaSlicer_ubu64.AppImage | ||
| mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage | ||
| chmod +x ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage | ||
| - name: Upload artifacts Ubuntu | ||
| if: inputs.os == 'ubuntu-20.04' | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: OrcaSlicer_Linux_${{ env.ver }} | ||
| path: './build/OrcaSlicer_ubu64.AppImage' | ||
| path: './build/OrcaSlicer_Linux_${{ env.ver }}.AppImage' | ||
|
|
||
| - name: Deploy Ubuntu release | ||
| if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' | ||
| uses: WebFreak001/[email protected] | ||
| with: | ||
| upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} | ||
| release_id: 137995723 | ||
| asset_path: ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage | ||
| asset_name: OrcaSlicer_Linux_${{ env.ver }}.AppImage | ||
| asset_content_type: application/octet-stream | ||
| max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| Build | ||
| Build.bat | ||
| /build*/ | ||
| deps/build | ||
| deps/build* | ||
| MYMETA.json | ||
| MYMETA.yml | ||
| _build | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,50 @@ | ||
| set WP=%CD% | ||
|
|
||
| set debug=OFF | ||
| set debuginfo=OFF | ||
| if "%1"=="debug" set debug=ON | ||
| if "%2"=="debug" set debug=ON | ||
| if "%1"=="debuginfo" set debuginfo=ON | ||
| if "%2"=="debuginfo" set debuginfo=ON | ||
| if "%debug%"=="ON" ( | ||
| set build_type=Debug | ||
| set build_dir=build-dbg | ||
| ) else ( | ||
| if "%debuginfo%"=="ON" ( | ||
| set build_type=RelWithDebInfo | ||
| set build_dir=build-dbginfo | ||
| ) else ( | ||
| set build_type=Release | ||
| set build_dir=build | ||
| ) | ||
| ) | ||
| echo build type set to %build_type% | ||
|
|
||
| cd deps | ||
| mkdir build | ||
| cd build | ||
| mkdir %build_dir% | ||
| cd %build_dir% | ||
| set DEPS=%CD%/OrcaSlicer_dep | ||
| if "%1"=="slicer" ( | ||
| GOTO :slicer | ||
| ) | ||
| echo "building deps.." | ||
| cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release | ||
| cmake --build . --config Release --target deps -- -m | ||
|
|
||
| echo cmake ../ -G "Visual Studio 16 2019 -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo% | ||
| cmake ../ -G "Visual Studio 16 2019 -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo% | ||
| cmake --build . --config %build_type% --target deps -- -m | ||
|
|
||
| if "%1"=="deps" exit /b 0 | ||
|
|
||
| :slicer | ||
| echo "building Orca Slicer..." | ||
| cd %WP% | ||
| mkdir build | ||
| cd build | ||
| mkdir %build_dir% | ||
| cd %build_dir% | ||
|
|
||
| cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" | ||
| cmake --build . --config Release --target ALL_BUILD -- -m | ||
| echo cmake .. -G "Visual Studio 16 2019 -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% | ||
| cmake .. -G "Visual Studio 16 2019 -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0" | ||
| cmake --build . --config %build_type% --target ALL_BUILD -- -m | ||
| cd .. | ||
| call run_gettext.bat | ||
| cd build | ||
| cmake --build . --target install --config Release | ||
| cd %build_dir% | ||
| cmake --build . --target install --config %build_type% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.