gitso

gitso Commit Details


Date:2009-10-04 17:38:25 (16 years 2 months ago)
Author:gerberad
Branch:master
Commit:25a9e4a5608961c4a0df609f39b2ca6af16d49d4
Parents: 2db403b214a3f454b517d942a0c5b4410c794d97
Message:/trunk/makegitso.sh Updated build script for OS X. We hadn't really cleaned up all the files yet for Gitso 0.6.

/trunk/ArgsParser.py
Updated the paths for OS X both for --dev and normal usage.

/trunk/Gitso.py
I added a temporary work-around for Snow Leopard by using paths.
This may actually not work. This may only be for upgrades (without a clean install) that have both versions of python...
Changes:

File differences

gitso/trunk/ArgsParser.py
4646
4747
4848
49
50
51
4952
5053
5154
......
6467
6568
6669
67
68
6970
7071
72
7173
74
75
76
7277
73
7478
79
7580
81
7682
7783
78
84
7985
8086
8187
␉␉if sys.platform.find('linux') != -1:␊
␉␉␉self.paths['main'] = os.path.join(sys.path[0], '..', 'share', 'gitso')␊
␉␉␉self.paths['copyright'] = os.path.join(sys.path[0], '..', 'share', 'doc', 'gitso', 'COPYING')␊
␉␉elif sys.platform == "darwin":␊
␉␉␉self.paths['main'] = sys.path[0]␊
␉␉␉self.paths['copyright'] = os.path.join(sys.path[0], 'COPYING')␊
␉␉else:␊
␉␉␉self.paths['main'] = os.path.join(sys.path[0], '..')␊
␉␉␉self.paths['copyright'] = os.path.join(sys.path[0], '..', 'COPYING')␊
␉␉␉␉if sys.platform == "darwin":␊
␉␉␉␉␉if not os.path.exists('build/OSXvnc'):␊
␉␉␉␉␉␉os.popen("mkdir build; cp arch/osx/OSXvnc.tar.gz build ; cd build ; tar xvfz OSXvnc.tar.gz > /dev/null")␊
␉␉␉␉␉if not os.path.exists('build/vncviewer'):␊
␉␉␉␉␉␉os.popen("cp arch/osx/vncviewer.tar.gz build ; cd build ; tar xvfz vncviewer.tar.gz > /dev/null")␊
␉␉␉␉␉if not os.path.exists('build/cotvnc.app'):␊
␉␉␉␉␉␉os.popen("cp arch/osx/cotvnc.app.tar.gz build ; cd build ; tar xvfz cotvnc.app.tar.gz > /dev/null")␊
␉␉␉␉␉␉␊
␉␉␉␉␉self.paths['resources'] = 'build/'␊
␉␉␉␉␉self.paths['main']␉␉= sys.path[0]␊
␉␉␉␉␉self.paths['copyright'] = os.path.join(sys.path[0], 'COPYING')␊
␉␉␉␉␉␊
␉␉␉␉elif sys.platform == "win32":␊
␉␉␉␉␉self.paths['main'] = os.path.join(sys.path[0])␊
␉␉␉␉␉self.paths['copyright'] = os.path.join(sys.path[0], 'COPYING')␊
␉␉␉␉␉self.paths['main']␉␉= os.path.join(sys.path[0])␊
␉␉␉␉␉self.paths['resources'] = 'arch/win32/'␊
␉␉␉␉␉␊
␉␉␉␉else:␊
␉␉␉␉␉self.paths['resources'] = 'arch/linux/'␊
␉␉␉␉␉self.paths['main'] = os.path.join(sys.path[0])␊
␉␉␉␉␉self.paths['main']␉␉= os.path.join(sys.path[0])␊
␉␉␉␉␉self.paths['copyright'] = os.path.join(sys.path[0], 'COPYING')␊
␊
␉␉␉elif sys.argv[i] == '--listen': # --listen␊
gitso/trunk/Gitso.py
2323
2424
2525
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
2646
2747
2848
49
2950
3051
3152
along with Gitso. If not, see <http://www.gnu.org/licenses/>.␊
"""␊
␊
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:␊
␉␉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')␊
␉␉sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/plat-mac')␊
␉␉sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/plat-mac/lib-scriptpackages')␊
␉␉sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/Extras/lib/python')␊
␉␉sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/lib-tk')␊
␉␉sys.path.append('/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/lib-old')␊
␉␉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')␊
␊
import wx␊
import ConnectionWindow, ArgsParser␊
␊
␊
if __name__ == "__main__":␊
␉app = wx.PySimpleApp()␊
␉args = ArgsParser.ArgsParser()␊
gitso/trunk/makegitso.sh
2020
2121
2222
23
2324
2425
2526
......
106107
107108
108109
110
111
112
113
109114
110115
111116
112117
113118
114119
115
120
116121
117122
118123
......
131136
132137
133138
134
139
135140
136141
137142
138143
139144
140145
141
146
142147
143148
144149
......
148153
149154
150155
151
156
152157
153158
154159
##########␊
␊
␊
DMG="Gitso_0.6.dmg"␊
DEB="gitso_0.6_all.deb"␊
TARGZ="gitso_0.6_all.tar.gz"␊
SRC="gitso_0.6_src.tar.bz2"␊
␉␉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 copyright dist/Gitso.app/Contents/Resources/␊
␉␉cp COPYING dist/Gitso.app/Contents/Resources/␊
␉␉cp PythonApplet.icns dist/Gitso.app/Contents/Resources/␊
␉␉␊
␉␉tar xvfz arch/osx/OSXvnc.tar.gz␊
␉␉cp GitsoThread.py dist/Gitso.app/Contents/Resources/␊
␉␉␊
␉␉cp arch/osx/libjpeg-copyright.txt dist/Gitso.app/Contents/Frameworks/␊
␉␉cp arch/osx/osxvnc_echoware-copyright.txt dist/Gitso.app/Contents/Resources/OSXvnc/␊
␉␉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 Gitso.dmg␊
␉␉rm -f $DMG␊
␉␉␊
␉␉mkdir dist/Gitso␊
␉␉cp arch/osx/dmg_DS_Store dist/Gitso/.DS_Store␊
␉␉cp -r arch/osx/Readme.rtfd dist/Gitso/Readme.rtfd␊
␉␉␊
␉␉echo -e "..."␊
␉␉hdiutil create -srcfolder dist/Gitso/ Gitso.dmg␊
␉␉hdiutil create -srcfolder dist/Gitso/ $DMG␊
␉␉echo -e "... [done]\n"␊
␉else␊
␉␉echo -e "Error, you need py2applet to be installed."␊

Archive Download the corresponding diff file

Branches

Number of commits:
Page rendered in 0.59311s using 13 queries.