epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix packaging scripts (OpenRA.Utility wasn't built, and SharpZipLib wasn't included).

Browse Source
This commit is contained in:
Paul Chote
2010-11-14 14:36:23 +13:00
parent 5d0b750a64
commit 5904563653
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -113,7 +113,10 @@ winlaunch_EXTRA = -resource:OpenRA.Launcher.MainForm.resources \
.SUFFIXES: .SUFFIXES:
.PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex utility winlaunch .PHONY: clean all game tool default mods mod_ra mod_cnc install uninstall editor_res editor tsbuild ralint seqed filex utility winlaunch
core: game editor utility winlaunch core: game editor
package: game editor utility
all: game tools
tools: editor ralint seqed filex tsbuild utility winlaunch
game: $(fileformats_TARGET) $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET) game: $(fileformats_TARGET) $(rcg_TARGET) $(rgl_TARGET) $(rnull_TARGET) $(game_TARGET) $(ra_TARGET) $(cnc_TARGET)
clean: clean:
@@ -206,9 +209,6 @@ OpenRA.Launcher.InstallPackagesDialog.resources:
OpenRA.Launcher.ConfigureModsDialog.resources: OpenRA.Launcher.ConfigureModsDialog.resources:
resgen2 OpenRA.Launcher/ConfigureModsDialog.resx OpenRA.Launcher.ConfigureModsDialog.resources 1> /dev/null resgen2 OpenRA.Launcher/ConfigureModsDialog.resx OpenRA.Launcher.ConfigureModsDialog.resources 1> /dev/null
tools: editor ralint seqed filex tsbuild
all: game tools
fixheader: packaging/fixheader.cs fixheader: packaging/fixheader.cs
@$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%) @$(CSC) packaging/fixheader.cs $(CSFLAGS) -out:fixheader.exe -t:exe $(COMMON_LIBS:%=-r:%)

6
packaging/package-all.sh
View File

@@ -17,7 +17,7 @@ cd "$SRCDIR"
mkdir packaging/built mkdir packaging/built
mkdir packaging/built/mods mkdir packaging/built/mods
echo $1 > VERSION echo $1 > VERSION
make game editor make package
# Remove the mdb files that are created during `make` # Remove the mdb files that are created during `make`
find . -path "*.mdb" -delete find . -path "*.mdb" -delete
@@ -28,6 +28,7 @@ find . -path "*.mdb" -delete
FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.Renderer.Cg.dll OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll \ FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.Renderer.Cg.dll OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll \
OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf cg glsl mods/ra mods/cnc VERSION COPYING HACKING INSTALL" OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf cg glsl mods/ra mods/cnc VERSION COPYING HACKING INSTALL"
echo "Copying files..."
for i in $FILES; do for i in $FILES; do
cp -R "$i" "packaging/built/$i" || exit 3 cp -R "$i" "packaging/built/$i" || exit 3
done done
@@ -38,6 +39,9 @@ cp thirdparty/Tao/* packaging/built
# Copy WindowsBase.dll for linux packages # Copy WindowsBase.dll for linux packages
cp thirdparty/WindowsBase.dll packaging/built cp thirdparty/WindowsBase.dll packaging/built
# SharpZipLib for zip file support
cp thirdparty/ICSharpCode.SharpZipLib.dll packaging/built
# Copy game icon for windows package # Copy game icon for windows package
cp OpenRA.Game/OpenRA.ico packaging/built cp OpenRA.Game/OpenRA.ico packaging/built