INTEGRATION: CWS jl104 (1.20.6); FILE MERGED

2008/06/20 08:42:19 jl 1.20.6.3: #i88078# copy cli_oootypes.dll into $(BIN)
2008/06/19 11:48:25 jl 1.20.6.2: #i88078
2008/06/19 10:04:10 jl 1.20.6.1: #i88078# moving tests from cli_ure to testtools

1 files changed, 42 insertions, 78 deletions

diff --git a/testtools/source/bridgetest/cli/makefile.mk b/testtools/source/bridgetest/cli/makefile.mk
index 456fff88809e..cc79704f1f50 100644
--- a/testtools/source/bridgetest/cli/makefile.mk
+++ b/testtools/source/bridgetest/cli/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.20 $
+# $Revision: 1.21 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -48,50 +48,11 @@ CCACHE_DISABLE=TRUE
 .INCLUDE :  settings.mk
 DLLPRE =
 CFLAGSENABLESYMBOLS:=-Z7
-
-.IF "$(COM)" == "MSC"
-
 # ------------------------------------------------------------------
-.IF "$(GUI)"=="WNT"
-MY_DLLPOSTFIX=.dll
-DESTDIR=$(BIN)
-BATCH_SUFFIX=.bat
-GIVE_EXEC_RIGHTS=@echo
-WINTARGETS=  \
-    $(DESTDIR)$/regcomp.exe \
-    $(DESTDIR)$/uno.exe \
-    $(DESTDIR)$/regcomp.exe.config \
-    $(DESTDIR)$/uno.exe.config
-
-.ELIF "$(GUI)"=="OS2"
-MY_DLLPOSTFIX=.dll
-DESTDIR=$(BIN)
-BATCH_SUFFIX=.cmd
-GIVE_EXEC_RIGHTS=@echo
-WINTARGETS=  \
-    $(DESTDIR)$/regcomp.exe \
-    $(DESTDIR)$/uno.exe \
-    $(DESTDIR)$/regcomp.exe.config \
-    $(DESTDIR)$/uno.exe.config
-
-.ELSE
-
-MY_DLLPOSTFIX=.so
-DESTDIR=$(OUT)$/lib
-BATCH_INPROCESS=bridgetest_inprocess
-GIVE_EXEC_RIGHTS=chmod +x
-.ENDIF		$(DESTDIR)$/bridgetest_server$(BATCH_SUFFIX) \
-        $(DESTDIR)$/bridgetest_client$(BATCH_SUFFIX) \
-        $(JAVATARGETS)
-
 
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+#These tests are for Windows only
+.IF "$(COM)" == "MSC" && "$(GUI)" == "WNT"
 
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(OUT)$/inc
-
-#-----------------------
 .IF "$(CCNUMVER)" >= "001399999999"
 CFLAGSCXX += -clr:oldSyntax -AI $(OUT)$/bin -AI $(SOLARBINDIR)
 SHL1STDLIBS = \
@@ -109,27 +70,26 @@ SHL1OBJS = $(SLOFILES)
 
 SHL1TARGET = $(TARGET)
 
-
 SHL1DEF = $(MISC)$/$(SHL1TARGET).def
 DEF1NAME = $(SHL1TARGET)
 
+.ENDIF
 
 # --- Targets ------------------------------------------------------
 
-.ENDIF
-
 .INCLUDE :	target.mk
 
-.IF "$(COM)" == "MSC"
+.IF "$(COM)" == "MSC" && "$(GUI)" == "WNT"
 
-ALLTAR : $(DESTDIR)$/cli_bridgetest_inprocess.exe
+ALLTAR : $(BIN)$/cli_bridgetest_inprocess.exe
 
 #################################################################
 
 CLI_URE = $(SOLARBINDIR)$/cli_ure.dll
-CLI_TYPES = $(SOLARBINDIR)$/cli_types.dll
+CLI_URETYPES = $(SOLARBINDIR)$/cli_uretypes.dll
 CLI_BASETYPES = $(SOLARBINDIR)$/cli_basetypes.dll
 CLI_CPPUHELPER = $(SOLARBINDIR)$/cli_cppuhelper.dll
+CLI_OOOTYPES = $(SOLARBINDIR)$/cli_oootypes.dll
 CLI_TYPES_BRIDGETEST = $(BIN)$/cli_types_bridgetest.dll
 
 CSCFLAGS = -warnaserror+ 
@@ -148,42 +108,42 @@ VBC_FLAGS += -optimize
 
 
 # C# ----------------------------------------------
-$(DESTDIR)$/cli_cs_testobj.uno.dll : \
+$(BIN)$/cli_cs_testobj.uno.dll : \
         cli_cs_testobj.cs \
         cli_cs_multi.cs \
         $(CLI_BASETYPES) \
-        $(CLI_TYPES) \
+        $(CLI_URETYPES) \
         $(CLI_URE)
     $(CSC) $(CSCFLAGS) -target:library -out:$@ \
         -reference:$(CLI_TYPES_BRIDGETEST) \
         -reference:$(CLI_URE) \
         -reference:$(CLI_BASETYPES) \
-         -reference:$(CLI_TYPES) \
+         -reference:$(CLI_URETYPES) \
         cli_cs_testobj.cs cli_cs_multi.cs
 
-$(DESTDIR)$/cli_cs_bridgetest.uno.dll : \
+$(BIN)$/cli_cs_bridgetest.uno.dll : \
         cli_cs_bridgetest.cs \
         $(CLI_BASETYPES) \
