Mercurial > hg > easyhg
changeset 372:2d3f1e5d8638
OS/X build fixes, for now slightly simpler (conceptually) situation in which we have a single bundle with two Python extension distributions in it, one for each active Python version
| author | Chris Cannam |
|---|---|
| date | Thu, 24 Mar 2011 13:15:49 +0000 |
| parents | f051d210521e |
| children | 1c7281288303 |
| files | common_osx.mm deploy/osx/deploy.sh deploy/osx/paths.sh easyhg.py src/common_osx.mm src/version.h |
| diffstat | 6 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/common_osx.mm Thu Mar 24 10:47:03 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ - -#include "common.h" - -#include <QString> - -#ifdef Q_OS_MAC - -#include <Foundation/Foundation.h> - -QString getUserRealName() -{ - NSString *s = NSFullUserName(); - return QString::fromLocal8Bit([s UTF8String]); -} - -#endif
--- a/deploy/osx/deploy.sh Thu Mar 24 10:47:03 2011 +0000 +++ b/deploy/osx/deploy.sh Thu Mar 24 13:15:49 2011 +0000 @@ -13,7 +13,7 @@ fi app=EasyMercurial -version=`perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' version.h` +version=`perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' src/version.h` case "$version" in [0-9].[0-9]) bundleVersion="$version".0 ;; [0-9].[0-9].[0-9]) bundleVersion="$version" ;;
--- a/deploy/osx/paths.sh Thu Mar 24 10:47:03 2011 +0000 +++ b/deploy/osx/paths.sh Thu Mar 24 13:15:49 2011 +0000 @@ -21,7 +21,7 @@ for fwk in QtCore QtGui QtNetwork; do find "$app.app" -type f -print | while read x; do - current=$(otool -L "$x" | grep "$fwk.framework/" | awk '{ print $1; }') + current=$(otool -L "$x" | grep "$fwk" | grep ramework | awk '{ print $1; }') [ -z "$current" ] && continue echo "$x has $current" relative=$(echo "$x" | sed -e "s,$app.app/Contents/,," \
--- a/easyhg.py Thu Mar 24 10:47:03 2011 +0000 +++ b/easyhg.py Thu Mar 24 13:15:49 2011 +0000 @@ -26,8 +26,8 @@ if not easyhg_import_path.startswith('NO_'): # We have an installation path: append it twice, once with # the Python version suffixed - version_suffix = "Py" + sys.version_info[0] + "." + sys.version_info[1]; - sys.path.append(easyhg_import_path + version_suffix) + version_suffix = "Py" + str(sys.version_info[0]) + "." + str(sys.version_info[1]); + sys.path.append(easyhg_import_path + "/" + version_suffix) sys.path.append(easyhg_import_path) # Try to load the PyQt4 module that we need. If this fails, we should
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common_osx.mm Thu Mar 24 13:15:49 2011 +0000 @@ -0,0 +1,16 @@ + +#include "common.h" + +#include <QString> + +#ifdef Q_OS_MAC + +#include <Foundation/Foundation.h> + +QString getUserRealName() +{ + NSString *s = NSFullUserName(); + return QString::fromLocal8Bit([s UTF8String]); +} + +#endif