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 ++++++++++++++------ docs/technical/smapi.md | 22 ++++++++++------------ 3 files changed, 38 insertions(+), 25 deletions(-) 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" diff --git a/docs/technical/smapi.md b/docs/technical/smapi.md index 789ea20b..4d75aef2 100644 --- a/docs/technical/smapi.md +++ b/docs/technical/smapi.md @@ -120,8 +120,10 @@ Windows](#on-windows)_ section below to create a build that retains the icon.** 2. Launch the game through the Steam UI. ### Prepare the release -1. Run `build/unix/set-smapi-version.sh` to set the SMAPI version. Make sure you use a [semantic - version](https://semver.org). Recommended format: +1. Run `build/unix/prepare-install-package.sh VERSION_HERE` to create the release package in the + root `bin` folder. + + Make sure you use a [semantic version](https://semver.org). Recommended format: build type | format | example :--------- | :----------------------- | :------ @@ -129,9 +131,6 @@ Windows](#on-windows)_ section below to create a build that retains the icon.** prerelease | `-beta.` | `4.0.0-beta.20251230` release | `` | `4.0.0` -2. Run `build/unix/prepare-install-package.sh` to create the release package in the root `bin` - folder. - ### On Windows #### First-time setup 1. Set up Windows Subsystem for Linux (WSL): @@ -147,8 +146,10 @@ Windows](#on-windows)_ section below to create a build that retains the icon.** ``` ### Prepare the release -1. Run `build/windows/set-smapi-version.ps1` in PowerShell to set the SMAPI version. Make sure you - use a [semantic version](https://semver.org). Recommended format: +1. Run `build/windows/prepare-install-package.ps1 VERSION_HERE` in PowerShell to create the release + package folders in the root `bin` folder. + + Make sure you use a [semantic version](https://semver.org). Recommended format: build type | format | example :--------- | :----------------------- | :------ @@ -156,12 +157,9 @@ Windows](#on-windows)_ section below to create a build that retains the icon.** prerelease | `-beta.` | `4.0.0-beta.20251230` release | `` | `4.0.0` -2. Run `build/windows/prepare-install-package.ps1` in PowerShell to create the release package - folders in the root `bin` folder. - -3. Launch WSL and run this script: +2. Launch WSL and run this script: ```bash - # edit to match the build created in steps 1-2 + # edit to match the build created in steps 1 # In WSL, `/mnt/c/example` accesses `C:\example` on the Windows filesystem. version="4.0.0" binFolder="/mnt/e/source/_Stardew/SMAPI/bin" -- cgit