5 files changed, 2 insertions, 559 deletions
diff --git a/testtools/inc/makefile.mk b/testtools/inc/makefile.mk
deleted file mode 100644
index 26dc9580b40d..000000000000
--- a/testtools/inc/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=testtools
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst
index 0b8f340ccff3..76da8aad9278 100644
--- a/testtools/prj/build.lst
+++ b/testtools/prj/build.lst
@@ -1,8 +1,3 @@
 tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
-tt testtools\inc nmake - all tt_inc NULL
-tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\idl nmake - all tt_bridgetest_idl tt_inc NULL
-tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\pyuno nmake - all tt_pyuno tt_bridgetest tt_inc NULL
-tt testtools\source\cliversioning nmake - all tt_cliver NULL
+tt testtools   		    		       		 usr1		 -	 all 	tt_mkout NULL
+tt testtools\prj 					 nmake		 -	 all 	tt_prj NULL
diff --git a/testtools/source/bridgetest/cli/makefile.mk b/testtools/source/bridgetest/cli/makefile.mk
deleted file mode 100644
index 8965f1d4d9b8..000000000000
--- a/testtools/source/bridgetest/cli/makefile.mk
+++ /dev/null
@@ -1,202 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=testtools
-TARGET=$(ENFORCEDSHLPREFIX)cli_cpp_bridgetest.uno
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# disable caching to avoid stale objects
-# on version changes
-CCACHE_DISABLE=TRUE
-.EXPORT : CCACHE_DISABLE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-CFLAGSENABLESYMBOLS:=-Z7
-# ------------------------------------------------------------------
-
-#These tests are for Windows only
-.IF "$(COM)" == "MSC" && "$(GUI)" == "WNT"
-
-.IF "$(CCNUMVER)" >= "001399999999"
-CFLAGSCXX += -clr:oldSyntax -AI $(OUT)$/bin -AI $(SOLARBINDIR)
-SHL1STDLIBS = \
-    mscoree.lib \
-    msvcmrt.lib
-.ELSE
-CFLAGSCXX += -clr -AI $(OUT)$/bin -AI $(SOLARBINDIR)
-SHL1STDLIBS = \
-    mscoree.lib
-.ENDIF
-SLOFILES= \
-    $(SLO)$/cli_cpp_bridgetest.obj
-
-SHL1OBJS = $(SLOFILES)
-
-SHL1TARGET = $(TARGET)
-
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-DEF1NAME = $(SHL1TARGET)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.IF "$(COM)" == "MSC" && "$(GUI)" == "WNT"
-
-ALLTAR : $(BIN)$/cli_bridgetest_inprocess.exe
-
-#################################################################
-
-CLI_URE = $(SOLARBINDIR)$/cli_ure.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+ 
-.IF "$(CCNUMVER)" <= "001399999999"
-VBC_FLAGS = -warnaserror+
-.ELSE
-VBC_FLAGS = -nowarn:42030 -warnaserror+
-.ENDIF
-.IF "$(debug)" != ""
-CSCFLAGS += -debug+ -checked+ -define:DEBUG -define:TRACE
-VBC_FLAGS += -debug+ -define:DEBUG=TRUE -define:TRACE=TRUE
-.ELSE
-CSCFLAGS += -optimize
-VBC_FLAGS += -optimize
-.ENDIF
-
-
-# C# ----------------------------------------------
-$(BIN)$/cli_cs_testobj.uno.dll : \
-        cli_cs_testobj.cs \
-        cli_cs_multi.cs \
-        $(CLI_BASETYPES) \
-        $(CLI_URETYPES) \
-        $(CLI_URE)
-    $(CSC) $(CSCFLAGS) -target:library -out:$@ \
-        -reference:$(CLI_TYPES_BRIDGETEST) \
-        -reference:$(CLI_URE) \
-        -reference:$(CLI_BASETYPES) \
-         -reference:$(CLI_URETYPES) \
-        cli_cs_testobj.cs cli_cs_multi.cs
-
-$(BIN)$/cli_cs_bridgetest.uno.dll : \
-        cli_cs_bridgetest.cs \
-        $(CLI_BASETYPES) \
-        $(CLI_URETYPES) \
-        $(CLI_URE)
-    $(CSC) $(CSCFLAGS) -target:library -out:$@ \
-        -reference:$(CLI_TYPES_BRIDGETEST) \
-        -reference:$(CLI_URETYPES) \
-        -reference:$(CLI_BASETYPES) \
-        -reference:$(CLI_URE) \
-        -reference:System.dll \
-        cli_cs_bridgetest.cs
-
-# Visual Basic ------------------------------------------
-$(BIN)$/cli_vb_bridgetest.uno.dll : \
-        cli_vb_bridgetest.vb \
-        $(CLI_BASETYPES) \
-        $(CLI_URETYPES) \
-        $(CLI_URE)
-    $(VBC) $(VBC_FLAGS) \
-        -target:library \
-        -out:$@ \
-        -reference:$(CLI_URETYPES) \
-        -reference:$(CLI_BASETYPES) \
-        -reference:$(CLI_URE) \
-        -reference:$(CLI_TYPES_BRIDGETEST) \
-        -reference:System.dll \
-        -reference:System.Drawing.dll \
-        -reference:System.Windows.Forms.dll \
-        cli_vb_bridgetest.vb
-
-$(BIN)$/cli_vb_testobj.uno.dll : \
-        cli_vb_testobj.vb \
-        $(CLI_BASETYPES) \
-        $(CLI_URETYPES) \
-        $(CLI_URE)
-    $(VBC) $(VBC_FLAGS) \
-        -target:library \
-        -out:$@ \
-        -reference:$(CLI_BASETYPES) \
-        -reference:$(CLI_URETYPES) \
-        -reference:$(CLI_URE) \
-        -reference:$(CLI_TYPES_BRIDGETEST) \
-        -reference:System.dll \
-        -reference:System.Drawing.dll \
-        -reference:System.Windows.Forms.dll \
-        cli_vb_testobj.vb
-
-$(MISC)$/copyassemblies.done .ERRREMOVE: 
-    $(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 : \
-        cli_bridgetest_inprocess.cs \
-        $(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_URETYPES) \
-        $(CLI_URE) \
-        $(CLI_CPPUHELPER)
-    $(CSC) $(CSCFLAGS) -target:exe -out:$@ \
-        -reference:$(CLI_TYPES_BRIDGETEST) \
-        -reference:$(CLI_BASETYPES) \
-        -reference:$(CLI_URETYPES) \
-        -reference:$(CLI_URE) \
-        -reference:$(CLI_CPPUHELPER) \
-        -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) cli_bridgetest_inprocess.ini $(BIN)
-
-.ENDIF
-
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk
deleted file mode 100644
index 8b172736adef..000000000000
--- a/testtools/source/bridgetest/idl/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..
-PRJNAME := testtools
-TARGET := bridgetest_idl
-
-.INCLUDE: settings.mk
-
-.INCLUDE: target.mk
-
-.IF "$(L10N_framework)"==""
-
-ALLTAR: $(MISC)$/$(TARGET).cppumaker.done $(MISC)$/$(TARGET).javamaker.done
-
-$(MISC)$/$(TARGET).cppumaker.done: $(BIN)$/bridgetest.rdb
-    $(CPPUMAKER) -O$(INCCOM) -BUCR $< -X$(SOLARBINDIR)/types.rdb
-    $(TOUCH) $@
-
-$(MISC)$/$(TARGET).javamaker.done: $(BIN)$/bridgetest.rdb
-    $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $<
-    $(TOUCH) $@
-
-$(BIN)$/bridgetest.rdb: bridgetest.idl
-    $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
-    - $(RM) $@
-    $(REGMERGE) $@ /UCR $(MISC)$/$(TARGET)$/bridgetest.urd
-
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)" != "GCC"
-
-CLIMAKERFLAGS =
-.IF "$(debug)" != ""
-CLIMAKERFLAGS += --verbose
-.ENDIF
-
-ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \
-    $(MISC)$/$(TARGET).javamaker.done \
-    $(BIN)$/cli_types_bridgetest.dll 
-
-$(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb
-    $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ -r $(SOLARBINDIR)$/cli_uretypes.dll \
-        -X $(SOLARBINDIR)$/types.rdb $< 
-    $(TOUCH) $@
-
-.ENDIF
-.ENDIF # GUI, WNT
-.ENDIF # L10N_framework
-
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
deleted file mode 100644
index 3e31ba6f8eb4..000000000000
--- a/testtools/source/bridgetest/makefile.mk
+++ /dev/null
@@ -1,238 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=testtools
-TARGET=bridgetest
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-LIBTARGET=NO
-
-.INCLUDE: settings.mk
-
-.IF "$(L10N_framework)"==""
-
-DLLPRE = # no leading "lib" on .so files
-
-.IF "$(GUI)"=="WNT"
-BATCH_SUFFIX=.bat
-GIVE_EXEC_RIGHTS=@echo
-MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR))))
-MY_LOCAL_CLASSDIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(PWD)/$(CLASSDIR)/)))
-.ELSE
-GIVE_EXEC_RIGHTS=chmod +x 
-MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
-MY_LOCAL_CLASSDIR=file://$(PWD)/$(CLASSDIR)/
-.ENDIF
-
-my_components = bridgetest constructors cppobj
-.IF "$(SOLAR_JAVA)" != ""
-my_components += testComponent
-.END
-
-.IF "$(GUI)"=="WNT"
-.IF "$(compcheck)" != ""
-CFLAGSCXX += -DCOMPCHECK
-.ENDIF
-.ENDIF
-
-SLOFILES = \
-    $(SLO)$/bridgetest.obj \
-    $(SLO)$/cppobj.obj \
-    $(SLO)$/currentcontextchecker.obj \
-    $(SLO)$/multi.obj
-
-# ---- test ----
-
-LIB1TARGET=$(SLB)$/cppobj.lib
-LIB1OBJFILES= \
-        $(SLO)$/cppobj.obj $(SLO)$/currentcontextchecker.obj $(SLO)$/multi.obj
-
-SHL1TARGET = $(ENFORCEDSHLPREFIX)cppobj.uno
-SHL1STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)
-
-SHL1LIBS=	$(LIB1TARGET)
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-.IF "$(GUI)"=="WNT"
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-.ELSE # just a quick hack for GCC fdo#42865
-SHL1USE_EXPORTS = name
-.ENDIF
-
-# ---- test object ----
-
-LIB2TARGET=$(SLB)$/bridgetest.lib
-LIB2OBJFILES= \
-        $(SLO)$/bridgetest.obj \
-        $(SLO)$/currentcontextchecker.obj \
-        $(SLO)$/multi.obj
-
-SHL2TARGET = $(ENFORCEDSHLPREFIX)bridgetest.uno
-SHL2STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)
-
-SHL2LIBS=	$(LIB2TARGET)
-SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
-DEF2NAME=	$(SHL2TARGET)
-.IF "$(GUI)"=="WNT"
-SHL2VERSIONMAP = $(SOLARENV)/src/component.map
-.ELSE # just a quick hack for GCC fdo#42865
-SHL2USE_EXPORTS = name
-.ENDIF
-
-
-SHL3TARGET = $(ENFORCEDSHLPREFIX)constructors.uno
-SHL3OBJS = $(SLO)$/constructors.obj
-SHL3STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL3VERSIONMAP = $(SOLARENV)/src/component.map
-SHL3IMPLIB = i$(SHL3TARGET)
-DEF3NAME = $(SHL3TARGET)
-
-.IF "$(SOLAR_JAVA)" != ""
-JARFILES = java_uno.jar jurt.jar ridl.jar
-JAVATARGETS=\
-    $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) \
-    $(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX)
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE :	target.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: \
-        runtest \
-        $(DLLDEST)/services.rdb \
-        $(DLLDEST)$/uno_types.rdb \
-        $(DLLDEST)$/uno_services.rdb \
-        $(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) \
-        $(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) \
-        $(JAVATARGETS)
-
-#################################################################
-
-runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
-        $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
-.IF "$(CROSS_COMPILING)"!="YES"
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
-    @echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
-.ELSE
-        cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
-        -ro uno_services.rdb -ro uno_types.rdb \
-        -s com.sun.star.test.bridge.BridgeTest -- \
-        com.sun.star.test.bridge.CppTestObject
-.ENDIF
-.ENDIF
-
-$(DLLDEST)/services.rdb :
-    $(COPY) $(SOLARXMLDIR)/ure/services.rdb $@
-
-$(DLLDEST)$/uno_types.rdb : $(SOLARBINDIR)$/udkapi.rdb
-    echo $(DLLDEST)
-    $(GNUCOPY) $(SOLARBINDIR)$/udkapi.rdb $@
-    $(REGMERGE) $@ / $(BIN)$/bridgetest.rdb
-
-$(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
-    echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro services.rdb \
-        -ro uno_services.rdb -ro uno_types.rdb \
-        -s com.sun.star.test.bridge.BridgeTest -- \
-        -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' > $@
-    $(GIVE_EXEC_RIGHTS) $@
-
-$(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
-    echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro uno_services.rdb -ro uno_types.rdb \
-        -s com.sun.star.test.bridge.CppTestObject \
-        -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' --singleaccept \
-        > $@
-    $(GIVE_EXEC_RIGHTS) $@
-
-
-.IF "$(SOLAR_JAVA)" != ""
-# jar-files, which regcomp needs so that it can use java
-MY_JARS=java_uno.jar ridl.jar jurt.jar juh.jar
-
-# CLASSPATH, which regcomp needs to be run
-MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)
-MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(PATH_SEPERATOR)..$/class
-
-# Use "127.0.0.1" instead of "localhost", see #i32281#:
-$(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk
-    -rm -f $@
-    echo java -classpath "$(MY_CLASSPATH)$(PATH_SEPERATOR)..$/class$/testComponent.jar" \
-        com.sun.star.comp.bridge.TestComponentMain \""uno:socket,host=127.0.0.1,port=2002;urp;test"\" singleaccept > $@
-    $(GIVE_EXEC_RIGHTS) $@
-
-$(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
-    echo '$(AUGMENT_LIBRARY_PATH)' JAVA_HOME='$(JAVA_HOME)' \
-        '$(SOLARBINDIR)'/uno -ro services.rdb -ro uno_services.rdb \
-        -ro uno_types.rdb -s com.sun.star.test.bridge.BridgeTest \
-        -env:URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) \
-        -env:MY_CLASSDIR_URL=$(MY_LOCAL_CLASSDIR) \
-        -- com.sun.star.test.bridge.JavaTestObject noCurrentContext > $@
-    $(GIVE_EXEC_RIGHTS) $@
-.ENDIF
-
-$(DLLDEST)$/uno_services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
-        $(MISC)/uno_services.input $(my_components:^"$(MISC)/":+".component")
-    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
-        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/uno_services.input
-
-$(MISC)/uno_services.input :
-    echo \
-        '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
-        > $@
-
-$(MISC)/bridgetest.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        bridgetest.component
-    $(XSLTPROC) --nonet --stringparam uri './$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt bridgetest.component
-
-$(MISC)/constructors.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt constructors.component
-    $(XSLTPROC) --nonet --stringparam uri './$(SHL3TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt constructors.component
-
-$(MISC)/cppobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        cppobj.component
-    $(XSLTPROC) --nonet --stringparam uri './$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt cppobj.component
-
-$(MISC)/testComponent.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt testComponent.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        'vnd.sun.star.expand:$${{MY_CLASSDIR_URL}}testComponent.jar' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt testComponent.component
-
-.ENDIF # L10N_framework