ooo-build r13471 - in trunk: . bin

[jannieuw svn gnome org]

Author: jannieuw
Date: Mon Aug  4 12:33:33 2008
New Revision: 13471
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13471&view=rev

Log:
2008-08-01  Jan Nieuwenhuizen  <janneke gnu org>

	* bin/gob: Do not ignore intro.bmp and friends.  Fixes build of
	exported tree.  Redo s/git-/git / in anticipation of upstream
	changes.


Modified:
   trunk/ChangeLog
   trunk/bin/gob

Modified: trunk/bin/gob
==============================================================================
--- trunk/bin/gob	(original)
+++ trunk/bin/gob	Mon Aug  4 12:33:33 2008
@@ -315,10 +315,6 @@
 config_office/visibility.s
 config_office/warn
 default_images/introabout/intro-save.bmp
-default_images/introabout/intro.bmp
-default_images/svx/res/openabout_ark.png
-default_images/svx/res/openabout_translateorgza.png
-default_images/sw/res/go-oo-team.png
 dmake/.deps/
 dmake/Makefile
 dmake/config.h
@@ -386,6 +382,13 @@
 solenv/unxlng*/
 svx/res
 '''
+keep = '''
+default_images/introabout/intro-save.bmp
+default_images/introabout/intro.bmp
+default_images/svx/res/openabout_ark.png
+default_images/svx/res/openabout_translateorgza.png
+default_images/sw/res/go-oo-team.png
+'''
 
 def create_gitignores (dir):
     for i in filter_out (operator.not_, gitignores.split ('\n')):
@@ -435,13 +438,13 @@
             create_gitignores (dir)
             drink = Setup ().get ('DRINK')
             print >> sys.stderr, 'Creating GIT archive - [ go and have some %(drink)s ] ...' % locals ()
-            self.system ('git-init')
+            self.system ('git init')
             svn_revision = get_svn_revision ()
             self.commit ('Initial svn:r%(svn_revision)s unpatched.' % locals ())
-            self.system ('git-branch %(pristine)s' % self.__dict__)
-            self.system ('git-tag gob-%(workspace)s-%(milestone)s %(pristine)s' % self.__dict__)
-            self.system ('git-branch pristine')
-            self.system ('git-gc')
+            self.system ('git branch %(pristine)s' % self.__dict__)
+            self.system ('git tag gob-%(workspace)s-%(milestone)s %(pristine)s' % self.__dict__)
+            self.system ('git branch pristine')
+            self.system ('git gc')
         if clean:
             if self.is_modified ():
                 self.system ('git reset --hard HEAD')
@@ -449,7 +452,7 @@
         if self.has_branch (self.patched):
             self.checkout (self.patched)
         else:
-            self.system ('git-checkout -b %(patched)s pristine' % self.__dict__)
+            self.system ('git checkout -b %(patched)s pristine' % self.__dict__)
         if self.has_branch (self.scratch):
             self.system ('git branch -D %(scratch)s' % self.__dict__)
     def pipe (self, command, raise_on_error=True):
@@ -460,11 +463,11 @@
         return system ('cd %(dir)s && %(command)s' % locals (), raise_on_error)
     def get_branches (self):
         return filter_out (operator.not_,
-                           self.pipe ('git-branch')
+                           self.pipe ('git branch')
                            .replace ('*', '')
                            .replace (' ', '').split ('\n'))
     def get_log (self, branch=''):
-        return self.pipe ('git-log --pretty=oneline %(branch)s --' % locals ())
+        return self.pipe ('git log --pretty=oneline %(branch)s --' % locals ())
     def current_commit (self, branch=''):
         s = self.get_log ('-1 ' + branch)
         return s[:s.index (' ')]
@@ -480,12 +483,12 @@
             self.commits = dict (map (grok_log_line, log.split ('\n')[:-2]))
         return self.commits.get (patch, None)
     def commit (self, message):
-        self.system ('git-add .')
-        self.system ('git-add -u .')
-        self.system ('''git-commit -m '%(message)s' ''' % locals ())
+        self.system ('git add .')
+        self.system ('git add -u .')
+        self.system ('''git commit -m '%(message)s' ''' % locals ())
     def is_modified (self):
         return re.sub ('# On branch.*\nnothing to commit \(working directory clean\)\n', '',
-                       self.pipe ('git-status', raise_on_error=False))
+                       self.pipe ('git status', raise_on_error=False))
     def assert_clean (self):
         dir = self.dir
         pending = self.is_modified ()
@@ -493,9 +496,9 @@
             raise GitFailed ('working directory unclean: %(dir)s\n%(pending)s' % locals ())
     def checkout (self, branch):
         if not self.is_on_branch (branch):
-            self.system ('git-checkout %(branch)s' % locals ())
+            self.system ('git checkout %(branch)s' % locals ())
     def get_current_branch (self):
-        return re.search ('(^|\n)\* (.+)', self.pipe ('git-branch')).group (2)
+        return re.search ('(^|\n)\* (.+)', self.pipe ('git branch')).group (2)
     def is_on_branch (self, branch):
         return branch == self.get_current_branch ()
     def has_branch (self, branch):
@@ -513,14 +516,14 @@
             dependencies = branch_get_dependencies_with_override (branches, patches, branch)
         if not self.has_branch (branch):
             base_depend = dependencies[0]
-            self.system ('git-checkout -b %(branch)s %(base_depend)s' % locals ())
+            self.system ('git checkout -b %(branch)s %(base_depend)s' % locals ())
             for dependency in dependencies[1:]:
-                self.system ('git-rebase %(dependency)s' % locals ())
+                self.system ('git rebase %(dependency)s' % locals ())
         else:
             self.checkout (branch)
         log = self.get_log (patched)
         commit = log[:log.index (' ')]
-        self.system ('git-cherry-pick -x %(commit)s' % locals ())
+        self.system ('git cherry-pick -x %(commit)s' % locals ())
     def before_ (self):
         self.assert_clean ()
         self.system ('git checkout -b %(scratch)s %(patched)s' % self.__dict__)
@@ -531,7 +534,7 @@
     def pick_patch (self, patch, commit):
         branch = patch_get_branch (patch)
         print >> sys.stderr, 'Picking patch[%(branch)s]:' % locals (), patch.name
-        self.system ('git-cherry-pick -x %(commit)s' % locals ())
+        self.system ('git cherry-pick -x %(commit)s' % locals ())
     def add_patch (self, branches, patches, patch):
         if patch.name in self.get_log ():
             print >> sys.stderr, 'patch already applied, skipping:', patch.name
@@ -542,7 +545,8 @@
         commit = None
         branch = patch_get_branch (patch)
         if self.has_branch (branch):
-            m = re.search ('(^|\n)([^\s]+)\s+.*(\s|/)%(name)s' % patch.__dict__, self.get_log (branch))
+            name = patch.name.replace ('+', '\+')
+            m = re.search ('(^|\n)([^\s]+)\s+.*(\s|/)%(name)s' % locals (), self.get_log (branch))
             if m:
                 commit = m.group (2)
         self.before_ ()
@@ -725,7 +729,7 @@
         branches = self.get_branches ()
         for patch in self.get_patches ():
             git.add_patch (branches, patches, patch)
-        git.system ('git-gc')
+        git.system ('git gc')
     def get_patches_for_distro (self, distro):
         patches = reduce (operator.add, map (lambda section: section.get_patches (), self.get_sections_for_distro (distro)))
         for patch in patches:
@@ -747,7 +751,7 @@
         git = Git (self.options.build_dir, self.options.patched)
         svn_revision = get_svn_revision ()
         git.commit ('Update to svn:r%(svn_revision)s patched.' % locals ())
-        git.system ('git-rebase patched')
+        git.system ('git rebase patched')
     def dependencies (self):
         '''list branch dependencies'''
         patches = self.get_patches ()
@@ -793,9 +797,9 @@
     def reset (self):
         '''reset - set GIT tree to pristine and remove all branches'''
         git = Git (self.options.build_dir, self.options.patched)
-        git.system ('git-checkout -f %(patched)s' % git.__dict__)
-        git.system ('git-reset --hard pristine')
-        git.system ('''git-branch | grep -Ev '/|master|patched|pristine|upstream|%(patched)s' | xargs git branch -D''' % git.__dict__)
+        git.system ('git checkout -f %(patched)s' % git.__dict__)
+        git.system ('git reset --hard pristine')
+        git.system ('''git branch | grep -Ev '/|master|patched|pristine|upstream|%(patched)s' | xargs git branch -D''' % git.__dict__)
     def patch_depend (self):
         '''patch-depend PATCH-1 PATCH-2 - show overlap between patches'''
         if len (self.options.arguments) != 2: