Mercurial > gub
changeset 3493:9342b541213d
python 2.6 compat: with() -> with_template()
line wrap: on
line diff
--- a/gub/gubb.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/gubb.py Fri May 18 01:05:55 2007 -0300 @@ -642,8 +642,16 @@ from gub import repository return repository.NewTarBall (self.settings.downloads, mirror, name, version, format, strip_components) + def with (self, + mirror='', + version='', + strip_components=1, + format='', + name=''): + self.with_template (mirror, version, strip_components, format, name) + # TODO: junk this, use TarBall ()or Version () - def with (self, + def with_template (self, mirror='', version='', strip_components=1,
--- a/gub/specs/autoconf.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/autoconf.py Fri May 18 01:05:55 2007 -0300 @@ -4,5 +4,5 @@ class Autoconf(toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (mirror=mirrors.gnu, + self.with_template (mirror=mirrors.gnu, version="2.59", format='bz2')
--- a/gub/specs/automake.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/automake.py Fri May 18 01:05:55 2007 -0300 @@ -4,5 +4,5 @@ class Automake (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (mirror=mirrors.gnu, + self.with_template (mirror=mirrors.gnu, version="1.10", format='gz')
--- a/gub/specs/bash.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/bash.py Fri May 18 01:05:55 2007 -0300 @@ -3,7 +3,7 @@ class Bash (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='3.2', + self.with_template (version='3.2', mirror='ftp://ftp.cwru.edu/pub/bash/bash-3.2.tar.gz', format='bz2')
--- a/gub/specs/boost.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/boost.py Fri May 18 01:05:55 2007 -0300 @@ -57,7 +57,7 @@ class Boost (BjamBuildSpec): def __init__ (self,settings): BjamBuildSpec.__init__ (self, settings) - self.with (version='1.33.1', mirror=mirrors.boost_1_33_1, format='bz2') + self.with_template (version='1.33.1', mirror=mirrors.boost_1_33_1, format='bz2') gubb.change_target_dict (self, {'CFLAGS': '-DBOOST_PLATFORM_CONFIG=\\"boost/config/platform/linux.hpp\\"'}) def get_substitution_dict (self, env={}): dict = BjamBuildSpec.get_substitution_dict (self, env)
--- a/gub/specs/cygcheck.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/cygcheck.py Fri May 18 01:05:55 2007 -0300 @@ -5,7 +5,7 @@ "Only need the cygcheck.exe binary." def __init__ (self, settings): gubb.BinarySpec.__init__ (self, settings) - self.with (version='1.5.18-1', mirror=mirrors.cygwin_bin, format='bz2') + self.with_template (version='1.5.18-1', mirror=mirrors.cygwin_bin, format='bz2') def untar (self): gubb.BinarySpec.untar (self)
--- a/gub/specs/distcc.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/distcc.py Fri May 18 01:05:55 2007 -0300 @@ -7,5 +7,5 @@ ''') def __init__ (self,s): toolpackage.ToolBuildSpec.__init__ (self,s) - self.with (version='2.18.3', + self.with_template (version='2.18.3', mirror="http://distcc.samba.org/ftp/distcc/distcc-%(version)s.tar.bz2"),
--- a/gub/specs/expat.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/expat.py Fri May 18 01:05:55 2007 -0300 @@ -6,7 +6,7 @@ class Expat (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='1.95.8', mirror=mirrors.sf, format='gz') + self.with_template (version='1.95.8', mirror=mirrors.sf, format='gz') def get_build_dependencies (self): return ['libtool'] @@ -39,7 +39,7 @@ class Expat__local (toolpackage.ToolBuildSpec): def __init__ (self,settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='1.95.8', mirror=mirrors.sf, format='gz') + self.with_template (version='1.95.8', mirror=mirrors.sf, format='gz') def patch (self): toolpackage.ToolBuildSpec.patch (self)
--- a/gub/specs/flex.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/flex.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Flex (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version="2.5.4a", + self.with_template (version="2.5.4a", mirror=mirrors.sf, format='gz'), def srcdir (self): return '%(allsrcdir)s/flex-2.5.4'
--- a/gub/specs/fondu.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/fondu.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Fondu (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version="060102", + self.with_template (version="060102", mirror='http://fondu.sourceforge.net/fondu_src-060102.tgz') def srcdir (self):
--- a/gub/specs/fontconfig.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/fontconfig.py Fri May 18 01:05:55 2007 -0300 @@ -120,7 +120,7 @@ class Fontconfig__local (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (mirror="git://anongit.freedesktop.org/git/fontconfig", + self.with_template (mirror="git://anongit.freedesktop.org/git/fontconfig", version=fc_version) def get_build_dependencies (self): @@ -137,7 +137,7 @@ class Fontconfig__cygwin (Fontconfig): def __init__ (self, settings): Fontconfig.__init__ (self, settings) - self.with (mirror=mirrors.fontconfig, version='2.4.1') + self.with_template (mirror=mirrors.fontconfig, version='2.4.1') def get_subpackage_definitions (self): d = dict (Fontconfig.get_subpackage_definitions (self))
--- a/gub/specs/fontforge.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/fontforge.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Fontforge (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (mirror='http://lilypond.org/download/gub-sources/fontforge_full-%(version)s.tar.bz2', + self.with_template (mirror='http://lilypond.org/download/gub-sources/fontforge_full-%(version)s.tar.bz2', version="20060501")
--- a/gub/specs/freetype-config.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/freetype-config.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ def __init__ (self, settings): gubb.SdkBuildSpec.__init__ (self, settings) self.has_source = False - self.with (version='2.1.9') + self.with_template (version='2.1.9') def untar (self): pass def install (self):
--- a/gub/specs/freetype.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/freetype.py Fri May 18 01:05:55 2007 -0300 @@ -6,7 +6,7 @@ class Freetype (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='2.1.10', mirror=mirrors.nongnu_savannah) + self.with_template (version='2.1.10', mirror=mirrors.nongnu_savannah) def license_file (self): return '%(srcdir)s/docs/LICENSE.TXT' @@ -58,7 +58,7 @@ class Freetype__local (toolpackage.ToolBuildSpec, Freetype): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='2.1.10', mirror=mirrors.nongnu_savannah) + self.with_template (version='2.1.10', mirror=mirrors.nongnu_savannah) def get_build_dependencies (self): # local is not split
--- a/gub/specs/gettext.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/gettext.py Fri May 18 01:05:55 2007 -0300 @@ -5,7 +5,7 @@ class Gettext (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='0.15', mirror=mirrors.gnu, format='gz') + self.with_template (version='0.15', mirror=mirrors.gnu, format='gz') def get_build_dependencies (self): return ['libtool'] @@ -39,7 +39,7 @@ class Gettext__mingw (Gettext): def __init__ (self, settings): Gettext.__init__ (self, settings) - self.with (version='0.15', mirror=mirrors.gnu, format='gz') + self.with_template (version='0.15', mirror=mirrors.gnu, format='gz') def config_cache_overrides (self, str): return (re.sub ('ac_cv_func_select=yes', 'ac_cv_func_select=no', @@ -66,7 +66,7 @@ class Gettext__local (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__(self,settings) - self.with (version='0.15', mirror=mirrors.gnu, format='gz') + self.with_template (version='0.15', mirror=mirrors.gnu, format='gz') def get_build_dependencies (self): return ['libtool']
--- a/gub/specs/git.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/git.py Fri May 18 01:05:55 2007 -0300 @@ -5,7 +5,7 @@ class Git__local (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (mirror='http://kernel.org/pub/software/scm/git/git-%(version)s.tar.bz2', + self.with_template (mirror='http://kernel.org/pub/software/scm/git/git-%(version)s.tar.bz2', version='1.5.1.4') def patch (self): self.shadow_tree ('%(srcdir)s', '%(builddir)s')
--- a/gub/specs/glib.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/glib.py Fri May 18 01:05:55 2007 -0300 @@ -8,7 +8,7 @@ ## 2.12.4 : see bug http://bugzilla.gnome.org/show_bug.cgi?id=362918 - self.with (#version='2.12.4', mirror=mirrors.gnome_216, + self.with_template (#version='2.12.4', mirror=mirrors.gnome_216, version='2.10.3', mirror=mirrors.gnome_214, format='bz2') @@ -66,7 +66,7 @@ class Glib__local (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='2.10.3', + self.with_template (version='2.10.3', mirror=mirrors.gnome_214, format='bz2')
--- a/gub/specs/gmp.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/gmp.py Fri May 18 01:05:55 2007 -0300 @@ -6,7 +6,7 @@ class Gmp (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='4.2.1', + self.with_template (version='4.2.1', mirror="http://ftp.sunet.se/pub/gnu/gmp/gmp-%(version)s.tar.bz2", format="bz2") if not self.settings.platform.startswith ('darwin'): @@ -67,7 +67,7 @@ class Gmp__cygwin (Gmp): def __init__ (self,settings): Gmp.__init__ (self, settings) - self.with (version='4.1.4') + self.with_template (version='4.1.4') def patch (self): self.system (''' @@ -99,7 +99,7 @@ class Gmp__local (toolpackage.ToolBuildSpec): def __init__ (self, s): toolpackage.ToolBuildSpec.__init__ (self, s) - self.with (version='4.2.1', + self.with_template (version='4.2.1', mirror="ftp://ftp.gnu.org/gnu/gmp/gmp-%(version)s.tar.bz2") def get_build_dependencies (self):
--- a/gub/specs/guile-config.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/guile-config.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ def __init__ (self, settings): gubb.SdkBuildSpec.__init__ (self, settings) self.has_source = False - self.with (version='1.8.0') + self.with_template (version='1.8.0') def untar (self): pass
--- a/gub/specs/guile.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/guile.py Fri May 18 01:05:55 2007 -0300 @@ -266,9 +266,9 @@ def __init__ (self, settings): Guile.__init__ (self, settings) #FIXME: barf, this breaks now that Guile uses git repo -# self.with (version='1.8.1') +# self.with_template (version='1.8.1') from gub import mirrors - self.with (version='1.8.1', mirror=mirrors.gnu, format='gz') + self.with_template (version='1.8.1', mirror=mirrors.gnu, format='gz') self.so_version = '17' # Using gub dependencies only would be nice, but
--- a/gub/specs/icoutils.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/icoutils.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) from gub import mirrors - self.with (version='0.26.0', mirror=mirrors.nongnu_savannah) + self.with_template (version='0.26.0', mirror=mirrors.nongnu_savannah) def get_build_dependencies (self): return ['libpng-devel'] def get_dependency_dict (self):
--- a/gub/specs/imagemagick.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/imagemagick.py Fri May 18 01:05:55 2007 -0300 @@ -3,7 +3,7 @@ class Imagemagick (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (mirror='ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-%(version)s-1.tar.bz2', + self.with_template (mirror='ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-%(version)s-1.tar.bz2', version='6.3.1') def license_file (self): return '%(srcdir)s/LICENSE'
--- a/gub/specs/libdbi-drivers-sqlite3.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libdbi-drivers-sqlite3.py Fri May 18 01:05:55 2007 -0300 @@ -6,7 +6,7 @@ class Libdbi_drivers_sqlite3 (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - #self.with (version='0.8.1', mirror=mirrors.sf, format='gz') + #self.with_template (version='0.8.1', mirror=mirrors.sf, format='gz') self.with_vc (repository.NewTarBall (self.settings.downloads, mirrors.sf, 'libdbi-drivers', '0.8.2')) def get_build_dependencies (self):
--- a/gub/specs/libdbi.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libdbi.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Libdbi (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='0.8.1', mirror=mirrors.sf, format='gz') + self.with_template (version='0.8.1', mirror=mirrors.sf, format='gz') def patch (self): targetpackage.TargetBuildSpec.patch (self)
--- a/gub/specs/libexif.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libexif.py Fri May 18 01:05:55 2007 -0300 @@ -5,7 +5,7 @@ def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) # incompatible with gphoto? -# self.with (version="0.6.9", mirror=mirrors.sf) +# self.with_template (version="0.6.9", mirror=mirrors.sf) # does not install -# self.with (version="0.6.14", mirror=mirrors.sf) - self.with (version="0.6.12", mirror=mirrors.sf) +# self.with_template (version="0.6.14", mirror=mirrors.sf) + self.with_template (version="0.6.12", mirror=mirrors.sf)
--- a/gub/specs/libgnugetopt.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libgnugetopt.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Libgnugetopt (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='1.3', format='bz2', mirror=mirrors.freebsd_ports) + self.with_template (version='1.3', format='bz2', mirror=mirrors.freebsd_ports) def patch (self): self.dump ('''
--- a/gub/specs/libgphoto2.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libgphoto2.py Fri May 18 01:05:55 2007 -0300 @@ -6,8 +6,8 @@ def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) # -lltdl build problem -# self.with (version='2.3.0', mirror=sf_gphoto) - self.with (version='2.3.1', mirror=sf_gphoto) +# self.with_template (version='2.3.0', mirror=sf_gphoto) + self.with_template (version='2.3.1', mirror=sf_gphoto) def get_build_dependencies (self): return ['libexif', 'libjpeg', 'libusb'] def wrap_pkg_config (self):
--- a/gub/specs/libiconv.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libiconv.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Libiconv (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='1.11', mirror=mirrors.gnu) + self.with_template (version='1.11', mirror=mirrors.gnu) def broken_for_distcc (self): return True
--- a/gub/specs/libjpeg.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libjpeg.py Fri May 18 01:05:55 2007 -0300 @@ -8,7 +8,7 @@ class Libjpeg (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='v6b', mirror=mirrors.jpeg) + self.with_template (version='v6b', mirror=mirrors.jpeg) def name (self): return 'libjpeg'
--- a/gub/specs/libpng.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libpng.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Libpng (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='1.2.8', mirror=mirrors.libpng) + self.with_template (version='1.2.8', mirror=mirrors.libpng) def license_file (self): return '%(srcdir)s/LICENSE' @@ -51,7 +51,7 @@ class Libpng__local (toolpackage.ToolBuildSpec, Libpng): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='1.2.8', mirror=mirrors.libpng) + self.with_template (version='1.2.8', mirror=mirrors.libpng) def get_build_dependencies (self): return ['libtool']
--- a/gub/specs/libtool.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libtool.py Fri May 18 01:05:55 2007 -0300 @@ -11,7 +11,7 @@ class Libtool (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='1.5.20', mirror=mirrors.gnu) + self.with_template (version='1.5.20', mirror=mirrors.gnu) self.so_version = '3' def get_subpackage_names (self): @@ -40,10 +40,10 @@ class Libtool__cygwin (Libtool): def __init__ (self, settings): Libtool.__init__ (self, settings) - self.with (version='1.5.22') + self.with_template (version='1.5.22') # FIXME: next to impossible to untar and patch automatically # should call for sanity on cygwin-apps@cygwin.com? - #self.with (version='1.5.23a', + #self.with_template (version='1.5.23a', # mirror='http://mirrors.kernel.org/sourceware/cygwin/release/libtool/libtool1.5/libtool1.5-%(version)s-1-src.tar.bz2',) # FIXME: build lib package naming: lib<NAME><MAJOR-SO-VERSION> into gub @@ -65,7 +65,7 @@ class Libtool__local (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='1.5.20', mirror=mirrors.gnu) + self.with_template (version='1.5.20', mirror=mirrors.gnu) def configure (self): gubb.BuildSpec.configure (self) def wrap_executables (self):
--- a/gub/specs/libusb.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/libusb.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Libusb (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version="0.1.12", mirror=mirrors.sf) + self.with_template (version="0.1.12", mirror=mirrors.sf) def configure (self): targetpackage.TargetBuildSpec.configure (self) # # FIXME: libtool too old for cross compile
--- a/gub/specs/lilypad.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/lilypad.py Fri May 18 01:05:55 2007 -0300 @@ -5,7 +5,7 @@ class LilyPad (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='0.0.7-1', + self.with_template (version='0.0.7-1', mirror='http://lilypond.org/download/gub-sources/lilypad-0.0.7-1-src.tar.bz2', format='bz2')
--- a/gub/specs/linux-headers.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/linux-headers.py Fri May 18 01:05:55 2007 -0300 @@ -32,7 +32,7 @@ linux_kernel_headers.Linux_kernel_headers.__init__ (self, settings) from gub import debian # debian.init_dependency_resolver (settings) - self.with ( + self.with_template ( name='linux-kernel-headers', # FIXME: we do not mirror all 12 debian arch's, # version=debian.get_packages ()['linux-kernel-headers'].version (), @@ -50,4 +50,4 @@ class Linux_headers__linux__64 (Linux_headers__debian): def __init__ (self, settings): Linux_headers__debian.__init__ (self, settings) - self.with (version='2.6.18-7', name='linux-kernel-headers') + self.with_template (version='2.6.18-7', name='linux-kernel-headers')
--- a/gub/specs/mftrace.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/mftrace.py Fri May 18 01:05:55 2007 -0300 @@ -2,6 +2,6 @@ class Mftrace (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='1.2.14', + self.with_template (version='1.2.14', mirror="http://lilypond.org/download/sources/mftrace/mftrace-%(version)s.tar.gz")
--- a/gub/specs/mingw-runtime.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/mingw-runtime.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Mingw_runtime (gubb.BinarySpec, gubb.SdkBuildSpec): def __init__ (self, settings): gubb.BinarySpec.__init__ (self, settings) - self.with (version='3.9', strip_components=0, mirror=mirrors.mingw) + self.with_template (version='3.9', strip_components=0, mirror=mirrors.mingw) def install (self): self.system (''' mkdir -p %(install_root)s/usr/share
--- a/gub/specs/netpbm.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/netpbm.py Fri May 18 01:05:55 2007 -0300 @@ -17,7 +17,7 @@ # self.with_vc (repo) - self.with (mirror='http://lilypond.org/download/gub-sources/netpbm-patched-10.35.tar.bz2', + self.with_template (mirror='http://lilypond.org/download/gub-sources/netpbm-patched-10.35.tar.bz2', version='10.35') def configure (self):
--- a/gub/specs/nsis.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/nsis.py Fri May 18 01:05:55 2007 -0300 @@ -8,7 +8,7 @@ toolpackage.ToolBuildSpec.__init__ (self, settings) if 1: - self.with (version='2.23', + self.with_template (version='2.23', mirror="http://surfnet.dl.sourceforge.net/sourceforge/%(name)s/%(name)s-%(version)s-src.tar.%(format)s", format="bz2")
--- a/gub/specs/osx-lilypad.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/osx-lilypad.py Fri May 18 01:05:55 2007 -0300 @@ -7,11 +7,11 @@ class Osx_lilypad__darwin__ppc (gubb.NullBuildSpec): def __init__ (self, settings): gubb.NullBuildSpec.__init__ (self, settings) - self.with (version="0.2", + self.with_template (version="0.2", mirror='http://lilypond.org/download/gub-sources/osx-lilypad-ppc-0.2.tar.gz') class Osx_lilypad__darwin__x86 (gubb.NullBuildSpec): def __init__ (self, settings): gubb.NullBuildSpec.__init__ (self, settings) - self.with (version="0.2", + self.with_template (version="0.2", mirror='http://lilypond.org/download/gub-sources/osx-lilypad-x86-0.2.tar.gz')
--- a/gub/specs/pango.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/pango.py Fri May 18 01:05:55 2007 -0300 @@ -9,7 +9,7 @@ class Pango (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='1.14.8', + self.with_template (version='1.14.8', mirror=mirrors.gnome_216, format='bz2')
--- a/gub/specs/pic.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/pic.py Fri May 18 01:05:55 2007 -0300 @@ -79,7 +79,7 @@ def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) # FIXME: lilypond_branch - self.with (version=settings.lilypond_branch, mirror=pic_cvs, + self.with_template (version=settings.lilypond_branch, mirror=pic_cvs, vc_type='cvs') # FIXME: should add to C_INCLUDE_PATH
--- a/gub/specs/pkg-config.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/pkg-config.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Pkg_config (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version="0.20", + self.with_template (version="0.20", mirror=mirrors.freedesktop), def configure (self):
--- a/gub/specs/potrace.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/potrace.py Fri May 18 01:05:55 2007 -0300 @@ -4,4 +4,4 @@ def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) from gub import mirrors - self.with (mirror=mirrors.sf, version="1.7"), + self.with_template (mirror=mirrors.sf, version="1.7"),
--- a/gub/specs/python-config.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/python-config.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ def __init__ (self, settings): gubb.SdkBuildSpec.__init__ (self, settings) self.has_source = False - self.with (version='2.4.1') + self.with_template (version='2.4.1') def untar (self): pass # FIXME: c&p python.py:install ()
--- a/gub/specs/python.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/python.py Fri May 18 01:05:55 2007 -0300 @@ -10,7 +10,7 @@ class Python (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='2.4.2', + self.with_template (version='2.4.2', mirror=mirrors.python, format='bz2') @@ -82,7 +82,7 @@ class Python__mingw_binary (gubb.BinarySpec): def __init__ (self, settings): gubb.BinarySpec.__init__ (self, settings) - self.with (mirror="http://lilypond.org/~hanwen/python-2.4.2-windows.tar.gz", + self.with_template (mirror="http://lilypond.org/~hanwen/python-2.4.2-windows.tar.gz", version='2.4.2') def python_version (self): @@ -147,7 +147,7 @@ class Python__local (toolpackage.ToolBuildSpec, Python): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='2.4.2', + self.with_template (version='2.4.2', mirror=mirrors.python, format='bz2')
--- a/gub/specs/python25.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/python25.py Fri May 18 01:05:55 2007 -0300 @@ -15,7 +15,7 @@ ## don't from gub import settings from build system. self.BASECFLAGS='' - self.with (version='2.5', + self.with_template (version='2.5', mirror=mirrors.python, format='bz2') @@ -131,7 +131,7 @@ class Python__local (toolpackage.ToolBuildSpec, Python): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='2.5', + self.with_template (version='2.5', mirror=mirrors.python, format='bz2')
--- a/gub/specs/regex.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/regex.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Regex (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='2.3.90-1', + self.with_template (version='2.3.90-1', mirror=mirrors.lilypondorg, format='bz2') def license_file (self):
--- a/gub/specs/scons.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/scons.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Scons (toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='0.96.93', + self.with_template (version='0.96.93', format='gz', mirror=mirrors.sf),
--- a/gub/specs/texinfo.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/texinfo.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class Texinfo(toolpackage.ToolBuildSpec): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version="4.8", + self.with_template (version="4.8", mirror=mirrors.gnu, format="bz2") def patch (self): toolpackage.ToolBuildSpec.patch (self)
--- a/gub/specs/urw-fonts.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/urw-fonts.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ def __init__ (self, settings): gubb.BinarySpec.__init__ (self, settings) - self.with (version='1.0.7pre41', + self.with_template (version='1.0.7pre41', mirror='ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-%(version)s.tar.bz2') self.vc_repository.strip_components = 0 def compile (self):
--- a/gub/specs/w32api-in-usr-lib.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/w32api-in-usr-lib.py Fri May 18 01:05:55 2007 -0300 @@ -3,7 +3,7 @@ class W32api_in_usr_lib (gubb.BinarySpec, gubb.SdkBuildSpec): def __init__ (self, settings): gubb.BinarySpec.__init__ (self, settings) - self.with (version='1.0', strip_components=0) + self.with_template (version='1.0', strip_components=0) def get_build_dependencies (self): return ['w32api'] def install (self):
--- a/gub/specs/w32api.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/w32api.py Fri May 18 01:05:55 2007 -0300 @@ -4,7 +4,7 @@ class W32api (gubb.BinarySpec, gubb.SdkBuildSpec): def __init__ (self, settings): gubb.BinarySpec.__init__ (self, settings) - self.with (version='3.6', strip_components=0, mirror=mirrors.mingw) + self.with_template (version='3.6', strip_components=0, mirror=mirrors.mingw) def untar (self): gubb.BinarySpec.untar (self) self.system ('''
--- a/gub/specs/zlib.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/specs/zlib.py Fri May 18 01:05:55 2007 -0300 @@ -5,7 +5,7 @@ class Zlib (targetpackage.TargetBuildSpec): def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) - self.with (version='1.2.3', + self.with_template (version='1.2.3', mirror='http://heanet.dl.sourceforge.net/sourceforge/libpng/zlib-1.2.3.tar.gz') def patch (self): @@ -39,7 +39,7 @@ # FIXME: removeme, try zlib-1.2.3.patch def x__init__ (self, settings): Zlib.__init__ (self, settings) - self.with (version='1.2.2', + self.with_template (version='1.2.2', mirror='http://heanet.dl.sourceforge.net/sourceforge/libpng/zlib-1.2.2.tar.gz') def patch (self): @@ -56,7 +56,7 @@ class Zlib__local (toolpackage.ToolBuildSpec, Zlib): def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) - self.with (version='1.2.3', + self.with_template (version='1.2.3', mirror='http://heanet.dl.sourceforge.net/sourceforge/libpng/zlib-1.2.3.tar.gz')
--- a/gub/versiondb.py Tue May 15 01:05:34 2007 -0300 +++ b/gub/versiondb.py Fri May 18 01:05:55 2007 -0300 @@ -29,6 +29,7 @@ def get_url_versions (url): + print url opener = urllib.URLopener () index = opener.open (url).read () @@ -186,6 +187,10 @@ db = VersionDataBase (options.dbfile) db.platforms = options.platforms.split (' ') + + if db.platforms == []: + sys.stderr.write ("need --platforms definition") + if options.test: print '2.9.28:', db.get_next_build_number ((2,9,28)) print '2.8.2:', db.get_next_build_number ((2,8,2))