changeset 5666:f5d2022f6af0

Replace def cache_file () -> class.cache_file.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Sat, 26 Sep 2009 23:47:32 +0200
parents c2252fd358e9
children c83d3a93c084
files gub/build.py gub/specs/db.py gub/system.py
diffstat 3 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/gub/build.py	Sat Sep 26 23:41:55 2009 +0200
+++ b/gub/build.py	Sat Sep 26 23:47:32 2009 +0200
@@ -30,6 +30,7 @@
     srcdir_build_broken = False
     autodir = '%(srcdir)s'
     config_cache_overrides = ''
+    config_cache_file = '%(builddir)s/config.cache'
     configure_binary = '%(autodir)s/configure'
     configure_flags = ' --prefix=%(configure_prefix)s'
     configure_variables = ''
@@ -347,10 +348,6 @@
     def src_package_uploads (self):
         return '%(packages)s'
 
-    @context.subst_method
-    def cache_file (self):
-        return '%(builddir)s/config.cache'
-
     def get_done (self):
         done = []
         if os.path.exists (self.get_stamp_file ()):
@@ -383,7 +380,7 @@
         string = self.config_cache_settings ()
         if string:
             self.system ('mkdir -p %(builddir)s || true')
-            self.dump (string, self.cache_file (), permissions=octal.o755)
+            self.dump (string, self.cache_file, permissions=octal.o755)
 
     def configure (self):
         if self.srcdir_build_broken:
--- a/gub/specs/db.py	Sat Sep 26 23:41:55 2009 +0200
+++ b/gub/specs/db.py	Sat Sep 26 23:47:32 2009 +0200
@@ -7,11 +7,10 @@
     srcdir_build_broken = True
     dependencies = ['tools::libtool']
     autodir = '%(srcdir)s/dist'
+    cache_file = '%(builddir)s/build_unix/config.cache'
     configure_command = 'cd build_unix && ' + target.AutoBuild.configure_command
     configure_binary = '%(builddir)s/dist/configure'
     make_flags = '-C build_unix'
-    def cache_file (self):
-        return '%(builddir)s/build_unix/config.cache'
     def configure (self):
         self.system ('mkdir -p %(builddir)s/build_unix')
         target.AutoBuild.configure (self)
--- a/gub/system.py	Sat Sep 26 23:41:55 2009 +0200
+++ b/gub/system.py	Sat Sep 26 23:47:32 2009 +0200
@@ -15,6 +15,7 @@
     install_after_build = False
     source = 'foo.tar.gz'
     vc_branch_suffix = ''
+    builddir = 'bar'
     srcdir = 'foo'
     configure_prefix = ''
     configure_command = ''