[ooo-build-commit] Branch 'ooo-build-3-1' - bin/gob

[Jan Nieuwenhuizen]

 bin/gob |   43 ++++++++-----------------------------------
 1 file changed, 8 insertions(+), 35 deletions(-)

New commits:
commit 92e3237cb275b0147f5a53d069f1372648f16927
Author: Jan Nieuwenhuizen <janneke at gnu.org>
Date:   Wed May 6 15:32:05 2009 +0200

    bin/gob: update for ooo310.

diff --git a/bin/gob b/bin/gob
index 48731d0..4e6f3a1 100755
--- a/bin/gob
+++ b/bin/gob
@@ -385,8 +385,10 @@ gitignores = '''
 *-pristine
 *.bak
 *.cxx-*
+*.deps
 *.git
 *.hxx-*
+*.log
 *.orig
 *.patched
 *.pristine
@@ -401,7 +403,7 @@ gitignores = '''
 CVS
 TAGS
 \#*
-localize.sdf
+xxx-have-in-patches-now:localize.sdf
 unxlng*.pro
 autom4te.cache/
 config.log
@@ -409,36 +411,18 @@ config.parms
 config.status
 configure
 set_soenv
+tmon.out
 visibility.cxx
 visibility.s
 warn
 default_images/introabout/intro-save.bmp
-dmake/.deps/
 dmake/Makefile
 dmake/config.h
 dmake/config.log
 dmake/config.status
-dmake/dag.o
-dmake/dbug/dbug/.deps/
 dmake/dmake
-dmake/dmake.o
+dmake/*.o
 dmake/dmakeroot.h
-dmake/dmdump.o
-dmake/dmstring.o
-dmake/expand.o
-dmake/function.o
-dmake/getinp.o
-dmake/hash.o
-dmake/imacs.o
-dmake/infer.o
-dmake/macparse.o
-dmake/make.o
-dmake/msdos/.deps/
-dmake/parse.o
-dmake/path.o
-dmake/percent.o
-dmake/quit.o
-dmake/rulparse.o
 dmake/stamp-h1
 dmake/startup/Makefile
 dmake/startup/config.mk
@@ -451,21 +435,8 @@ dmake/startup/unix/sysvr4/Makefile
 dmake/startup/winnt/Makefile
 dmake/startup/winnt/mingw/Makefile
 dmake/startup/winnt/msvc6/Makefile
-dmake/stat.o
-dmake/state.o
-dmake/sysintf.o
 dmake/tests/Makefile
-dmake/unix/.deps/
 dmake/unix/.dirstamp
-dmake/unix/arlib.o
-dmake/unix/dcache.o
-dmake/unix/dirbrk.o
-dmake/unix/rmprq.o
-dmake/unix/ruletab.o
-dmake/unix/runargv.o
-dmake/unix/tempnam.o
-dmake/win95/.deps/
-dmake/win95/microsft/.deps/
 instsetoo_native/res/banner_nld.bmp
 instsetoo_native/res/banner_ooop.bmp
 instsetoo_native/res/nologoinstall_nld.bmp
@@ -1071,7 +1042,9 @@ def parse_options ():
 def set_option_defaults (options):
     options.flat_apply_dir = '.git/apply-dir'
     options.verbose -= options.quiet
-    options.apply_dir = options.apply_dir.replace ('ooo300', 'dev300')
+    options.apply_dir = (options.apply_dir
+                         .replace ('ooo300', 'dev300')
+                         .replace ('ooo310', 'dev300'))
     if not options.distros:
         options.distros = ['SUSE']
     if not options.dir_branch: