From b3cddbba410f3e34352237b1e161d8fbb16e0787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 29 Jun 2013 14:28:25 +0200 Subject: [PATCH 1/6] added AUTHORS to packages required for the new Credits button --- packaging/package-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/package-all.sh b/packaging/package-all.sh index b46543bda6..75a821cef6 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -31,7 +31,7 @@ markdown DOCUMENTATION.md > DOCUMENTATION.html FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.FileFormats.dll \ OpenRA.Renderer.SdlCommon.dll OpenRA.Renderer.Cg.dll OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll \ FreeSans.ttf FreeSansBold.ttf titles.ttf Dune2k.ttf cg glsl mods/ra mods/cnc mods/d2k \ -README.html CONTRIBUTING.html DOCUMENTATION.html COPYING HACKING INSTALL CHANGELOG" +AUTHORS README.html CONTRIBUTING.html DOCUMENTATION.html COPYING HACKING INSTALL CHANGELOG" echo "Copying files..." for i in $FILES; do From 09ce64ee04faf5cdc82bd1e604ff8ba1722d4107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 29 Jun 2013 14:47:52 +0200 Subject: [PATCH 2/6] add the global mix database from XCC required for the asset browser --- packaging/package-all.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 75a821cef6..46bd06055a 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -59,6 +59,9 @@ cp OpenRA.Game/OpenRA.ico packaging/built # Remove demo.mix from cnc rm ./packaging/built/mods/cnc/bits/demo.mix +# Workaround for problems with spaces in filenames. +cp "global mix database.dat" packaging/built + # # Change into packaging directory and run the # platform-dependant packaging in parallel From 5e3f19ea52ae153d645fba877b9a190aec6ad20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 29 Jun 2013 14:56:41 +0200 Subject: [PATCH 3/6] fix typo in spec file --- packaging/linux/rpm/openra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec index d23dc7f836..4167a08faa 100644 --- a/packaging/linux/rpm/openra.spec +++ b/packaging/linux/rpm/openra.spec @@ -12,7 +12,7 @@ Packager: Matthew Bowra-Dean Requires: mono-core mono-devel SDL openal Prefix: /usr Source: %{name}-%{version}.tar.gz -Buildroot: /tmp/openra +BuildRoot: /tmp/openra %description A multiplayer reimplementation of the Command & Conquer: Red Alert game From 85c146caf2982834ded77b34b0559b6acc45838d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 29 Jun 2013 15:20:40 +0200 Subject: [PATCH 4/6] don't break if FILES contain spaces --- packaging/package-all.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 46bd06055a..93c62b66b1 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -28,14 +28,17 @@ markdown DOCUMENTATION.md > DOCUMENTATION.html # List of files that are packaged on all platforms # Note that the Tao dlls are shipped on all platforms except osx and that # they are now installed to the game directory instead of placed in the gac -FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.FileFormats.dll \ -OpenRA.Renderer.SdlCommon.dll OpenRA.Renderer.Cg.dll OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll \ -FreeSans.ttf FreeSansBold.ttf titles.ttf Dune2k.ttf cg glsl mods/ra mods/cnc mods/d2k \ -AUTHORS README.html CONTRIBUTING.html DOCUMENTATION.html COPYING HACKING INSTALL CHANGELOG" +FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \ +'OpenRA.FileFormats.dll' 'OpenRA.Renderer.SdlCommon.dll' 'OpenRA.Renderer.Cg.dll' 'OpenRA.Renderer.Gl.dll' 'OpenRA.Renderer.Null.dll' \ +'FreeSans.ttf' 'FreeSansBold.ttf' 'titles.ttf' 'Dune2k.ttf' \ +'cg' 'glsl' 'mods/ra' 'mods/cnc' 'mods/d2k' \ +'AUTHORS' 'COPYING' 'HACKING' 'INSTALL' 'CHANGELOG' \ +'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' \ +'global mix database.dat') echo "Copying files..." -for i in $FILES; do - cp -R "$i" "packaging/built/$i" || exit 3 +for i in "${FILES[@]}"; do + cp -R "${i}" "packaging/built/${i}" || exit 3 done # Copy Tao @@ -59,9 +62,6 @@ cp OpenRA.Game/OpenRA.ico packaging/built # Remove demo.mix from cnc rm ./packaging/built/mods/cnc/bits/demo.mix -# Workaround for problems with spaces in filenames. -cp "global mix database.dat" packaging/built - # # Change into packaging directory and run the # platform-dependant packaging in parallel From 9d256d93a59302c06d26f36c88125ce574d7e360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 29 Jun 2013 15:22:09 +0200 Subject: [PATCH 5/6] don't list every file in RPM spec %files folders are enough --- packaging/linux/rpm/buildpackage.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh index e6263cf882..9fb62de211 100755 --- a/packaging/linux/rpm/buildpackage.sh +++ b/packaging/linux/rpm/buildpackage.sh @@ -13,10 +13,10 @@ sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec rootdir=`readlink -f $2` sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec -for x in `find $rootdir -type f` +for x in `find $rootdir -type d` do y="${x#$rootdir}" - sed -i "/%files/ a $y" openra.spec + sed -i "/%files/ a ${y}" openra.spec done cp openra.spec "$3/SPECS/" From cfd5a73b92c165319dfc209822eadbeb25c4000e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 29 Jun 2013 15:45:17 +0200 Subject: [PATCH 6/6] forgot to add AUTHORS and global mix database.dat to NSIS script --- packaging/windows/OpenRA.nsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index f368f628d2..43755c768b 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -85,6 +85,7 @@ Section "Client" Client File "${SRCDIR}\ICSharpCode.SharpZipLib.dll" File "${SRCDIR}\FuzzyLogicLibrary.dll" File "${SRCDIR}\Mono.Nat.dll" + File "${SRCDIR}\AUTHORS" File "${SRCDIR}\COPYING" File "${SRCDIR}\HACKING" File "${SRCDIR}\INSTALL" @@ -92,6 +93,7 @@ Section "Client" Client File "${SRCDIR}\OpenRA.ico" File "${SRCDIR}\Tao.*.dll" File "${SRCDIR}\SharpFont.dll" + File "${SRCDIR}\global mix database.dat" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$StartMenuFolder" @@ -266,6 +268,7 @@ Function ${UN}Clean Delete $INSTDIR\Mono.Nat.dll Delete $INSTDIR\Tao.*.dll Delete $INSTDIR\SharpFont.dll + Delete $INSTDIR\AUTHORS Delete $INSTDIR\COPYING Delete $INSTDIR\HACKING Delete $INSTDIR\INSTALL @@ -276,6 +279,7 @@ Function ${UN}Clean Delete $INSTDIR\cg.dll Delete $INSTDIR\cgGL.dll Delete $INSTDIR\zlib1.dll + Delete "$INSTDIR\global mix database.dat" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA" Delete $INSTDIR\uninstaller.exe RMDir $INSTDIR