diff options
| author | Rene Engelhard <rene@openoffice.org> | 2010-06-22 20:02:48 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@openoffice.org> | 2010-06-22 20:02:48 +0200 |
| commit | 63505bf6949df61bc8a0d3fe1be414b1b8042abb (patch) | |
| tree | 5e39f67521ed492194d7633a154d3f25dc9649be | |
| parent | 18d6c7b0e73dfb7ce6b3ecb25aeb42924417f332 (diff) | |
smoketest26: fix smoketestoo_native "build" without Java
| -rwxr-xr-x | smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk | 7 | ||||
| -rwxr-xr-x | smoketestoo_native/data/smoketestdoc.sxw | bin | 35550 -> 35311 bytes |
2 files changed, 7 insertions, 0 deletions
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk index c007616d4..da9b30279 100755 --- a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk +++ b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk @@ -34,6 +34,8 @@ no_common_build_zip:=TRUE # --- Settings ----------------------------------------------------- +.IF "$(SOLAR_JAVA)" != "" + .INCLUDE : settings.mk JARFILES = ridl.jar jurt.jar unoil.jar juh.jar @@ -81,3 +83,8 @@ $(JAVACLASSFILES) .UPDATEALL: $(MISC)$/$(TARGET)$/TestExtension.rdb $(MISC)$/$(TARGET)$/$(JARTARGET) : $(JARTARGETN) $(COPY) $< $@ + +.ELSE +@all: + @echo "Java disabled. Nothing to do." +.ENDIF diff --git a/smoketestoo_native/data/smoketestdoc.sxw b/smoketestoo_native/data/smoketestdoc.sxw Binary files differindex 84e1e30bf..67c765745 100755 --- a/smoketestoo_native/data/smoketestdoc.sxw +++ b/smoketestoo_native/data/smoketestdoc.sxw |