[ooo-build-commit] .: 3 commits - bin/piece bin/sloppypatch.pl patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Wed May 12 04:40:45 PDT 2010
bin/piece/install-generic | 4 +--
bin/sloppypatch.pl | 9 +++++++
patches/dev300/apply | 1
patches/dev300/piece-mysqlc.diff | 11 +++++++++
patches/dev300/piece-reportbuilder.diff | 12 +++++++--
patches/dev300/piece-sdext.diff | 39 +++++++++++++++++++++++++++-----
6 files changed, 65 insertions(+), 11 deletions(-)
New commits:
commit 09ddd4be587553d98469599e15375f91e9942b1a
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed May 12 13:39:06 2010 +0200
Set correctly the upstream build version in the split build (bnc#582120)
* bin/piece/install-generic: get the version from solenv/inc/minor.mk
(bnc#582120)
diff --git a/bin/piece/install-generic b/bin/piece/install-generic
index 241f378..162b666 100755
--- a/bin/piece/install-generic
+++ b/bin/piece/install-generic
@@ -13,8 +13,8 @@ fi
# ----- monster make_installer section -----
# can't just source $SOLARENV/inc/minor.mk [ sadly ] - missing quotes.
-export BUILD=9319
-export LAST_MINOR=m21
+export BUILD=`grep "BUILD=" "$OO_INSTDIR/solenv/inc/minor.mk" | cut -d= -f2`
+export LAST_MINOR=`grep "LAST_MINOR=" "$OO_INSTDIR/solenv/inc/minor.mk" | cut -d= -f2`
export OUT="`pwd`/solver/install"
export LOCAL_OUT=$OUT;
export LOCAL_COMMON_OUT=$OUT;
commit 5e45e307b4d998eb38af8acf5df3fabc7e845d5a
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed May 12 13:37:19 2010 +0200
Split build of extensions in ooo320-m17 fix
* patches/dev300/apply:
* patches/dev300/piece-mysqlc.diff:
* patches/dev300/piece-reportbuilder.diff:
* patches/dev300/piece-sdext.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 347dc08..e63c05f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3606,6 +3606,7 @@ piece-scripting.diff
piece-helpcontent2.diff
piece-sdext.diff
piece-swext.diff
+piece-mysqlc.diff
piece-writerfilter.diff
piece-ridljar.diff
piece-offapi.diff
diff --git a/patches/dev300/piece-mysqlc.diff b/patches/dev300/piece-mysqlc.diff
new file mode 100644
index 0000000..508375b
--- /dev/null
+++ b/patches/dev300/piece-mysqlc.diff
@@ -0,0 +1,11 @@
+--- mysqlc/source/makefile.mk.old 2010-04-28 11:35:17.000000000 +0200
++++ mysqlc/source/makefile.mk 2010-05-11 10:30:58.000000000 +0200
+@@ -264,7 +264,7 @@ EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CP
+ .INCLUDE : target.mk
+ .INCLUDE : extension_post.mk
+
+-$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
++$(COMPONENT_IMAGES) : $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
diff --git a/patches/dev300/piece-reportbuilder.diff b/patches/dev300/piece-reportbuilder.diff
index 6ef66b8..2a4f82d 100644
--- a/patches/dev300/piece-reportbuilder.diff
+++ b/patches/dev300/piece-reportbuilder.diff
@@ -111,9 +111,9 @@
PROCESSOUT=$(MISC)$/$(EXTNAME)
PROCESSORDIR=$(SOLARBINDIR)
---- reportbuilder/util/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
-+++ reportbuilder/util/makefile.mk 2010-03-12 17:11:54.000000000 +0100
-@@ -133,6 +133,10 @@ $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$
+--- reportbuilder/util/makefile.mk.old 2010-04-28 11:35:17.000000000 +0200
++++ reportbuilder/util/makefile.mk 2010-05-11 10:43:42.000000000 +0200
+@@ -129,11 +129,15 @@ $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
@@ -124,3 +124,9 @@
$(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
+
+-$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
++$(COMPONENT_IMAGES) : $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
diff --git a/patches/dev300/piece-sdext.diff b/patches/dev300/piece-sdext.diff
index 90ae3b7..a8baf91 100644
--- a/patches/dev300/piece-sdext.diff
+++ b/patches/dev300/piece-sdext.diff
@@ -1,6 +1,28 @@
---- sdext/source/minimizer/makefile.mk.old 2010-02-02 12:49:41.000000000 +0100
-+++ sdext/source/minimizer/makefile.mk 2010-03-05 20:10:38.000000000 +0100
-@@ -129,7 +129,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS)
+--- sdext/source/presenter/makefile.mk.old 2010-04-28 11:35:17.000000000 +0200
++++ sdext/source/presenter/makefile.mk 2010-05-11 10:49:19.000000000 +0200
+@@ -293,7 +293,7 @@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
+ @-$(MKDIRHIER) $(@:d)
+ +$(COPY) $< $@
+
+-$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
++$(COMPONENT_IMAGES) : $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
+--- sdext/source/pdfimport/makefile.mk.old 2010-04-28 11:35:17.000000000 +0200
++++ sdext/source/pdfimport/makefile.mk 2010-05-11 10:49:19.000000000 +0200
+@@ -148,7 +148,7 @@ $(COMPONENT_HELP) : help$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
+-$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
++$(COMPONENT_IMAGES) : $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+ .ENDIF # L10N_framework
+--- sdext/source/minimizer/makefile.mk.old 2010-04-28 11:35:17.000000000 +0200
++++ sdext/source/minimizer/makefile.mk 2010-05-11 10:49:19.000000000 +0200
+@@ -125,11 +125,11 @@ EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS)
.IF "$(L10N_framework)"==""
.INCLUDE : extension_post.mk
@@ -9,9 +31,14 @@
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
---- sdext/util/makefile.pmk.old 2010-02-02 12:49:41.000000000 +0100
-+++ sdext/util/makefile.pmk 2010-03-05 20:10:38.000000000 +0100
-@@ -31,7 +31,7 @@
+-$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
++$(COMPONENT_IMAGES) : $(SOLARVER)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
+ @@-$(MKDIRHIER) $(@:d)
+ $(COPY) $< $@
+
+--- sdext/util/makefile.pmk.old 2010-04-28 11:35:17.000000000 +0200
++++ sdext/util/makefile.pmk 2010-05-11 10:48:41.000000000 +0200
+@@ -27,7 +27,7 @@
XSLDIR=$(SOLARXMLDIR)$/processing
XCSROOT=$(SOLARXMLDIR)
commit 3f3593f94999aa3e12846cf051ba35942addca2e
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed May 12 13:32:33 2010 +0200
handle git diff headers in the split build
* bin/sloppypatch.pl: filter out the git headers; it is hard to keep the right
git headers with the related hunks; patch tool is confused with the
non-related index entry; it is not really needed
diff --git a/bin/sloppypatch.pl b/bin/sloppypatch.pl
index b0add79..3c7c514 100755
--- a/bin/sloppypatch.pl
+++ b/bin/sloppypatch.pl
@@ -60,6 +60,15 @@ my $line_matched = 0;
while (<STDIN>) {
my $line = $_;
+ # ignore the git headers
+ # especially "index " line" drives the patch tool mad when:
+ # + it is included but the related --- and +++ lines are not used in the end
+ # + it looks like "index 0000000..00204f9" which means a new file but
+ # it is actually a mess from the last used hunk
+ next if $line =~ m/^diff --git/;
+ next if $line =~ m/^new file/;
+ next if $line =~ m/^index /;
+
# same of unified context patch header:
# --- file.old 2009-02-26 20:04:16.000000000 +0100
# +++ file 2009-02-26 20:04:41.000000000 +0100
More information about the ooo-build-commit
mailing list