diff --git a/mod.config b/mod.config index f3d0ff9..eb06d99 100644 --- a/mod.config +++ b/mod.config @@ -87,6 +87,10 @@ PACKAGING_APPIMAGE_DEPENDENCIES_TAG="20180408" # when packaging your mod. e.g. "./mods/modcontent" or "./mods/d2k/OpenRA.Mods.D2k.dll" PACKAGING_COPY_ENGINE_FILES="" +# Overwrite the version in mod.yaml with the tag used for the SDK release +# Accepts values "True" or "False". +PACKAGING_OVERWRITE_MOD_VERSION="True" + ############################################################################## # Advanced Configuration # diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index da5cc32..712409a 100755 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -37,7 +37,7 @@ fi require_variables "MOD_ID" "ENGINE_DIRECTORY" "PACKAGING_DISPLAY_NAME" "PACKAGING_INSTALLER_NAME" \ "PACKAGING_APPIMAGE_DEPENDENCIES_TAG" "PACKAGING_APPIMAGE_DEPENDENCIES_SOURCE" "PACKAGING_APPIMAGE_DEPENDENCIES_TEMP_ARCHIVE_NAME" \ - "PACKAGING_FAQ_URL" + "PACKAGING_FAQ_URL" "PACKAGING_OVERWRITE_MOD_VERSION" TAG="$1" if [ $# -eq "1" ]; then @@ -66,7 +66,13 @@ fi echo "Building core files" -make version VERSION="${TAG}" +MOD_VERSION=$(grep 'Version:' mods/${MOD_ID}/mod.yaml | awk '{print $2}') + +if [ "${PACKAGING_OVERWRITE_MOD_VERSION}" == "True" ]; then + make version VERSION="${TAG}" +else + echo "Mod version ${MOD_VERSION} will remain unchanged."; +fi pushd "${ENGINE_DIRECTORY}" > /dev/null make linux-dependencies diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh index 7c8a623..42d4b78 100755 --- a/packaging/osx/buildpackage.sh +++ b/packaging/osx/buildpackage.sh @@ -36,7 +36,7 @@ fi require_variables "MOD_ID" "ENGINE_DIRECTORY" "PACKAGING_DISPLAY_NAME" "PACKAGING_INSTALLER_NAME" \ "PACKAGING_OSX_LAUNCHER_TAG" "PACKAGING_OSX_LAUNCHER_SOURCE" "PACKAGING_OSX_LAUNCHER_TEMP_ARCHIVE_NAME" \ - "PACKAGING_FAQ_URL" + "PACKAGING_FAQ_URL" "PACKAGING_OVERWRITE_MOD_VERSION" TAG="$1" if [ $# -eq "1" ]; then @@ -78,7 +78,13 @@ if [ ! -d "${OUTPUTDIR}" ]; then exit 1 fi -make version VERSION="${TAG}" +MOD_VERSION=$(grep 'Version:' mods/${MOD_ID}/mod.yaml | awk '{print $2}') + +if [ "${PACKAGING_OVERWRITE_MOD_VERSION}" == "True" ]; then + make version VERSION="${TAG}" +else + echo "Mod version ${MOD_VERSION} will remain unchanged."; +fi pushd ${ENGINE_DIRECTORY} > /dev/null make osx-dependencies diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh index 59fa46c..7ad36e8 100755 --- a/packaging/windows/buildpackage.sh +++ b/packaging/windows/buildpackage.sh @@ -34,7 +34,7 @@ fi require_variables "MOD_ID" "ENGINE_DIRECTORY" "PACKAGING_DISPLAY_NAME" "PACKAGING_INSTALLER_NAME" \ "PACKAGING_WINDOWS_LAUNCHER_NAME" "PACKAGING_WINDOWS_REGISTRY_KEY" "PACKAGING_WINDOWS_INSTALL_DIR_NAME" \ - "PACKAGING_WINDOWS_LICENSE_FILE" "PACKAGING_FAQ_URL" "PACKAGING_WEBSITE_URL" "PACKAGING_AUTHORS" + "PACKAGING_WINDOWS_LICENSE_FILE" "PACKAGING_FAQ_URL" "PACKAGING_WEBSITE_URL" "PACKAGING_AUTHORS" "PACKAGING_OVERWRITE_MOD_VERSION" TAG="$1" if [ $# -eq "1" ]; then @@ -65,7 +65,13 @@ if [ ! -d "${OUTPUTDIR}" ]; then exit 1 fi -make version VERSION="${TAG}" +MOD_VERSION=$(grep 'Version:' mods/${MOD_ID}/mod.yaml | awk '{print $2}') + +if [ "${PACKAGING_OVERWRITE_MOD_VERSION}" == "True" ]; then + make version VERSION="${TAG}" +else + echo "Mod version ${MOD_VERSION} will remain unchanged."; +fi pushd ${ENGINE_DIRECTORY} > /dev/null SRC_DIR="$(pwd)"