changeset 3357:f9700ecd2f27

download -> mirrors fixes.
author Han-Wen Nienhuys <hanwen@xs4all.nl>
date Sat, 28 Apr 2007 18:35:26 -0400
parents 90f1cf90fc61
children 62b4af3d27ff
files lib/cygwin.py specs/boost.py specs/fontconfig.py specs/freetype.py specs/hello.py specs/libdbi-drivers-sqlite3.py specs/python25.py specs/texinfo.py specs/zlib.py
diffstat 9 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/lib/cygwin.py	Sat Apr 28 18:33:00 2007 -0400
+++ b/lib/cygwin.py	Sat Apr 28 18:35:26 2007 -0400
@@ -135,9 +135,9 @@
 def get_cross_packages (settings):
     import linux
     cross_packs = [
-        Binutils (settings).with (version='2.17', format='bz2', mirror=download.gnu),
+        Binutils (settings).with (version='2.17', format='bz2', mirror=mirrors.gnu),
         W32api_in_usr_lib (settings).with (version='1.0',  strip_components=0),
-        Gcc (settings).with (version='4.1.1', mirror=download.gcc_41, format='bz2'),
+        Gcc (settings).with (version='4.1.1', mirror=mirrors.gcc_41, format='bz2'),
         linux.Freetype_config (settings).with (version='2.1.9'),
         linux.Python_config (settings).with (version='2.4.3'),
 # FIXME: using the binary libtool package is quite involved, it has
--- a/specs/boost.py	Sat Apr 28 18:33:00 2007 -0400
+++ b/specs/boost.py	Sat Apr 28 18:35:26 2007 -0400
@@ -1,4 +1,4 @@
-import download
+import mirrors
 import gub
 import misc
 import targetpackage
@@ -57,7 +57,7 @@
 class Boost (BjamBuildSpec):
     def __init__ (self,settings):
         BjamBuildSpec.__init__ (self, settings)
-        self.with (version='1.33.1', mirror=download.boost_1_33_1, format='bz2')
+        self.with (version='1.33.1', mirror=mirrors.boost_1_33_1, format='bz2')
         gub.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/specs/fontconfig.py	Sat Apr 28 18:33:00 2007 -0400
+++ b/specs/fontconfig.py	Sat Apr 28 18:35:26 2007 -0400
@@ -137,7 +137,7 @@
 class Fontconfig__cygwin (Fontconfig):
     def __init__ (self, settings):
         Fontconfig.__init__ (self, settings)
-        self.with (mirror=download.fontconfig, version='2.4.1')
+        self.with (mirror=mirrors.fontconfig, version='2.4.1')
 
     def get_subpackage_definitions (self):
         d = dict (Fontconfig.get_subpackage_definitions (self))
--- a/specs/freetype.py	Sat Apr 28 18:33:00 2007 -0400
+++ b/specs/freetype.py	Sat Apr 28 18:35:26 2007 -0400
@@ -1,4 +1,4 @@
-import download
+import mirrors
 import gub
 import targetpackage
 import toolpackage
@@ -6,7 +6,7 @@
 class Freetype (targetpackage.TargetBuildSpec):
     def __init__ (self, settings):
         targetpackage.TargetBuildSpec.__init__ (self, settings)
-        self.with (version='2.1.10', mirror=download.nongnu_savannah)
+        self.with (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=download.nongnu_savannah)
+        self.with (version='2.1.10', mirror=mirrors.nongnu_savannah)
 
     def get_build_dependencies (self):
         # local is not split
--- a/specs/hello.py	Sat Apr 28 18:33:00 2007 -0400
+++ b/specs/hello.py	Sat Apr 28 18:35:26 2007 -0400
@@ -1,7 +1,7 @@
-import download
+import mirrors
 import targetpackage
 
 class Hello (targetpackage.TargetBuildSpec):
     def __init__ (self, settings):
         targetpackage.TargetBuildSpec.__init__ (self, settings)
-        self.with_tarball (mirror=download.lilypondorg, version='1.0')
+        self.with_tarball (mirror=mirrors.lilypondorg, version='1.0')
--- a/specs/libdbi-drivers-sqlite3.py	Sat Apr 28 18:33:00 2007 -0400
+++ b/specs/libdbi-drivers-sqlite3.py	Sat Apr 28 18:35:26 2007 -0400
@@ -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=download.sf, format='gz')
+        #self.with (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/specs/python25.py	Sat Apr 28 18:33:00 2007 -0400
+++ b/specs/python25.py	Sat Apr 28 18:35:26 2007 -0400
@@ -1,7 +1,7 @@
 import re
 import sys
 #
-import download
+import mirrors
 import glob
 import gub
 import targetpackage
@@ -15,7 +15,7 @@
         ## don't import settings from build system.
 	self.BASECFLAGS=''
         self.with (version='2.5',
-                   mirror=download.python,
+                   mirror=mirrors.python,
                    format='bz2')
 
     def configure_command (self):
@@ -131,7 +131,7 @@
     def __init__ (self, settings):
         toolpackage.ToolBuildSpec.__init__ (self, settings)
         self.with (version='2.5',
-                   mirror=download.python,
+                   mirror=mirrors.python,
                    format='bz2')
 
     def configure (self):
--- a/specs/texinfo.py	Sat Apr 28 18:33:00 2007 -0400
+++ b/specs/texinfo.py	Sat Apr 28 18:35:26 2007 -0400
@@ -1,11 +1,11 @@
 import toolpackage
-import download
+import mirrors
 
 class Texinfo(toolpackage.ToolBuildSpec):
     def __init__ (self, settings):
         toolpackage.ToolBuildSpec.__init__ (self, settings)
         self.with (version="4.8",
-                   mirror=download.gnu, format="bz2")
+                   mirror=mirrors.gnu, format="bz2")
     def patch (self):
         toolpackage.ToolBuildSpec.patch (self)
         self.system ('cd %(srcdir)s && patch -p1 <  %(patchdir)s/texinfo-4.8.patch')
--- a/specs/zlib.py	Sat Apr 28 18:33:00 2007 -0400
+++ b/specs/zlib.py	Sat Apr 28 18:35:26 2007 -0400
@@ -37,7 +37,7 @@
 
 class Zlib__mingw (Zlib):
     # FIXME: removeme, try zlib-1.2.3.patch
-    def __init__ (self, settings):
+    def x__init__ (self, settings):
         Zlib.__init__ (self, settings)
         self.with (version='1.2.2',
                    mirror='http://heanet.dl.sourceforge.net/sourceforge/libpng/zlib-1.2.2.tar.gz')