gitso

gitso Commit Details


Date:2009-11-29 20:16:52 (15 years 22 days ago)
Author:gerberad
Branch:master
Commit:d5a4006a2f227384c92668e9b759832e6491639a
Parents: 52a28935432244868516eb35a09710eb08895180
Message:/trunk/makegitso.sh Updated different builds for Snow Leopard and Leopard.

/trunk/Gitso.py
Fixed the paths issue.

/trunk/arch/osx/Info.plist
Temp file that should be deleted.

/trunk/arch/osx/setup.py
Updated setup for Snow Leopard.

/trunk/arch/osx/Info_OSX-10.5.plist
/trunk/arch/osx/Info_OSX-10.6.plist
Updated different Info.plist files for Leopard and Snow Leopard.
Changes:

File differences

gitso/trunk/Gitso.py
2525
2626
2727
28
2829
2930
3031
31
32
32
33
34
3335
3436
3537
......
4143
4244
4345
46
4447
48
49
4550
4651
4752
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')
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
gitso/trunk/arch/osx/Info.plist
3232
3333
3434
35
35
3636
3737
3838
39
39
4040
4141
4242
4343
4444
45
45
4646
4747
4848
......
7272
7373
7474
75
76
75
76
7777
7878
7979
8080
81
81
8282
83
84
83
84
8585
86
86
8787
8888
8989
......
9191
9292
9393
94
94
9595
9696
9797
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.5</string>
<string>0.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.5</string>
<string>0.6</string>
<key>LSHasLocalizedDisplayName</key>
<false/>
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
<string>Copyright not specified</string>
<string>Aaron Gerber and Derek Buranen 2010</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<array/>
<key>PyRuntimeLocations</key>
<array>
<string>@executable_path/../Frameworks/Python.framework/Versions/2.5/Python</string>
<string>/System/Library/Frameworks/Python.framework/Versions/2.5/Python</string>
<string>@executable_path/../Frameworks/Python.framework/Versions/2.6/Python</string>
<string>/System/Library/Frameworks/Python.framework/Versions/2.6/Python</string>
</array>
<key>PythonInfoDict</key>
<dict>
<key>PythonExecutable</key>
<string>/System/Library/Frameworks/Python.framework/Versions/2.5/Resources/Python.app/Contents/MacOS/Python</string>
<string>/System/Library/Frameworks/Python.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/Python</string>
<key>PythonLongVersion</key>
<string>2.5.1 (r251:54863, Jan 17 2008, 19:35:17)
[GCC 4.0.1 (Apple Inc. build 5465)]</string>
<string>Python 2.6.1 (r261:67515, Jul 7 2009, 23:51:51)
[GCC 4.2.1 (Apple Inc. build 5646)] on darwin</string>
<key>PythonShortVersion</key>
<string>2.5</string>
<string>2.6</string>
<key>py2app</key>
<dict>
<key>alias</key>
<key>template</key>
<string>app</string>
<key>version</key>
<string>0.3.6</string>
<string>0.4.2</string>
</dict>
</dict>
</dict>
gitso/trunk/arch/osx/Info_OSX-10.5.plist
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
<string>Gitso</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeOSTypes</key>
<array>
<string>****</string>
<string>fold</string>
<string>disk</string>
</array>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
</array>
<key>CFBundleExecutable</key>
<string>Gitso</string>
<key>CFBundleIconFile</key>
<string>PythonApplet.icns</string>
<key>CFBundleIdentifier</key>
<string>org.pythonmac.unspecified.Gitso</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Gitso</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.5</string>
<key>LSHasLocalizedDisplayName</key>
<false/>
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
<string>Copyright not specified</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>PyMainFileNames</key>
<array>
<string>__boot__</string>
</array>
<key>PyOptions</key>
<dict>
<key>alias</key>
<false/>
<key>argv_emulation</key>
<true/>
<key>no_chdir</key>
<false/>
<key>optimize</key>
<integer>0</integer>
<key>prefer_ppc</key>
<false/>
<key>site_packages</key>
<false/>
<key>use_pythonpath</key>
<false/>
</dict>
<key>PyResourcePackages</key>
<array/>
<key>PyRuntimeLocations</key>
<array>
<string>@executable_path/../Frameworks/Python.framework/Versions/2.5/Python</string>
<string>/System/Library/Frameworks/Python.framework/Versions/2.5/Python</string>
</array>
<key>PythonInfoDict</key>
<dict>
<key>PythonExecutable</key>
<string>/System/Library/Frameworks/Python.framework/Versions/2.5/Resources/Python.app/Contents/MacOS/Python</string>
<key>PythonLongVersion</key>
<string>2.5.1 (r251:54863, Jan 17 2008, 19:35:17)
[GCC 4.0.1 (Apple Inc. build 5465)]</string>
<key>PythonShortVersion</key>
<string>2.5</string>
<key>py2app</key>
<dict>
<key>alias</key>
<false/>
<key>template</key>
<string>app</string>
<key>version</key>
<string>0.3.6</string>
</dict>
</dict>
</dict>
</plist>
gitso/trunk/arch/osx/Info_OSX-10.6.plist
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
<string>Gitso</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeOSTypes</key>
<array>
<string>****</string>
<string>fold</string>
<string>disk</string>
</array>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
</array>
<key>CFBundleExecutable</key>
<string>Gitso</string>
<key>CFBundleIconFile</key>
<string>PythonApplet.icns</string>
<key>CFBundleIdentifier</key>
<string>org.pythonmac.unspecified.Gitso</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Gitso</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.6</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.6</string>
<key>LSHasLocalizedDisplayName</key>
<false/>
<key>NSAppleScriptEnabled</key>
<false/>
<key>NSHumanReadableCopyright</key>
<string>Aaron Gerber and Derek Buranen 2010</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>PyMainFileNames</key>
<array>
<string>__boot__</string>
</array>
<key>PyOptions</key>
<dict>
<key>alias</key>
<false/>
<key>argv_emulation</key>
<true/>
<key>no_chdir</key>
<false/>
<key>optimize</key>
<integer>0</integer>
<key>prefer_ppc</key>
<false/>
<key>site_packages</key>
<false/>
<key>use_pythonpath</key>
<false/>
</dict>
<key>PyResourcePackages</key>
<array/>
<key>PyRuntimeLocations</key>
<array>
<string>@executable_path/../Frameworks/Python.framework/Versions/2.6/Python</string>
<string>/System/Library/Frameworks/Python.framework/Versions/2.6/Python</string>
</array>
<key>PythonInfoDict</key>
<dict>
<key>PythonExecutable</key>
<string>/System/Library/Frameworks/Python.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/Python</string>
<key>PythonLongVersion</key>
<string>Python 2.6.1 (r261:67515, Jul 7 2009, 23:51:51)
[GCC 4.2.1 (Apple Inc. build 5646)] on darwin</string>
<key>PythonShortVersion</key>
<string>2.6</string>
<key>py2app</key>
<dict>
<key>alias</key>
<false/>
<key>template</key>
<string>app</string>
<key>version</key>
<string>0.4.2</string>
</dict>
</dict>
</dict>
</plist>
gitso/trunk/arch/osx/setup.py
99
1010
1111
12
12
13
1314
1415
1516
APP = ['Gitso.py']
DATA_FILES = []
OPTIONS = {'argv_emulation': True}
OPTIONS = {'argv_emulation': True,
'site_packages': True}
setup(
app=APP,
gitso/trunk/makegitso.sh
2020
2121
2222
23
23
24
2425
2526
2627
......
3940
4041
4142
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
42155
43156
44157
......
84197
85198
86199
87
88
89
90
91200
92201
93202
......
102211
103212
104213
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
214
215
158216
159217
160218
##########
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"
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:"
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
#
#
# 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

Archive Download the corresponding diff file

Branches

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