summaryrefslogtreecommitdiff
path: root/testtools
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-02-16 13:39:47 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-02-16 13:39:47 +0000
commitedfac7ceacd32add223b5cc9c65362f53dbc372c (patch)
treeb61b4dd51178e132a38cc6898fe6ea0b5f8c7051 /testtools
parentfd960e4f700d32267e8e21be560e8ba27d33494c (diff)
CWS-TOOLING: integrate CWS dr66_OOO310
2009-01-22 15:51:40 +0100 dr r266730 : #i98028# moved to CWS dr66 2009-01-22 15:50:28 +0100 dr r266729 : #i98028# moved to CWS dr66 2009-01-20 16:25:49 +0100 dr r266595 : #i98282# resolve palette colors while loading chart gradients (convert back to unx lineends...) 2009-01-20 16:23:19 +0100 dr r266594 : #i98282# resolve palette colors while loading chart gradients 2009-01-19 15:43:57 +0100 dr r266507 : #i97900# move fix to CWS dr66 2009-01-19 15:40:28 +0100 dr r266506 : #i97900# move fix to CWS dr66 2009-01-19 15:20:14 +0100 dr r266505 : #i98141# correctly update note position while switching LTR/RTL mode of sheet 2009-01-06 10:28:02 +0100 dr r265899 : CWS-TOOLING: rebase CWS dr66 to trunk@265758 (milestone: DEV300:m38) 2008-11-13 13:59:02 +0100 dr r263644 : #i10000# merge problems 2008-11-13 13:25:15 +0100 dr r263639 : #i10000# merge problems 2008-11-13 13:22:58 +0100 dr r263638 : #i10000# merge problems 2008-11-13 13:22:25 +0100 dr r263637 : #i10000# merge problems 2008-11-12 13:40:46 +0100 dr r263595 : #i10000# merge problem 2008-11-12 11:34:51 +0100 dr r263583 : CWS-TOOLING: rebase CWS dr66 to trunk@263288 (milestone: DEV300:m35) 2008-11-11 16:58:11 +0100 dr r263568 : CWS-TOOLING: rebase CWS dr66 to trunk@262087 (milestone: DEV300:m33) 2008-10-27 14:38:34 +0100 dr r262675 : migrate CWS dr66 to SVN
Diffstat (limited to 'testtools')
-rw-r--r--testtools/source/bridgetest/cli/makefile.mk12
-rw-r--r--testtools/source/cliversioning/makefile.mk12
2 files changed, 12 insertions, 12 deletions
diff --git a/testtools/source/bridgetest/cli/makefile.mk b/testtools/source/bridgetest/cli/makefile.mk
index cc79704f1..630cfeba8 100644
--- a/testtools/source/bridgetest/cli/makefile.mk
+++ b/testtools/source/bridgetest/cli/makefile.mk
@@ -170,11 +170,11 @@ $(BIN)$/cli_vb_testobj.uno.dll : \
cli_vb_testobj.vb
$(MISC)$/copyassemblies.done .ERRREMOVE:
- $(GNUCOPY) -p $(CLI_CPPUHELPER) $(BIN)$/$(CLI_CPPUHELPER:f)
- $(GNUCOPY) -p $(CLI_BASETYPES) $(BIN)$/$(CLI_BASETYPES:f)
- $(GNUCOPY) -p $(CLI_URETYPES) $(BIN)$/$(CLI_URETYPES:f)
- $(GNUCOPY) -p $(CLI_URE) $(BIN)$/$(CLI_URE:f)
- $(GNUCOPY) -p $(CLI_OOOTYPES) $(BIN)$/$(CLI_OOOTYPES:f)
+ $(GNUCOPY) $(CLI_CPPUHELPER) $(BIN)$/$(CLI_CPPUHELPER:f)
+ $(GNUCOPY) $(CLI_BASETYPES) $(BIN)$/$(CLI_BASETYPES:f)
+ $(GNUCOPY) $(CLI_URETYPES) $(BIN)$/$(CLI_URETYPES:f)
+ $(GNUCOPY) $(CLI_URE) $(BIN)$/$(CLI_URE:f)
+ $(GNUCOPY) $(CLI_OOOTYPES) $(BIN)$/$(CLI_OOOTYPES:f)
$(TOUCH) $@
$(BIN)$/cli_bridgetest_inprocess.exe : \
@@ -201,7 +201,7 @@ $(BIN)$/cli_bridgetest_inprocess.exe : \
-reference:$(BIN)$/cli_vb_testobj.uno.dll \
-reference:$(BIN)$/cli_cpp_bridgetest.uno.dll \
cli_bridgetest_inprocess.cs
- $(GNUCOPY) -p cli_bridgetest_inprocess.ini $(BIN)
+ $(GNUCOPY) cli_bridgetest_inprocess.ini $(BIN)
.ENDIF
diff --git a/testtools/source/cliversioning/makefile.mk b/testtools/source/cliversioning/makefile.mk
index cacef2e1f..d319ce7fd 100644
--- a/testtools/source/cliversioning/makefile.mk
+++ b/testtools/source/cliversioning/makefile.mk
@@ -81,15 +81,15 @@ ALLTAR: \
COPYVERSIONLIBS:
- -$(GNUCOPY) -p $(VERSIONLIBS)$/* $(BIN)
+ -$(GNUCOPY) $(VERSIONLIBS)$/* $(BIN)
$(MISC)$/copyassemblies.done .ERRREMOVE:
- $(GNUCOPY) -p $(CLI_CPPUHELPER) $(BIN)$/$(CLI_CPPUHELPER:f)
- $(GNUCOPY) -p $(CLI_BASETYPES) $(BIN)$/$(CLI_BASETYPES:f)
- $(GNUCOPY) -p $(CLI_URETYPES) $(BIN)$/$(CLI_URETYPES:f)
- $(GNUCOPY) -p $(CLI_URE) $(BIN)$/$(CLI_URE:f)
- $(GNUCOPY) -p $(CLI_OOOTYPES) $(BIN)$/$(CLI_OOOTYPES:f)
+ $(GNUCOPY) $(CLI_CPPUHELPER) $(BIN)$/$(CLI_CPPUHELPER:f)
+ $(GNUCOPY) $(CLI_BASETYPES) $(BIN)$/$(CLI_BASETYPES:f)
+ $(GNUCOPY) $(CLI_URETYPES) $(BIN)$/$(CLI_URETYPES:f)
+ $(GNUCOPY) $(CLI_URE) $(BIN)$/$(CLI_URE:f)
+ $(GNUCOPY) $(CLI_OOOTYPES) $(BIN)$/$(CLI_OOOTYPES:f)
$(TOUCH) $@
CSFILES2 = runtests.cs