From 08dea92585112b76a175b8081510ff079f8b7fac Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Thu, 11 Feb 2010 01:43:28 -0800 Subject: [PATCH] darwin: Update README to mention .app workarounds Testing .app bundles is non-trivial on PPC Tiger machines so mention the testing workaround mentioned on the git-cola mailing list. Signed-off-by: David Aguilar --- darwin/README | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/darwin/README b/darwin/README index fb5faa0b..062e59d4 100644 --- a/darwin/README +++ b/darwin/README @@ -4,17 +4,36 @@ first. MacPorts can be used for this. The macports-setup-dev-env.sh script sets up your build environment. It'll take a long time to run. -Once it's complete, running this from the command-prompt -generates git-cola.app: - - $ make git-cola.app - - -If you're using macports then you'll have to add -/opt/local/Library/Frameworks/Python.Framework/Versions/Current/bin -to your $PATH so that you can build and run cola from its source tree. +Once you've installed the macports packages then you should be able +to run cola out of its source tree. This is a good sanity check +before trying to build git-cola.app: $ cola=$PWD $ make $ cd $there $ $cola/bin/git-cola + +Once that's working then you can generate git-cola.app: + + $ make git-cola.app + # double-click or run 'open' on the generated .app bundle + + +NOTE: Some Mac OS X flavors won't be able to run the generated git-cola.app +when macports is installed on the system. There is a problem where +the dynamic loader tries to load the Qt libraries twice. + +This workaround was not needed on an Intel Leopard machine but was +needed when testing the package on a PPC Tiger machine. YMMV. + +A workaround that allows you to test the .app is to fake the +removal of macports: + + cd /opt + sudo mv local local.bak + open /path/to/git-cola.app # this should work now + sudo mv local.bak local + +Don't try this unless you have problems running git-cola.app on a +mac build machine. Some Mac OS X variants do not have this problem +and it's likely that the problem only exists on PPC Tiger machines. -- 2.11.4.GIT