diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..5135af0e452 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.exe filter=lfs diff=lfs merge=lfs -text diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml index cccc0849443..108f42bcb77 100644 --- a/.github/workflows/build_check_cache.yml +++ b/.github/workflows/build_check_cache.yml @@ -23,7 +23,7 @@ jobs: valid-cache: ${{ steps.cache_deps.outputs.cache-hit }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: set outputs id: set_outputs @@ -38,7 +38,7 @@ jobs: - name: load cache id: cache_deps - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.set_outputs.outputs.cache-path }} key: ${{ steps.set_outputs.outputs.cache-key }} diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 0306552a061..8652030a36c 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -31,17 +31,17 @@ jobs: # Setup the environment - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: load cached deps - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ inputs.cache-path }} key: ${{ inputs.cache-key }} - name: setup dev on Windows if: inputs.os == 'windows-latest' - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - name: Get the date on Ubuntu and macOS if: inputs.os != 'windows-latest' @@ -101,21 +101,21 @@ jobs: # Upload Artifacts - name: Upload Mac ${{ inputs.arch }} artifacts if: inputs.os == 'macos-12' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }} path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep*.tar.gz - name: Upload Windows artifacts if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OrcaSlicer_dep_win64_${{ env.date }} path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip - name: Upload Ubuntu artifacts if: inputs.os == 'ubuntu-20.04' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OrcaSlicer_dep_ubuntu_${{ env.date }} path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 64c3e25db6b..2ab116a6bca 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -25,10 +25,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + lfs: 'true' - name: load cached deps - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ inputs.cache-path }} key: ${{ inputs.cache-key }} @@ -123,14 +125,14 @@ jobs: - name: Upload artifacts mac if: inputs.os == 'macos-12' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: 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/deploy-nightly@v3.0.0 + uses: WebFreak001/deploy-nightly@v3.1.0 with: upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} release_id: 137995723 @@ -142,7 +144,7 @@ jobs: # Windows - name: setup MSVC if: inputs.os == 'windows-latest' - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 - name: Install nsis if: inputs.os == 'windows-latest' @@ -175,28 +177,28 @@ jobs: - name: Upload artifacts Win zip if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OrcaSlicer_Windows_${{ env.ver }}_portable path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip - name: Upload artifacts Win installer if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OrcaSlicer_Windows_${{ env.ver }} path: ${{ github.workspace }}/build/OrcaSlicer*.exe - name: Upload artifacts Win PDB if: inputs.os == 'windows-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: 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/deploy-nightly@v3.0.0 + uses: WebFreak001/deploy-nightly@v3.1.0 with: upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} release_id: 137995723 @@ -207,7 +209,7 @@ jobs: - name: Deploy Windows release installer if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest' - uses: WebFreak001/deploy-nightly@v3.0.0 + uses: WebFreak001/deploy-nightly@v3.1.0 with: upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} release_id: 137995723 @@ -256,14 +258,14 @@ jobs: - name: Upload artifacts Ubuntu if: inputs.os == 'ubuntu-20.04' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OrcaSlicer_Linux_${{ env.ver }} path: './build/OrcaSlicer_Linux_${{ env.ver }}.AppImage' - name: Deploy Ubuntu release if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' - uses: WebFreak001/deploy-nightly@v3.0.0 + uses: WebFreak001/deploy-nightly@v3.1.0 with: upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} release_id: 137995723 @@ -274,7 +276,7 @@ jobs: - name: Deploy orca_custom_preset_tests if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' - uses: WebFreak001/deploy-nightly@v3.0.0 + uses: WebFreak001/deploy-nightly@v3.1.0 with: upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} release_id: 137995723 diff --git a/.github/workflows/check_locale.yml b/.github/workflows/check_locale.yml index 576a525b515..16a1e2b6540 100644 --- a/.github/workflows/check_locale.yml +++ b/.github/workflows/check_locale.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install gettext run: | diff --git a/.github/workflows/check_profiles.yml b/.github/workflows/check_profiles.yml index 2f49a06ae5b..6208a205fa3 100644 --- a/.github/workflows/check_profiles.yml +++ b/.github/workflows/check_profiles.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # download - name: Download diff --git a/.github/workflows/publish_docs_to_wiki.yml b/.github/workflows/publish_docs_to_wiki.yml index c55539c118a..4c78bbb4e21 100644 --- a/.github/workflows/publish_docs_to_wiki.yml +++ b/.github/workflows/publish_docs_to_wiki.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # 1. Clone the current wiki master branch to a folder named `tmp_wiki` - name: Pull content from wiki diff --git a/README.md b/README.md index f37d5a2d03f..512b78a83e7 100644 --- a/README.md +++ b/README.md @@ -64,10 +64,11 @@ Explore the latest developments in Orca Slicer with our nightly builds. Feedback # How to compile - Windows 64-bit - - Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl. + - Tools needed: Visual Studio 2019, Cmake, git, git-lfs, Strawberry Perl. - You will require cmake version 3.14 or later, which is available [on their website](https://cmake.org/download/). - Strawberry Perl is [available on their github repository](https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/). - Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019` + - Note: Don't forget to run `git lfs pull` after cloning the repository to download tools on Windows - Mac 64-bit - Tools needed: Xcode, Cmake, git, gettext, libtool, automake, autoconf, texinfo diff --git a/run_gettext.bat b/run_gettext.bat index 2bad470098a..9a0425df1bc 100644 --- a/run_gettext.bat +++ b/run_gettext.bat @@ -9,7 +9,7 @@ for %%a in (%*) do ( ) if %FULL_MODE%==1 ( - xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost -f ./localization/i18n/list.txt -o ./localization/i18n/OrcaSlicer.pot + .\tools\xgettext.exe --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost -f ./localization/i18n/list.txt -o ./localization/i18n/OrcaSlicer.pot build\\src\\hints\\Release\\hintsToPot ./resources ./localization/i18n ) REM Print the current directory @@ -28,8 +28,8 @@ goto :eof set "name=%~n1" set "lang=%name:OrcaSlicer_=%" if %FULL_MODE%==1 ( - msgmerge -N -o "%file%" "%file%" "%pot_file%" + .\tools\msgmerge.exe -N -o "%file%" "%file%" "%pot_file%" ) if not exist "./resources/i18n/%lang%" mkdir "./resources/i18n/%lang%" - msgfmt --check-format -o "./resources/i18n/%lang%/OrcaSlicer.mo" "%file%" + .\tools\msgfmt.exe --check-format -o "./resources/i18n/%lang%/OrcaSlicer.mo" "%file%" goto :eof diff --git a/tools/7z.exe b/tools/7z.exe index a739ca0fde8..871646e20fe 100644 Binary files a/tools/7z.exe and b/tools/7z.exe differ diff --git a/tools/msgfmt.exe b/tools/msgfmt.exe new file mode 100644 index 00000000000..d4a144a7761 --- /dev/null +++ b/tools/msgfmt.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f9898c795ae727469e031fa41783ee1f928a16500e80efca230d796d3e3a820 +size 1945633 diff --git a/tools/msgmerge.exe b/tools/msgmerge.exe new file mode 100644 index 00000000000..e78db692232 --- /dev/null +++ b/tools/msgmerge.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:919fceafd8284420fbed71088abf6583d87e3c846e55f56675af969dd785bcc8 +size 2354301 diff --git a/tools/xgettext.exe b/tools/xgettext.exe new file mode 100644 index 00000000000..67f36ccb648 --- /dev/null +++ b/tools/xgettext.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c510f2711b124c7738965b519b286678a9a393a73486fbf48208220460ca8a30 +size 3423198