Mercurial > gub

changeset 3510:e76828443438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git changes - git template dir patch - override version number
author Han-Wen Nienhuys <hanwen@lilypond.org>
date Sat, 26 May 2007 20:14:17 -0300
parents 0abcaf783c72
children c79c70776f50
files gub/specs/git.py
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/git.py	Sat May 26 20:10:26 2007 -0300
+++ b/gub/specs/git.py	Sat May 26 20:14:17 2007 -0300
@@ -55,14 +55,14 @@
 
     def patch (self):
         self.system('cd %(srcdir)s && git reset --hard HEAD')
+        self.system('cd %(srcdir)s && patch -p1 < %(patchdir)s/git-1.5.2-templatedir.patch')
         targetpackage.TargetBuildSpec.patch (self)
         self.system ('rm -rf %(builddir)s')
         self.shadow_tree ('%(srcdir)s', '%(builddir)s')
         self.file_sub ([('git describe','true')],
                         '%(srcdir)s/GIT-VERSION-GEN')
         self.system('cd %(srcdir)s && patch -p1 < %(patchdir)s/git-1.5-shell-anality.patch')
-
-
+        
 class Git__mingw (Git):
     def __init__ (self, settings):
         Git.__init__ (self, settings)
@@ -77,6 +77,7 @@
                          '-lwsock32'),
                         ],
                        '%(builddir)s/Makefile')
+        self.dump('%(version)s-GUB', '%(builddir)s/version')
 
     def makeflags (self):
         return (' uname_S=MINGW'
@@ -88,6 +89,3 @@
                 + ' SHELL_PATH=/bin/sh'
                 + ' PERL_PATH=/bin/perl')
 
-    def version (self):
-        return '1.5.1'
-