Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. v0.7.0-16-gb2bc62c
|
From: Brad A. <br...@us...> - 2011-12-31 18:36:29
|
gemrb: Infinity Engine emulator
The branch master has been updated
via b2bc62c6d415852b7adbbc9f82f493e6f6e3c750 (commit)
via b7e22d3b00d77b1dfc60e9cceccd56a6978eeb2f (commit)
via dee1023b01b28cdb0fdd03fa945b8bdfa2d86f24 (commit)
via e5fc040fde2930d6761b1ffc8ff98395ea2b298a (commit)
via ce2c55be318ffd3e6c9b441d2458929d289b2ceb (commit)
via 585b7db462d41c7e8b092a3add9c8901bd7d0b7e (commit)
via 86e1ed85f26a98d22e2eed0c065a21bb726d59ff (commit)
Summary of changes:
apple/CocoaWrapper/ios/CocoaMain.m | 10 +++++---
apple/GemRB.xcodeproj/project.pbxproj | 9 +++++--
apple/ios/Info.plist | 39 +-------------------------------
apple/ios/iTunesMetadata.plist | 4 +-
artwork/gemrb.icns | Bin 44623 -> 56828 bytes
gemrb/core/Interface.cpp | 3 +-
6 files changed, 18 insertions(+), 47 deletions(-)
from ef5f246d449683a962c26fc43a359e79cf390d62 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b2bc62c6d415852b7adbbc9f82f493e6f6e3c750
commit b2bc62c6d415852b7adbbc9f82f493e6f6e3c750
Merge: b7e22d3 ef5f246
Author: Brad Allred <bra...@me...>
Date: Sat Dec 31 11:35:08 2011 -0700
Merge branch 'master' of ssh://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b7e22d3b00d77b1dfc60e9cceccd56a6978eeb2f
commit b7e22d3b00d77b1dfc60e9cceccd56a6978eeb2f
Author: Brad Allred <bra...@me...>
Date: Sat Dec 31 11:34:04 2011 -0700
Xcode (iOS target): automatically update the iTunesMetadata.plist with current timestamp and git version.
diff --git a/apple/GemRB.xcodeproj/project.pbxproj b/apple/GemRB.xcodeproj/project.pbxproj
index 1417820..5f55837 100644
--- a/apple/GemRB.xcodeproj/project.pbxproj
+++ b/apple/GemRB.xcodeproj/project.pbxproj
@@ -3717,7 +3717,7 @@
A29BF85813A0427900C812DD /* Resources */,
A29BF85913A0427900C812DD /* Sources */,
A29BF85A13A0427900C812DD /* Frameworks */,
- A2D4C61613A978520086BCC4 /* ShellScript */,
+ A2D4C61613A978520086BCC4 /* Run Script */,
);
buildRules = (
);
@@ -3907,7 +3907,7 @@
shellPath = /bin/bash;
shellScript = "#build the SDLVideo driver. we cannot have it as a target dependency because we use \"bundle loader\"\nxcodebuild -project GemRB.xcodeproj -target SDLVideo -configuration $CONFIGURATION SYMROOT=$SYMROOT\n\n#i like having a symlink to the build directory available\nln -s \"$BUILT_PRODUCTS_DIR\" osx/build\n\n#increment the version number for the build\nREV=`git log --pretty=format:'' | wc -l | sed 's/\\ //g'`\nVERSION=`git describe --tags --dirty=-patched`\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $VERSION\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"";
};
- A2D4C61613A978520086BCC4 /* ShellScript */ = {
+ A2D4C61613A978520086BCC4 /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -3919,11 +3919,12 @@
ios/iTunesArtWork,
ios/iTunesMetadata.plist,
);
+ name = "Run Script";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#increment the version number for the build\nREV=`git log --pretty=format:'' | wc -l | sed 's/\\ //g'`\nVERSION=`git describe --tags --dirty=-patched`\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $VERSION\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n\ncp ios/GemRB.cfg $BUILT_PRODUCTS_DIR/\"$CONTENTS_FOLDER_PATH\"/GemRB.cfg\ncp ios/GemRB.cfg.newinstall $BUILT_PRODUCTS_DIR/\"$CONTENTS_FOLDER_PATH\"/GemRB.cfg.newinstall\ncp -r ../gemrb/GUIScripts/ $BUILT_PRODUCTS_DIR/\"$CONTENTS_FOLDER_PATH\"/GUIScripts\ncp -r ../gemrb/override/ $BUILT_PRODUCTS_DIR/\"$CONTENTS_FOLDER_PATH\"/override\n\n#make ipa\n#purge payload of everything\nrm -r ios/Payload\nmkdir ios/Payload\n#we could simply copy from the directory to payload but i like having a symlink available\nln -s \"$BUILT_PRODUCTS_DIR\" ios/build\ncp -r ios/build/GemRB.app ios/Payload/GemRB.app\ncd ios\nzip -r GemRB-ios-$VERSION.ipa iTunesArtWork iTunesMetadata.plist Payload";
+ shellScript = "#increment the version number for the build\nREV=`git log --pretty=format:'' | wc -l | sed 's/\\ //g'`\nVERSION=`git describe --tags --dirty=-patched`\nDATE=`date -u +%Y-%m-%d\\T%T\\Z`\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $VERSION\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n\n#updtate the iTumesMetaData\n/usr/libexec/PlistBuddy -c \"Set :softwareVersionExternalIdentifier $REV\" \"ios/iTunesMetadata.plist\"\n/usr/libexec/PlistBuddy -c \"Set :releaseDate $DATE\" \"ios/iTunesMetadata.plist\"\n\ncp ios/GemRB.cfg $BUILT_PRODUCTS_DIR/\"$CONTENTS_FOLDER_PATH\"/GemRB.cfg\ncp ios/GemRB.cfg.newinstall $BUILT_PRODUCTS_DIR/\"$CONTENTS_FOLDER_PATH\"/GemRB.cfg.newinstall\ncp -r ../gemrb/GUIScripts/ $BUILT_PRODUCTS_DIR/\"$CONTENTS_FOLDER_PATH\"/GUIScripts\ncp -r ../gemrb/override/ $BUILT_PRODUCTS_DIR/\"$CONTENTS_FOLDER_PATH\"/override\n\n#make ipa\n#purge payload of everything\nrm -r ios/Payload\nmkdir ios/Payload\n#we could simply copy from the directory to payload but i like having a symlink available\nln -s \"$BUILT_PRODUCTS_DIR\" ios/build\ncp -r ios/build/GemRB.app ios/Payload/GemRB.app\ncd ios\nzip -r GemRB-ios-$VERSION.ipa iTunesArtWork iTunesMetadata.plist Payload";
};
A2F8709214AE448500F9CC1F /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
diff --git a/apple/ios/iTunesMetadata.plist b/apple/ios/iTunesMetadata.plist
index 04e2bbe..f7673fe 100644
--- a/apple/ios/iTunesMetadata.plist
+++ b/apple/ios/iTunesMetadata.plist
@@ -48,7 +48,7 @@
<string>itunes-games</string>
</dict>
<key>releaseDate</key>
- <string>2011-12-23T08:00:00Z</string>
+ <string></string>
<key>s</key>
<integer>143441</integer>
<key>softwareIcon57x57URL</key>
@@ -62,7 +62,7 @@
<key>softwareVersionBundleId</key>
<string>net.sourceforgepany.GemRB</string>
<key>softwareVersionExternalIdentifier</key>
- <integer>66</integer>
+ <integer>0</integer>
<key>softwareVersionExternalIdentifiers</key>
<array>
<integer>1466803</integer>
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=dee1023b01b28cdb0fdd03fa945b8bdfa2d86f24
commit dee1023b01b28cdb0fdd03fa945b8bdfa2d86f24
Author: Brad Allred <bra...@me...>
Date: Sat Dec 31 10:46:12 2011 -0700
CocoaWrapper(iOS): temporary hack so quitting doesn't cause an infinite loop. once SDL is patched will remove. Also some comment cleanup.
diff --git a/apple/CocoaWrapper/ios/CocoaMain.m b/apple/CocoaWrapper/ios/CocoaMain.m
index 2c09e22..095917c 100644
--- a/apple/CocoaWrapper/ios/CocoaMain.m
+++ b/apple/CocoaWrapper/ios/CocoaMain.m
@@ -58,9 +58,6 @@ int SDL_main (int argc, char **argv)
argc += 2;
argv = realloc(argv, sizeof(char*) * argc);
argv[argc - 2] = "-c";
-
- //hope that this cstrig doesnt get deallocated until we are done with it...
- //the Docs say it will be deallocated when the NSAutoreleasePool is drained which happens at the end of every run loop
argv[argc - 1] = (char*)configPath;
}else{
//popup a message???
@@ -70,6 +67,7 @@ int SDL_main (int argc, char **argv)
[win release];
[nibObjects release];
+ // pass control to GemRB
int ret = GemRB_main(argc, argv);
if (ret != 0) {
// TODO: inject into error() function instead and rewrite the core to always use error instead of returning.
@@ -87,5 +85,7 @@ int SDL_main (int argc, char **argv)
}
[alert release];
}
- return ret;
+ // FIXME: temporary hack to terminate because an update to libSDL makes returning fall into an infinate loop
+ exit(ret);
+ //return ret;
}
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=e5fc040fde2930d6761b1ffc8ff98395ea2b298a
commit e5fc040fde2930d6761b1ffc8ff98395ea2b298a
Author: Brad Allred <bra...@me...>
Date: Fri Dec 30 22:37:29 2011 -0700
Interface: iOS sandbox path was mistakenly appending to the default UserDir instead of overriding it.
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index d4c3806..10ec7b3 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -2182,10 +2182,11 @@ bool Interface::LoadConfig(void)
char* s = getenv( "HOME" );
if (s) {
strcpy( UserDir, s );
- strcat( UserDir, "/."PACKAGE"/" );
#if TARGET_OS_IPHONE
//we are in both a sandbox and a bundle
strcat( UserDir, "/"PACKAGE".app/");
+#else
+ strcat( UserDir, "/."PACKAGE"/" );
#endif
} else {
strcpy( UserDir, "./" );
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=ce2c55be318ffd3e6c9b441d2458929d289b2ceb
commit ce2c55be318ffd3e6c9b441d2458929d289b2ceb
Author: Brad Allred <bra...@me...>
Date: Fri Dec 30 22:31:52 2011 -0700
CocoaWrapper (iOS): suppress console error about PYTHONHOME not being set.
diff --git a/apple/CocoaWrapper/ios/CocoaMain.m b/apple/CocoaWrapper/ios/CocoaMain.m
index afe1f8f..2c09e22 100644
--- a/apple/CocoaWrapper/ios/CocoaMain.m
+++ b/apple/CocoaWrapper/ios/CocoaMain.m
@@ -32,6 +32,8 @@ int SDL_main (int argc, char **argv)
{
//do all the special plugin initializations here
Py_NoSiteFlag = 1;
+ //this mostly just supresses a benign console error
+ setenv("PYTHONHOME", "GUIScripts", 0);
UIWindow* win = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
win.backgroundColor = [UIColor blackColor];
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=585b7db462d41c7e8b092a3add9c8901bd7d0b7e
commit 585b7db462d41c7e8b092a3add9c8901bd7d0b7e
Author: Brad Allred <bra...@me...>
Date: Fri Dec 30 22:00:03 2011 -0700
Xcode: change the icon file to have a rounded white background (instead of transparent). fixes the icon looking like just a small gem on black backgrounds.
diff --git a/apple/ios/Info.plist b/apple/ios/Info.plist
index 438d364..44198ec 100644
--- a/apple/ios/Info.plist
+++ b/apple/ios/Info.plist
@@ -6,47 +6,12 @@
<string>en</string>
<key>CFBundleDisplayName</key>
<string>${PRODUCT_NAME}</string>
- <key>CFBundleDocumentTypes</key>
- <array>
- <dict>
- <key>CFBundleTypeIconFiles</key>
- <array/>
- <key>CFBundleTypeName</key>
- <string>IE Game Date</string>
- <key>LSItemContentTypes</key>
- <array>
- <string>bg1</string>
- <string>bg2</string>
- </array>
- </dict>
- <dict>
- <key>CFBundleTypeIconFiles</key>
- <array/>
- <key>CFBundleTypeName</key>
- <string>GemRB Configuration File</string>
- <key>LSItemContentTypes</key>
- <array>
- <string>cfg</string>
- </array>
- </dict>
- <dict>
- <key>CFBundleTypeIconFiles</key>
- <array/>
- <key>CFBundleTypeName</key>
- <string>IE Save Data</string>
- <key>LSItemContentTypes</key>
- <array>
- <string>sav</string>
- </array>
- </dict>
- </array>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
- <string>gemrb.png</string>
+ <string>Icon.png</string>
<key>CFBundleIconFiles</key>
<array>
- <string>gemrb.png</string>
<string>Icon.png</string>
<string>Ic...@2x...g</string>
<string>Icon-72.png</string>
@@ -85,7 +50,7 @@
<key>UIFileSharingEnabled</key>
<true/>
<key>UIPrerenderedIcon</key>
- <string>YES</string>
+ <string>NO</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
diff --git a/artwork/gemrb.icns b/artwork/gemrb.icns
index 2cc2996..1986009 100644
Binary files a/artwork/gemrb.icns and b/artwork/gemrb.icns differ
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=86e1ed85f26a98d22e2eed0c065a21bb726d59ff
commit 86e1ed85f26a98d22e2eed0c065a21bb726d59ff
Author: Brad Allred <bra...@me...>
Date: Fri Dec 30 21:28:41 2011 -0700
Xcode (iOS target): apparently you need a mac os x deployment target in order to compile for the simulator...
diff --git a/apple/GemRB.xcodeproj/project.pbxproj b/apple/GemRB.xcodeproj/project.pbxproj
index 1e8c218..1417820 100644
--- a/apple/GemRB.xcodeproj/project.pbxproj
+++ b/apple/GemRB.xcodeproj/project.pbxproj
@@ -6368,6 +6368,7 @@
"$(inherited)",
$SDK_DIR/usr/lib,
);
+ MACOSX_DEPLOYMENT_TARGET = "";
OTHER_CFLAGS = (
"-DTARGET_OS_IPHONE",
"-isystem",
@@ -6415,6 +6416,7 @@
"$(inherited)",
$SDK_DIR/usr/lib,
);
+ MACOSX_DEPLOYMENT_TARGET = "";
OTHER_CFLAGS = (
"-isystem",
./ios/SDL/Include/,
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|