-        $(CLI_TYPES) \
+        $(CLI_URETYPES) \
         $(CLI_URE)
     $(CSC) $(CSCFLAGS) -target:library -out:$@ \
         -reference:$(CLI_TYPES_BRIDGETEST) \
-        -reference:$(CLI_TYPES) \
+        -reference:$(CLI_URETYPES) \
         -reference:$(CLI_BASETYPES) \
         -reference:$(CLI_URE) \
         -reference:System.dll \
         cli_cs_bridgetest.cs
 
 # Visual Basic ------------------------------------------
-$(DESTDIR)$/cli_vb_bridgetest.uno.dll : \
+$(BIN)$/cli_vb_bridgetest.uno.dll : \
         cli_vb_bridgetest.vb \
         $(CLI_BASETYPES) \
-        $(CLI_TYPES) \
+        $(CLI_URETYPES) \
         $(CLI_URE)
     $(VBC) $(VBC_FLAGS) \
         -target:library \
         -out:$@ \
-        -reference:$(CLI_TYPES) \
+        -reference:$(CLI_URETYPES) \
         -reference:$(CLI_BASETYPES) \
         -reference:$(CLI_URE) \
         -reference:$(CLI_TYPES_BRIDGETEST) \
@@ -192,16 +152,16 @@ $(DESTDIR)$/cli_vb_bridgetest.uno.dll : \
         -reference:System.Windows.Forms.dll \
         cli_vb_bridgetest.vb
 
-$(DESTDIR)$/cli_vb_testobj.uno.dll : \
+$(BIN)$/cli_vb_testobj.uno.dll : \
         cli_vb_testobj.vb \
         $(CLI_BASETYPES) \
-        $(CLI_TYPES) \
+        $(CLI_URETYPES) \
         $(CLI_URE)
     $(VBC) $(VBC_FLAGS) \
         -target:library \
         -out:$@ \
         -reference:$(CLI_BASETYPES) \
-        -reference:$(CLI_TYPES) \
+        -reference:$(CLI_URETYPES) \
         -reference:$(CLI_URE) \
         -reference:$(CLI_TYPES_BRIDGETEST) \
         -reference:System.dll \
@@ -209,35 +169,39 @@ $(DESTDIR)$/cli_vb_testobj.uno.dll : \
         -reference:System.Windows.Forms.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)
+    $(TOUCH) $@
 
-$(DESTDIR)$/cli_bridgetest_inprocess.exe : \
+$(BIN)$/cli_bridgetest_inprocess.exe : \
         cli_bridgetest_inprocess.cs \
-        $(DESTDIR)$/cli_cs_bridgetest.uno.dll \
-        $(DESTDIR)$/cli_cs_testobj.uno.dll \
-        $(DESTDIR)$/cli_vb_bridgetest.uno.dll \
-        $(DESTDIR)$/cli_vb_testobj.uno.dll \
-        $(DESTDIR)$/cli_cpp_bridgetest.uno.dll \
+        $(BIN)$/cli_cs_bridgetest.uno.dll \
+        $(BIN)$/cli_cs_testobj.uno.dll \
+        $(BIN)$/cli_vb_bridgetest.uno.dll \
+        $(BIN)$/cli_vb_testobj.uno.dll \
+        $(BIN)$/cli_cpp_bridgetest.uno.dll \
+        $(MISC)$/copyassemblies.done \
         $(CLI_BASETYPES) \
-        $(CLI_TYPES) \
+        $(CLI_URETYPES) \
         $(CLI_URE) \
         $(CLI_CPPUHELPER)
     $(CSC) $(CSCFLAGS) -target:exe -out:$@ \
         -reference:$(CLI_TYPES_BRIDGETEST) \
         -reference:$(CLI_BASETYPES) \
-        -reference:$(CLI_TYPES) \
+        -reference:$(CLI_URETYPES) \
         -reference:$(CLI_URE) \
         -reference:$(CLI_CPPUHELPER) \
-        -reference:$(DESTDIR)$/cli_cs_bridgetest.uno.dll \
-        -reference:$(DESTDIR)$/cli_cs_testobj.uno.dll \
-        -reference:$(DESTDIR)$/cli_vb_bridgetest.uno.dll \
-        -reference:$(DESTDIR)$/cli_vb_testobj.uno.dll \
-        -reference:$(DESTDIR)$/cli_cpp_bridgetest.uno.dll \
+        -reference:$(BIN)$/cli_cs_bridgetest.uno.dll \
+        -reference:$(BIN)$/cli_cs_testobj.uno.dll \
+        -reference:$(BIN)$/cli_vb_bridgetest.uno.dll \
+        -reference:$(BIN)$/cli_vb_testobj.uno.dll \
+        -reference:$(BIN)$/cli_cpp_bridgetest.uno.dll \
         cli_bridgetest_inprocess.cs
-    $(GNUCOPY) -p cli_bridgetest_inprocess.ini $(DESTDIR)
-    $(GNUCOPY) -p $(CLI_CPPUHELPER) $(DESTDIR)$/$(CLI_CPPUHELPER:f)
-    $(GNUCOPY) -p $(CLI_BASETYPES) $(DESTDIR)$/$(CLI_BASETYPES:f)
-    $(GNUCOPY) -p $(CLI_TYPES) $(DESTDIR)$/$(CLI_TYPES:f)
-    $(GNUCOPY) -p $(CLI_URE) $(DESTDIR)$/$(CLI_URE:f)
+    $(GNUCOPY) -p cli_bridgetest_inprocess.ini $(BIN)
 
 .ENDIF