diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 5e7ef688159..82a38918728 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -60,15 +60,15 @@ jobs: choco install strawberryperl mkdir ${{ github.workspace }}/deps/build mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep - $env:SHELL = "X:PATHCOMMAND.COM /P /E:1024" .\build_release_vs2022.bat deps + .\build_release_vs2022.bat pack cd ${{ github.workspace }}/deps/build - name: Build on Mac x86_64 if: matrix.os == 'macos-12' && matrix.arch == 'x86_64' working-directory: ${{ github.workspace }} run: | - brew install cmake git gettext + brew install cmake git gettext automake mkdir -p ${{ github.workspace }}/deps/build_x86_64 mkdir -p ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64 ./build_release_macos.sh -dp -a x86_64 @@ -77,7 +77,7 @@ jobs: if: matrix.os == 'macos-12' && matrix.arch == 'arm64' working-directory: ${{ github.workspace }} run: | - brew install cmake git gettext + brew install cmake git gettext automake mkdir -p ${{ github.workspace }}/deps/build_arm64 mkdir -p ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64 ./build_release_macos.sh -dp -a arm64 @@ -117,7 +117,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: OrcaSlicer_dep_win64_${{ env.date }} - path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep + path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip - name: Upload Ubuntu artifacts if: matrix.os == 'ubuntu-20.04' diff --git a/build_release_vs2022.bat b/build_release_vs2022.bat index b323bfc72fa..a2711771217 100644 --- a/build_release_vs2022.bat +++ b/build_release_vs2022.bat @@ -1,16 +1,33 @@ +@REM OcarSlicer build script for Windows +@echo off set WP=%CD% + +@REM Pack deps +if "%1"=="pack" ( + setlocal ENABLEDELAYEDEXPANSION + cd %WP%/deps/build + for /f "tokens=2-4 delims=/ " %%a in ('date /t') do set build_date=%%c%%b%%a + echo packing deps: OrcaSlicer_dep_win64_!build_date!_vs2022.zip + + %WP%/tools/7z.exe a OrcaSlicer_dep_win64_!build_date!_vs2022.zip OrcaSlicer_dep + exit /b 0 +) + +setlocal DISABLEDELAYEDEXPANSION cd deps mkdir build cd build set DEPS=%CD%/OrcaSlicer_dep + if "%1"=="slicer" ( GOTO :slicer ) echo "building deps.." + + cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release cmake --build . --config Release --target deps -- -m - if "%1"=="deps" exit /b 0 :slicer @@ -19,9 +36,10 @@ cd %WP% mkdir build cd build -cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release +echo cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release +cmake .. -G "Visual Studio 17 2022" -A x64 -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.22000.0" cmake --build . --config Release --target ALL_BUILD -- -m cd .. call run_gettext.bat cd build -cmake --build . --target install --config Release \ No newline at end of file +cmake --build . --target install --config Release diff --git a/deps/OpenSSL/OpenSSL.cmake b/deps/OpenSSL/OpenSSL.cmake index b42b1a808d2..7eb28af1a73 100644 --- a/deps/OpenSSL/OpenSSL.cmake +++ b/deps/OpenSSL/OpenSSL.cmake @@ -40,10 +40,10 @@ endif() ExternalProject_Add(dep_OpenSSL #EXCLUDE_FROM_ALL ON - #URL "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz" - URL "https://github.com/openssl/openssl/archive/refs/tags/openssl-3.1.2.tar.gz" - #URL_HASH SHA256=b92f9d3d12043c02860e5e602e50a73ed21a69947bcc74d391f41148e9f6aa95 - URL_HASH SHA256=8c776993154652d0bb393f506d850b811517c8bd8d24b1008aef57fbe55d3f31 + URL "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1w.tar.gz" + URL_HASH SHA256=2130E8C2FB3B79D1086186F78E59E8BC8D1A6AEDF17AB3907F4CB9AE20918C41 + # URL "https://github.com/openssl/openssl/archive/refs/tags/openssl-3.1.2.tar.gz" + # URL_HASH SHA256=8c776993154652d0bb393f506d850b811517c8bd8d24b1008aef57fbe55d3f31 DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/OpenSSL CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch} "--openssldir=${DESTDIR}/usr/local" diff --git a/tools/7z.exe b/tools/7z.exe new file mode 100644 index 00000000000..a739ca0fde8 Binary files /dev/null and b/tools/7z.exe differ