From bc954c00f13f2b5bb832dcd5f816b3c6982c3e2d Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 20 May 2018 21:18:35 +0100 Subject: [PATCH] Allow mods to customize the license text in their Windows installers. --- mod.config | 3 +++ packaging/windows/buildpackage.nsi | 2 +- packaging/windows/buildpackage.sh | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mod.config b/mod.config index 56dac26..f3d0ff9 100644 --- a/mod.config +++ b/mod.config @@ -77,6 +77,9 @@ PACKAGING_WINDOWS_INSTALL_DIR_NAME="OpenRA Example Mod" # This should not contain spaces or special characters. PACKAGING_WINDOWS_REGISTRY_KEY="OpenRAExampleMod" +# Path to the file containing the text to show in the Windows installer license dialog +PACKAGING_WINDOWS_LICENSE_FILE="./COPYING" + # The git tag to use for the AppImage dependencies. PACKAGING_APPIMAGE_DEPENDENCIES_TAG="20180408" diff --git a/packaging/windows/buildpackage.nsi b/packaging/windows/buildpackage.nsi index 6c23366..079e3de 100644 --- a/packaging/windows/buildpackage.nsi +++ b/packaging/windows/buildpackage.nsi @@ -29,7 +29,7 @@ SetCompressor lzma RequestExecutionLevel admin !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "${SRCDIR}\COPYING" +!insertmacro MUI_PAGE_LICENSE "${PACKAGING_WINDOWS_LICENSE_FILE}" !insertmacro MUI_PAGE_DIRECTORY !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh index 9ff3489..59fa46c 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_FAQ_URL" "PACKAGING_WEBSITE_URL" "PACKAGING_AUTHORS" + "PACKAGING_WINDOWS_LICENSE_FILE" "PACKAGING_FAQ_URL" "PACKAGING_WEBSITE_URL" "PACKAGING_AUTHORS" TAG="$1" if [ $# -eq "1" ]; then @@ -95,7 +95,7 @@ mono "${SRC_DIR}/fixheader.exe" "${BUILTDIR}/${PACKAGING_WINDOWS_LAUNCHER_NAME}. echo "Building Windows setup.exe" pushd "${PACKAGING_DIR}" > /dev/null -makensis -V2 -DSRCDIR="${BUILTDIR}" -DDEPSDIR="${SRC_DIR}/thirdparty/download/windows" -DTAG="${TAG}" -DMOD_ID="${MOD_ID}" -DPACKAGING_WINDOWS_INSTALL_DIR_NAME="${PACKAGING_WINDOWS_INSTALL_DIR_NAME}" -DPACKAGING_WINDOWS_LAUNCHER_NAME="${PACKAGING_WINDOWS_LAUNCHER_NAME}" -DPACKAGING_DISPLAY_NAME="${PACKAGING_DISPLAY_NAME}" -DPACKAGING_WEBSITE_URL="${PACKAGING_WEBSITE_URL}" -DPACKAGING_AUTHORS="${PACKAGING_AUTHORS}" -DPACKAGING_WINDOWS_REGISTRY_KEY="${PACKAGING_WINDOWS_REGISTRY_KEY}" buildpackage.nsi +makensis -V2 -DSRCDIR="${BUILTDIR}" -DDEPSDIR="${SRC_DIR}/thirdparty/download/windows" -DTAG="${TAG}" -DMOD_ID="${MOD_ID}" -DPACKAGING_WINDOWS_INSTALL_DIR_NAME="${PACKAGING_WINDOWS_INSTALL_DIR_NAME}" -DPACKAGING_WINDOWS_LAUNCHER_NAME="${PACKAGING_WINDOWS_LAUNCHER_NAME}" -DPACKAGING_DISPLAY_NAME="${PACKAGING_DISPLAY_NAME}" -DPACKAGING_WEBSITE_URL="${PACKAGING_WEBSITE_URL}" -DPACKAGING_AUTHORS="${PACKAGING_AUTHORS}" -DPACKAGING_WINDOWS_REGISTRY_KEY="${PACKAGING_WINDOWS_REGISTRY_KEY}" -DPACKAGING_WINDOWS_LICENSE_FILE="${TEMPLATE_ROOT}/${PACKAGING_WINDOWS_LICENSE_FILE}" buildpackage.nsi if [ $? -eq 0 ]; then mv OpenRA.Setup.exe "${OUTPUTDIR}/${PACKAGING_INSTALLER_NAME}-$TAG.exe" fi