gitso

gitso Commit Details


Date:2010-02-21 18:35:42 (14 years 10 months ago)
Author:gerberad
Branch:master
Commit:30588081633eee860e712123399aae37d19f786a
Parents: 39d7351ec6183a058991667730fda7bab97a31ca
Message:/trunk/makegitso.sh /trunk/arch/linux/build_rpm.sh /trunk/arch/linux/gitso_rpm.spec Updated build script for OpenSUSE.

/trunk/GitsoThread.py
/trunk/ConnectionWindow.py
Disabled NatPMP.

/trunk/CHANGELOG.txt
/trunk/arch/linux/changelog
Updated for new release.
Changes:

File differences

gitso/trunk/CHANGELOG.txt
11
22
3
3
4
5
6
47
8
9
10
11
12
13
14
15
16
17
18
19
20
521
622
723
0.6␊
----------------------------␊
*added --dev option while testing␊
# Complete rewrite of process management.␊
# Actually stop VNC Processes (Windows)␊
# Support loading remote hosts file.␊
# Command line switches␊
␊
* --dev (Done)␊
* --listen (Done)␊
* --connect IP (Done)␊
* --list list_file (Done)␊
* --version (Done)␊
* --help (Done) ␊
␊
# manpage for (Linux)␊
# Support for .rpms (Fedora, OpenSUSE, CentOS)␊
# Implement Native VNC listener (OS X)␊
# Better process management, user gets notified if connection is broken.␊
# Licensing Updates (across the board).␊
# Improved documentation. ␊
␊
0.5 - "Kill the undead"␊
-----------------------------------------␊
gitso/trunk/ConnectionWindow.py
4646
4747
4848
49
50
51
4952
5053
5154
......
8588
8689
8790
88
89
91
92
93
9094
9195
9296
......
163167
164168
165169
166
170
171
167172
168173
169174
170175
171
176
177
172178
173179
174180
␉␉self.thread = None␊
␉␉self.threadLock = thread.allocate_lock()␊
␉␉␊
␉␉# Disable until 0.7 release␊
␉␉self.enablePMP = False␊
␉␉␊
␉␉if sys.platform.find('linux') != -1:␊
␉␉␉width = 165␊
␉␉␉height = 350␊
␉␉␊
␉␉# checkbox for natpmp␊
␉␉if sys.platform == 'darwin' or sys.platform.find('linux') != -1:␊
␉␉␉self.cb1 = wx.CheckBox(self, -1, 'Use NAT-PMP', (130, 48))␊
␉␉␉self.cb1.Enable(False)␊
␉␉␉if self.enablePMP:␊
␉␉␉␉self.cb1 = wx.CheckBox(self, -1, 'Use NAT-PMP', (130, 48))␊
␉␉␉␉self.cb1.Enable(False)␊
␊
␊
␉␉# the combobox Control␊
␉␉␉self.ToggleValue = 0␊
␉␉␉self.hostField.Enable(True)␊
␉␉␉if sys.platform == 'darwin' or sys.platform.find('linux') != -1:␊
␉␉␉␉self.cb1.Enable(False)␊
␉␉␉␉if self.enablePMP:␊
␉␉␉␉␉self.cb1.Enable(False)␊
␉␉else:␊
␉␉␉self.ToggleValue = 1␊
␉␉␉self.hostField.Enable(False)␊
␉␉␉if sys.platform == 'darwin' or sys.platform.find('linux') != -1:␊
␉␉␉␉self.cb1.Enable(True)␊
␉␉␉␉if self.enablePMP:␊
␉␉␉␉␉self.cb1.Enable(True)␊
␉␊
␉␊
␉def ConnectSupport(self, event):␊
gitso/trunk/GitsoThread.py
6060
6161
6262
63
64
65
63
64
65
66
6667
6768
6869
......
99100
100101
101102
102
103
104
105
103
104
105
106
107
106108
107109
108110
......
148150
149151
150152
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
166169
␉␉else:␊
␉␉␉# Give Support␊
␉␉␉if sys.platform == 'darwin' or sys.platform.find('linux') != -1:␊
␉␉␉␉self.window.cb1.Enable(False)␊
␉␉␉␉if self.window.cb1.GetValue() == True:␊
␉␉␉␉␉self.NATPMP('request')␊
␉␉␉␉if self.window.enablePMP:␊
␉␉␉␉␉self.window.cb1.Enable(False)␊
␉␉␉␉␉if self.window.cb1.GetValue() == True:␊
␉␉␉␉␉␉self.NATPMP('request')␊
␉␉␉␊
␉␉␉self.pid = self.process.giveSupport()␊
␉␉␉time.sleep(.5)␊
␉␉@author: Aaron Gerber␊
␉␉"""␊
␉␉if sys.platform == 'darwin' or sys.platform.find('linux') != -1:␊
␉␉␉if self.window.rb1.GetValue() == False: #give support␊
␉␉␉␉if self.window.cb1.GetValue() == True:␊
␉␉␉␉␉self.NATPMP('giveup')␊
␉␉␉␉self.window.cb1.Enable(True)␊
␉␉␉if self.window.enablePMP:␊
␉␉␉␉if self.window.rb1.GetValue() == False: #give support␊
␉␉␉␉␉if self.window.cb1.GetValue() == True:␊
␉␉␉␉␉␉self.NATPMP('giveup')␊
␉␉␉␉␉self.window.cb1.Enable(True)␊
␉␊
␉␉self.process.KillPID()␊
␉␉self.pid = 0␊
␉␉@author: Dennis Koot␊
␉␉"""␊
␉␉if sys.platform == 'darwin' or sys.platform.find('linux') != -1:␊
␉␉␉if action == 'request':␊
␉␉␉␉lifetime = 3600␊
␉␉␉␉print "Request port 5500 (NAT-PMP)."␊
␉␉␉else:␊
␉␉␉␉lifetime = 0␊
␉␉␉␉print "Give up port 5500 (NAT-PMP)."␊
␉␊
␉␉␉pubpriv_port = int(5500)␊
␉␉␉protocol = NATPMP.NATPMP_PROTOCOL_TCP␊
␉␉␉␊
␉␉␉try:␊
␉␉␉␉gateway = NATPMP.get_gateway_addr()␊
␉␉␉␉print NATPMP.map_port(protocol, pubpriv_port, pubpriv_port, lifetime, gateway_ip=gateway)␊
␉␉␉except:␊
␉␉␉␉print "Warning: Unable to automap port."␊
␉␉␉if self.window.enablePMP:␊
␉␉␉␉if action == 'request':␊
␉␉␉␉␉lifetime = 3600␊
␉␉␉␉␉print "Request port 5500 (NAT-PMP)."␊
␉␉␉␉else:␊
␉␉␉␉␉lifetime = 0␊
␉␉␉␉␉print "Give up port 5500 (NAT-PMP)."␊
␉␉␊
␉␉␉␉pubpriv_port = int(5500)␊
␉␉␉␉protocol = NATPMP.NATPMP_PROTOCOL_TCP␊
␉␉␉␉␊
␉␉␉␉try:␊
␉␉␉␉␉gateway = NATPMP.get_gateway_addr()␊
␉␉␉␉␉print NATPMP.map_port(protocol, pubpriv_port, pubpriv_port, lifetime, gateway_ip=gateway)␊
␉␉␉␉except:␊
␉␉␉␉␉print "Warning: Unable to automap port."␊
␊
gitso/trunk/arch/linux/build_rpm.sh
77
88
99
10
1110
1211
1312
......
4039
4140
4241
42
43
fi␊
␊
echo -e "Setting up RPM build-root!\n\t"␊
echo -e "'$1'\n"␊
␊
BUILD_ROOT="$HOME/rpmbuild/BUILDROOT/gitso-0.6-1.i386"␊
␊
␊
gzip -cf arch/linux/gitso.1 > $BUILD_ROOT/usr/share/man/man1/gitso.1.gz␊
␊
echo 'Done';␊
␊
gitso/trunk/arch/linux/changelog
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
122
223
324
PACKAGE (0.6) karmic; urgency=low␊
␊
* Complete rewrite of process management.␊
* Actually stop VNC Processes (Windows)␊
* Support loading remote hosts file.␊
* Command line switches␊
* --dev (Done)␊
* --listen (Done)␊
* --connect IP (Done)␊
* --list list_file (Done)␊
* --version (Done)␊
* --help (Done) ␊
* manpage for (Linux)␊
* Support for .rpms (Fedora, OpenSUSE, CentOS)␊
* Implement Native VNC listener (OS X)␊
* Better process management, user gets notified if connection is broken.␊
* Licensing Updates (across the board).␊
* Improved documentation. ␊
␊
-- Aaron D. Gerber <gerberad@gmail.com> Sun, 21 Feb 2010 17:32:40 -0600␊
␊
PACKAGE (0.5) hardy; urgency=low␊
␊
* Complete rewrite of the interface␊
gitso/trunk/arch/linux/gitso_rpm.spec
4141
4242
4343
44
44
4545
4646
4747
48
49
50
51
52
48
5349
50
5451
55
5652
53
54
55
5756
5857
58
5959
6060
6161
␊
%{_prefix}/applications/gitso.desktop␊
␊
%{_prefix}/doc/gitso/copyright␊
%{_prefix}/doc/gitso/COPYING␊
%{_prefix}/doc/gitso/README␊
%{_prefix}/doc/gitso/changelog.gz␊
␊
%{_prefix}/gitso/icon.png␊
%{_prefix}/gitso/ArgsParser.py␊
%{_prefix}/gitso/__init__.py␊
%{_prefix}/gitso/hosts.txt␊
%{_prefix}/gitso/AboutWindow.py␊
%{_prefix}/gitso/Gitso.py␊
%{_prefix}/gitso/ConnectionWindow.py␊
%{_prefix}/gitso/AboutWindow.py␊
%{_prefix}/gitso/GitsoThread.py␊
%{_prefix}/gitso/Gitso.py␊
%{_prefix}/gitso/Processes.py␊
%{_prefix}/gitso/ArgsParser.py␊
%{_prefix}/gitso/__init__.py␊
%{_prefix}/gitso/hosts.txt␊
%{_prefix}/gitso/NATPMP.py␊
%{_prefix}/gitso/icon.ico␊
%{_prefix}/gitso/icon.png␊
␊
%{_mandir}/man1/gitso.1.gz␊
␊
gitso/trunk/makegitso.sh
3434
3535
3636
37
3738
3839
3940
......
332333
333334
334335
335
336
337336
338
337
339338
339
340
341
340342
341343
342344
......
345347
346348
347349
348
350
349351
350352
351353
......
356358
357359
358360
359
360
361
362
363
364
365
366
367
368
361369
362370
363371
␊
␉␉# Clean up first.␊
␉␉find . -name "*~" -exec rm {} ';'␊
␊
␉␉rm -rf $OSX_BUILD_DIR␊
␉␉rm -rf $RPM_BUILD_DIR␊
␉␉rm -rf $DEB_BUILD_DIR␊
␉␉# RPM version of Gitso␊
␉␉if [ "$RPMNAME" = "fedora" ]; then␊
␉␉␉SPEC="gitso_rpm_fedora.spec"␊
␉␉␉# Before installing the .rpm␊
␉␉␉# You need to install http://dl.atrpms.net/all/x11vnc-0.9.3-3.fc9.i386.rpm␊
␉␉␉# yum --nogpgcheck install gitso_0.6-1_fedora.i386.rpm ␊
␉␉else␊
␉␉elif [ "$RPMNAME" = "opensuse" ]; then␊
␉␉␉SPEC="gitso_rpm.spec"␊
␉␉else␊
␉␉ echo -e "Error: Please '$RPMNAME' specify --opensuse or --fedora\n"␊
␉␉ exit 1␊
␉␉fi␊
␊
␉␉echo "Creating $RPM"␊
␉␉BUILD_ROOT="$RPM_BUILD_DIR/rpm/tmp/gitso-root"␊
␊
␉␉# We need this because the rpmbuild below needs to the source ball.␊
␉␉# Also realize that mksrc is going to clean-up, so if you creat dist files before this line␊
␉␉# Also realize that mksrc is going to clean-up, so if you creat diste files before this line␊
␉␉# They will be deleted.␊
␉␉mksrc␊
␉␉␊
␊
␉␉cp arch/linux/$SPEC $TMP␊
␉␉perl -e 's/%\(echo \$HOME\)/$ENV{'RPM_BUILD_DIR'}/g;' -pi $TMP/$SPEC␊
␊
␉␉rpmbuild -ba $TMP/$SPEC␊
␉␉␊
␉␉if [ "$RPMNAME" = "fedora" ]; then␊
␉␉␉rpmbuild -ba $TMP/$SPEC␊
␉␉elif [ "$RPMNAME" = "opensuse" ]; then␊
␉␉␉export RPM_BUILD_ROOT="$HOME/rpmbuild/BUILDROOT/gitso-0.6-1.i386"␊
␉␉␉rpmbuild -ba --buildroot=$RPM_BUILD_ROOT $TMP/$SPEC␊
␉␉fi␊
␉␉␊
␉␉find $RPM_BUILD_DIR/rpm/RPMS -name "*.rpm" -exec cp {} $RPMOUT ';'␊
␊
␉␉echo -e " [done]\n"␊

Archive Download the corresponding diff file

Branches

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