summaryrefslogtreecommitdiff
path: root/cli_ure/qa
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-01-25 12:43:02 +0000
committerOliver Bolte <obo@openoffice.org>2007-01-25 12:43:02 +0000
commitcf50d599d329fda13cb18c25d32b39cab1c73a24 (patch)
tree7e38bba6e465c22cb1bea735c569d2b4f08635b5 /cli_ure/qa
parent69afbd644dd3aec80b8e9e31bf9013f38acd6eec (diff)
INTEGRATION: CWS ause069 (1.4.14); FILE MERGED
2006/10/18 17:10:14 hjs 1.4.14.1: #i70359# remove forced shell calls
Diffstat (limited to 'cli_ure/qa')
-rw-r--r--cli_ure/qa/versioning/makefile.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/cli_ure/qa/versioning/makefile.mk b/cli_ure/qa/versioning/makefile.mk
index 23c6cd4528bd..3e7f9d4d1668 100644
--- a/cli_ure/qa/versioning/makefile.mk
+++ b/cli_ure/qa/versioning/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: rt $ $Date: 2006-07-25 07:53:03 $
+# last change: $Author: obo $ $Date: 2007-01-25 13:43:02 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -94,13 +94,13 @@ COPYVERSIONLIBS: MAKEOUTDIR
CSFILES2 = runtests.cs
$(EXETARGET2): $(CSFILES2) MAKEOUTDIR
- +$(CSC) $(CSCFLAGS) -target:exe -out:$(EXETARGET2) \
+ $(CSC) $(CSCFLAGS) -target:exe -out:$(EXETARGET2) \
$(CSFILES2)
CSFILESLIB = version.cs
$(TESTLIB): $(CSFILESLIB) MAKEOUTDIR
- +$(CSC) $(CSCFLAGS) -target:library -out:$(TESTLIB) \
+ $(CSC) $(CSCFLAGS) -target:library -out:$(TESTLIB) \
-reference:$(BIN)$/cli_ure.dll \
-reference:$(BIN)$/cli_types.dll \
-reference:$(BIN)$/cli_basetypes.dll \
@@ -110,7 +110,7 @@ $(TESTLIB): $(CSFILESLIB) MAKEOUTDIR
#This target only checks if the the office/program/assembly directory
#contains the proper libraries.
$(OUTDIR)$/buildwithofficelibs.dll: MAKEOUTDIR
- +$(CSC) $(CSCFLAGS) -target:library -out:$@ \
+ $(CSC) $(CSCFLAGS) -target:library -out:$@ \
-reference:"$(office)"$/program$/assembly$/cli_ure.dll \
-reference:"$(office)"$/program$/assembly$/cli_types.dll \
-reference:"$(office)"$/program$/assembly$/cli_basetypes.dll \
@@ -163,7 +163,7 @@ CT_NOOFFICE = -NoOffice
# --- Targets ------------------------------------------------------
RUN: $(OUTDIR)$/buildwithofficelibs.dll
- +java -cp $(CLASSPATH) -DSystemRoot=$(SystemRoot) -Dcli_test_program=$(EXETARGET2) -Duno_path="$(office)"\program $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
+ java -cp $(CLASSPATH) -DSystemRoot=$(SystemRoot) -Dcli_test_program=$(EXETARGET2) -Duno_path="$(office)"\program $(CT_APP) $(CT_NOOFFICE) $(CT_TESTBASE) $(CT_TEST)
run: RUN