Fix windows package filenames.

This commit is contained in:
Paul Chote
2020-11-28 13:13:08 +00:00
committed by teinarss
parent 57f40a0b20
commit d3847d49ed

View File

@@ -39,13 +39,13 @@ function makelauncher()
convert "${ARTWORK_DIR}/${MOD_ID}_16x16.png" "${ARTWORK_DIR}/${MOD_ID}_24x24.png" "${ARTWORK_DIR}/${MOD_ID}_32x32.png" "${ARTWORK_DIR}/${MOD_ID}_48x48.png" "${ARTWORK_DIR}/${MOD_ID}_256x256.png" "${BUILTDIR}/${MOD_ID}.ico" convert "${ARTWORK_DIR}/${MOD_ID}_16x16.png" "${ARTWORK_DIR}/${MOD_ID}_24x24.png" "${ARTWORK_DIR}/${MOD_ID}_32x32.png" "${ARTWORK_DIR}/${MOD_ID}_48x48.png" "${ARTWORK_DIR}/${MOD_ID}_256x256.png" "${BUILTDIR}/${MOD_ID}.ico"
# Create mod-specific launcher # Create mod-specific launcher
msbuild -t:Build "${SRCDIR}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -restore -p:Configuration=Release -p:TargetPlatform="${PLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:LauncherIcon="${BUILTDIR}/${MOD_ID}.ico" -p:ModID="${MOD_ID}" -p:DisplayName="${DISPLAY_NAME}" -p:FaqUrl="${FAQ_URL}" msbuild -t:Build "${SRCDIR}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -restore -p:Configuration=Release -p:TargetPlatform="win-${PLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:LauncherIcon="${BUILTDIR}/${MOD_ID}.ico" -p:ModID="${MOD_ID}" -p:DisplayName="${DISPLAY_NAME}" -p:FaqUrl="${FAQ_URL}"
cp "${SRCDIR}/bin/${LAUNCHER_NAME}.exe" "${BUILTDIR}" cp "${SRCDIR}/bin/${LAUNCHER_NAME}.exe" "${BUILTDIR}"
cp "${SRCDIR}/bin/${LAUNCHER_NAME}.exe.config" "${BUILTDIR}" cp "${SRCDIR}/bin/${LAUNCHER_NAME}.exe.config" "${BUILTDIR}"
# Enable the full 4GB address space for the 32 bit game executable # Enable the full 4GB address space for the 32 bit game executable
# The server and utility do not use enough memory to need this # The server and utility do not use enough memory to need this
if [ "${PLATFORM}" = "win-x86" ]; then if [ "${PLATFORM}" = "x86" ]; then
python3 MakeLAA.py "${BUILTDIR}/${LAUNCHER_NAME}.exe" python3 MakeLAA.py "${BUILTDIR}/${LAUNCHER_NAME}.exe"
fi fi
} }
@@ -63,12 +63,12 @@ function build_platform()
pushd "${SRCDIR}" > /dev/null || exit 1 pushd "${SRCDIR}" > /dev/null || exit 1
make clean make clean
make core TARGETPLATFORM="${PLATFORM}" make core TARGETPLATFORM="win-${PLATFORM}"
make version VERSION="${TAG}" make version VERSION="${TAG}"
make install-engine TARGETPLATFORM="${PLATFORM}" gameinstalldir="" DESTDIR="${BUILTDIR}" make install-engine TARGETPLATFORM="win-${PLATFORM}" gameinstalldir="" DESTDIR="${BUILTDIR}"
make install-common-mod-files gameinstalldir="" DESTDIR="${BUILTDIR}" make install-common-mod-files gameinstalldir="" DESTDIR="${BUILTDIR}"
make install-default-mods gameinstalldir="" DESTDIR="${BUILTDIR}" make install-default-mods gameinstalldir="" DESTDIR="${BUILTDIR}"
make install-dependencies TARGETPLATFORM="${PLATFORM}" gameinstalldir="" DESTDIR="${BUILTDIR}" make install-dependencies TARGETPLATFORM="win-${PLATFORM}" gameinstalldir="" DESTDIR="${BUILTDIR}"
popd > /dev/null || exit 1 popd > /dev/null || exit 1
echo "Compiling Windows launchers (${PLATFORM})" echo "Compiling Windows launchers (${PLATFORM})"
@@ -82,19 +82,19 @@ function build_platform()
echo "Building Windows setup.exe ($1)" echo "Building Windows setup.exe ($1)"
makensis -V2 -DSRCDIR="${BUILTDIR}" -DTAG="${TAG}" -DSUFFIX="${SUFFIX}" ${USE_PROGRAMFILES32} OpenRA.nsi makensis -V2 -DSRCDIR="${BUILTDIR}" -DTAG="${TAG}" -DSUFFIX="${SUFFIX}" ${USE_PROGRAMFILES32} OpenRA.nsi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
mv OpenRA.Setup.exe "${OUTPUTDIR}/OpenRA-$TAG-$1.exe" mv OpenRA.Setup.exe "${OUTPUTDIR}/OpenRA-${TAG}-${PLATFORM}.exe"
else else
exit 1 exit 1
fi fi
echo "Packaging zip archive ($1)" echo "Packaging zip archive ($1)"
pushd "${BUILTDIR}" > /dev/null pushd "${BUILTDIR}" > /dev/null
zip "OpenRA-${TAG}-${1}-winportable.zip" -r -9 * --quiet zip "OpenRA-${TAG}-${PLATFORM}-winportable.zip" -r -9 * --quiet
mv "OpenRA-${TAG}-${1}-winportable.zip" "${OUTPUTDIR}" mv "OpenRA-${TAG}-${PLATFORM}-winportable.zip" "${OUTPUTDIR}"
popd > /dev/null popd > /dev/null
rm -rf "${BUILTDIR}" rm -rf "${BUILTDIR}"
} }
build_platform "win-x86" build_platform "x86"
build_platform "win-x64" build_platform "x64"