Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the autorevision script instead of the program. 

Refs #2401.
master
dak180 2011-03-06 20:13:40 -05:00
parent 6d7572131e
commit add956d337
6 changed files with 68 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
macosx/Resources/Warzone-Info.plist
View File

@ -28,18 +28,22 @@
<true/>
<key>ATSApplicationFontsPath</key>
<string>Fonts/</string>
<key>VCSLongHash</key>
<string>VCS_FULL_HASH</string>
<key>VCSShortHash</key>
<string>VCS_SHORT_HASH</string>
<key>CFBundleVersion</key>
<string>SVN_REV</string>
<string>VCS_NUM</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.strategy-games</string>
<key>CFBundleShortVersionString</key>
<string>SVN_TAG [SVN_SHORT_HASH_WITHOUT_QUOTES]</string>
<string>VCS_TAG [VCS_SHORT_HASH]</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project</string>
<key>CFBundleGetInfoString</key>
<string>SVN_TAG [SVN_SHORT_HASH_WITHOUT_QUOTES], Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project</string>
<string>VCS_TAG [VCS_SHORT_HASH], Copyright © 1999-2004 Eidos Interactive, Copyright © 2005-2010 The Warzone 2100 Project</string>
<key>LSMinimumSystemVersion</key>
<string>10.4.0</string>
<string>${MACOSX_DEPLOYMENT_TARGET}.0</string>
<key>LSRequiresNativeExecution</key>
<true/>
<key>UTExportedTypeDeclarations</key>

143
macosx/Warzone.xcodeproj/project.pbxproj
View File

