INTEGRATION: CWS cliuno01 (1.9.2.1.16); FILE MERGED

2003/08/01 14:06:36 jl 1.9.2.1.16.11: #107130# java testComponent.jar is registered now
2003/07/29 13:58:30 jl 1.9.2.1.16.10: #107130# moved to testtools/source/bridgetest/cli/cli_cs_bridgetest.cs cli_bridgetest.cs
2003/07/25 15:27:18 jl 1.9.2.1.16.9: #107130# support for visual basic bridge test component in cli_vb_testobj.cs
2003/07/25 10:29:30 jl 1.9.2.1.16.8: #107130# support for visual basic client (XMain impl) in cli_vb_bridgetest_inprocess.vb
2003/07/18 10:02:40 jl 1.9.2.1.16.7: #107130# added uno.exe.config and regcomp.exe.config makefile.mk
2003/07/02 13:08:44 jl 1.9.2.1.16.6: *** empty log message ***
2003/06/05 13:31:27 dbo 1.9.2.1.16.5: #107130# fixing tests
2003/06/03 13:47:08 dbo 1.9.2.1.16.4: RESYNC: (1.9.2.1-1.11); FILE MERGED
2003/05/08 12:55:32 dbo 1.9.2.1.16.3: #107130# cli_udkapi.dll -> cli_types.dll
2003/04/22 16:34:49 dbo 1.9.2.1.16.2: #107130# cli_bridgetest_inprocess executable for convenience
2003/04/11 17:15:20 dbo 1.9.2.1.16.1: #107130# CLI tests

testtools/source/bridgetest/makefile.mk

+#*************************************************************************
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.12 $
+#
+#   last change: $Author: obo $ $Date: 2003-09-04 09:16:38 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
 PRJ=..$/..
 
 PRJNAME=testtools
@@ -20,7 +82,8 @@ MY_DLLPOSTFIX=.dll
 DESTDIR=$(BIN)
 BATCH_SUFFIX=.bat
 GIVE_EXEC_RIGHTS=@echo
-WINTARGETS=$(DESTDIR)$/regcomp.exe $(DESTDIR)$/uno.exe
+WINTARGETS=$(DESTDIR)$/regcomp.exe $(DESTDIR)$/uno.exe 
+
 .ELSE
 MY_DLLPOSTFIX=.so
 DESTDIR=$(OUT)$/lib
@@ -48,6 +111,7 @@ UNOTYPES= \
         com.sun.star.registry.XRegistryKey	\
         com.sun.star.container.XSet		\
         com.sun.star.test.bridge.XBridgeTest 	\
+        com.sun.star.test.bridge.XBridgeTest2   \
         com.sun.star.bridge.XUnoUrlResolver		\
             com.sun.star.lang.XSingleComponentFactory	\
         com.sun.star.uno.XComponentContext          
@@ -107,9 +171,12 @@ ALL : \
         $(DESTDIR)$/bridgetest_server$(BATCH_SUFFIX) \
         $(DESTDIR)$/bridgetest_client$(BATCH_SUFFIX) \
         $(JAVATARGETS) \
-        $(WINTARGETS)
+        $(WINTARGETS) \
+
 .INCLUDE :	target.mk
 
+#################################################################
+
 $(DESTDIR)$/uno_types.rdb : $(SOLARBINDIR)$/udkapi.rdb
     echo $(DESTDIR)
     $(GNUCOPY) -p $? $@
@@ -126,7 +193,9 @@ $(DESTDIR)$/bridgetest_server$(BATCH_SUFFIX) : bridgetest_server
     $(GNUCOPY) -p $? $@
     $(GIVE_EXEC_RIGHTS) $@
 
+
 .IF "$(SOLAR_JAVA)" != ""
+NULLSTR=
 # jar-files, which regcomp needs so that it can use java
 MY_JARS=java_uno.jar ridl.jar sandbox.jar jurt.jar juh.jar
 
@@ -154,10 +223,18 @@ $(DESTDIR)$/bridgetest_inprocess_java$(BATCH_SUFFIX) : makefile.mk
     $(GIVE_EXEC_RIGHTS) $@
 .ENDIF
 
+bla=testComponent.jar
+JAVACOMP=$(PWD)
+JavaComponentURL : $$JAVACOMP=file:///$($(assign $(JAVACOMP)= $(subst,\,/ $(PWD:d))class/testComponent.jar)) ;
+    echo ###JavaComponentURL
+    @echo $(JAVACOMP) 
+
+#	$(JAVACOMP)=file:///$($(assign $(JAVACOMP)= $(subst,\,/ $(PWD:d))class/testComponent.jar))
+
 # I can't make a dependency on shared libraries, because dependent targets
 # get the .setdir current directory. AAARGGGGGG !
 $(DESTDIR)$/uno_services.rdb .SETDIR=$(DESTDIR) : $(WINTARGETS)
-    regcomp -register -r uno_services.rdb \
+    regcomp -register -br uno_types.rdb -r uno_services.rdb \
         -c bridgetest.uno$(MY_DLLPOSTFIX)	\
         -c cppobj.uno$(MY_DLLPOSTFIX)		\
         -c connector.uno$(MY_DLLPOSTFIX)		\
@@ -166,17 +243,16 @@ $(DESTDIR)$/uno_services.rdb .SETDIR=$(DESTDIR) : $(WINTARGETS)
         -c remotebridge.uno$(MY_DLLPOSTFIX)	\
         -c uuresolver.uno$(MY_DLLPOSTFIX)
 .IF "$(SOLAR_JAVA)" != ""
-    regcomp -register -r uno_services.rdb \
+    regcomp -register -br uno_types.rdb -r uno_services.rdb \
         -c javaloader.uno$(MY_DLLPOSTFIX)	\
         -c javavm.uno$(MY_DLLPOSTFIX)
-
-# currently no chance to construct absolute file url for testComponent.jar
-# 	regmerge regcomp.rdb / $(SOLARBINDIR)$/udkapi.rdb uno_services.rdb
-# 	regcomp -register -r uno_services.rdb -br regcomp.rdb \
-# 		-classpath $(MY_CLASSPATH)	\
-# 		-c file:///c:/source/testtools/wntmsci9/class/testComponent.jar
+    regcomp -register -br uno_types.rdb -br uno_services.rdb -r uno_services.rdb \
+        -c $(subst,\,/ file:///$(PWD:d))class/testComponent.jar \
+        -l com.sun.star.loader.Java \
+        -classpath $(MY_CLASSPATH)
 .ENDIF
 
+BLA:=$(PWD:s/bin/class)
 
 $(DESTDIR)$/regcomp.exe : $(SOLARBINDIR)$/regcomp.exe
     -rm -f $@
@@ -185,3 +261,4 @@ $(DESTDIR)$/regcomp.exe : $(SOLARBINDIR)$/regcomp.exe
 $(DESTDIR)$/uno.exe : $(SOLARBINDIR)$/uno.exe
     -rm -f $@
     cp $? $@
+