[Libreoffice-commits] .: Branch 'integration/dev300_m98' - desktop/test

[Jan Holesovsky]

 desktop/test/deployment/active/makefile.mk  |    7 +++++++
 desktop/test/deployment/passive/makefile.mk |    7 +++++++
 2 files changed, 14 insertions(+)

New commits:
commit ecb752357d7bbbfe04f9fc12adec4d638099e48e
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Mar 7 14:53:10 2011 +0100

    Fix build --without-java in 'desktop'.

diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk
index 5511a39..71f24e7 100644
--- a/desktop/test/deployment/active/makefile.mk
+++ b/desktop/test/deployment/active/makefile.mk
@@ -29,6 +29,8 @@ PRJ = ../../..
 PRJNAME = desktop
 TARGET = test_deployment_active
 
+.IF "$(SOLAR_JAVA)" != ""
+
 ENABLE_EXCEPTIONS = TRUE
 
 PACKAGE = com/sun/star/comp/test/deployment/active_java
@@ -81,3 +83,8 @@ $(MISC)/$(TARGET)/active_java.jar : MANIFEST.MF $(JAVATARGET)
         $(MISC)/$(TARGET)/active_java.jar-zip/$(PACKAGE)/
     cd $(MISC)/$(TARGET)/active_java.jar-zip && zip ../active_java.jar \
         META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
+
+.ELSE # no java
+ALLTAR :
+    @echo "Java disabled, not creating active.oxt."
+.ENDIF
diff --git a/desktop/test/deployment/passive/makefile.mk b/desktop/test/deployment/passive/makefile.mk
index 019e5dc..7123a79 100644
--- a/desktop/test/deployment/passive/makefile.mk
+++ b/desktop/test/deployment/passive/makefile.mk
@@ -29,6 +29,8 @@ PRJ = ../../..
 PRJNAME = desktop
 TARGET = test_deployment_passive
 
+.IF "$(SOLAR_JAVA)" != ""
+
 ENABLE_EXCEPTIONS = TRUE
 
 PACKAGE = com/sun/star/comp/test/deployment/passive_java
@@ -134,3 +136,8 @@ $(MISC)/$(TARGET)/passive_java.jar : MANIFEST.MF $(JAVATARGET)
         $(MISC)/$(TARGET)/passive_java.jar-zip/$(PACKAGE)/
     cd $(MISC)/$(TARGET)/passive_java.jar-zip && zip ../passive_java.jar \
         META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
+
+.ELSE # no java
+ALLTAR :
+    @echo "Java disabled, not creating passive.oxt."
+.ENDIF