diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c9e751b..9fe8967 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -63,7 +63,7 @@ jobs: with: name: YUVviewer_macos path: | - ./build_release/out/YUVviewer.dmg + ./dmgOut/*.dmg - name: Run tests run: | @@ -111,7 +111,7 @@ jobs: with: name: YUVviewer_macos_arm64 path: | - ./build_release/out/YUVviewer.dmg + ./dmgOut/*.dmg - name: Run tests run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6815db3..a60f0b6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -91,7 +91,7 @@ jobs: with: name: YUVviewer_windows path: | - ./InnoSetup/YUVviewer_setup.exe + ./output/*.exe - name: Run tests run: | diff --git a/build_dmg.sh b/build_dmg.sh index deca752..7a47985 100755 --- a/build_dmg.sh +++ b/build_dmg.sh @@ -35,5 +35,14 @@ cp $OPENCV_DIR/lib/libopencv_imgcodecs.4.0.dylib ./YUVviewer.app/Contents/Framew cp $OPENCV_DIR/lib/libopencv_core.4.0.dylib ./YUVviewer.app/Contents/Frameworks/libopencv_core.4.0.dylib otool -L ./YUVviewer.app/Contents/MacOS/YUVviewer ./build-dmg.sh YUVviewer +cd ../../ +mkdir dmgOut +cpu=$(sysctl -n machdep.cpu.brand_string) +ARCH="x86_64" +case $cpu in + *Intel*) ARCH="x86_64" ;; + *Apple*) ARCH="arm64" ;; +esac +cp ./build_release/out/YUVviewer.dmg ./dmgOut/YUVviewer_macos_"$YUVVIEWER_VERSION"_"$ARCH".dmg echo build success! ############################################################################### diff --git a/build_setup.bat b/build_setup.bat index 2fe8098..099039c 100644 --- a/build_setup.bat +++ b/build_setup.bat @@ -50,5 +50,12 @@ xcopy /y "%QT_TOOLS_DIR%\*.dll" ".\InnoSetup\build\" echo "wait inno build setup..." iscc /q ".\InnoSetup\build_temp_setup.iss" del .\InnoSetup\build_temp_setup.iss +FOR /F "delims=. tokens=1-3" %%x IN ("%YUVVIEWER_VERSION%") DO ( + set "YUVVIEWER_MAJARVERSION=%%x" + set "YUVVIEWER_SUBVERSION=%%y" + set "YUVVIEWER_REVISION=%%z" +) +mkdir ".\output" +echo F|xcopy /S /Q /Y /F ".\InnoSetup\YUVviewer_setup.exe" ".\output\YUVviewer_windows_V%YUVVIEWER_MAJARVERSION%%YUVVIEWER_SUBVERSION%%YUVVIEWER_REVISION%_x86_64_setup.exe" echo "build success!" :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::