From d8369c266f23fd7054a3a1e3d071cb5fadc27ecd Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 6 Jul 2024 13:56:29 +0200 Subject: Linux: optimize Github workflow by caching wxBuildConsole and wxBuildGUI folders We also modify build script to detect the presence of wxBuildConsole and wxBuildGUI folders and reuse them --- .github/workflows/build-linux.yml | 52 +++++++++++++++++---- src/Build/build_cmake_deb.sh | 7 ++- src/Build/build_cmake_opensuse.sh | 32 ++++++------- src/Build/build_cmake_rpm.sh | 28 +++++------ src/Build/build_veracrypt_freebsd.sh | 25 +++++++--- src/Build/build_veracrypt_linux.sh | 26 +++++++---- src/Build/build_veracrypt_linux_no_sse2.sh | 26 +++++++---- src/Build/build_veracrypt_macosx.sh | 14 ++++-- src/COMReg/Release/CL.read.1.tlog | Bin 0 -> 85022 bytes src/COMReg/Release/CL.write.1.tlog | Bin 0 -> 1752 bytes src/COMReg/Release/COMReg.lastbuildstate | 2 + src/COMReg/Release/COMReg.log | 39 ++++++++++++++++ src/COMReg/Release/COMReg.obj | Bin 0 -> 75342 bytes src/COMReg/Release/COMReg.res | Bin 0 -> 373372 bytes src/COMReg/Release/COMReg.write.1.tlog | 0 src/COMReg/Release/Crc.obj | Bin 0 -> 49369 bytes src/COMReg/Release/Dlgcode.obj | Bin 0 -> 1054928 bytes src/COMReg/Release/SelfExtract.obj | Bin 0 -> 198058 bytes .../Release/VeraCryptCOMRegBase.Build.CppClean.log | 16 +++++++ src/COMReg/Release/VeraCryptCOMRegBase.exe | Bin 0 -> 512512 bytes .../VeraCryptCOMRegBase.exe.intermediate.manifest | 10 ++++ src/COMReg/Release/cl.command.1.tlog | Bin 0 -> 3858 bytes src/COMReg/Release/link-cvtres.read.1.tlog | 1 + src/COMReg/Release/link-cvtres.write.1.tlog | 1 + src/COMReg/Release/link.command.1.tlog | Bin 0 -> 2312 bytes src/COMReg/Release/link.read.1.tlog | Bin 0 -> 5160 bytes src/COMReg/Release/link.write.1.tlog | Bin 0 -> 1036 bytes src/COMReg/Release/mt.command.1.tlog | Bin 0 -> 462 bytes src/COMReg/Release/mt.read.1.tlog | Bin 0 -> 708 bytes src/COMReg/Release/mt.write.1.tlog | Bin 0 -> 336 bytes src/COMReg/Release/rc.command.1.tlog | Bin 0 -> 488 bytes src/COMReg/Release/rc.read.1.tlog | Bin 0 -> 2598 bytes src/COMReg/Release/rc.write.1.tlog | Bin 0 -> 222 bytes src/COMReg/Release/vc100.pdb | Bin 0 -> 430080 bytes src/Release/Setup Files/VeraCrypt COMReg.exe | Bin 0 -> 20392448 bytes src/Release/Setup Files/VeraCrypt Format-arm64.exe | Bin 0 -> 3558912 bytes src/Release/Setup Files/VeraCrypt Format-x64.exe | Bin 0 -> 6208512 bytes src/Release/Setup Files/VeraCrypt Format.exe | Bin 0 -> 7697408 bytes src/Release/Setup Files/VeraCrypt Portable.exe | Bin 0 -> 20204544 bytes src/Release/Setup Files/VeraCrypt Setup.exe | Bin 0 -> 20392448 bytes src/Release/Setup Files/VeraCrypt-arm64.exe | Bin 0 -> 3536896 bytes src/Release/Setup Files/VeraCrypt-x64.exe | Bin 0 -> 6188032 bytes src/Release/Setup Files/VeraCrypt.exe | Bin 0 -> 7643648 bytes src/Release/Setup Files/VeraCryptCOMRegBase.exe | Bin 0 -> 512512 bytes .../Setup Files/VeraCryptExpander-arm64.exe | Bin 0 -> 3004416 bytes src/Release/Setup Files/VeraCryptExpander-x64.exe | Bin 0 -> 5664256 bytes src/Release/Setup Files/VeraCryptExpander.exe | Bin 0 -> 7226880 bytes src/Release/Setup Files/VeraCryptSetup.dll | Bin 0 -> 20168192 bytes src/VeraCrypt.sdf | Bin 0 -> 91443200 bytes src/VeraCrypt.suo | Bin 0 -> 24576 bytes src/ipch/crypto-57c110f3/crypto-be6a8ba7.ipch | Bin 0 -> 37224448 bytes src/ipch/mount-e667f7/veracrypt-87304586.ipch | Bin 0 -> 78053376 bytes src/ipch/mount-e667f7/veracrypt-b8a55284.ipch | Bin 0 -> 78053376 bytes 53 files changed, 211 insertions(+), 68 deletions(-) create mode 100644 src/COMReg/Release/CL.read.1.tlog create mode 100644 src/COMReg/Release/CL.write.1.tlog create mode 100644 src/COMReg/Release/COMReg.lastbuildstate create mode 100644 src/COMReg/Release/COMReg.log create mode 100644 src/COMReg/Release/COMReg.obj create mode 100644 src/COMReg/Release/COMReg.res create mode 100644 src/COMReg/Release/COMReg.write.1.tlog create mode 100644 src/COMReg/Release/Crc.obj create mode 100644 src/COMReg/Release/Dlgcode.obj create mode 100644 src/COMReg/Release/SelfExtract.obj create mode 100644 src/COMReg/Release/VeraCryptCOMRegBase.Build.CppClean.log create mode 100644 src/COMReg/Release/VeraCryptCOMRegBase.exe create mode 100644 src/COMReg/Release/VeraCryptCOMRegBase.exe.intermediate.manifest create mode 100644 src/COMReg/Release/cl.command.1.tlog create mode 100644 src/COMReg/Release/link-cvtres.read.1.tlog create mode 100644 src/COMReg/Release/link-cvtres.write.1.tlog create mode 100644 src/COMReg/Release/link.command.1.tlog create mode 100644 src/COMReg/Release/link.read.1.tlog create mode 100644 src/COMReg/Release/link.write.1.tlog create mode 100644 src/COMReg/Release/mt.command.1.tlog create mode 100644 src/COMReg/Release/mt.read.1.tlog create mode 100644 src/COMReg/Release/mt.write.1.tlog create mode 100644 src/COMReg/Release/rc.command.1.tlog create mode 100644 src/COMReg/Release/rc.read.1.tlog create mode 100644 src/COMReg/Release/rc.write.1.tlog create mode 100644 src/COMReg/Release/vc100.pdb create mode 100644 src/Release/Setup Files/VeraCrypt COMReg.exe create mode 100644 src/Release/Setup Files/VeraCrypt Format-arm64.exe create mode 100644 src/Release/Setup Files/VeraCrypt Format-x64.exe create mode 100644 src/Release/Setup Files/VeraCrypt Format.exe create mode 100644 src/Release/Setup Files/VeraCrypt Portable.exe create mode 100644 src/Release/Setup Files/VeraCrypt Setup.exe create mode 100644 src/Release/Setup Files/VeraCrypt-arm64.exe create mode 100644 src/Release/Setup Files/VeraCrypt-x64.exe create mode 100644 src/Release/Setup Files/VeraCrypt.exe create mode 100644 src/Release/Setup Files/VeraCryptCOMRegBase.exe create mode 100644 src/Release/Setup Files/VeraCryptExpander-arm64.exe create mode 100644 src/Release/Setup Files/VeraCryptExpander-x64.exe create mode 100644 src/Release/Setup Files/VeraCryptExpander.exe create mode 100644 src/Release/Setup Files/VeraCryptSetup.dll create mode 100644 src/VeraCrypt.sdf create mode 100644 src/VeraCrypt.suo create mode 100644 src/ipch/crypto-57c110f3/crypto-be6a8ba7.ipch create mode 100644 src/ipch/mount-e667f7/veracrypt-87304586.ipch create mode 100644 src/ipch/mount-e667f7/veracrypt-b8a55284.ipch diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 4145835a..dddeb87b 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -57,20 +57,30 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Cache wxWidgets + - name: Generate cache key + id: cache-key + run: | + echo "cache_key=$(echo ${{ env.WXWIDGETS_VERSION }}-$(sha256sum src/Makefile | awk '{print $1}'))" >> $GITHUB_OUTPUT + + - name: Cache wxBuildConsole + uses: actions/cache@v3 + id: cache-wxbuildconsole + with: + path: /tmp/wxBuildConsole + key: wxBuildConsole-${{ steps.cache-key.outputs.cache_key }} + + - name: Cache wxBuildGUI uses: actions/cache@v3 - id: cache-wxwidgets + id: cache-wxbuildgui with: - path: /tmp/wxWidgets-${{ env.WXWIDGETS_VERSION }} - key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ hashFiles('src/Build/build_cmake_deb.sh', 'src/Makefile') }} - restore-keys: | - wxWidgets-${{ env.WXWIDGETS_VERSION }}- + path: /tmp/wxBuildGUI + key: wxBuildGUI-${{ steps.cache-key.outputs.cache_key }} - name: Install dependencies run: sudo apt-get update && sudo apt-get install -y wget tar libpcsclite-dev libfuse-dev yasm libgtk-3-dev libwxgtk3.0-gtk3-dev libayatana-appindicator3-dev cmake debhelper - - name: Download and extract wxWidgets to /tmp - if: steps.cache-wxwidgets.outputs.cache-hit != 'true' + - name: Download and extract wxWidgets to /tmp if build folders are missing + if: steps.cache-wxbuildconsole.outputs.cache-hit != 'true' || steps.cache-wxbuildgui.outputs.cache-hit != 'true' run: | wget https://github.com/wxWidgets/wxWidgets/releases/download/v${{ env.WXWIDGETS_VERSION }}/wxWidgets-${{ env.WXWIDGETS_VERSION }}.tar.bz2 -O /tmp/wxWidgets-${{ env.WXWIDGETS_VERSION }}.tar.bz2 mkdir -p /tmp/wxWidgets-${{ env.WXWIDGETS_VERSION }} @@ -165,4 +175,28 @@ jobs: exit 1 fi sudo veracrypt -d - sudo apt remove -y veracrypt + sudo apt remove -y veracrypt-console + + - name: Cleanup old caches + uses: actions/github-script@v6 + if: always() + with: + script: | + const caches = await github.rest.actions.getActionsCacheList({ + owner: context.repo.owner, + repo: context.repo.repo, + }) + for (const cache of caches.data.actions_caches) { + if (cache.key.startsWith('wxBuildConsole-') || cache.key.startsWith('wxBuildGUI-')) { + if (cache.key !== `wxBuildConsole-${{ steps.cache-key.outputs.cache_key }}` && + cache.key !== `wxBuildGUI-${{ steps.cache-key.outputs.cache_key }}`) { + console.log(`Deleting cache with key: ${cache.key}`) + await github.rest.actions.deleteActionsCacheById({ + owner: context.repo.owner, + repo: context.repo.repo, + cache_id: cache.id, + }) + } + } + } + diff --git a/src/Build/build_cmake_deb.sh b/src/Build/build_cmake_deb.sh index 797b6d77..5aca3589 100755 --- a/src/Build/build_cmake_deb.sh +++ b/src/Build/build_cmake_deb.sh @@ -53,7 +53,12 @@ build_and_install() { wxstatic_value="" if [ "$wxstatic" = "WXSTATIC" ]; then wxstatic_value="WXSTATIC=1" - make $wxstatic_value $nogui wxbuild || exit 1 + # Check if wx-config exists in WX_BUILD_DIR + if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." + else + make $wxstatic_value $nogui wxbuild || exit 1 + fi fi indicator_value="" diff --git a/src/Build/build_cmake_opensuse.sh b/src/Build/build_cmake_opensuse.sh index 32c5a6cc..923238ad 100644 --- a/src/Build/build_cmake_opensuse.sh +++ b/src/Build/build_cmake_opensuse.sh @@ -41,18 +41,18 @@ echo "Building GUI version of VeraCrypt for RPM using wxWidgets static libraries # This will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildGui -# To build wxWidgets using native GTK version -make WXSTATIC=1 wxbuild || exit 1 -ln -s $WX_BUILD_DIR/lib $WX_BUILD_DIR/lib64 +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + make WXSTATIC=1 wxbuild || exit 1 + ln -s $WX_BUILD_DIR/lib $WX_BUILD_DIR/lib64 +fi + make WXSTATIC=1 clean || exit 1 make WXSTATIC=1 || exit 1 make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1 -# Uncomment below and comment lines above to reuse existing wxWidgets build -# make WXSTATIC=1 clean || exit 1 -# make WXSTATIC=1 || exit 1 -# make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1 - echo "Building console version of VeraCrypt for RPM using wxWidgets static libraries" # This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?" @@ -62,18 +62,18 @@ echo "Building console version of VeraCrypt for RPM using wxWidgets static libra # This will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole -# To build wxWidgets using native GTK version -make WXSTATIC=1 NOGUI=1 wxbuild || exit 1 -ln -s $WX_BUILD_DIR/lib $WX_BUILD_DIR/lib64 +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + make WXSTATIC=1 NOGUI=1 wxbuild || exit 1 + ln -s $WX_BUILD_DIR/lib $WX_BUILD_DIR/lib64 +fi + make WXSTATIC=1 NOGUI=1 clean || exit 1 make WXSTATIC=1 NOGUI=1 || exit 1 make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1 -# Uncomment below and comment lines above to reuse existing wxWidgets build -# make WXSTATIC=1 NOGUI=1 clean || exit 1 -# make WXSTATIC=1 NOGUI=1 || exit 1 -# make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1 - echo "Creating VeraCrypt RPM packages " # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM diff --git a/src/Build/build_cmake_rpm.sh b/src/Build/build_cmake_rpm.sh index 247c1e5e..f9f4bd5b 100644 --- a/src/Build/build_cmake_rpm.sh +++ b/src/Build/build_cmake_rpm.sh @@ -41,17 +41,17 @@ echo "Building GUI version of VeraCrypt for RPM using wxWidgets static libraries # This will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildGui -# To build wxWidgets using native GTK version -make WXSTATIC=1 wxbuild || exit 1 +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + make WXSTATIC=1 wxbuild || exit 1 +fi + make WXSTATIC=1 clean || exit 1 make WXSTATIC=1 || exit 1 make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1 -# Uncomment below and comment lines above to reuse existing wxWidgets build -# make WXSTATIC=1 clean || exit 1 -# make WXSTATIC=1 || exit 1 -# make WXSTATIC=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/GUI" || exit 1 - echo "Building console version of VeraCrypt for RPM using wxWidgets static libraries" # This is to avoid " Error: Unable to initialize GTK+, is DISPLAY set properly?" @@ -61,17 +61,17 @@ echo "Building console version of VeraCrypt for RPM using wxWidgets static libra # This will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole -# To build wxWidgets using native GTK version -make WXSTATIC=1 NOGUI=1 wxbuild || exit 1 +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + make WXSTATIC=1 NOGUI=1 wxbuild || exit 1 +fi + make WXSTATIC=1 NOGUI=1 clean || exit 1 make WXSTATIC=1 NOGUI=1 || exit 1 make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1 -# Uncomment below and comment lines above to reuse existing wxWidgets build -# make WXSTATIC=1 NOGUI=1 clean || exit 1 -# make WXSTATIC=1 NOGUI=1 || exit 1 -# make WXSTATIC=1 NOGUI=1 install DESTDIR="$PARENTDIR/VeraCrypt_Setup/Console" || exit 1 - echo "Creating VeraCrypt RPM packages " # -DCPACK_RPM_PACKAGE_DEBUG=TRUE for debugging cpack RPM diff --git a/src/Build/build_veracrypt_freebsd.sh b/src/Build/build_veracrypt_freebsd.sh index 00fbdd0a..d3acf92d 100755 --- a/src/Build/build_veracrypt_freebsd.sh +++ b/src/Build/build_veracrypt_freebsd.sh @@ -44,17 +44,28 @@ echo "Building GUI version of VeraCrypt" # this will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildGui -gmake WXSTATIC=1 wxbuild && gmake WXSTATIC=1 clean && gmake WXSTATIC=1 && gmake WXSTATIC=1 package +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + gmake WXSTATIC=1 wxbuild || exit 1 +fi -# Uncomment below and comment line above to reuse existing wxWidgets build -#gmake WXSTATIC=1 clean && gmake WXSTATIC=1 && gmake WXSTATIC=1 package +gmake WXSTATIC=1 clean || exit 1 +gmake WXSTATIC=1 || exit 1 +gmake WXSTATIC=1 package || exit 1 echo "Building console version of VeraCrypt" # this will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole -gmake WXSTATIC=1 NOGUI=1 wxbuild && gmake WXSTATIC=1 NOGUI=1 clean && gmake WXSTATIC=1 NOGUI=1 && gmake WXSTATIC=1 NOGUI=1 package - -# Uncomment below and comment line above to reuse existing wxWidgets build -#gmake WXSTATIC=1 NOGUI=1 clean && gmake WXSTATIC=1 NOGUI=1 && gmake WXSTATIC=1 NOGUI=1 package +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + gmake WXSTATIC=1 NOGUI=1 wxbuild || exit 1 +fi +gmake WXSTATIC=1 NOGUI=1 clean || exit 1 +gmake WXSTATIC=1 NOGUI=1 || exit 1 +gmake WXSTATIC=1 NOGUI=1 package || exit 1 diff --git a/src/Build/build_veracrypt_linux.sh b/src/Build/build_veracrypt_linux.sh index 7c226937..af00859c 100755 --- a/src/Build/build_veracrypt_linux.sh +++ b/src/Build/build_veracrypt_linux.sh @@ -43,17 +43,27 @@ echo "Building GUI version of VeraCrypt" # this will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildGui -make WXSTATIC=1 wxbuild && make WXSTATIC=1 clean && make WXSTATIC=1 && make WXSTATIC=1 package - -# Uncomment below and comment line above to reuse existing wxWidgets build -# make WXSTATIC=1 clean && make WXSTATIC=1 && make WXSTATIC=1 package +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + make WXSTATIC=1 wxbuild || exit 1 +fi +make WXSTATIC=1 clean || exit 1 +make WXSTATIC=1 || exit 1 +make WXSTATIC=1 package || exit 1 echo "Building console version of VeraCrypt" # this will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole -make WXSTATIC=1 NOGUI=1 wxbuild && make WXSTATIC=1 NOGUI=1 clean && make WXSTATIC=1 NOGUI=1 && make WXSTATIC=1 NOGUI=1 package - -# Uncomment below and comment line above to reuse existing wxWidgets build -# make WXSTATIC=1 NOGUI=1 clean && make WXSTATIC=1 NOGUI=1 && make WXSTATIC=1 NOGUI=1 package +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + make WXSTATIC=1 NOGUI=1 wxbuild || exit 1 +fi +make WXSTATIC=1 NOGUI=1 clean || exit 1 +make WXSTATIC=1 NOGUI=1 || exit 1 +make WXSTATIC=1 NOGUI=1 package || exit 1 diff --git a/src/Build/build_veracrypt_linux_no_sse2.sh b/src/Build/build_veracrypt_linux_no_sse2.sh index 7162ecd4..e5e46252 100755 --- a/src/Build/build_veracrypt_linux_no_sse2.sh +++ b/src/Build/build_veracrypt_linux_no_sse2.sh @@ -43,17 +43,27 @@ echo "Building GUI version of VeraCrypt" # this will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildGuiNoSSE2 -make WXSTATIC=1 NOSSE2=1 wxbuild && make WXSTATIC=1 NOSSE2=1 clean && make WXSTATIC=1 NOSSE2=1 && make WXSTATIC=1 NOSSE2=1 package - -# Uncomment below and comment line above to reuse existing wxWidgets build -# make WXSTATIC=1 NOSSE2=1 clean && make WXSTATIC=1 NOSSE2=1 && make WXSTATIC=1 NOSSE2=1 package +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + make WXSTATIC=1 NOSSE2=1 wxbuild || exit 1 +fi +make WXSTATIC=1 NOSSE2=1 clean || exit 1 +make WXSTATIC=1 NOSSE2=1 || exit 1 +make WXSTATIC=1 NOSSE2=1 package || exit 1 echo "Building console version of VeraCrypt" # this will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildConsoleNoSSE2 -make WXSTATIC=1 NOGUI=1 NOSSE2=1 wxbuild && make WXSTATIC=1 NOGUI=1 NOSSE2=1 clean && make WXSTATIC=1 NOGUI=1 NOSSE2=1 && make WXSTATIC=1 NOGUI=1 NOSSE2=1 package - -# Uncomment below and comment line above to reuse existing wxWidgets build -# make WXSTATIC=1 NOGUI=1 NOSSE2=1 clean && make WXSTATIC=1 NOGUI=1 NOSSE2=1 && make WXSTATIC=1 NOGUI=1 NOSSE2=1 package +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + make WXSTATIC=1 NOGUI=1 NOSSE2=1 wxbuild || exit 1 +fi +make WXSTATIC=1 NOGUI=1 NOSSE2=1 clean || exit 1 +make WXSTATIC=1 NOGUI=1 NOSSE2=1 || exit 1 +make WXSTATIC=1 NOGUI=1 NOSSE2=1 package || exit diff --git a/src/Build/build_veracrypt_macosx.sh b/src/Build/build_veracrypt_macosx.sh index 918a9ad1..0198bd37 100755 --- a/src/Build/build_veracrypt_macosx.sh +++ b/src/Build/build_veracrypt_macosx.sh @@ -82,8 +82,12 @@ echo "Using MacOSX SDK $VC_OSX_SDK with target set to $VC_OSX_TARGET" cd $SOURCEPATH echo "Building VeraCrypt" -make WXSTATIC=FULL wxbuild && make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package - -# Uncomment below and comment line above to reuse existing wxWidgets build -# make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package - +# Check if wx-config exists in WX_BUILD_DIR +if [ -L "${WX_BUILD_DIR}/wx-config" ]; then + echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild." +else + make WXSTATIC=FULL wxbuild || exit 1 +fi +make WXSTATIC=FULL clean || exit 1 +make WXSTATIC=FULL || exit 1 +make WXSTATIC=FULL package || exit 1 diff --git a/src/COMReg/Release/CL.read.1.tlog b/src/COMReg/Release/CL.read.1.tlog new file mode 100644 index 00000000..e728b1d4 Binary files /dev/null and b/src/COMReg/Release/CL.read.1.tlog differ diff --git a/src/COMReg/Release/CL.write.1.tlog b/src/COMReg/Release/CL.write.1.tlog new file mode 100644 index 00000000..66cbff20 Binary files /dev/null and b/src/COMReg/Release/CL.write.1.tlog differ diff --git a/src/COMReg/Release/COMReg.lastbuildstate b/src/COMReg/Release/COMReg.lastbuildstate new file mode 100644 index 00000000..cb1ffdb5 --- /dev/null +++ b/src/COMReg/Release/COMReg.lastbuildstate @@ -0,0 +1,2 @@ +#v4.0:v100:false +Release|Win32|C:\dev\prj\Github\VeraCrypt\src\| diff --git a/src/COMReg/Release/COMReg.log b/src/COMReg/Release/COMReg.log new file mode 100644 index 00000000..72121ac1 --- /dev/null +++ b/src/COMReg/Release/COMReg.log @@ -0,0 +1,39 @@ +Build started 6/12/2024 10:44:09 AM. + 1>Project "C:\dev\prj\Github\VeraCrypt\src\COMReg\COMReg.vcxproj" on node 2 (rebuild target(s)). + 1>_PrepareForClean: + Deleting file "Release\COMReg.lastbuildstate". + InitializeBuildStatus: + Touching "Release\COMReg.unsuccessfulbuild". + ClCompile: + C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /I..\Setup /I..\Common /I..\Crypto /I..\ /I..\PKCS11 /I..\Common\zlib /I..\Common\libzip /I..\Common\lzma /Zi /nologo /W3 /WX- /O2 /Oi /Oy- /GL /D WIN32 /D VC_COMREG /D NDEBUG /D _WINDOWS /D HAVE_CONFIG_H /D ZIP_STATIC /D _UNICODE /D UNICODE /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Release\\" /Fd"Release\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\Common\Crc.c ..\Setup\SelfExtract.c + Crc.c + SelfExtract.c + C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /I..\Setup /I..\Common /I..\Crypto /I..\ /I..\PKCS11 /I..\Common\zlib /I..\Common\libzip /I..\Common\lzma /Zi /nologo /W3 /WX- /O2 /Oi /Oy- /GL /D WIN32 /D VC_COMREG /D NDEBUG /D _WINDOWS /D HAVE_CONFIG_H /D ZIP_STATIC /D _UNICODE /D UNICODE /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Release\\" /Fd"Release\vc100.pdb" /Gd /TP /analyze- /errorReport:prompt ..\Common\Dlgcode.c COMReg.cpp + Dlgcode.c + COMReg.cpp + ResourceCompile: + C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"Release\COMReg.res" COMReg.rc + Link: + C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"Release\VeraCryptCOMRegBase.exe" /INCREMENTAL:NO /NOLOGO ..\Common\Release\Zip.lib ..\Crypto\Release\crypto.lib ..\Common\Release\lzma.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"Release\VeraCryptCOMRegBase.exe.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /PDB:"C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\VeraCryptCOMRegBase.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"Release\VeraCryptCOMRegBase.lib" /MACHINE:X86 Release\COMReg.res + Release\Crc.obj + Release\Dlgcode.obj + Release\SelfExtract.obj + Release\COMReg.obj + C:\dev\prj\Github\VeraCrypt\src\Common\Release\Lzma.lib + Generating code + Finished generating code + COMReg.vcxproj -> C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\VeraCryptCOMRegBase.exe + Manifest: + C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\mt.exe /nologo /verbose /outputresource:"Release\VeraCryptCOMRegBase.exe;#1" /manifest Release\VeraCryptCOMRegBase.exe.intermediate.manifest + PostBuildEvent: + copy Release\VeraCryptCOMRegBase.exe "..\Release\Setup Files\VeraCryptCOMRegBase.exe" + :VCEnd + 1 file(s) copied. + FinalizeBuildStatus: + Deleting file "Release\COMReg.unsuccessfulbuild". + Touching "Release\COMReg.lastbuildstate". + 1>Done Building Project "C:\dev\prj\Github\VeraCrypt\src\COMReg\COMReg.vcxproj" (rebuild target(s)). + +Build succeeded. + +Time Elapsed 00:00:02.70 diff --git a/src/COMReg/Release/COMReg.obj b/src/COMReg/Release/COMReg.obj new file mode 100644 index 00000000..4bfdb19e Binary files /dev/null and b/src/COMReg/Release/COMReg.obj differ diff --git a/src/COMReg/Release/COMReg.res b/src/COMReg/Release/COMReg.res new file mode 100644 index 00000000..49bb867c Binary files /dev/null and b/src/COMReg/Release/COMReg.res differ diff --git a/src/COMReg/Release/COMReg.write.1.tlog b/src/COMReg/Release/COMReg.write.1.tlog new file mode 100644 index 00000000..e69de29b diff --git a/src/COMReg/Release/Crc.obj b/src/COMReg/Release/Crc.obj new file mode 100644 index 00000000..5782236a Binary files /dev/null and b/src/COMReg/Release/Crc.obj differ diff --git a/src/COMReg/Release/Dlgcode.obj b/src/COMReg/Release/Dlgcode.obj new file mode 100644 index 00000000..aac13468 Binary files /dev/null and b/src/COMReg/Release/Dlgcode.obj differ diff --git a/src/COMReg/Release/SelfExtract.obj b/src/COMReg/Release/SelfExtract.obj new file mode 100644 index 00000000..1522314a Binary files /dev/null and b/src/COMReg/Release/SelfExtract.obj differ diff --git a/src/COMReg/Release/VeraCryptCOMRegBase.Build.CppClean.log b/src/COMReg/Release/VeraCryptCOMRegBase.Build.CppClean.log new file mode 100644 index 00000000..3cb4ad77 --- /dev/null +++ b/src/COMReg/Release/VeraCryptCOMRegBase.Build.CppClean.log @@ -0,0 +1,16 @@ +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\cl.command.1.tlog +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\CL.read.1.tlog +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\CL.write.1.tlog +C:\DEV\PRJ\GITHUB\VERACRYPT\SRC\COMREG\RELEASE\COMREG.OBJ +C:\DEV\PRJ\GITHUB\VERACRYPT\SRC\COMREG\RELEASE\COMREG.RES +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\COMReg.write.1.tlog +C:\DEV\PRJ\GITHUB\VERACRYPT\SRC\COMREG\RELEASE\CRC.OBJ +C:\DEV\PRJ\GITHUB\VERACRYPT\SRC\COMREG\RELEASE\DLGCODE.OBJ +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\link.command.1.tlog +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\link.read.1.tlog +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\link.write.1.tlog +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\rc.command.1.tlog +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\rc.read.1.tlog +C:\dev\prj\Github\VeraCrypt\src\COMReg\Release\rc.write.1.tlog +C:\DEV\PRJ\GITHUB\VERACRYPT\SRC\COMREG\RELEASE\SELFEXTRACT.OBJ +C:\DEV\PRJ\GITHUB\VERACRYPT\SRC\COMREG\RELEASE\VC100.PDB diff --git a/src/COMReg/Release/VeraCryptCOMRegBase.exe b/src/COMReg/Release/VeraCryptCOMRegBase.exe new file mode 100644 index 00000000..8ac0fec7 Binary files /dev/null and b/src/COMReg/Release/VeraCryptCOMRegBase.exe differ diff --git a/src/COMReg/Release/VeraCryptCOMRegBase.exe.intermediate.manifest b/src/COMReg/Release/VeraCryptCOMRegBase.exe.intermediate.manifest new file mode 100644 index 00000000..ecea6f7f --- /dev/null +++ b/src/COMReg/Release/VeraCryptCOMRegBase.exe.intermediate.manifest @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/COMReg/Release/cl.command.1.tlog b/src/COMReg/Release/cl.command.1.tlog new file mode 100644 index 00000000..22da2c19 Binary files /dev/null and b/src/COMReg/Release/cl.command.1.tlog differ diff --git a/src/COMReg/Release/link-cvtres.read.1.tlog b/src/COMReg/Release/link-cvtres.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/src/COMReg/Release/link-cvtres.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/src/COMReg/Release/link-cvtres.write.1.tlog b/src/COMReg/Release/link-cvtres.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/src/COMReg/Release/link-cvtres.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/src/COMReg/Release/link.command.1.tlog b/src/COMReg/Release/link.command.1.tlog new file mode 100644 index 00000000..d056a9da Binary files /dev/null and b/src/COMReg/Release/link.command.1.tlog differ diff --git a/src/COMReg/Release/link.read.1.tlog b/src/COMReg/Release/link.read.1.tlog new file mode 100644 index 00000000..d32e3623 Binary files /dev/null and b/src/COMReg/Release/link.read.1.tlog differ diff --git a/src/COMReg/Release/link.write.1.tlog b/src/COMReg/Release/link.write.1.tlog new file mode 100644 index 00000000..c2f1dd09 Binary files /dev/null and b/src/COMReg/Release/link.write.1.tlog differ diff --git a/src/COMReg/Release/mt.command.1.tlog b/src/COMReg/Release/mt.command.1.tlog new file mode 100644 index 00000000..386b5c1f Binary files /dev/null and b/src/COMReg/Release/mt.command.1.tlog differ diff --git a/src/COMReg/Release/mt.read.1.tlog b/src/COMReg/Release/mt.read.1.tlog new file mode 100644 index 00000000..d8974785 Binary files /dev/null and b/src/COMReg/Release/mt.read.1.tlog differ diff --git a/src/COMReg/Release/mt.write.1.tlog b/src/COMReg/Release/mt.write.1.tlog new file mode 100644 index 00000000..4a846233 Binary files /dev/null and b/src/COMReg/Release/mt.write.1.tlog differ diff --git a/src/COMReg/Release/rc.command.1.tlog b/src/COMReg/Release/rc.command.1.tlog new file mode 100644 index 00000000..63e77673 Binary files /dev/null and b/src/COMReg/Release/rc.command.1.tlog differ diff --git a/src/COMReg/Release/rc.read.1.tlog b/src/COMReg/Release/rc.read.1.tlog new file mode 100644 index 00000000..0c8fcd0f Binary files /dev/null and b/src/COMReg/Release/rc.read.1.tlog differ diff --git a/src/COMReg/Release/rc.write.1.tlog b/src/COMReg/Release/rc.write.1.tlog new file mode 100644 index 00000000..4ead313c Binary files /dev/null and b/src/COMReg/Release/rc.write.1.tlog differ diff --git a/src/COMReg/Release/vc100.pdb b/src/COMReg/Release/vc100.pdb new file mode 100644 index 00000000..376a16a4 Binary files /dev/null and b/src/COMReg/Release/vc100.pdb differ diff --git a/src/Release/Setup Files/VeraCrypt COMReg.exe b/src/Release/Setup Files/VeraCrypt COMReg.exe new file mode 100644 index 00000000..07c0e955 Binary files /dev/null and b/src/Release/Setup Files/VeraCrypt COMReg.exe differ diff --git a/src/Release/Setup Files/VeraCrypt Format-arm64.exe b/src/Release/Setup Files/VeraCrypt Format-arm64.exe new file mode 100644 index 00000000..5c8f736f Binary files /dev/null and b/src/Release/Setup Files/VeraCrypt Format-arm64.exe differ diff --git a/src/Release/Setup Files/VeraCrypt Format-x64.exe b/src/Release/Setup Files/VeraCrypt Format-x64.exe new file mode 100644 index 00000000..9e1630da Binary files /dev/null and b/src/Release/Setup Files/VeraCrypt Format-x64.exe differ diff --git a/src/Release/Setup Files/VeraCrypt Format.exe b/src/Release/Setup Files/VeraCrypt Format.exe new file mode 100644 index 00000000..657fe48b Binary files /dev/null and b/src/Release/Setup Files/VeraCrypt Format.exe differ diff --git a/src/Release/Setup Files/VeraCrypt Portable.exe b/src/Release/Setup Files/VeraCrypt Portable.exe new file mode 100644 index 00000000..6ebfbdda Binary files /dev/null and b/src/Release/Setup Files/VeraCrypt Portable.exe differ diff --git a/src/Release/Setup Files/VeraCrypt Setup.exe b/src/Release/Setup Files/VeraCrypt Setup.exe new file mode 100644 index 00000000..07c0e955 Binary files /dev/null and b/src/Release/Setup Files/VeraCrypt Setup.exe differ diff --git a/src/Release/Setup Files/VeraCrypt-arm64.exe b/src/Release/Setup Files/VeraCrypt-arm64.exe new file mode 100644 index 00000000..bdd76241 Binary files /dev/null and b/src/Release/Setup Files/VeraCrypt-arm64.exe differ diff --git a/src/Release/Setup Files/VeraCrypt-x64.exe b/src/Release/Setup Files/VeraCrypt-x64.exe new file mode 100644 index 00000000..3a77c353 Binary files /dev/null and b/src/Release/Setup Files/VeraCrypt-x64.exe differ diff --git a/src/Release/Setup Files/VeraCrypt.exe b/src/Release/Setup Files/VeraCrypt.exe new file mode 100644 index 00000000..cb1d750d Binary files /dev/null and b/src/Release/Setup Files/VeraCrypt.exe differ diff --git a/src/Release/Setup Files/VeraCryptCOMRegBase.exe b/src/Release/Setup Files/VeraCryptCOMRegBase.exe new file mode 100644 index 00000000..8ac0fec7 Binary files /dev/null and b/src/Release/Setup Files/VeraCryptCOMRegBase.exe differ diff --git a/src/Release/Setup Files/VeraCryptExpander-arm64.exe b/src/Release/Setup Files/VeraCryptExpander-arm64.exe new file mode 100644 index 00000000..5f460b05 Binary files /dev/null and b/src/Release/Setup Files/VeraCryptExpander-arm64.exe differ diff --git a/src/Release/Setup Files/VeraCryptExpander-x64.exe b/src/Release/Setup Files/VeraCryptExpander-x64.exe new file mode 100644 index 00000000..f96362f0 Binary files /dev/null and b/src/Release/Setup Files/VeraCryptExpander-x64.exe differ diff --git a/src/Release/Setup Files/VeraCryptExpander.exe b/src/Release/Setup Files/VeraCryptExpander.exe new file mode 100644 index 00000000..d7c135e6 Binary files /dev/null and b/src/Release/Setup Files/VeraCryptExpander.exe differ diff --git a/src/Release/Setup Files/VeraCryptSetup.dll b/src/Release/Setup Files/VeraCryptSetup.dll new file mode 100644 index 00000000..9688daf7 Binary files /dev/null and b/src/Release/Setup Files/VeraCryptSetup.dll differ diff --git a/src/VeraCrypt.sdf b/src/VeraCrypt.sdf new file mode 100644 index 00000000..7fec6d99 Binary files /dev/null and b/src/VeraCrypt.sdf differ diff --git a/src/VeraCrypt.suo b/src/VeraCrypt.suo new file mode 100644 index 00000000..669e2bff Binary files /dev/null and b/src/VeraCrypt.suo differ diff --git a/src/ipch/crypto-57c110f3/crypto-be6a8ba7.ipch b/src/ipch/crypto-57c110f3/crypto-be6a8ba7.ipch new file mode 100644 index 00000000..f15afd89 Binary files /dev/null and b/src/ipch/crypto-57c110f3/crypto-be6a8ba7.ipch differ diff --git a/src/ipch/mount-e667f7/veracrypt-87304586.ipch b/src/ipch/mount-e667f7/veracrypt-87304586.ipch new file mode 100644 index 00000000..c6f9c746 Binary files /dev/null and b/src/ipch/mount-e667f7/veracrypt-87304586.ipch differ diff --git a/src/ipch/mount-e667f7/veracrypt-b8a55284.ipch b/src/ipch/mount-e667f7/veracrypt-b8a55284.ipch new file mode 100644 index 00000000..dfca06db Binary files /dev/null and b/src/ipch/mount-e667f7/veracrypt-b8a55284.ipch differ -- cgit v1.2.3