From f507bd0f9cebe68fa2adf176740a0d00b3e6f884 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Fri, 29 Apr 2022 22:55:12 -0400 Subject: set SMAPI version from main build script --- build/unix/prepare-install-package.sh | 21 ++++++++++++++------- build/windows/prepare-install-package.ps1 | 20 ++++++++++++++------ 2 files changed, 28 insertions(+), 13 deletions(-) (limited to 'build') diff --git a/build/unix/prepare-install-package.sh b/build/unix/prepare-install-package.sh index 9dd24b82..e9b413b4 100755 --- a/build/unix/prepare-install-package.sh +++ b/build/unix/prepare-install-package.sh @@ -28,6 +28,20 @@ declare -A msBuildPlatformNames=(["linux"]="Unix" ["macOS"]="OSX" ["windows"]="W cd "`dirname "$0"`/../.." +########## +## Set version +########## +# get version number +version="$1" +if [ $# -eq 0 ]; then + echo "SMAPI release version (like '4.0.0'):" + read version +fi + +# set version +. ${0%/*}/set-smapi-version.sh "$version" + + ########## ## Clear old build files ########## @@ -190,13 +204,6 @@ done ########## ## Create release zips ########## -# get version number -version="$1" -if [ $# -eq 0 ]; then - echo "SMAPI release version (like '4.0.0'):" - read version -fi - # rename folders mv "$packagePath" "bin/SMAPI $version installer" mv "$packageDevPath" "bin/SMAPI $version installer for developers" diff --git a/build/windows/prepare-install-package.ps1 b/build/windows/prepare-install-package.ps1 index b6a23124..5a1e0bcc 100644 --- a/build/windows/prepare-install-package.ps1 +++ b/build/windows/prepare-install-package.ps1 @@ -12,6 +12,20 @@ . "$PSScriptRoot\lib\in-place-regex.ps1" + +########## +## Set version +########## +# get version number +$version = $args[0] +if (!$version) { + $version = Read-Host "SMAPI release version (like '4.0.0')" +} + +# set version +. "$PSScriptRoot/set-smapi-version.ps1" "$version" + + ########## ## Constants ########## @@ -197,12 +211,6 @@ foreach ($folder in $folders) { ########### ### Create release zips ########### -# get version number -$version = $args[0] -if (!$version) { - $version = Read-Host "SMAPI release version (like '4.0.0')" -} - # rename folders mv "$packagePath" "bin/SMAPI $version installer" mv "$packageDevPath" "bin/SMAPI $version installer for developers" -- cgit