diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:10:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-25 12:10:03 +0000 |
| commit | 42ee0187443404b4f18845b6208a7a70df235d2f (patch) | |
| tree | 591ce1917f1f7c64820c04bf6e0ad98c42ea4202 /sc | |
| parent | 9c0428836027af2fb0b30606764cfcd94b2198fa (diff) | |
INTEGRATION: CWS ause069 (1.4.296); FILE MERGED
2006/11/24 14:37:05 hjs 1.4.296.1: #i70359# remove forced shell calls
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/addin/util/makefile.mk | 12 | ||||
| -rw-r--r-- | sc/qa/complex/dataPilot/makefile.mk | 6 | ||||
| -rw-r--r-- | sc/qa/complex/sc/makefile.mk | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sc/addin/util/makefile.mk b/sc/addin/util/makefile.mk index c78de8829177..291d68b63110 100644 --- a/sc/addin/util/makefile.mk +++ b/sc/addin/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2005-09-08 17:20:35 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:09:36 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -46,11 +46,11 @@ $(BIN)$/addin.zip : \ $(MISC)$/rot.lst \ $(MISC)$/dfa.lst .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - +$(TYPE) $(MISC)$/rot.lst | tr -s " " "\n" | zip -@ -u -j -ll $(BIN)$/addin.zip $(CHECKZIPRESULT) - +$(TYPE) $(MISC)$/dfa.lst | tr -s " " "\n" | zip -@ -u -j -ll $(BIN)$/addin.zip $(CHECKZIPRESULT) - +chmod +rw $(BIN)$/addin.zip + $(TYPE) $(MISC)$/rot.lst | tr -s " " "\n" | zip -@ -u -j -ll $(BIN)$/addin.zip $(CHECKZIPRESULT) + $(TYPE) $(MISC)$/dfa.lst | tr -s " " "\n" | zip -@ -u -j -ll $(BIN)$/addin.zip $(CHECKZIPRESULT) + chmod +rw $(BIN)$/addin.zip .ELSE - +$(TYPE) $< | zip -@ -u -j $(BIN)$/addin.zip $(CHECKZIPRESULT) + $(TYPE) $< | zip -@ -u -j $(BIN)$/addin.zip $(CHECKZIPRESULT) .ENDIF ALL: \ diff --git a/sc/qa/complex/dataPilot/makefile.mk b/sc/qa/complex/dataPilot/makefile.mk index f765dccb45ef..040294e079d0 100644 --- a/sc/qa/complex/dataPilot/makefile.mk +++ b/sc/qa/complex/dataPilot/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2005-09-08 18:05:28 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:09:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -63,4 +63,4 @@ JARCOMPRESS = TRUE run: - +java -cp $(CLASSPATH) org.openoffice.Runner -TimeOut 0 -tb java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b) + java -cp $(CLASSPATH) org.openoffice.Runner -TimeOut 0 -tb java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b) diff --git a/sc/qa/complex/sc/makefile.mk b/sc/qa/complex/sc/makefile.mk index 4031a3601b86..f81876b8b622 100644 --- a/sc/qa/complex/sc/makefile.mk +++ b/sc/qa/complex/sc/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: rt $ $Date: 2005-09-08 18:08:30 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:10:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -62,4 +62,4 @@ JARCOMPRESS = TRUE run: - +java -cp $(CLASSPATH) org.openoffice.Runner -TimeOut 0 -tb java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b) + java -cp $(CLASSPATH) org.openoffice.Runner -TimeOut 0 -tb java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b) |