[ooo-build-commit] .: 6 commits - apache-commons/java jfreereport/java reportbuilder/registry sdext/source tomcat/makefile.mk
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Sep 16 09:55:20 PDT 2010
apache-commons/java/codec/makefile.mk | 2 +-
apache-commons/java/httpclient/makefile.mk | 5 ++++-
jfreereport/java/flute/makefile.mk | 2 +-
jfreereport/java/jfreereport/makefile.mk | 2 +-
jfreereport/java/libbase/makefile.mk | 2 +-
jfreereport/java/libfonts/makefile.mk | 2 +-
jfreereport/java/libformula/makefile.mk | 2 +-
jfreereport/java/liblayout/makefile.mk | 2 +-
jfreereport/java/libloader/makefile.mk | 2 +-
jfreereport/java/librepository/makefile.mk | 2 +-
jfreereport/java/libserializer/makefile.mk | 2 +-
jfreereport/java/libxml/makefile.mk | 2 +-
jfreereport/java/sac/makefile.mk | 2 +-
reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs | 2 +-
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 6 +-----
sdext/source/presenter/PresenterController.cxx | 2 +-
sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu | 3 +++
tomcat/makefile.mk | 5 +++++
18 files changed, 27 insertions(+), 20 deletions(-)
New commits:
commit a69ebb6f9e5a082f2faabc151625bfa56039fa90
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Sep 16 18:48:35 2010 +0200
framework-extra-job-config-sdext.diff: Migrated
i#107568
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
index ba74332..1241a72 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
@@ -5,6 +5,9 @@
<prop oor:name="Service">
<value>com.sun.star.comp.Draw.framework.PresenterScreenJob</value>
</prop>
+ <prop oor:name="Context">
+ <value>com.sun.star.presentation.PresentationDocument</value>
+ </prop>
</node>
</node>
<node oor:name="Events">
commit 1ebfd127ad09edb4028fa480d436a6cbc851a353
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Sep 16 18:46:15 2010 +0200
pdfimport-lax-restrictions.diff: Lax restrictions on pdf import filter.
i#90468
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index 0bc92f6..719d3ae 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -159,11 +159,7 @@ int main(int argc, char **argv)
// Check various permissions.
- if ( !aDoc.isOk()||
- !aDoc.okToPrint() ||
- !aDoc.okToChange()||
- !aDoc.okToCopy()||
- !aDoc.okToAddNotes() )
+ if ( !aDoc.isOk() )
{
pdfi::PDFOutDev* pOutDev( new pdfi::PDFOutDev(&aErrDoc) );
commit ef0ca59cb36d75803bf5db43671546cdc6d4ca54
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Sep 16 18:36:06 2010 +0200
slideshow-effect-rewind-sdext.diff: allows to step back one animation effect
i#48179
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index cf3ec87..db7d0f9 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -998,7 +998,6 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
}
break;
- case awt::Key::LEFT:
case awt::Key::PAGEUP:
if (mxSlideShowController.is())
{
@@ -1009,6 +1008,7 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
}
break;
+ case awt::Key::LEFT:
case awt::Key::UP:
case awt::Key::P:
case awt::Key::BACKSPACE:
commit 0f5f80f081126258df7fbec04885dbe984d2f3a4
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Sep 16 18:33:30 2010 +0200
build-java-target-extensions.diff: Allow specifying java target version.
i#93115
diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk
index 6976731..be96f87 100644
--- a/apache-commons/java/codec/makefile.mk
+++ b/apache-commons/java/codec/makefile.mk
@@ -58,7 +58,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk
index 8e4f2ca..900fb08 100644
--- a/apache-commons/java/httpclient/makefile.mk
+++ b/apache-commons/java/httpclient/makefile.mk
@@ -66,7 +66,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index 9444d75..ffe668c 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -51,7 +51,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
index b527d28..cd815d2 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -51,7 +51,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index 1cbfc11..15197e0 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index f59b3cc..cd2ff34 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 4372ce2..28fcf99 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -52,7 +52,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk
index 0340e43..ba70d79 100644
--- a/jfreereport/java/liblayout/makefile.mk
+++ b/jfreereport/java/liblayout/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index ce97b40..cfb5955 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index e11639c..d39daa1 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index 12a301e..05cf850 100644
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index d0c8bb4..17109ee 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -50,7 +50,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
index 44cb284..a0dafe9 100644
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@ -60,7 +60,7 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk
index a4d8236..b440e84 100755
--- a/tomcat/makefile.mk
+++ b/tomcat/makefile.mk
@@ -49,7 +49,12 @@ ADDITIONAL_FILES = jakarta-servletapi-5/build.xml
PATCH_FILES=tomcat.patch
BUILD_DIR=jakarta-servletapi-5
+
+.IF "$(JAVACISGCJ)"=="yes"
BUILD_ACTION=$(ANT)
+.ELSE
+BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
+.ENDIF
# --- Targets ------------------------------------------------------
commit 07a3e44e1de6a9d0383244c7bf3b36a886e5ca01
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Thu Sep 16 18:30:58 2010 +0200
apache-commons-build-fix-invalid-chars.diff: Fix build
Fixing build breakage in apache-common module when you use UTF-8 based locale in the build system
diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk
index 6e05150..8e4f2ca 100644
--- a/apache-commons/java/httpclient/makefile.mk
+++ b/apache-commons/java/httpclient/makefile.mk
@@ -58,6 +58,9 @@ OUT2CLASS=dist$/commons-httpclient.jar
COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar
+ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
+.EXPORT : ANT_OPTS
+
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
commit e384da1732bbe387724b028671e77471ab011c9f
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Sep 16 18:28:16 2010 +0200
redirect-extensions-reportbuilder.diff: Migrated
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs
index c290e00..f1adabe 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs
+++ b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs
@@ -52,7 +52,7 @@
<author>LLA</author>
<desc>Direct download URL to the Oracle(tm) Report Builder extension.</desc>
</info>
- <value>http://extensions.services.openoffice.org</value>
+ <value>http://extensions.go-oo.org</value>
</prop>
<prop oor:name="Name" oor:type="xs:string">
<info>
More information about the ooo-build-commit
mailing list