@ -7,6 +7,17 @@
objects = {
/* Begin PBXAggregateTarget section */
43071471132465D500FB6EBF /* Autorevision */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 4307147F132465F000FB6EBF /* Build configuration list for PBXAggregateTarget "Autorevision" */;
buildPhases = (
43071470132465D500FB6EBF /* Run autorevision */,
);
dependencies = (
);
name = Autorevision;
productName = Autorevision;
};
43F77C7710F0125E00E04615 /* Make DMGs for Release */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 43F77C8A10F0126F00E04615 /* Build configuration list for PBXAggregateTarget "Make DMGs for Release" */;
@ -306,7 +317,6 @@
02BBB2090DA874F6002D438B /* exceptionhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02BBB2070DA874F6002D438B /* exceptionhandler.cpp */; };
02C8AEF80BE68A5600E9D8A7 /* png_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02C8AEF60BE68A5600E9D8A7 /* png_util.cpp */; };
02C8AEFC0BE68A6800E9D8A7 /* oggvorbis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02C8AEFA0BE68A6800E9D8A7 /* oggvorbis.cpp */; };
02CDDCF90D159BE000722688 /* autorevision.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02CDDCF80D159BE000722688 /* autorevision.cpp */; };
02CDDD130D159DF600722688 /* QuesoGLC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0223BBD10CFE3D5C0056EF85 /* QuesoGLC.framework */; };
02CDDD1C0D159E2F00722688 /* openal_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02CDDD1A0D159E2F00722688 /* openal_error.cpp */; };
02DDA81C0BD3C1420049AB60 /* analysis.c in Sources */ = {isa = PBXBuildFile; fileRef = 02DDA7F50BD3C1420049AB60 /* analysis.c */; };
@ -661,13 +671,6 @@
remoteGlobalIDString = 02581C5C0BD5A94A00957CBC;
remoteInfo = SDLmain;
};
02CDDCFE0D159C0000722688 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 02356D660BD3BB2600E9A019 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 02CDDCF30D159BC300722688;
remoteInfo = Autorevision;
};
02DDA8680BD3C21E0049AB60 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 02356D660BD3BB2600E9A019 /* Project object */;
@ -682,6 +685,13 @@
remoteGlobalIDString = 02356D820BD3BB4100E9A019;
remoteInfo = Zlib;
};
430714801324663A00FB6EBF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 02356D660BD3BB2600E9A019 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 43071471132465D500FB6EBF;
remoteInfo = Autorevision;
};
43AE78FC10F0F4F500FED5D3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 02356D660BD3BB2600E9A019 /* Project object */;
@ -1269,7 +1279,6 @@
02C8AEF70BE68A5600E9D8A7 /* png_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = png_util.h; path = ../lib/ivis_opengl/png_util.h; sourceTree = SOURCE_ROOT; };
02C8AEFA0BE68A6800E9D8A7 /* oggvorbis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = oggvorbis.cpp; path = ../lib/sound/oggvorbis.cpp; sourceTree = SOURCE_ROOT; };
02C8AEFB0BE68A6800E9D8A7 /* oggvorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = oggvorbis.h; path = ../lib/sound/oggvorbis.h; sourceTree = SOURCE_ROOT; };
02CDDCF40D159BC300722688 /* Autorevision */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Autorevision; sourceTree = BUILT_PRODUCTS_DIR; };
02CDDCF80D159BE000722688 /* autorevision.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = autorevision.cpp; path = ../build_tools/autorevision/autorevision.cpp; sourceTree = SOURCE_ROOT; };
02CDDD080D159D5900722688 /* autorevision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = autorevision.h; path = ../src/autorevision.h; sourceTree = SOURCE_ROOT; };
02CDDD1A0D159E2F00722688 /* openal_error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = openal_error.cpp; path = ../lib/sound/openal_error.cpp; sourceTree = SOURCE_ROOT; };
@ -1690,13 +1699,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
02CDDCF20D159BC300722688 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
02DDA7EC0BD3C03F0049AB60 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@ -1867,7 +1869,6 @@
022B2F220BD55814002E64E3 /* Gettext.framework */,
02581C5D0BD5A94A00957CBC /* libSDLmain.a */,
0223BBD10CFE3D5C0056EF85 /* QuesoGLC.framework */,
02CDDCF40D159BC300722688 /* Autorevision */,
97AEAB330E8C1B5200A10721 /* Theora.framework */,
);
name = Products;
@ -3210,7 +3211,7 @@
0246AA730BD3E47F004D1C70 /* PBXBuildRule */,
);
dependencies = (
02CDDCFF0D159C0000722688 /* PBXTargetDependency */,
430714811324663A00FB6EBF /* PBXTargetDependency */,
02581C630BD5A97400957CBC /* PBXTargetDependency */,
022B313F0BD56915002E64E3 /* PBXTargetDependency */,
0246A2FF0BD3CCF0004D1C70 /* PBXTargetDependency */,
@ -3303,23 +3304,6 @@
productReference = 02581C5D0BD5A94A00957CBC /* libSDLmain.a */;
productType = "com.apple.product-type.library.static";
};
02CDDCF30D159BC300722688 /* Autorevision */ = {
isa = PBXNativeTarget;
buildConfigurationList = 02CDDCFA0D159BE000722688 /* Build configuration list for PBXNativeTarget "Autorevision" */;
buildPhases = (
02CDDCF10D159BC300722688 /* Sources */,
02CDDCF20D159BC300722688 /* Frameworks */,
43095E9A10EEA8630067E86B /* Run autorevision */,
);
buildRules = (
);
dependencies = (
);
name = Autorevision;
productName = Autorevision;
productReference = 02CDDCF40D159BC300722688 /* Autorevision */;
productType = "com.apple.product-type.tool";
};
02DDA7ED0BD3C03F0049AB60 /* Vorbis */ = {
isa = PBXNativeTarget;
buildConfigurationList = 02DDA7F00BD3C03F0049AB60 /* Build configuration list for PBXNativeTarget "Vorbis" */;
@ -3434,7 +3418,7 @@
projectRoot = ..;
targets = (
02356D740BD3BB3400E9A019 /* Warzone */,
02CDDCF30D159BC300722688 /* Autorevision */,
43071471132465D500FB6EBF /* Autorevision */,
43FA570C10FF8E9B0074E914 /* Setup Prebuilt Components */,
02581C5C0BD5A94A00957CBC /* SDLmain */,
022B2F210BD55814002E64E3 /* Gettext */,
@ -3682,7 +3666,7 @@
shellPath = /bin/sh;
shellScript = "# Config\nexport PATH=$PATH:/sw/bin:/opt/local/bin\npodir=\"../po\"\ndisfile=\"configs/LangDis\"\naresdir=\"build/${CONFIGURATION}/Warzone.app/Contents/Resources/\"\nbresdir=\"locale/\"\nmessdir=\"LC_MESSAGES/\"\nmonme=\"warzone2100.mo\"\npolist=`ls -1 ${podir} | sed -n 's:\\.po$:&:p' | sed -e 's:\\.po::'`\ndislist=`cat ${disfile} | sed -n 's:^<::p'`\n\n# 1st san check\necho \"Checking for msgfmt...\"\nif [ -f build/notrans.dis ]; then\n rm build/notrans.dis\n echo \"warning: Gettext support has been disabled for this build because we could not find a binary.\" >&2\n exit 0\nelif ! type -aP msgfmt; then\n echo \"error: Fatal inability to properly translate messages.\" >&2\n exit 1\nfi\n\n# Get the path\nmsgfmtpth=`type -P msgfmt`\n\n# 2nd san check\necho \"Checking for sanity...\"\nif ! $msgfmtpth --version; then\n echo \"error: Fatal failure of san check.\" >&2\n exit 1\nfi\n\n# Disable selected langs\nfor dislang in ${dislist}; do\n echo \"Cleaning up for ${dislang} ...\"\n rm -rfv \"${aresdir}${dislang}.lproj\"\ndone\n\n# Make .mo\nfor lang in ${polist}; do\n if [ -d \"${aresdir}${lang}.lproj\" ]; then\n echo \"Setting up for ${lang} ...\"\n mkdir -p \"${aresdir}${bresdir}${lang}/${messdir}\"\n $msgfmtpth -v -o \"${aresdir}${bresdir}${lang}/${messdir}${monme}\" \"${podir}/${lang}.po\"\n fi\ndone\n\nexit 0";
};
43095E9A10EEA8630067E86B /* Run autorevision */ = {
43071470132465D500FB6EBF /* Run autorevision */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@ -3691,11 +3675,10 @@
);
name = "Run autorevision";
outputPaths = (
"$(SRCROOT)/../src/autorevision.h",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "function hfilter {\n sed -n 's:#define:&:p' src/autorevision.h | sed 's:\"::g' | sed -e 's:refs/heads/:branch/:' -e 's:master:Master:' -e 's:^v::' | sed -e 's:_beta: Beta :' -e 's:_rc: RC :' >macosx/build/autorevision.h\n}\n\n\ncd ..\nexport PATH=$PATH:/sw/bin:/opt/local/bin\n\n# Do not run if we will not get useful information\nif [[ ! -d \".git\" ]] && [[ ! -d \".hg\" ]]; then\n if [ -f \"src/autorevision.h\" ]; then\n echo \"Not a repo.\"\n hfilter\n exit 0\n fi\nfi\n\n# Wait a bit if Autorevision does not exist\ntick=0\nwhile [ ! -s \"./macosx/build/${CONFIGURATION}/Autorevision\" ]; do\n let tick=${tick}+1\n if [ ${tick} == 11 ]; then\n break\n fi\n sleep 1\ndone\n\n\nif ! ./macosx/build/${CONFIGURATION}/Autorevision +cstr . src/autorevision.h; then\n echo \"error: Could not run Autorevision\"\n exit 1\nfi\n\nhfilter\nexit 0\n";
shellPath = /bin/sh;
shellScript = "function hfilter {\n sed -e 's:refs/heads/:branch/:' -e 's:master:Master:' -e 's:^v::' src/autorevision.h | sed -e 's:_beta: Beta :' -e 's:_rc: RC :' > \"${OBJROOT}/autorevision.h\"\n}\n\n\nexport PATH=$PATH:/sw/bin:/opt/local/bin\ncd ..\n\n# Do not run if we will not get useful information\nif [[ ! -d \".git\" ]] && [[ ! -d \".hg\" ]]; then\n if [ -f \"src/autorevision.h\" ]; then\n echo \"Not a repo.\"\n hfilter\n exit 0\n fi\nfi\n\n\nif ! build_tools/autorevision.sh src/autorevision.h; then\n echo \"error: Could not run Autorevision\"\n exit 1\nfi\n\nhfilter\nexit 0\n";
};
4345290E1130F84E002AD731 /* msgfmt */ = {
isa = PBXShellScriptBuildPhase;
@ -4113,14 +4096,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
02CDDCF10D159BC300722688 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
02CDDCF90D159BE000722688 /* autorevision.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
02DDA7EB0BD3C03F0049AB60 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@ -4255,11 +4230,6 @@
target = 02581C5C0BD5A94A00957CBC /* SDLmain */;
targetProxy = 02581C620BD5A97400957CBC /* PBXContainerItemProxy */;
};
02CDDCFF0D159C0000722688 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 02CDDCF30D159BC300722688 /* Autorevision */;
targetProxy = 02CDDCFE0D159C0000722688 /* PBXContainerItemProxy */;
};
02DDA8690BD3C21E0049AB60 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 02356E080BD3BCFE00E9A019 /* Ogg */;
@ -4270,6 +4240,11 @@
target = 02356D820BD3BB4100E9A019 /* Zlib */;
targetProxy = 02DDA8D20BD3C3780049AB60 /* PBXContainerItemProxy */;
};
430714811324663A00FB6EBF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 43071471132465D500FB6EBF /* Autorevision */;
targetProxy = 430714801324663A00FB6EBF /* PBXContainerItemProxy */;
};
43AE78FD10F0F4F500FED5D3 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 02356D740BD3BB3400E9A019 /* Warzone */;
@ -4499,20 +4474,6 @@
};
name = Release;
};
02CDDCFB0D159BE000722688 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 43025EB71120CD41006C49B1 /* Autorevision-Debug.xcconfig */;
buildSettings = {
};
name = Debug;
};
02CDDCFC0D159BE000722688 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 43025EB81120CD41006C49B1 /* Autorevision-Release.xcconfig */;
buildSettings = {
};
name = Release;
};
02DDA7F10BD3C03F0049AB60 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 43025F2B1121F965006C49B1 /* Vorbis-Debug.xcconfig */;
@ -4541,6 +4502,27 @@
};
name = Release;
};
4307147A132465D600FB6EBF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = Autorevision;
};
name = Debug;
};
4307147B132465D600FB6EBF /* StaticAnalyzer */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = Autorevision;
};
name = StaticAnalyzer;
};
4307147C132465D600FB6EBF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
PRODUCT_NAME = Autorevision;
};
name = Release;
};
4389DBD4111B0A0700B98DEF /* StaticAnalyzer */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 43025DFE1120A4CA006C49B1 /* Project-All.xcconfig */;
@ -4555,13 +4537,6 @@
};
name = StaticAnalyzer;
};
4389DBD7111B0A0700B98DEF /* StaticAnalyzer */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 43025EB71120CD41006C49B1 /* Autorevision-Debug.xcconfig */;
buildSettings = {
};
name = StaticAnalyzer;
};
4389DBD8111B0A0700B98DEF /* StaticAnalyzer */ = {
isa = XCBuildConfiguration;
buildSettings = {
@ -4786,16 +4761,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
02CDDCFA0D159BE000722688 /* Build configuration list for PBXNativeTarget "Autorevision" */ = {
isa = XCConfigurationList;
buildConfigurations = (
02CDDCFB0D159BE000722688 /* Debug */,
4389DBD7111B0A0700B98DEF /* StaticAnalyzer */,
02CDDCFC0D159BE000722688 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
02DDA7F00BD3C03F0049AB60 /* Build configuration list for PBXNativeTarget "Vorbis" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@ -4816,6 +4781,16 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
4307147F132465F000FB6EBF /* Build configuration list for PBXAggregateTarget "Autorevision" */ = {
isa = XCConfigurationList;
buildConfigurations = (
4307147A132465D600FB6EBF /* Debug */,
4307147B132465D600FB6EBF /* StaticAnalyzer */,
4307147C132465D600FB6EBF /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
43F77C8A10F0126F00E04615 /* Build configuration list for PBXAggregateTarget "Make DMGs for Release" */ = {
isa = XCConfigurationList;
buildConfigurations = (

9
macosx/configs/Autorevision-All.xcconfig
View File

@ -1,9 +0,0 @@
// Autorevision settings for all configurations
ARCHS = $(ARCHS_STANDARD_32_64_BIT)
ONLY_ACTIVE_ARCH = YES
INSTALL_PATH = $(HOME)/bin
PREBINDING = NO
PRODUCT_NAME = Autorevision
GCC_MODEL_TUNING = G5

11
macosx/configs/Autorevision-Debug.xcconfig
View File

@ -1,11 +0,0 @@
// Autorevision settings for Debug configuration
#include "Autorevision-All.xcconfig"
COPY_PHASE_STRIP = NO
GCC_ENABLE_FIX_AND_CONTINUE = YES
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
GCC_DYNAMIC_NO_PIC = NO
GCC_OPTIMIZATION_LEVEL = 0
ZERO_LINK = YES

9
macosx/configs/Autorevision-Release.xcconfig
View File

@ -1,9 +0,0 @@
// Autorevision settings for Release configuration
#include "Autorevision-All.xcconfig"
COPY_PHASE_STRIP = YES
GCC_ENABLE_FIX_AND_CONTINUE = NO
GCC_GENERATE_DEBUGGING_SYMBOLS = NO
ZERO_LINK = NO