From 307eaecc9eb4a325241e4c8d6a70d2c948c50007 Mon Sep 17 00:00:00 2001 From: steelphase Date: Wed, 15 Oct 2014 00:43:19 -0400 Subject: [PATCH] Update Windows installer and Makefile Update windows installer to point to OpenRA.exe replace CrashDialog with GameMonitor in MakeFile Fix and simplify packaging scripts --- Makefile | 22 +++++++++++----------- packaging/linux/buildpackage.sh | 6 ------ packaging/osx/buildpackage.sh | 3 ++- packaging/package-all.sh | 5 ++++- packaging/windows/OpenRA.nsi | 13 ++++++------- 5 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index a1dcf74860..484c655d93 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,6 @@ INSTALL_DATA = $(INSTALL) -m644 # program targets CORE = rsdl2 rnull game utility ralint TOOLS = editor tsbuild crashdialog - VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`) @@ -207,14 +206,14 @@ tsbuild: OpenRA.TilesetBuilder.FormBuilder.resources OpenRA.TilesetBuilder.FormN ##### Launchers / Utilities ##### -crashdialog_SRCS := $(shell find OpenRA.CrashDialog/ -iname '*.cs') -crashdialog_TARGET = OpenRA.CrashDialog.exe -crashdialog_KIND = exe -crashdialog_DEPS = $(game_TARGET) -crashdialog_LIBS = $(COMMON_LIBS) $(crashdialog_DEPS) System.Windows.Forms.dll -crashdialog_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico -PROGRAMS += crashdialog -crashdialog: $(crashdialog_TARGET) +gamemonitor_SRCS := $(shell find OpenRA.GameMonitor/ -iname '*.cs') +gamemonitor_TARGET = OpenRA.exe +gamemonitor_KIND = winexe +gamemonitor_DEPS = $(game_TARGET) +gamemonitor_LIBS = $(COMMON_LIBS) $(gamemonitor_DEPS) System.Windows.Forms.dll +gamemonitor_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico +PROGRAMS += gamemonitor +gamemonitor: $(gamemonitor_TARGET) # Backend for the launcher apps - queries game/mod info and applies actions to an install utility_SRCS := $(shell find OpenRA.Utility/ -iname '*.cs') @@ -257,9 +256,9 @@ default: cli-dependencies core core: game renderers mods utility ralint -tools: editor tsbuild crashdialog +tools: editor tsbuild gamemonitor -package: dependencies core editor crashdialog docs version +package: dependencies core editor gamemonitor docs version mods: mod_common mod_ra mod_cnc mod_d2k mod_ts @@ -344,6 +343,7 @@ install-tools: tools @-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)" @$(INSTALL_DIR) "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)" + @$(RM) $(DATA_INSTALL_DIR)/OpenRA.TilesetBuilder.exe # TODO: won't work outside the source tree install-linux-icons: @$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/" diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index 928b9474e1..32dea3f898 100755 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -26,12 +26,6 @@ cp $DEPSDIR/* $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/ # Install startup scripts, desktop files and icons make install-linux-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR" -# Remove the WinForms dialog which is replaced with a native one provided by zenity -rm $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/OpenRA.CrashDialog.exe - -# Remove the WinForms tileset builder which does not work outside the source tree -rm $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/OpenRA.TilesetBuilder.exe - # Documentation mkdir -p $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/ cp *.html $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/ diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh index f8cc1f847e..a21a70fb2a 100755 --- a/packaging/osx/buildpackage.sh +++ b/packaging/osx/buildpackage.sh @@ -18,9 +18,10 @@ cp -rv $2/* $3/* "OpenRA.app/Contents/Resources/" || exit 3 # Remove unused icon rm OpenRA.app/Contents/Resources/OpenRA.ico + # Remove broken WinForms applications +rm OpenRA.app/Contents/Resources/OpenRA.exe rm OpenRA.app/Contents/Resources/OpenRA.Editor.exe -rm OpenRA.app/Contents/Resources/OpenRA.CrashDialog.exe # Set version string sed "s/{DEV_VERSION}/${1}/" OpenRA.app/Contents/Info.plist.template > OpenRA.app/Contents/Info.plist diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 3944fc59e4..cc8319e9e8 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -30,7 +30,7 @@ markdown DOCUMENTATION.md > DOCUMENTATION.html markdown Lua-API.md > Lua-API.html # List of files that are packaged on all platforms -FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' 'OpenRA.CrashDialog.exe' \ +FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \ 'OpenRA.Renderer.Sdl2.dll' 'OpenRA.Renderer.Null.dll' \ 'lua' 'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' 'mods/modchooser' \ 'AUTHORS' 'COPYING' 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' 'CHANGELOG.html' \ @@ -68,6 +68,9 @@ cp thirdparty/RestSharp.dll packaging/built # Copy game icon for windows package cp OpenRA.Game/OpenRA.ico packaging/built +# Copy the Windows crash monitor +cp OpenRA.exe packaging/built + cd packaging echo "Creating packages..." diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 9b5dfebb9f..db8fd6f95b 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -65,9 +65,9 @@ Section "Game" GAME File /r "${SRCDIR}\mods\modchooser" SetOutPath "$INSTDIR" + File "${SRCDIR}\OpenRA.exe" File "${SRCDIR}\OpenRA.Game.exe" File "${SRCDIR}\OpenRA.Utility.exe" - File "${SRCDIR}\OpenRA.CrashDialog.exe" File "${SRCDIR}\OpenRA.Renderer.Null.dll" File "${SRCDIR}\OpenRA.Renderer.Sdl2.dll" File "${SRCDIR}\ICSharpCode.SharpZipLib.dll" @@ -97,8 +97,8 @@ Section "Game" GAME !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\OpenRA.lnk" $OUTDIR\OpenRA.Game.exe "" \ - "$OUTDIR\OpenRA.Game.exe" "" "" "" "" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\OpenRA.lnk" $OUTDIR\OpenRA.exe "" \ + "$OUTDIR\OpenRA.exe" "" "" "" "" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\README.lnk" $OUTDIR\README.html "" \ "$OUTDIR\README.html" "" "" "" "" !insertmacro MUI_STARTMENU_WRITE_END @@ -125,8 +125,8 @@ SectionEnd SectionGroup /e "Settings" Section "Desktop Shortcut" DESKTOPSHORTCUT SetOutPath "$INSTDIR" - CreateShortCut "$DESKTOP\OpenRA.lnk" $INSTDIR\OpenRA.Game.exe "" \ - "$INSTDIR\OpenRA.Game.exe" "" "" "" "" + CreateShortCut "$DESKTOP\OpenRA.lnk" $INSTDIR\OpenRA.exe "" \ + "$INSTDIR\OpenRA.exe" "" "" "" "" SectionEnd SectionGroupEnd @@ -181,10 +181,9 @@ Function ${UN}Clean RMDir /r $INSTDIR\maps RMDir /r $INSTDIR\glsl RMDir /r $INSTDIR\lua - Delete $INSTDIR\OpenRA.Launcher.exe + Delete $INSTDIR\OpenRA.exe Delete $INSTDIR\OpenRA.Game.exe Delete $INSTDIR\OpenRA.Utility.exe - Delete $INSTDIR\OpenRA.CrashDialog.exe Delete $INSTDIR\OpenRA.Editor.exe Delete $INSTDIR\OpenRA.Renderer.Null.dll Delete $INSTDIR\OpenRA.Renderer.Sdl2.dll