From 40e999f7d1286a4c616376d9b2942abe1c69608f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Sun, 17 Sep 2023 20:02:44 +0200 Subject: [PATCH] installers: add VERSION file --- VERSION | 1 + installer/macos/deploy_macos.sh | 8 ++++---- installer/wix/build_installer.ps1 | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..a2268e2 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.3.1 \ No newline at end of file diff --git a/installer/macos/deploy_macos.sh b/installer/macos/deploy_macos.sh index dd9345b..ed88361 100755 --- a/installer/macos/deploy_macos.sh +++ b/installer/macos/deploy_macos.sh @@ -16,7 +16,7 @@ test_ok() { BUILD_DIR=builddir PROJECTDIR="$( cd "$(dirname "$0")/../" ; pwd -P )" TARGETDIR="${PROJECTDIR}/${BUILD_DIR}/INSTALL_GPS" -VERSION="$(git describe --always --abbrev=0)" +VERSION="$(cat VERSION)" export VERSION echo "VERSION=$VERSION" @@ -171,8 +171,8 @@ fi echo "make macos installer(.dmg)......" cp "${PROJECTDIR}/macos/installers/dmg.json" gps_dmg.json cp "${PROJECTDIR}/macos/installers/background.png" "${PROJECTDIR}/${BUILD_DIR}/gps_dmg_background.png" -rm -f ${PROJECTDIR}/GstPipelineStudio-${VERSION}-macos.dmg -appdmg gps_dmg.json "${PROJECTDIR}/GstPipelineStudio-${VERSION}-macos.dmg" +rm -f ${PROJECTDIR}/GstPipelineStudio-${VERSION}.dmg +appdmg gps_dmg.json "${PROJECTDIR}/GstPipelineStudio-${VERSION}.dmg" if [ $? -eq 0 ]; then echo "[done]" else @@ -181,7 +181,7 @@ fi # make portable package echo -n "make macos portable......" -tar czf "${PROJECTDIR}/GstPipelineStudio-${VERSION}-macos.tar.gz" -C "${PROJECTDIR}" ${BUILD_DIR}/GstPipelineStudio.app +tar czf "${PROJECTDIR}/GstPipelineStudio-${VERSION}.tar.gz" -C "${PROJECTDIR}" ${BUILD_DIR}/GstPipelineStudio.app if [ $? -eq 0 ]; then echo "[done]" else diff --git a/installer/wix/build_installer.ps1 b/installer/wix/build_installer.ps1 index 9d538fc..ac151ef 100644 --- a/installer/wix/build_installer.ps1 +++ b/installer/wix/build_installer.ps1 @@ -15,10 +15,8 @@ $lightToolPath = Join-Path $wixFolder -ChildPath light.exe $heatToolPath = Join-Path $wixFolder -ChildPath heat.exe $GPSUpgradeCode = "9B87C8FF-599C-4F20-914E-AF5E68CB3DC0" -$GPSVersion = $(git describe --always --abbrev=0) -Write-Output "Version:" -Write-Output $GPSVersion -$GPSVersion = "0.3.1" + +$GPSVersion = Get-Content $PSScriptRoot\..\..\VERSION -Raw Write-Output $GPSVersion try {