[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-12-g6eba544
The following commit has been merged in the debian-experimental-3.5 branch:
commit 17c53458b1760a3ad5298a1acae48d17716014c0
Author: Rene Engelhard <rene@debian.org>
Date: Sat Dec 31 23:18:13 2011 +0100
actually use new QADEVOOO BUILD_TYPE
diff --git a/patches/conditionalize-qadevOOo-build.diff b/patches/conditionalize-qadevOOo-build.diff
index 4385519..59412ee 100644
--- a/patches/conditionalize-qadevOOo-build.diff
+++ b/patches/conditionalize-qadevOOo-build.diff
@@ -104,3 +104,57 @@ index 1cbe6e3..0a60de3 100644
unote unotest\source\cpp nmake - all source_cpp NULL
unote unotest\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector NULL
unote unotest\source\java\org\openoffice\test nmake - all source_java NULL
+
+diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
+index d77da7f..897a85f 100755
+--- a/connectivity/qa/connectivity/tools/makefile.mk
++++ b/connectivity/qa/connectivity/tools/makefile.mk
+@@ -38,6 +38,11 @@ all:
+ @echo "Java not available. Build skipped"
+ .ELSE
+
++.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
++all:
++ @echo "QADEVOO not set. Build skipped"
++.ELSE
++
+ #----- compile .java files -----------------------------------------
+
+ JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
+@@ -56,6 +61,8 @@ ALL : ALLTAR
+ ALL: ALLDEP
+ .ENDIF
+
++.ENDIF # QADEVOOO option
+ .ENDIF # "$(SOLAR_JAVA)" == ""
+
+ .INCLUDE : target.mk
++
+diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
+index 3081a75..76028ad 100755
+--- a/connectivity/qa/makefile.mk
++++ b/connectivity/qa/makefile.mk
+@@ -33,6 +33,10 @@ PACKAGE = complex/connectivity
+ # --- Settings -----------------------------------------------------
+ .INCLUDE: settings.mk
+
++.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
++all:
++ @echo "QADEVOO not set. Build skipped"
++.ELSE
+ #----- compile .java files -----------------------------------------
+
+ JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
+@@ -65,6 +69,7 @@ ALL : ALLTAR
+ .ELSE
+ ALL: ALLDEP
+ .ENDIF
++.ENDIF # QADEVOOO option
+
+ .INCLUDE : target.mk
+
+@@ -76,3 +81,4 @@ run: $(CLASSDIR)$/$(JARTARGET)
+
+ run_%: $(CLASSDIR)$/$(JARTARGET)
+ +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//)
++
--
LibreOffice packaging repository
Reply to: