diff options
| -rw-r--r-- | build-scripts/sugar-framework.modules | 11 | ||||
| -rw-r--r-- | cvs.py | 96 | ||||
| -rwxr-xr-x | sugar-jhbuild | 6 |
3 files changed, 7 insertions, 106 deletions
diff --git a/build-scripts/sugar-framework.modules b/build-scripts/sugar-framework.modules index 58f4f22..41de59c 100644 --- a/build-scripts/sugar-framework.modules +++ b/build-scripts/sugar-framework.modules @@ -2,9 +2,8 @@ <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?> <moduleset> <include href="jhbuild/modulesets/gnome-2.16.modules"/> - <repository type="cvs" name="gnome.org" - cvsroot=":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome" - password=""/> + <repository type="svn" name="svn.gnome.org" default="yes" + href="http://svn.gnome.org/svn/"/> <repository type="cvs" name="mozilla.org" cvsroot=":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot" password="anonymous"/> @@ -38,7 +37,7 @@ </dependencies> </autotools> <autotools id="gnome-python-extras"> - <branch repo="gnome.org"/> + <branch repo="svn.gnome.org"/> <dependencies> <dep package="pygtk"/> <dep package="mozilla"/> @@ -68,7 +67,7 @@ </dependencies> </autotools> <autotools id="librsvg" supports-non-srcdir-builds="no" autogenargs="--disable-gtk-theme --disable-gnome-vfs --without-svgz"> - <branch repo="gnome.org"/> + <branch repo="svn.gnome.org"/> <dependencies> <dep package="libxml2"/> <dep package="gtk+"/> @@ -77,7 +76,7 @@ </dependencies> </autotools> <autotools id="gnome-python-desktop"> - <branch repo="gnome.org"/> + <branch repo="svn.gnome.org"/> <dependencies> <dep package="pygtk"/> <dep package="libwnck"/> @@ -1,96 +0,0 @@ -# jhbuild - a build script for GNOME 1.x and 2.x -# Copyright (C) 2001-2006 James Henstridge -# -# cvs.py: some code to handle various cvs operations -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import sys -import os -import md5 - -# table used to scramble passwords in ~/.cvspass files -_shifts = [ - 0, 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, - 114,120, 53, 79, 96,109, 72,108, 70, 64, 76, 67,116, 74, 68, 87, - 111, 52, 75,119, 49, 34, 82, 81, 95, 65,112, 86,118,110,122,105, - 41, 57, 83, 43, 46,102, 40, 89, 38,103, 45, 50, 42,123, 91, 35, - 125, 55, 54, 66,124,126, 59, 47, 92, 71,115, 78, 88,107,106, 56, - 36,121,117,104,101,100, 69, 73, 99, 63, 94, 93, 39, 37, 61, 48, - 58,113, 32, 90, 44, 98, 60, 51, 33, 97, 62, 77, 84, 80, 85,223, - 225,216,187,166,229,189,222,188,141,249,148,200,184,136,248,190, - 199,170,181,204,138,232,218,183,255,234,220,247,213,203,226,193, - 174,172,228,252,217,201,131,230,197,211,145,238,161,179,160,212, - 207,221,254,173,202,146,224,151,140,196,205,130,135,133,143,246, - 192,159,244,239,185,168,215,144,139,165,180,157,147,186,214,176, - 227,231,219,169,175,156,206,198,129,164,150,210,154,177,134,127, - 182,128,158,208,162,132,167,209,149,241,153,251,237,236,171,195, - 243,233,253,240,194,250,191,155,142,137,245,235,163,242,178,152 -] - -def scramble(password): - return 'A' + ''.join([chr(_shifts[ord(ch)]) for ch in password]) - -def descramble(password): - assert password[0] == 'A', 'unknown password format' - return ''.join([chr(_shifts[ord(ch)]) for ch in password[1:]]) - -def _canonicalise_cvsroot(cvsroot): - if not cvsroot.startswith(':pserver:'): return cvsroot - parts = cvsroot.split(':') - if parts[3].startswith('/'): - parts[3] = '2401' + parts[3] - return ':'.join(parts) - -def login(cvsroot, password=None): - if not cvsroot.startswith(':pserver:'): return - cvsroot = _canonicalise_cvsroot(cvsroot) - cvspass = os.path.join(os.environ['HOME'], '.cvspass') - - # check if the password has already been entered: - try: - fp = open(cvspass, 'r') - for line in fp.readlines(): - parts = line.split() - if not parts: - continue - if parts[0] == '/1': - root = parts[1] - else: - root = _canonicalise_cvsroot(parts[0]) - if root == cvsroot: - return - break - except IOError: - pass - # if we have a password, just write it directly to the .cvspass file - if password is not None: - fp = open(cvspass, 'a') - fp.write('/1 %s %s\n' % (cvsroot, scramble(password))) - fp.close() - else: - # call cvs login .. - if os.system('cvs -d %s login' % cvsroot) != 0: - sys.stderr.write('could not log into %s\n' % cvsroot) - sys.exit(1) - -def checkout(cvsroot, module): - if not cvsroot.startswith(':pserver:'): return - cvsroot = _canonicalise_cvsroot(cvsroot) - - cmd = ['cvs', '-z3', '-q', '-d', cvsroot, 'checkout', '-P'] - cmd.append(module) - os.spawnvp(os.P_WAIT, 'cvs', cmd) diff --git a/sugar-jhbuild b/sugar-jhbuild index 7990004..cfe60e5 100755 --- a/sugar-jhbuild +++ b/sugar-jhbuild @@ -9,13 +9,11 @@ from dependency import LibDependency def update_jhbuild(): print 'Updating jhbuild...' sys.path.append(os.path.join(base_dir)) - import cvs os.chdir(build_scripts_dir) - cvsroot = ':pserver:anonymous@anoncvs.gnome.org:/cvs/gnome' - cvs.login(cvsroot, 'anonymous') - cvs.checkout(cvsroot, 'jhbuild') + cmd = ['svn', 'co', 'svn://svn.gnome.org/svn/jhbuild/trunk', 'jhbuild'] + os.spawnvp(os.P_WAIT, 'svn', cmd) os.chdir(exec_dir) |