[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - 21 commits - extensions/source extensions/test Makefile Repository.mk .src_root store/Package_inc.mk testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_uno_test.mk testtools/inc testtools/InternalUnoApi_bridgetest.mk testtools/Jar_testComponent.mk testtools/Library_bridgetest.mk testtools/Library_constructors.mk testtools/Library_cppobj.mk testtools/Makefile testtools/Module_testtools.mk testtools/prj testtools/Rdb_uno_services.mk testtools/source testtools/StaticLibrary_bridgetest.mk
David Ostrovsky
davido at kemper.freedesktop.org
Fri May 25 00:16:15 PDT 2012
Makefile | 522 +++++++++++++++++++++++++
Repository.mk | 4
extensions/source/update/feed/test/makefile.mk | 58 --
extensions/test/ole/OleClient/makefile.mk | 72 ---
store/Package_inc.mk | 1
testtools/CustomTarget_bridgetest.mk | 112 +++++
testtools/CustomTarget_bridgetest_climaker.mk | 46 ++
testtools/CustomTarget_bridgetest_javamaker.mk | 39 +
testtools/CustomTarget_uno_test.mk | 43 ++
testtools/InternalUnoApi_bridgetest.mk | 42 ++
testtools/Jar_testComponent.mk | 57 ++
testtools/Library_bridgetest.mk | 58 ++
testtools/Library_constructors.mk | 54 ++
testtools/Library_cppobj.mk | 58 ++
testtools/Makefile | 7
testtools/Module_testtools.mk | 63 +++
testtools/Rdb_uno_services.mk | 41 +
testtools/StaticLibrary_bridgetest.mk | 43 ++
testtools/inc/makefile.mk | 39 -
testtools/prj/build.lst | 9
testtools/source/bridgetest/cli/makefile.mk | 202 ---------
testtools/source/bridgetest/idl/makefile.mk | 73 ---
testtools/source/bridgetest/makefile.mk | 238 -----------
23 files changed, 1192 insertions(+), 689 deletions(-)
New commits:
commit d8cfb50a98d1bb4e0c4ca3b44f6cfda396f5842a
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sat May 19 22:29:46 2012 +0200
cleaning up dmake stuff
Change-Id: I85d1ffef06028f8781a0406ea6e43b0e0406413c
diff --git a/testtools/inc/makefile.mk b/testtools/inc/makefile.mk
deleted file mode 100644
index 26dc958..0000000
--- 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 0b8f340..76da8aa 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 8965f1d..0000000
--- 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 8b17273..0000000
--- 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 3e31ba6..0000000
--- 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
commit 948ddd62f8749d991a5bfec739ed066c8dee24bd
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sat May 19 22:10:41 2012 +0200
prefix testtools libraries with testtools_ in Repository.mk
Change-Id: I0894b073b5263a45c9026ec55049ebeaf0770535
diff --git a/Repository.mk b/Repository.mk
index a2dadf9..b2c5e54 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -586,9 +586,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
endif
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
- cppobj \
- bridgetest \
- constructors \
acceptor \
binaryurp \
bootstrap \
@@ -603,6 +600,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
reflection \
stocservices \
streams \
+ testtools_cppobj \
+ testtools_bridgetest \
+ testtools_constructors \
textinstream \
textoutstream \
))
@@ -642,7 +642,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
shlxthandler_common \
shlxthandler_common_x64 \
salcpprt \
- testtools_bridgetest \
+ testtools_bridgetest_s \
transex \
ulingu \
vclmain \
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
index b2765f6..a8f8fa5 100644
--- a/testtools/Library_bridgetest.mk
+++ b/testtools/Library_bridgetest.mk
@@ -24,34 +24,34 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Library_Library,bridgetest))
+$(eval $(call gb_Library_Library,testtools_bridgetest))
-$(eval $(call gb_Library_set_componentfile,bridgetest,testtools/source/bridgetest/bridgetest))
+$(eval $(call gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest))
-$(eval $(call gb_Executable_set_include,bridgetest,\
+$(eval $(call gb_Executable_set_include,testtools_bridgetest,\
-I$(SRCDIR)/testtools/source/bridgetest \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_use_internal_api,bridgetest,\
+$(eval $(call gb_Library_use_internal_api,testtools_bridgetest,\
bridgetest \
))
-$(eval $(call gb_Library_use_api,bridgetest,\
+$(eval $(call gb_Library_use_api,testtools_bridgetest,\
udkapi \
))
-$(eval $(call gb_Library_use_static_libraries,bridgetest,\
- testtools_bridgetest \
+$(eval $(call gb_Library_use_static_libraries,testtools_bridgetest,\
+ testtools_bridgetest_s \
))
-$(eval $(call gb_Library_use_libraries,bridgetest,\
+$(eval $(call gb_Library_use_libraries,testtools_bridgetest,\
cppu \
cppuhelper \
sal \
))
-$(eval $(call gb_Library_add_exception_objects,bridgetest,\
+$(eval $(call gb_Library_add_exception_objects,testtools_bridgetest,\
testtools/source/bridgetest/bridgetest \
))
diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk
index abf273b..3de7008 100644
--- a/testtools/Library_constructors.mk
+++ b/testtools/Library_constructors.mk
@@ -24,30 +24,30 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Library_Library,constructors))
+$(eval $(call gb_Library_Library,testtools_constructors))
-$(eval $(call gb_Library_set_componentfile,constructors,testtools/source/bridgetest/constructors))
+$(eval $(call gb_Library_set_componentfile,testtools_constructors,testtools/source/bridgetest/constructors))
-$(eval $(call gb_Executable_set_include,constructors,\
+$(eval $(call gb_Executable_set_include,testtools_constructors,\
-I$(SRCDIR)/testtools/source/bridgetest \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_use_internal_api,constructors,\
+$(eval $(call gb_Library_use_internal_api,testtools_constructors,\
bridgetest \
))
-$(eval $(call gb_Library_use_api,constructors,\
+$(eval $(call gb_Library_use_api,testtools_constructors,\
udkapi \
))
-$(eval $(call gb_Library_use_libraries,constructors,\
+$(eval $(call gb_Library_use_libraries,testtools_constructors,\
cppu \
cppuhelper \
sal \
))
-$(eval $(call gb_Library_add_exception_objects,constructors,\
+$(eval $(call gb_Library_add_exception_objects,testtools_constructors,\
testtools/source/bridgetest/constructors \
))
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
index 649f71a..0bbdf23 100644
--- a/testtools/Library_cppobj.mk
+++ b/testtools/Library_cppobj.mk
@@ -24,34 +24,34 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Library_Library,cppobj))
+$(eval $(call gb_Library_Library,testtools_cppobj))
-$(eval $(call gb_Library_set_componentfile,cppobj,testtools/source/bridgetest/cppobj))
+$(eval $(call gb_Library_set_componentfile,testtools_cppobj,testtools/source/bridgetest/cppobj))
-$(eval $(call gb_Executable_set_include,cppobj,\
+$(eval $(call gb_Executable_set_include,testtools_cppobj,\
-I$(SRCDIR)/testtools/source/bridgetest \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_use_internal_api,cppobj,\
+$(eval $(call gb_Library_use_internal_api,testtools_cppobj,\
bridgetest \
))
-$(eval $(call gb_Library_use_api,cppobj,\
+$(eval $(call gb_Library_use_api,testtools_cppobj,\
udkapi \
))
-$(eval $(call gb_Library_use_static_libraries,cppobj,\
- testtools_bridgetest \
+$(eval $(call gb_Library_use_static_libraries,testtools_cppobj,\
+ testtools_bridgetest_s \
))
-$(eval $(call gb_Library_use_libraries,cppobj,\
+$(eval $(call gb_Library_use_libraries,testtools_cppobj,\
cppu \
cppuhelper \
sal \
))
-$(eval $(call gb_Library_add_exception_objects,cppobj,\
+$(eval $(call gb_Library_add_exception_objects,testtools_cppobj,\
testtools/source/bridgetest/cppobj \
))
diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk
index c3bde3c..ed96f34 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -25,22 +25,17 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest))
+$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s))
-$(eval $(call gb_StaticLibrary_set_include,cppobj,\
- -I$(SRCDIR)/testtools/source/bridgetest \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest,\
+$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\
bridgetest \
))
-$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest,\
+$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest_s,\
udkapi \
))
-$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest,\
+$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest_s,\
testtools/source/bridgetest/currentcontextchecker \
testtools/source/bridgetest/multi \
))
commit 99a58620d5068230e08bbedf15ce57a403172609
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 19 13:34:22 2012 +0200
do not run bridgetest on macosx/ppc
Change-Id: I6df6c061b09674370a99c2b5e69927500af8d1e5
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index f24ac0a..7f422f2 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -51,9 +51,13 @@ $(eval $(call gb_Module_add_targets,testtools,\
endif
ifneq ($(CROSS_COMPILING),YES)
+# FIXME: Mac OSX PPC GCC fails this test!, likely broken UNO bridge.
+# (is it still relevant?)
+ifneq ($(COM)$(OS)$(CPU),GCCMACOSXP)
$(eval $(call gb_Module_add_check_targets,testtools,\
CustomTarget_uno_test \
))
endif
+endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 89b1196901e1175d9f9322af91b9a9397cf3c7d9
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 19 13:33:01 2012 +0200
do not run bridgetest on cross-compilation
Change-Id: I59addd16d4bd6720164c71dae3bd03e5d91afa40
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 948d79a..f24ac0a 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -50,8 +50,10 @@ $(eval $(call gb_Module_add_targets,testtools,\
))
endif
+ifneq ($(CROSS_COMPILING),YES)
$(eval $(call gb_Module_add_check_targets,testtools,\
CustomTarget_uno_test \
))
+endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit c53276f57bab6433dd6c56eabb225d684e6153fa
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 19 12:09:18 2012 +0200
use gb_Jar_set_componentfile
Change-Id: Ie2ee3387537d1ab968ca685d7b30aa59d28734db
diff --git a/testtools/CustomTarget_bridgetest_testComponent.mk b/testtools/CustomTarget_bridgetest_testComponent.mk
deleted file mode 100644
index 49e6d1f..0000000
--- a/testtools/CustomTarget_bridgetest_testComponent.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_testComponent))
-
-testComponent_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_testComponent)
-
-$(call gb_CustomTarget_get_target,testtools/bridgetest_testComponent) : $(testComponent_DIR)/done
-
-$(testComponent_DIR)/done : $(gb_XSLTPROCTARGET) \
- $(SRCDIR)/testtools/source/bridgetest/testComponent.component | $(testComponent_DIR)/.dir
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMP,1)
- $(call gb_Helper_abbreviate_dirs_native, \
- $(gb_XSLTPROC) --nonet --stringparam uri \
- 'vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/testComponent.jar' \
- -o $(OUTDIR)/xml/component/testtools/source/bridgetest/testComponent.component \
- $(gb_ComponentTarget_XSLTCOMMANDFILE) $(SRCDIR)/testtools/source/bridgetest/testComponent.component && touch $@)
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index 6cba308..12dfe3f 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -44,6 +44,8 @@ $(eval $(call gb_Jar_set_packageroot,testComponent,com))
$(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest))
+$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,URE))
+
$(eval $(call gb_Jar_add_packagedirs,testComponent,\
$(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class/test \
))
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 3bf20e0..948d79a 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -40,7 +40,6 @@ ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,testtools,\
Jar_testComponent \
CustomTarget_bridgetest_javamaker \
- CustomTarget_bridgetest_testComponent \
))
endif
commit 79cd91d90202118f38fad1982ac110430c90b1c2
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 19 11:23:57 2012 +0200
CustomTarget_uno_test is a test
Change-Id: I I547827f41986c54b98b5d9019f680378ca89c11d
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index e6968d5..3bf20e0 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -27,14 +27,13 @@
$(eval $(call gb_Module_Module,testtools))
$(eval $(call gb_Module_add_targets,testtools,\
+ CustomTarget_bridgetest \
InternalUnoApi_bridgetest \
StaticLibrary_bridgetest \
Library_cppobj \
Library_bridgetest \
Library_constructors \
Rdb_uno_services \
- CustomTarget_uno_test \
- CustomTarget_bridgetest \
))
ifneq ($(SOLAR_JAVA),)
@@ -52,4 +51,8 @@ $(eval $(call gb_Module_add_targets,testtools,\
))
endif
+$(eval $(call gb_Module_add_check_targets,testtools,\
+ CustomTarget_uno_test \
+))
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 8349dbc06931ca687721c6f2e335e5b4149f07b2
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 19 11:18:30 2012 +0200
bridgetest does not need offapi
Change-Id: I I6ed4e2aa8f01a44939afa8d081dd2dc6a3a2a8a6
diff --git a/testtools/InternalUnoApi_bridgetest.mk b/testtools/InternalUnoApi_bridgetest.mk
index 7d70832..643a8d9 100644
--- a/testtools/InternalUnoApi_bridgetest.mk
+++ b/testtools/InternalUnoApi_bridgetest.mk
@@ -27,11 +27,6 @@
$(eval $(call gb_InternalUnoApi_InternalUnoApi,bridgetest))
$(eval $(call gb_InternalUnoApi_use_api,bridgetest,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_InternalUnoApi_define_api_dependencies,bridgetest,offapi,\
udkapi \
))
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
index 466fd03..b2765f6 100644
--- a/testtools/Library_bridgetest.mk
+++ b/testtools/Library_bridgetest.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_internal_api,bridgetest,\
))
$(eval $(call gb_Library_use_api,bridgetest,\
- offapi \
udkapi \
))
diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk
index fc6f776..abf273b 100644
--- a/testtools/Library_constructors.mk
+++ b/testtools/Library_constructors.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_internal_api,constructors,\
))
$(eval $(call gb_Library_use_api,constructors,\
- offapi \
udkapi \
))
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
index 538395e..649f71a 100644
--- a/testtools/Library_cppobj.mk
+++ b/testtools/Library_cppobj.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_internal_api,cppobj,\
))
$(eval $(call gb_Library_use_api,cppobj,\
- offapi \
udkapi \
))
diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk
index 56fc5bf..c3bde3c 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest,\
))
$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest,\
- offapi \
udkapi \
))
commit 70869f90a0e5f20a78285e380f5faebd2deffe4e
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 19 11:14:18 2012 +0200
add missing dep on uno executable
Change-Id: Ib4747b78a90c70b4222900d9f9ac45f2cb07662e
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index 15f8f89..0e76891 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -31,6 +31,7 @@ UNO_EXE := $(OUTDIR)/bin/uno
.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
$(call gb_CustomTarget_get_target,testtools/uno_test) : $(call gb_Rdb_get_target,uno_services) \
+ $(UNO_EXE) \
$(call gb_InternalUnoApi_get_target,bridgetest)
$(call gb_Helper_abbreviate_dirs_native, $(UNO_EXE) \
-ro $(OUTDIR)/xml/uno_services.rdb \
commit 6927e73f2626a994d80bd0764ed2a7e300f58d4b
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 19 11:02:55 2012 +0200
fix typo
Change-Id: I6c69daaa171786e605a58b23d8cd10cf43e5b139
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index f416674..a54281d 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -31,7 +31,7 @@ climaker_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker
$(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
$(climaker_DIR)/cli_types_bridgetest.dll
-$(UICM)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
+$(climaker_DIR)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
$(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
$(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
commit f6d722e7026a0c78f89e8f201f7a399d135db518
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sat May 19 11:39:19 2012 +0200
batch scripts are working now
Change-Id: Ia58bee4b4d5322cc6c31b24a7c43367d6fd301fc
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index 32d877b..c1f4317 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -43,7 +43,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \
$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) \
$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) \
-# which other prerequisits do we need here?
+# which other prerequisites do we need here?
$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
@@ -52,18 +52,23 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
- "-s com.sun.star.test.bridge.BridgeTest" \
+ "-s com.sun.star.test.bridge.CppTestObject" \
"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"--singleaccept" > $@)
$(GIVE_EXEC_RIGHTS) $@
-# which other prerequisits do we need here?
+ifneq ($(SOLAR_JAVA),)
+
+# how to do it more elegantly?
+MY_CLASSPATH := $(call gb_Helper_native_path,$(OUTDIR)/bin/ridl.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/java_uno.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/jurt.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/juh.jar)
+
+# which other prerequisites do we need here?
$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
echo "java" \
- "-classpath $(OUTDIR)/bin/testComponent.jar" \
+ "-classpath $(MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
"com.sun.star.comp.bridge.TestComponentMain" \
\""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
"singleaccept"> $@)
@@ -74,27 +79,32 @@ $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
- echo "JAVA_HOME=$(JAVA_HOME) $(UNO_EXE)" \
+ echo "JAVA_HOME=$(JAVA_HOME)" \
+ "LD_LIBRARY_PATH=$(OUTDIR)/lib" \
+ "$(UNO_EXE)" \
+ "-ro $(OUTDIR)/xml/ure/services.rdb" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
"-s com.sun.star.test.bridge.BridgeTest" \
- "-env:URE_INTERNAL_JAVA_DIR=$(OUTDIR)/bin" \
- "-env:URE_INTERNAL_LIB_DIR=$(OUTDIR)/lib" \
+ "-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \
+ "-env:URE_INTERNAL_LIB_DIR=file://$(OUTDIR)/lib" \
"-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
> $@)
$(GIVE_EXEC_RIGHTS) $@
+endif
-# which other prerequisits do we need here?
+# which other prerequisites do we need here?
$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
echo "$(UNO_EXE)" \
+ "-ro $(OUTDIR)/xml/ure/services.rdb" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
- "-s com.sun.star.test.bridge.BridgeTest" \
+ "-s com.sun.star.test.bridge.BridgeTest --" \
"-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
> $@)
$(GIVE_EXEC_RIGHTS) $@
commit 8a7798b87f0add54c19dd52fe403a7b3c7de3ee5
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sat May 19 01:25:08 2012 +0200
create batch files for test
Change-Id: I651bcd35c0a29917bcea21e26a3985b8cf101f7e
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index 85a0250..32d877b 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
-gb_UNO := $(OUTDIR)/bin/uno
+UNO_EXE := $(OUTDIR)/bin/uno
ifeq ($(OS),WNT)
BATCH_SUFFIX := .bat
@@ -39,14 +39,16 @@ endif
$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
- $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
+ $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) \
+ $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) \
# which other prerequisits do we need here?
$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
- echo "$(gb_UNO)" \
+ echo "$(UNO_EXE)" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
@@ -56,11 +58,39 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
$(GIVE_EXEC_RIGHTS) $@
# which other prerequisits do we need here?
+$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
+ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ echo "java" \
+ "-classpath $(OUTDIR)/bin/testComponent.jar" \
+ "com.sun.star.comp.bridge.TestComponentMain" \
+ \""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
+ "singleaccept"> $@)
+ $(GIVE_EXEC_RIGHTS) $@
+
+# which other prerequisites do we need here?
+$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \
+ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ echo "JAVA_HOME=$(JAVA_HOME) $(UNO_EXE)" \
+ "-ro $(OUTDIR)/xml/uno_services.rdb" \
+ "-ro $(OUTDIR)/bin/udkapi.rdb" \
+ "-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
+ "-s com.sun.star.test.bridge.BridgeTest" \
+ "-env:URE_INTERNAL_JAVA_DIR=$(OUTDIR)/bin" \
+ "-env:URE_INTERNAL_LIB_DIR=$(OUTDIR)/lib" \
+ "-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
+ > $@)
+ $(GIVE_EXEC_RIGHTS) $@
+
+# which other prerequisits do we need here?
$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs_native,\
- echo "$(gb_UNO)" \
+ echo "$(UNO_EXE)" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
"-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk
index 7775c94..9fc0dea 100644
--- a/testtools/Rdb_uno_services.mk
+++ b/testtools/Rdb_uno_services.mk
@@ -32,4 +32,10 @@ $(eval $(call gb_Rdb_add_components,uno_services,\
testtools/source/bridgetest/bridgetest \
))
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Rdb_add_components,uno_services,\
+ testtools/source/bridgetest/testComponent \
+))
+endif
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 9c0dc25ee701901d5c3c5334a3da4fe57d063cb2
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sat May 19 00:26:29 2012 +0200
CustomTarget_bridgetest
Change-Id: I2457061286dcdfe8e07624cd235261e7ed731172
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
new file mode 100644
index 0000000..85a0250
--- /dev/null
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -0,0 +1,72 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
+
+workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
+gb_UNO := $(OUTDIR)/bin/uno
+
+ifeq ($(OS),WNT)
+BATCH_SUFFIX := .bat
+GIVE_EXEC_RIGHTS=@echo
+else
+BATCH_SUFFIX :=
+GIVE_EXEC_RIGHTS=chmod +x
+endif
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
+ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
+ $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+
+# which other prerequisits do we need here?
+$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
+ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ echo "$(gb_UNO)" \
+ "-ro $(OUTDIR)/xml/uno_services.rdb" \
+ "-ro $(OUTDIR)/bin/udkapi.rdb" \
+ "-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
+ "-s com.sun.star.test.bridge.BridgeTest" \
+ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
+ "--singleaccept" > $@)
+ $(GIVE_EXEC_RIGHTS) $@
+
+# which other prerequisits do we need here?
+$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \
+ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ echo "$(gb_UNO)" \
+ "-ro $(OUTDIR)/xml/uno_services.rdb" \
+ "-ro $(OUTDIR)/bin/udkapi.rdb" \
+ "-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb" \
+ "-s com.sun.star.test.bridge.BridgeTest" \
+ "-u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
+ > $@)
+ $(GIVE_EXEC_RIGHTS) $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index a48a98e..15f8f89 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -25,14 +25,14 @@
# instead of those above.
$(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test))
-gb_UNO := $(OUTDIR)/bin/uno
+UNO_EXE := $(OUTDIR)/bin/uno
# this target is phony to run it every time
.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
$(call gb_CustomTarget_get_target,testtools/uno_test) : $(call gb_Rdb_get_target,uno_services) \
$(call gb_InternalUnoApi_get_target,bridgetest)
- $(call gb_Helper_abbreviate_dirs_native, $(gb_UNO) \
+ $(call gb_Helper_abbreviate_dirs_native, $(UNO_EXE) \
-ro $(OUTDIR)/xml/uno_services.rdb \
-ro $(OUTDIR)/bin/udkapi.rdb \
-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 68382af..e6968d5 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,testtools,\
Library_constructors \
Rdb_uno_services \
CustomTarget_uno_test \
+ CustomTarget_bridgetest \
))
ifneq ($(SOLAR_JAVA),)
commit 6eac0e2b809f019032127a7c79b1f2d47f171aba
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Thu May 17 22:47:19 2012 +0200
CustomTarget_uno_test added.
Change-Id: Ia6b99cc7ec7d911d46354c1c892d8a6bbd23e188
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
new file mode 100644
index 0000000..a48a98e
--- /dev/null
+++ b/testtools/CustomTarget_uno_test.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test))
+gb_UNO := $(OUTDIR)/bin/uno
+
+# this target is phony to run it every time
+.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
+
+$(call gb_CustomTarget_get_target,testtools/uno_test) : $(call gb_Rdb_get_target,uno_services) \
+ $(call gb_InternalUnoApi_get_target,bridgetest)
+ $(call gb_Helper_abbreviate_dirs_native, $(gb_UNO) \
+ -ro $(OUTDIR)/xml/uno_services.rdb \
+ -ro $(OUTDIR)/bin/udkapi.rdb \
+ -ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \
+ -s com.sun.star.test.bridge.BridgeTest \
+ -- com.sun.star.test.bridge.CppTestObject)
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 7368d4c..68382af 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -28,14 +28,14 @@ $(eval $(call gb_Module_Module,testtools))
$(eval $(call gb_Module_add_targets,testtools,\
InternalUnoApi_bridgetest \
+ StaticLibrary_bridgetest \
Library_cppobj \
Library_bridgetest \
Library_constructors \
- StaticLibrary_bridgetest \
Rdb_uno_services \
+ CustomTarget_uno_test \
))
-
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,testtools,\
Jar_testComponent \
diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk
index 768463b..7775c94 100644
--- a/testtools/Rdb_uno_services.mk
+++ b/testtools/Rdb_uno_services.mk
@@ -26,18 +26,10 @@
$(eval $(call gb_Rdb_Rdb,uno_services))
-$(eval $(call gb_Rdb_use_custom_headers,uno_services,testtools/bridgetest_testComponent))
-
$(eval $(call gb_Rdb_add_components,uno_services,\
testtools/source/bridgetest/cppobj \
testtools/source/bridgetest/constructors \
testtools/source/bridgetest/bridgetest \
))
-ifneq ($(SOLAR_JAVA),)
-$(eval $(call gb_Rdb_add_components,uno_services,\
- testtools/source/bridgetest/testComponent \
-))
-endif
-
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 7087d2e101048c9e309a9d578e0cb05a0ebd1333
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Thu May 17 19:11:07 2012 +0200
uno_services.rdb are now created
Because there is still no helper for javamaker and
automagically xslt procession of components during
jar building phase, manually steps are needed.
CustomTarget_bridgetest_testComponent.mk takescare of this.
Change-Id: I I6bf5bdc0b2bcd19e09fdd6b32e46a2c228f4e357
diff --git a/testtools/CustomTarget_bridgetest_testComponent.mk b/testtools/CustomTarget_bridgetest_testComponent.mk
new file mode 100644
index 0000000..49e6d1f
--- /dev/null
+++ b/testtools/CustomTarget_bridgetest_testComponent.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_testComponent))
+
+testComponent_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_testComponent)
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest_testComponent) : $(testComponent_DIR)/done
+
+$(testComponent_DIR)/done : $(gb_XSLTPROCTARGET) \
+ $(SRCDIR)/testtools/source/bridgetest/testComponent.component | $(testComponent_DIR)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMP,1)
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(gb_XSLTPROC) --nonet --stringparam uri \
+ 'vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/testComponent.jar' \
+ -o $(OUTDIR)/xml/component/testtools/source/bridgetest/testComponent.component \
+ $(gb_ComponentTarget_XSLTCOMMANDFILE) $(SRCDIR)/testtools/source/bridgetest/testComponent.component && touch $@)
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 7ca07ef..7368d4c 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -32,13 +32,15 @@ $(eval $(call gb_Module_add_targets,testtools,\
Library_bridgetest \
Library_constructors \
StaticLibrary_bridgetest \
+ Rdb_uno_services \
))
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,testtools,\
- CustomTarget_bridgetest_javamaker \
Jar_testComponent \
+ CustomTarget_bridgetest_javamaker \
+ CustomTarget_bridgetest_testComponent \
))
endif
diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk
new file mode 100644
index 0000000..768463b
--- /dev/null
+++ b/testtools/Rdb_uno_services.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Rdb_Rdb,uno_services))
+
+$(eval $(call gb_Rdb_use_custom_headers,uno_services,testtools/bridgetest_testComponent))
+
+$(eval $(call gb_Rdb_add_components,uno_services,\
+ testtools/source/bridgetest/cppobj \
+ testtools/source/bridgetest/constructors \
+ testtools/source/bridgetest/bridgetest \
+))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Rdb_add_components,uno_services,\
+ testtools/source/bridgetest/testComponent \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 2fa34a26329966584e2275ad389cc3c435883d0b
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Thu May 17 00:35:06 2012 +0200
testComponent is now building correctly
Change-Id: I I58cabe71ffa6ba05652ba98b61c71d8919456323
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index 2796b75..f416674 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -26,14 +26,14 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_climaker))
-TTBC := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker)
+climaker_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker)
$(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
- $(TTBC)/cli_types_bridgetest.dll
+ $(climaker_DIR)/cli_types_bridgetest.dll
$(UICM)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
$(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
- $(call gb_Executable_get_target_for_build,climaker) | $(TTBC)/.dir
+ $(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,climaker \
@@ -43,23 +43,4 @@ $(UICM)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
-r $(OUTDIR)/bin/cli_uretypes.dll \
$< > /dev/null)
-#
-# shamelessly stolen in unoil module
-# do we need this here?
-#
-#$(UICM)/cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config \
-# $(SRCDIR)/unoil/climaker/version.txt | $(UICM)/.dir
-# $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
-# $(call gb_Helper_abbreviate_dirs_native, \
-# perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@)
-#
-#$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : $(UICM)/cli_oootypes.config \
-# $(UICM)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk
-# $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1)
-# $(call gb_Helper_abbreviate_dirs_native, \
-# al -out:$@ \
-# -version:$(CLI_OOOTYPES_POLICY_VERSION) \
-# -keyfile:$(OUTDIR)/bin/cliuno.snk \
-# -link:$<)
-
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index 86eedde..5e4110f 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -26,14 +26,14 @@
$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_javamaker))
-TTBJ := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)
+javamaker_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)
-$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(TTBJ)/done
+$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(javamaker_DIR)/done
-$(TTBJ)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
- $(call gb_Executable_get_target_for_build,javamaker) | $(TTBJ)/.dir
+$(javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
+ $(call gb_Executable_get_target_for_build,javamaker) | $(javamaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,javamaker -BUCR -nD -O$(TTBJ)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
+ $(call gb_Helper_execute,javamaker -BUCR -nD -O$(javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/CustomTarget_uno_services.mk b/testtools/CustomTarget_uno_services.mk
deleted file mode 100644
index 570cc14..0000000
--- a/testtools/CustomTarget_uno_services.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_services))
-
-TTUS := $(call gb_CustomTarget_get_workdir,testtools/uno_services)
-
-$(call gb_CustomTarget_get_target,testtools/uno_services) : $(TTUS)/uno_services.rdb
-
-#$(call gb_CustomTarget_get_target,i18npool/localedata) : \
-# $(patsubst %.xml,$(IPLD)/localedata_%.cxx, \
-# $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
-
-#$(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \
-# $(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser)
-# $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
-# $(call gb_Helper_abbreviate_dirs_native, \
-# $(call gb_Helper_execute,saxparser) $* $< $@.tmp \
-# $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) \
-# $(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/bin/types.rdb) \
-# -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
-# $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
-# sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
-# rm $@.tmp)
-
-$(TTUS)/uno_services.rdb : $(TTUS)/uno_services.input \
- $(gb_XSLTPROCTARGET) $(SOLARENV)/bin/packcomponents.xslt
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1)
- $(call gb_Helper_abbreviate_dirs_native, \
- $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \
- -o $@ $(SOLARENV)/bin/packcomponents.xslt $<)
-
-$(TTUS)/uno_services.input :| $(TTUS)/.dir
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- echo '<list>$(my_components:^"<filename>":+".component</filename>")</list>' > $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index 1bfd5c3..6cba308 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -32,9 +32,21 @@ $(eval $(call gb_Jar_use_jars,testComponent,\
$(OUTDIR)/bin/juh.jar \
))
+$(eval $(call gb_Jar_use_customtargets,testComponent,\
+ testtools/bridgetest_javamaker \
+))
+
+$(eval $(call gb_Jar_use_jars,testComponent,\
+ $(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class \
+))
+
$(eval $(call gb_Jar_set_packageroot,testComponent,com))
-$(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/Manifest.mf))
+$(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest))
+
+$(eval $(call gb_Jar_add_packagedirs,testComponent,\
+ $(WORKDIR)/CustomTarget/testtools/bridgetest_javamaker/class/test \
+))
$(eval $(call gb_Jar_add_sourcefiles,testComponent,\
testtools/com/sun/star/comp/bridge/TestComponent \
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 5c14803..7ca07ef 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -32,18 +32,16 @@ $(eval $(call gb_Module_add_targets,testtools,\
Library_bridgetest \
Library_constructors \
StaticLibrary_bridgetest \
- CustomTarget_uno_services \
- Rdb_cppobj \
))
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,testtools,\
CustomTarget_bridgetest_javamaker \
+ Jar_testComponent \
))
endif
-# Jar_testComponent \
ifeq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,testtools,\
diff --git a/testtools/Rdb_cppobj.mk b/testtools/Rdb_cppobj.mk
deleted file mode 100644
index 0f35627..0000000
--- a/testtools/Rdb_cppobj.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Rdb_Rdb,cppobj))
-
-$(eval $(call gb_Rdb_add_components,cppobj,\
- testtools/source/bridgetest/cppobj \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 01c87a6105d6e517eb3a11ebf3015349445c1b96
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Tue May 15 00:55:02 2012 +0200
bridgetest further targets migrated
Change-Id: I9e1b13b8f0454aa65d3b0b6a0b26e54bd2b3a21f
diff --git a/Repository.mk b/Repository.mk
index 5a47d26..a2dadf9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -586,6 +586,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
endif
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
+ cppobj \
+ bridgetest \
+ constructors \
acceptor \
binaryurp \
bootstrap \
@@ -639,6 +642,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
shlxthandler_common \
shlxthandler_common_x64 \
salcpprt \
+ testtools_bridgetest \
transex \
ulingu \
vclmain \
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
new file mode 100644
index 0000000..2796b75
--- /dev/null
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_climaker))
+
+TTBC := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker)
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
+ $(TTBC)/cli_types_bridgetest.dll
+
+$(UICM)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
+ $(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
+ $(call gb_Executable_get_target_for_build,climaker) | $(TTBC)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(call gb_Helper_execute,climaker \
+ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
+ --out $@ \
+ -X $(OUTDIR)/bin/types.rdb \
+ -r $(OUTDIR)/bin/cli_uretypes.dll \
+ $< > /dev/null)
+
+#
+# shamelessly stolen in unoil module
+# do we need this here?
+#
+#$(UICM)/cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config \
+# $(SRCDIR)/unoil/climaker/version.txt | $(UICM)/.dir
+# $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
+# $(call gb_Helper_abbreviate_dirs_native, \
+# perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@)
+#
+#$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : $(UICM)/cli_oootypes.config \
+# $(UICM)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk
+# $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1)
+# $(call gb_Helper_abbreviate_dirs_native, \
+# al -out:$@ \
+# -version:$(CLI_OOOTYPES_POLICY_VERSION) \
+# -keyfile:$(OUTDIR)/bin/cliuno.snk \
+# -link:$<)
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/CustomTarget_uno_services.mk b/testtools/CustomTarget_uno_services.mk
new file mode 100644
index 0000000..570cc14
--- /dev/null
+++ b/testtools/CustomTarget_uno_services.mk
@@ -0,0 +1,60 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_services))
+
+TTUS := $(call gb_CustomTarget_get_workdir,testtools/uno_services)
+
+$(call gb_CustomTarget_get_target,testtools/uno_services) : $(TTUS)/uno_services.rdb
+
+#$(call gb_CustomTarget_get_target,i18npool/localedata) : \
+# $(patsubst %.xml,$(IPLD)/localedata_%.cxx, \
+# $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
+
+#$(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \
+# $(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser)
+# $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
+# $(call gb_Helper_abbreviate_dirs_native, \
+# $(call gb_Helper_execute,saxparser) $* $< $@.tmp \
+# $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) \
+# $(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/bin/types.rdb) \
+# -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
+# $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
+# sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
+# rm $@.tmp)
+
+$(TTUS)/uno_services.rdb : $(TTUS)/uno_services.input \
+ $(gb_XSLTPROCTARGET) $(SOLARENV)/bin/packcomponents.xslt
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1)
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \
+ -o $@ $(SOLARENV)/bin/packcomponents.xslt $<)
+
+$(TTUS)/uno_services.input :| $(TTUS)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ echo '<list>$(my_components:^"<filename>":+".component</filename>")</list>' > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
new file mode 100644
index 0000000..466fd03
--- /dev/null
+++ b/testtools/Library_bridgetest.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,bridgetest))
+
+$(eval $(call gb_Library_set_componentfile,bridgetest,testtools/source/bridgetest/bridgetest))
+
+$(eval $(call gb_Executable_set_include,bridgetest,\
+ -I$(SRCDIR)/testtools/source/bridgetest \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_internal_api,bridgetest,\
+ bridgetest \
+))
+
+$(eval $(call gb_Library_use_api,bridgetest,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_static_libraries,bridgetest,\
+ testtools_bridgetest \
+))
+
+$(eval $(call gb_Library_use_libraries,bridgetest,\
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,bridgetest,\
+ testtools/source/bridgetest/bridgetest \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk
new file mode 100644
index 0000000..fc6f776
--- /dev/null
+++ b/testtools/Library_constructors.mk
@@ -0,0 +1,55 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,constructors))
+
+$(eval $(call gb_Library_set_componentfile,constructors,testtools/source/bridgetest/constructors))
+
+$(eval $(call gb_Executable_set_include,constructors,\
+ -I$(SRCDIR)/testtools/source/bridgetest \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_internal_api,constructors,\
+ bridgetest \
+))
+
+$(eval $(call gb_Library_use_api,constructors,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_libraries,constructors,\
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,constructors,\
+ testtools/source/bridgetest/constructors \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
new file mode 100644
index 0000000..538395e
--- /dev/null
+++ b/testtools/Library_cppobj.mk
@@ -0,0 +1,59 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,cppobj))
+
+$(eval $(call gb_Library_set_componentfile,cppobj,testtools/source/bridgetest/cppobj))
+
+$(eval $(call gb_Executable_set_include,cppobj,\
+ -I$(SRCDIR)/testtools/source/bridgetest \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_internal_api,cppobj,\
+ bridgetest \
+))
+
+$(eval $(call gb_Library_use_api,cppobj,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_static_libraries,cppobj,\
+ testtools_bridgetest \
+))
+
+$(eval $(call gb_Library_use_libraries,cppobj,\
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cppobj,\
+ testtools/source/bridgetest/cppobj \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 16da8e3..5c14803 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -28,14 +28,27 @@ $(eval $(call gb_Module_Module,testtools))
$(eval $(call gb_Module_add_targets,testtools,\
InternalUnoApi_bridgetest \
- CustomTarget_bridgetest_javamaker \
+ Library_cppobj \
+ Library_bridgetest \
+ Library_constructors \
+ StaticLibrary_bridgetest \
+ CustomTarget_uno_services \
+ Rdb_cppobj \
))
-#ifneq ($(SOLAR_JAVA),)
-#$(eval $(call gb_Module_add_targets,testtools,\
-# Jar_testComponent \
-#))
-#endif
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,testtools,\
+ CustomTarget_bridgetest_javamaker \
+))
+endif
+
+# Jar_testComponent \
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Module_add_targets,testtools,\
+ CustomTarget_bridgetest_climaker \
+))
+endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/testtools/Rdb_cppobj.mk b/testtools/Rdb_cppobj.mk
new file mode 100644
index 0000000..0f35627
--- /dev/null
+++ b/testtools/Rdb_cppobj.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Rdb_Rdb,cppobj))
+
+$(eval $(call gb_Rdb_add_components,cppobj,\
+ testtools/source/bridgetest/cppobj \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk
new file mode 100644
index 0000000..56fc5bf
--- /dev/null
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest))
+
+$(eval $(call gb_StaticLibrary_set_include,cppobj,\
+ -I$(SRCDIR)/testtools/source/bridgetest \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest,\
+ bridgetest \
+))
+
+$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest,\
+ testtools/source/bridgetest/currentcontextchecker \
+ testtools/source/bridgetest/multi \
+))
+
+# vim: set noet sw=4 ts=4:
commit 1ae848123c1590957fbed899c82f56a9f3735c5a
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Thu May 10 09:58:05 2012 +0200
bridgetest.rdb path fixed
Change-Id: If458cbafeeb75d76c5efca9a979bb45242da89a1
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index 25709ee..86eedde 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -30,7 +30,7 @@ TTBJ := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)
$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(TTBJ)/done
-$(TTBJ)/done : $(OUTDIR)/rdb/bridgetest.rdb \
+$(TTBJ)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
$(call gb_Executable_get_target_for_build,javamaker) | $(TTBJ)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs_native, \
commit e70ebcd03b93cb10d50ffc7d9a743859e66704f4
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Thu May 10 09:10:23 2012 +0200
bridgetest_javamaker target added
Change-Id: Ice0a284683d67168624aeb9d737ff219c9074251
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
new file mode 100644
index 0000000..25709ee
--- /dev/null
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest_javamaker))
+
+TTBJ := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(TTBJ)/done
+
+$(TTBJ)/done : $(OUTDIR)/rdb/bridgetest.rdb \
+ $(call gb_Executable_get_target_for_build,javamaker) | $(TTBJ)/.dir
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(call gb_Helper_execute,javamaker -BUCR -nD -O$(TTBJ)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 79ebf69..16da8e3 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -26,16 +26,16 @@
$(eval $(call gb_Module_Module,testtools))
-#$(eval $(call gb_Module_add_targets,testtools,\
-# Jar_testComponent \
-#))
-
-ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,testtools,\
InternalUnoApi_bridgetest \
+ CustomTarget_bridgetest_javamaker \
))
-endif
+#ifneq ($(SOLAR_JAVA),)
+#$(eval $(call gb_Module_add_targets,testtools,\
# Jar_testComponent \
+#))
+#endif
+
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit e3ae6758f84872d950ac1502ab4659f7000e67e4
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Mon May 7 08:48:12 2012 +0200
gbuild conversion: testtools module
Change-Id: I1fde7853d4708da9ec217b6e4d5b782648b065cb
diff --git a/Makefile b/Makefile
index c1bc067..3d7eac7 100644
--- a/Makefile
+++ b/Makefile
@@ -127,6 +127,7 @@ sw\
swext\
tail_build\
test\
+testtools\
toolkit\
tools\
translations\
@@ -240,7 +241,6 @@ soltools\
stax\
stlport\
sysui\
-testtools\
tomcat\
udm\
vigra\
commit 669a9b7e01770b99efad7594169877a17416adc5
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Mon May 7 08:40:36 2012 +0200
gbuild conversion: testtools module
Change-Id: I90787a7d239dd4f73f53d13bd5b08172ee2b6a5e
diff --git a/testtools/InternalUnoApi_bridgetest.mk b/testtools/InternalUnoApi_bridgetest.mk
new file mode 100644
index 0000000..7d70832
--- /dev/null
+++ b/testtools/InternalUnoApi_bridgetest.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,bridgetest))
+
+$(eval $(call gb_InternalUnoApi_use_api,bridgetest,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_InternalUnoApi_define_api_dependencies,bridgetest,offapi,\
+ udkapi \
+))
+
+$(eval $(call gb_InternalUnoApi_set_include,bridgetest,\
+ -I$(OUTDIR)/idl \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_InternalUnoApi_add_idlfiles,bridgetest,testtools/source/bridgetest/idl,\
+ bridgetest \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
new file mode 100644
index 0000000..1bfd5c3
--- /dev/null
+++ b/testtools/Jar_testComponent.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Jar_Jar,testComponent))
+
+$(eval $(call gb_Jar_use_jars,testComponent,\
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/juh.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,testComponent,com))
+
+$(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/Manifest.mf))
+
+$(eval $(call gb_Jar_add_sourcefiles,testComponent,\
+ testtools/com/sun/star/comp/bridge/TestComponent \
+ testtools/com/sun/star/comp/bridge/CurrentContextChecker \
+ testtools/com/sun/star/comp/bridge/TestComponentMain \
+))
diff --git a/testtools/Makefile b/testtools/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/testtools/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
new file mode 100644
index 0000000..79ebf69
--- /dev/null
+++ b/testtools/Module_testtools.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky at gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,testtools))
+
+#$(eval $(call gb_Module_add_targets,testtools,\
+# Jar_testComponent \
+#))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,testtools,\
+ InternalUnoApi_bridgetest \
+))
+endif
+
+# Jar_testComponent \
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/testtools/prj/dmake b/testtools/prj/dmake
deleted file mode 100644
index e69de29..0000000
commit e4e7b08bd39a5e1a4b5b191f6577dcd99c7da552
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sun May 6 17:17:22 2012 +0200
gbuild conversion: store module
Change-Id: Idbab17b87d042079a8fa6ded7a7424a745761b2f
diff --git a/.src_root b/.src_root
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile b/Makefile
index 8edbef1..c1bc067 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,361 @@ SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
.PHONY : $(filter-out $(SRCDIR)/config_host.mk,$(MAKECMDGOALS))
+ifeq ($(gb_Side),)
+gb_Side:=host
+endif
+
+include $(SRCDIR)/config_$(gb_Side).mk
+
+ifeq ($(GMAKE_OPTIONS),)
+ifeq ($(verbose),)
+export GMAKE_OPTIONS:=-rs
+else
+export GMAKE_OPTIONS:=-r
+endif
+endif
+
+gbuild_modules:= \
+MathMLDTD\
+Mesa\
+UnoControls\
+accessibility\
+animations\
+apple_remote\
+avmedia\
+basctl\
+basebmp\
+basegfx\
+basic\
+bean\
+binaryurp\
+canvas\
+chart2\
+clucene\
+codemaker\
+comphelper\
+configmgr\
+cppcanvas\
+cppu\
+cppuhelper\
+cpputools\
+cui\
+dbaccess\
+desktop\
+drawinglayer\
+dtrans\
+editeng\
+embeddedobj\
+embedserv\
+eventattacher\
+extensions\
+fileaccess\
+filter\
+forms\
+formula\
+fpicker\
+framework\
+hwpfilter\
+i18npool\
+i18nutil\
+idl\
+idlc\
+io\
+javaunohelper\
+jurt\
+jvmaccess\
+jvmfwk\
+l10ntools\
+lingucomponent\
+linguistic\
+lotuswordpro\
+nlpsolver\
+np_sdk\
+o3tl\
+offapi\
+officecfg\
+oovbaapi\
+oox\
+package\
+packimages\
+padmin\
+psprint_config\
+qadevOOo\
+regexp\
+registry\
+reportdesign\
+rdbmaker\
+ridljar\
+rsc\
+sal\
+salhelper\
+sane\
+sax\
+sc\
+scaddins\
+sccomp\
+scripting\
+sd\
+sdext\
+sfx2\
+slideshow\
+smoketest\
+sot\
+starmath\
+stoc\
+store\
+svl\
+svtools\
+svx\
+sw\
+swext\
+tail_build\
+test\
+toolkit\
+tools\
+translations\
+twain\
+ucb\
+ucbhelper\
+udkapi\
+unixODBC\
+unodevtools\
+unoil\
+unotest\
+unotools\
+unoxml\
+ure\
+uui\
+vbahelper\
+vcl\
+wizards\
+writerfilter\
+writerperfect\
+xmerge\
+xml2cmp\
+xmlhelp\
+xmloff\
+xmlreader\
+xmlscript\
+xmlsecurity\
+
+dmake_modules:=\
+afms\
+apache-commons\
+autodoc\
+beanshell\
+berkeleydb\
+binfilter \
+boost\
+bridges\
+cairo\
+cli_ure\
+connectivity\
+cosv\
+cppunit\
+crashrep\
+ct2n\
+curl\
+dictionaries \
+epm\
+expat\
+external\
+extras\
+fontconfig\
+freetype\
+gdk-pixbuf\
+gettext\
+glib\
+graphite\
+helpcontent2 \
+hsqldb\
+hunspell\
+hyphen\
+icc\
+icu\
+instsetoo_native\
+jfreereport\
+jpeg\
+languagetool\
+libcdr\
+libcmis\
+libcroco\
+libexttextcat\
+libgsf\
+libpng\
+librsvg\
+libvisio\
+libwpd\
+libwpg\
+libwps\
+libxml2\
+libxmlsec\
+libxslt\
+lcms2\
+lpsolve\
+lucene\
+mdds\
+migrationanalysis\
+more_fonts\
+moz\
+mysqlc\
+mysqlcppconn\
+mythes\
+neon\
+nss\
+odk\
+openssl\
+pango\
+postgresql\
+postprocess\
+python\
+pyuno\
+readlicense_oo\
+redland\
+remotebridges\
+reportbuilder\
+rhino\
+saxon\
+scp2\
+setup_native\
+shell\
+solenv\
+soltools\
+stax\
+stlport\
+sysui\
+testtools\
+tomcat\
+udm\
+vigra\
+x11_extensions\
+xpdf\
+xsltml\
+zlib\
+
+gb_TAILBUILDMODULES := $(shell make -f $(SRCDIR)/tail_build/Makefile showmodules)
+
+define gbuild_module_rules
+.PHONY: $(1) $(1).all $(1).clean $(1).deliver
+
+$(1): bootstrap fetch
+ cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T
+
+ifeq ($(filter $(1),$(gb_TAILBUILDMODULES)),)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list