diff --git a/gitso/trunk/Gitso.py b/gitso/trunk/Gitso.py index 0cc0be8..265ffff 100644 --- a/gitso/trunk/Gitso.py +++ b/gitso/trunk/Gitso.py @@ -25,11 +25,13 @@ along with Gitso. If not, see . import sys, platform, re + if sys.platform == 'darwin': # If we're on Snow Leopard, we want to use Python 2.5 until we figure out what Apple's doing with 2.6 ver = platform.mac_ver() - - if re.match('10\.6', ver[0]) <> None: + + if re.match('10\.5', ver[0]) <> None: + """ sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python26.zip') sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5') sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/plat-darwin') @@ -41,7 +43,10 @@ if sys.platform == 'darwin': sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/lib-dynload') sys.path.append('/Library/Python/2.5/site-packages') sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/Extras/lib/python/PyObjC') + """ sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/Extras/lib/python/wx-2.8-mac-unicode') + elif re.match('10\.6', ver[0]) <> None: + sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.6/Extras/lib/python/wx-2.8-mac-unicode') import wx import ConnectionWindow, ArgsParser diff --git a/gitso/trunk/arch/osx/Info.plist b/gitso/trunk/arch/osx/Info.plist index ad616f5..4e56b7c 100644 --- a/gitso/trunk/arch/osx/Info.plist +++ b/gitso/trunk/arch/osx/Info.plist @@ -32,17 +32,17 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.5 + 0.6 CFBundleSignature ???? CFBundleVersion - 0.5 + 0.6 LSHasLocalizedDisplayName NSAppleScriptEnabled NSHumanReadableCopyright - Copyright not specified + Aaron Gerber and Derek Buranen 2010 NSMainNibFile MainMenu NSPrincipalClass @@ -72,18 +72,18 @@ PyRuntimeLocations - @executable_path/../Frameworks/Python.framework/Versions/2.5/Python - /System/Library/Frameworks/Python.framework/Versions/2.5/Python + @executable_path/../Frameworks/Python.framework/Versions/2.6/Python + /System/Library/Frameworks/Python.framework/Versions/2.6/Python PythonInfoDict PythonExecutable - /System/Library/Frameworks/Python.framework/Versions/2.5/Resources/Python.app/Contents/MacOS/Python + /System/Library/Frameworks/Python.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/Python PythonLongVersion - 2.5.1 (r251:54863, Jan 17 2008, 19:35:17) -[GCC 4.0.1 (Apple Inc. build 5465)] + Python 2.6.1 (r261:67515, Jul 7 2009, 23:51:51) +[GCC 4.2.1 (Apple Inc. build 5646)] on darwin PythonShortVersion - 2.5 + 2.6 py2app alias @@ -91,7 +91,7 @@ template app version - 0.3.6 + 0.4.2 diff --git a/gitso/trunk/arch/osx/Info_OSX-10.5.plist b/gitso/trunk/arch/osx/Info_OSX-10.5.plist new file mode 100644 index 0000000..ad616f5 --- /dev/null +++ b/gitso/trunk/arch/osx/Info_OSX-10.5.plist @@ -0,0 +1,98 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + Gitso + CFBundleDocumentTypes + + + CFBundleTypeOSTypes + + **** + fold + disk + + CFBundleTypeRole + Viewer + + + CFBundleExecutable + Gitso + CFBundleIconFile + PythonApplet.icns + CFBundleIdentifier + org.pythonmac.unspecified.Gitso + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Gitso + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.5 + CFBundleSignature + ???? + CFBundleVersion + 0.5 + LSHasLocalizedDisplayName + + NSAppleScriptEnabled + + NSHumanReadableCopyright + Copyright not specified + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + PyMainFileNames + + __boot__ + + PyOptions + + alias + + argv_emulation + + no_chdir + + optimize + 0 + prefer_ppc + + site_packages + + use_pythonpath + + + PyResourcePackages + + PyRuntimeLocations + + @executable_path/../Frameworks/Python.framework/Versions/2.5/Python + /System/Library/Frameworks/Python.framework/Versions/2.5/Python + + PythonInfoDict + + PythonExecutable + /System/Library/Frameworks/Python.framework/Versions/2.5/Resources/Python.app/Contents/MacOS/Python + PythonLongVersion + 2.5.1 (r251:54863, Jan 17 2008, 19:35:17) +[GCC 4.0.1 (Apple Inc. build 5465)] + PythonShortVersion + 2.5 + py2app + + alias + + template + app + version + 0.3.6 + + + + diff --git a/gitso/trunk/arch/osx/Info_OSX-10.6.plist b/gitso/trunk/arch/osx/Info_OSX-10.6.plist new file mode 100644 index 0000000..4e56b7c --- /dev/null +++ b/gitso/trunk/arch/osx/Info_OSX-10.6.plist @@ -0,0 +1,98 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + Gitso + CFBundleDocumentTypes + + + CFBundleTypeOSTypes + + **** + fold + disk + + CFBundleTypeRole + Viewer + + + CFBundleExecutable + Gitso + CFBundleIconFile + PythonApplet.icns + CFBundleIdentifier + org.pythonmac.unspecified.Gitso + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Gitso + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.6 + CFBundleSignature + ???? + CFBundleVersion + 0.6 + LSHasLocalizedDisplayName + + NSAppleScriptEnabled + + NSHumanReadableCopyright + Aaron Gerber and Derek Buranen 2010 + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + PyMainFileNames + + __boot__ + + PyOptions + + alias + + argv_emulation + + no_chdir + + optimize + 0 + prefer_ppc + + site_packages + + use_pythonpath + + + PyResourcePackages + + PyRuntimeLocations + + @executable_path/../Frameworks/Python.framework/Versions/2.6/Python + /System/Library/Frameworks/Python.framework/Versions/2.6/Python + + PythonInfoDict + + PythonExecutable + /System/Library/Frameworks/Python.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/Python + PythonLongVersion + Python 2.6.1 (r261:67515, Jul 7 2009, 23:51:51) +[GCC 4.2.1 (Apple Inc. build 5646)] on darwin + PythonShortVersion + 2.6 + py2app + + alias + + template + app + version + 0.4.2 + + + + diff --git a/gitso/trunk/arch/osx/setup.py b/gitso/trunk/arch/osx/setup.py index c855b81..70beee2 100644 --- a/gitso/trunk/arch/osx/setup.py +++ b/gitso/trunk/arch/osx/setup.py @@ -9,7 +9,8 @@ from setuptools import setup APP = ['Gitso.py'] DATA_FILES = [] -OPTIONS = {'argv_emulation': True} +OPTIONS = {'argv_emulation': True, +'site_packages': True} setup( app=APP, diff --git a/gitso/trunk/makegitso.sh b/gitso/trunk/makegitso.sh index b781dca..6b26475 100755 --- a/gitso/trunk/makegitso.sh +++ b/gitso/trunk/makegitso.sh @@ -20,7 +20,8 @@ ########## -DMG="Gitso_0.6.dmg" +DMG_OSX_106="Gitso_0.6_SnowLeopard.dmg" +DMG_OSX_105="Gitso_0.6_Leopard.dmg" DEB="gitso_0.6_all.deb" TARGZ="gitso_0.6_all.tar.gz" SRC="gitso_0.6_src.tar.bz2" @@ -39,6 +40,118 @@ function mksrc { rm -rf $TMP_PKG } +function snowLeopardDMG { + echo -e "Creating Gitso.app " + rm -f setup.py + rm -rf dist + + #echo -e ".." + #py2applet --make-setup Gitso.py + + echo -e ".." + + # To manually include the wx libraries, I'm not sure we need them... + # python setup.py py2app --includes=wx --packages=wx + + python arch/osx/setup.py py2app + #rm setup.py + + echo -e ".." + cp arch/osx/Info_OSX-10.6.plist dist/Gitso.app/Contents/ + + cp COPYING dist/Gitso.app/Contents/Resources/ + cp PythonApplet.icns dist/Gitso.app/Contents/Resources/ + + tar xvfz arch/osx/OSXvnc.tar.gz + mv OSXvnc dist/Gitso.app/Contents/Resources/ + + tar xvfz arch/osx/cotvnc.app.tar.gz + mv cotvnc.app dist/Gitso.app/Contents/Resources/ + + cp icon.ico dist/Gitso.app/Contents/Resources/ + cp icon.png dist/Gitso.app/Contents/Resources/ + cp __init__.py dist/Gitso.app/Contents/Resources/ + cp ArgsParser.py dist/Gitso.app/Contents/Resources/ + cp Processes.py dist/Gitso.app/Contents/Resources/ + cp ConnectionWindow.py dist/Gitso.app/Contents/Resources/ + cp AboutWindow.py dist/Gitso.app/Contents/Resources/ + cp GitsoThread.py dist/Gitso.app/Contents/Resources/ + + cp arch/osx/libjpeg-copyright.txt dist/Gitso.app/Contents/Frameworks/ + cp arch/osx/osxnvc_echoware-copyright.txt dist/Gitso.app/Contents/Resources/OSXvnc/ + cp arch/osx/cotvnc-copyright.txt dist/Gitso.app/Contents/Resources/cotvnc.app/contents/Resources + cp arch/osx/osxvnc-copyright.txt dist/Gitso.app/Contents/Resources/OSXvnc/ + + echo -e " [done]\n" + + echo -e "Creating $DMG_OSX_106" + rm -f $DMG_OSX_106 + + mkdir dist/Gitso + cp arch/osx/dmg_DS_Store dist/Gitso/.DS_Store + ln -s /Applications/ dist/Gitso/Applications + + mv "dist/Gitso.app" "dist/Gitso/" + cp -r arch/osx/Readme.rtfd dist/Gitso/Readme.rtfd + + echo -e "..." + hdiutil create -srcfolder dist/Gitso/ $DMG_OSX_106 + echo -e "... [done]\n" +} + +function LeopardDMG { + echo -e "Creating Gitso.app " + rm -f setup.py + rm -rf dist + + echo -e ".." + + python arch/osx/setup.py py2app + + echo -e ".." + cp arch/osx/Info_OSX-10.5.plist dist/Gitso.app/Contents/ + + cp COPYING dist/Gitso.app/Contents/Resources/ + cp PythonApplet.icns dist/Gitso.app/Contents/Resources/ + + tar xvfz arch/osx/OSXvnc.tar.gz + mv OSXvnc dist/Gitso.app/Contents/Resources/ + + tar xvfz arch/osx/cotvnc.app.tar.gz + mv cotvnc.app dist/Gitso.app/Contents/Resources/ + + cp icon.ico dist/Gitso.app/Contents/Resources/ + cp icon.png dist/Gitso.app/Contents/Resources/ + cp __init__.py dist/Gitso.app/Contents/Resources/ + cp ArgsParser.py dist/Gitso.app/Contents/Resources/ + cp Processes.py dist/Gitso.app/Contents/Resources/ + cp ConnectionWindow.py dist/Gitso.app/Contents/Resources/ + cp AboutWindow.py dist/Gitso.app/Contents/Resources/ + cp GitsoThread.py dist/Gitso.app/Contents/Resources/ + + cp arch/osx/libjpeg-copyright.txt dist/Gitso.app/Contents/Frameworks/ + cp arch/osx/osxnvc_echoware-copyright.txt dist/Gitso.app/Contents/Resources/OSXvnc/ + cp arch/osx/cotvnc-copyright.txt dist/Gitso.app/Contents/Resources/cotvnc.app/contents/Resources + cp arch/osx/osxvnc-copyright.txt dist/Gitso.app/Contents/Resources/OSXvnc/ + + echo -e " [done]\n" + + echo -e "Creating $DMG_OSX_105" + rm -f $DMG_OSX_105 + + mkdir dist/Gitso + cp arch/osx/dmg_DS_Store dist/Gitso/.DS_Store + ln -s /Applications/ dist/Gitso/Applications + + mv "dist/Gitso.app" "dist/Gitso/" + cp -r arch/osx/Readme.rtfd dist/Gitso/Readme.rtfd + + echo -e "..." + hdiutil create -srcfolder dist/Gitso/ $DMG_OSX_105 + echo -e "... [done]\n" +} + + CLEAN="yes" RPMNAME="opensuse" echo -n "Starting makegitso:" @@ -84,10 +197,6 @@ fi if [ "`uname -a | grep Darwin`" != "" ]; then if test `which py2applet`; then - echo -e "Creating Gitso.app " - rm -f setup.py - rm -rf dist - # To Make cotvnc # cvs -z3 -d:pserver:anonymous@cotvnc.cvs.sourceforge.net:/cvsroot/cotvnc co -P cotvnc # @@ -102,59 +211,8 @@ if [ "`uname -a | grep Darwin`" != "" ]; then # # Patch was made with: diff -aurr . ../cotvnc-gitso/ > cotvnc-gitso.diff # - - echo -e ".." - py2applet --make-setup Gitso.py - - echo -e ".." - - # To manually include the wx libraries, I'm not sure we need them... - # python setup.py py2app --includes=wx --packages=wx - - python setup.py py2app - rm setup.py - - echo -e ".." - cp arch/osx/Info.plist dist/Gitso.app/Contents/ - - cp COPYING dist/Gitso.app/Contents/Resources/ - cp PythonApplet.icns dist/Gitso.app/Contents/Resources/ - - tar xvfz arch/osx/OSXvnc.tar.gz - mv OSXvnc dist/Gitso.app/Contents/Resources/ - - tar xvfz arch/osx/cotvnc.app.tar.gz - mv cotvnc.app dist/Gitso.app/Contents/Resources/ - - cp icon.ico dist/Gitso.app/Contents/Resources/ - cp icon.png dist/Gitso.app/Contents/Resources/ - cp __init__.py dist/Gitso.app/Contents/Resources/ - cp ArgsParser.py dist/Gitso.app/Contents/Resources/ - cp Processes.py dist/Gitso.app/Contents/Resources/ - cp ConnectionWindow.py dist/Gitso.app/Contents/Resources/ - cp AboutWindow.py dist/Gitso.app/Contents/Resources/ - cp GitsoThread.py dist/Gitso.app/Contents/Resources/ - - cp arch/osx/libjpeg-copyright.txt dist/Gitso.app/Contents/Frameworks/ - cp arch/osx/osxnvc_echoware-copyright.txt dist/Gitso.app/Contents/Resources/OSXvnc/ - cp arch/osx/cotvnc-copyright.txt dist/Gitso.app/Contents/Resources/cotvnc.app/contents/Resources - cp arch/osx/osxvnc-copyright.txt dist/Gitso.app/Contents/Resources/OSXvnc/ - - echo -e " [done]\n" - - echo -e "Creating Gitso.dmg " - rm -f $DMG - - mkdir dist/Gitso - cp arch/osx/dmg_DS_Store dist/Gitso/.DS_Store - ln -s /Applications/ dist/Gitso/Applications - - mv "dist/Gitso.app" "dist/Gitso/" - cp -r arch/osx/Readme.rtfd dist/Gitso/Readme.rtfd - - echo -e "..." - hdiutil create -srcfolder dist/Gitso/ $DMG - echo -e "... [done]\n" + snowLeopardDMG + LeopardDMG else echo -e "Error, you need py2applet to be installed." fi