From 972c6d397c526757ee0cc57404d72cd83e855cd7 Mon Sep 17 00:00:00 2001 From: dak180 Date: Mon, 4 Jan 2010 16:13:38 +0000 Subject: [PATCH] Correct copyright strings DMG script refinements git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8978 4a71c877-e1ca-e34f-864e-861f7616d084 --- macosx/Resources/Warzone-Info.plist | 8 ++++---- macosx/Warzone.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/macosx/Resources/Warzone-Info.plist b/macosx/Resources/Warzone-Info.plist index 441f99246..a144c1014 100644 --- a/macosx/Resources/Warzone-Info.plist +++ b/macosx/Resources/Warzone-Info.plist @@ -1,5 +1,5 @@ - + CFBundleDevelopmentRegion @@ -21,11 +21,11 @@ CFBundleVersion SVN_REV CFBundleShortVersionString - SVN_URI (SVN_REV) + SVN_URI NSHumanReadableCopyright - Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 Warzone Resurrection Project + Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project CFBundleGetInfoString - SVN_URI (SVN_REV), Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 Warzone Resurrection Project + SVN_URI, Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project LSMinimumSystemVersion 10.4.0 UTExportedTypeDeclarations diff --git a/macosx/Warzone.xcodeproj/project.pbxproj b/macosx/Warzone.xcodeproj/project.pbxproj index 37ce947e6..2919e2dc8 100644 --- a/macosx/Warzone.xcodeproj/project.pbxproj +++ b/macosx/Warzone.xcodeproj/project.pbxproj @@ -3654,7 +3654,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd ..\n./macosx/build/${CONFIGURATION}/Autorevision +cstr . src/autorevision.h\nsed -n 's:#define:&:p' src/autorevision.h | sed 's:\"::g' >macosx/build/autorevision.h"; + shellScript = "cd ..\n./macosx/build/${CONFIGURATION}/Autorevision +cstr . src/autorevision.h\nsed -n 's:#define:&:p' src/autorevision.h | sed 's:\"::g' | sed 's:tags/::' | sed 's:beta:Beta :' | sed 's:rc:RC :' >macosx/build/autorevision.h"; }; 43F3011910D3572400707B6E /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -3680,7 +3680,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "# Config\nsimgfl=\"http://downloads.sourceforge.net/project/warzone2100/build-tools/wztemplate.sparseimage\"\nsimgflnme=\"wztemplate.sparseimage\"\nsequence=\"http://www.il.fontys.nl/~giel/warzone/videos/latest/en/hi/sequences.wz\"\nsequencenme=\"sequences.wz\"\nsequencelo=\"http://www.il.fontys.nl/~giel/warzone/videos/latest/en/lo/sequences.wz\"\nsequencelonme=\"sequences-lo.wz\"\nrelbuild=\"build/Release/Warzone.app\"\ndmgout=\"build/dmgout\"\n\n# Fail if not release\nif [ ! -d \"$relbuild\" ]; then\n echo \"This should only be run as Release\"\n exit 1\nfi\n\n# Make a dir and get the sparseimage\nmkdir -p \"$dmgout\"\ncd \"$dmgout\"\nif [ ! -f \"$simgflnme\" ]; then\n echo \"Fetching $simgfl\"\n if ! curl -L -O --connect-timeout \"30\" \"$simgfl\"; then\n echo \"Unable to fetch $simgfl\"\n exit 1\n fi\nelse\n echo \"$simgflnme already exists, skipping\"\nfi\n\n# Get the sequences\n# if [ ! -f \"$sequencenme\" ]; then\n# if ! curl -L -O --connect-timeout \"30\" \"$sequence\"; then\n# echo \"Unable to fetch $sequence\"\n# exit 1\n# fi\n# else\n# echo \"$sequencenme already exists, skipping\"\n# fi\nif [ ! -f \"$sequencelonme\" ]; then\n if ! curl -L --connect-timeout \"30\" -o \"$sequencelonme\" \"$sequencelo\"; then\n echo \"Unable to fetch $sequencelo\"\n exit 1\n fi\nelse\n echo \"$sequencelonme already exists, skipping\"\nfi\n\n# Copy over the app\ncd ../../\necho \"Copying the app cleanly.\"\nif ! tar -c --exclude .svn --exclude 'Makefile*' --exclude 'makefile*' -C build/Release Warzone.app | tar -xC $dmgout; then\n echo \"Unable to copy the app\"\n exit 1\nfi\ncd \"$dmgout\"\n\n# mkredist.bash\necho \"== Compressing base.zip ==\"\ncd Warzone.app/Contents/Resources/data/\nif [ -d base/ ]\nthen\n cd base/\n zip -r ../base.wz *\n cd ..\n rm -rf base/\nfi\n\necho \"== Compressing mp.zip ==\"\nif [ -d mp/ ]\nthen\n cd mp/\n zip -r ../mp.wz *\n cd ..\n rm -rf mp/\nfi\n\n# rm sequences.wz\n\ncd ../../../../\n\nmkdir temp/\nmkdir out/\n\necho \"== Creating DMG ==\"\ncp wztemplate.sparseimage temp/wztemplatecopy.sparseimage\nhdiutil resize -size 150m temp/wztemplatecopy.sparseimage\nmountpt=`hdiutil mount temp/wztemplatecopy.sparseimage | tr -d \"\\t\" | sed -E 's:(/dev/disk[0-9])( +)(/Volumes/Warzone 2100):\\1:'`\ncp -r Warzone.app/* /Volumes/Warzone\\ 2100/Warzone.app\n# hdiutil detach `expr match \"$mountpt\" '\\(^[^ ]*\\)'`\nhdiutil detach \"$mountpt\"\nhdiutil convert temp/wztemplatecopy.sparseimage -format UDZO -o out/warzone2100-novideo.dmg\n\necho \"== Creating LQ DMG ==\"\nhdiutil resize -size 350m temp/wztemplatecopy.sparseimage\nmountpt=`hdiutil mount temp/wztemplatecopy.sparseimage | tr -d \"\\t\" | sed -E 's:(/dev/disk[0-9])( +)(/Volumes/Warzone 2100):\\1:'`\ncp sequences-lo.wz /Volumes/Warzone\\ 2100/Warzone.app/Contents/Resources/data/sequences.wz\n# hdiutil detach `expr match \"$mountpt\" '\\(^[^ ]*\\)'`\nhdiutil detach \"$mountpt\"\nhdiutil convert temp/wztemplatecopy.sparseimage -format UDZO -o out/warzone2100-lqvideo.dmg\n\n# echo \"== Creating HQ DMG ==\"\n# hdiutil resize -size 700m temp/wztemplatecopy.sparseimage\n# mountpt=`hdiutil mount temp/wztemplatecopy.sparseimage | tr -d \"\\t\" | sed -E 's:(/dev/disk[0-9])( +)(/Volumes/Warzone 2100):\\1:'``\n# rm /Volumes/Warzone\\ 2100/Warzone.app/Contents/Resources/data/sequences.wz\n# cp sequences.wz /Volumes/Warzone\\ 2100/Warzone.app/Contents/Resources/data/sequences.wz\n# hdiutil detach \"$mountpt\"\n# hdiutil converttemp/wztemplatecopy.sparseimage -format UDZO -o out/warzone2100-hqvideo.dmg\n\necho \"== Cleaning up ==\"\nrm -f temp/wztemplatecopy.sparseimage\nrmdir temp/\n\n# Open the dir\nopen \"$dmgout/out\"\n\nexit 0"; + shellScript = "# Config\nsimgfl=\"http://downloads.sourceforge.net/project/warzone2100/build-tools/wztemplate.sparseimage\"\nsimgflnme=\"wztemplate.sparseimage\"\nsequence=\"http://www.il.fontys.nl/~giel/warzone/videos/latest/en/hi/sequences.wz\"\nsequencenme=\"sequences.wz\"\nsequencelo=\"http://www.il.fontys.nl/~giel/warzone/videos/latest/en/lo/sequences.wz\"\nsequencelonme=\"sequences-lo.wz\"\nrelbuild=\"build/Release/Warzone.app\"\ndmgout=\"build/dmgout\"\n\n# Fail if not release\nif [ ! -d \"$relbuild\" ]; then\n echo \"This should only be run as Release\"\n exit 1\nfi\n\n# Make a dir and get the sparseimage\nmkdir -p \"$dmgout\"\ncd \"$dmgout\"\nif [ ! -f \"$simgflnme\" ]; then\n echo \"Fetching $simgfl\"\n if ! curl -L -O --connect-timeout \"30\" \"$simgfl\"; then\n echo \"Unable to fetch $simgfl\"\n exit 1\n fi\nelse\n echo \"$simgflnme already exists, skipping\"\nfi\n\n# Get the sequences\n\n# Comment out the following to skip the high qual seq\n# if [ ! -f \"$sequencenme\" ]; then\n# echo \"Fetching $sequencenme\"\n# if ! curl -L -O --connect-timeout \"30\" \"$sequence\"; then\n# echo \"Unable to fetch $sequence\"\n# exit 1\n# fi\n# else\n# echo \"$sequencenme already exists, skipping\"\n# fi\n# \n\n# Comment out the following to skip the low qual seq\nif [ ! -f \"$sequencelonme\" ]; then\n echo \"Fetching $sequencelonme\"\n if ! curl -L --connect-timeout \"30\" -o \"$sequencelonme\" \"$sequencelo\"; then\n echo \"Unable to fetch $sequencelo\"\n exit 1\n fi\nelse\n echo \"$sequencelonme already exists, skipping\"\nfi\n# \n\n# Copy over the app\ncd ../../\necho \"Copying the app cleanly.\"\nrm -r -f $dmgout/Warzone.app\nif ! tar -c --exclude .svn --exclude 'Makefile*' --exclude 'makefile*' -C build/Release Warzone.app | tar -xC $dmgout; then\n echo \"Unable to copy the app\"\n exit 1\nfi\ncd \"$dmgout\"\n\n# mkredist.bash\n\ncd Warzone.app/Contents/Resources/data/\n\necho \"== Compressing base.zip ==\"\nif [ -d base/ ]\nthen\n cd base/\n zip -r ../base.wz *\n cd ..\n rm -rf base/\nfi\n\necho \"== Compressing mp.zip ==\"\nif [ -d mp/ ]\nthen\n cd mp/\n zip -r ../mp.wz *\n cd ..\n rm -rf mp/\nfi\n\ncd ../../../../\n\nrm -r -f ./out ./temp\nmkdir temp/\nmkdir out/\n\necho \"== Creating DMG ==\"\ncp wztemplate.sparseimage temp/wztemplatecopy.sparseimage\nhdiutil resize -size 150m temp/wztemplatecopy.sparseimage\nmountpt=`hdiutil mount temp/wztemplatecopy.sparseimage | tr -d \"\\t\" | sed -E 's:(/dev/disk[0-9])( +)(/Volumes/Warzone 2100):\\1:'`\ncp -r Warzone.app/* /Volumes/Warzone\\ 2100/Warzone.app\n# hdiutil detach `expr match \"$mountpt\" '\\(^[^ ]*\\)'`\nhdiutil detach \"$mountpt\"\nhdiutil convert temp/wztemplatecopy.sparseimage -format UDZO -o out/warzone2100-novideo.dmg\n\nif [ -f \"$sequencelonme\" ]; then\n echo \"== Creating LQ DMG ==\"\n hdiutil resize -size 350m temp/wztemplatecopy.sparseimage\n mountpt=`hdiutil mount temp/wztemplatecopy.sparseimage | tr -d \"\\t\" | sed -E 's:(/dev/disk[0-9])( +)(/Volumes/Warzone 2100):\\1:'`\n cp sequences-lo.wz /Volumes/Warzone\\ 2100/Warzone.app/Contents/Resources/data/sequences.wz\n # hdiutil detach `expr match \"$mountpt\" '\\(^[^ ]*\\)'`\n hdiutil detach \"$mountpt\"\n hdiutil convert temp/wztemplatecopy.sparseimage -format UDZO -o out/warzone2100-lqvideo.dmg\nelse\n echo \"$sequencelonme does not exist, skipping\"\nfi\n\n\nif [ -f \"$sequencenme\" ]; then\n echo \"== Creating HQ DMG ==\"\n hdiutil resize -size 700m temp/wztemplatecopy.sparseimage\n mountpt=`hdiutil mount temp/wztemplatecopy.sparseimage | tr -d \"\\t\" | sed -E 's:(/dev/disk[0-9])( +)(/Volumes/Warzone 2100):\\1:'`\n rm /Volumes/Warzone\\ 2100/Warzone.app/Contents/Resources/data/sequences.wz\n cp sequences.wz /Volumes/Warzone\\ 2100/Warzone.app/Contents/Resources/data/sequences.wz\n hdiutil detach \"$mountpt\"\n hdiutil converttemp/wztemplatecopy.sparseimage -format UDZO -o out/warzone2100-hqvideo.dmg\nelse\n echo \"$sequencenme does not exist, skipping\"\nfi\n\necho \"== Cleaning up ==\"\nrm -f temp/wztemplatecopy.sparseimage\nrmdir temp/\n\n# Open the dir\nopen \"out\"\n\nexit 0"; }; 9711774C0F87A677000C8A96 /* Fetch source */ = { isa = PBXShellScriptBuildPhase; @@ -4547,7 +4547,7 @@ OTHER_CFLAGS = "$(inherited)"; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; WARNING_CFLAGS = ""; - WARNING_LDFLAGS = "-Wno-mlong-branch"; + WARNING_LDFLAGS = ""; }; name = Debug; }; @@ -4573,7 +4573,7 @@ OTHER_CFLAGS = "$(inherited)"; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; WARNING_CFLAGS = ""; - WARNING_LDFLAGS = "-Wno-mlong-branch"; + WARNING_LDFLAGS = ""; }; name = Release; };