[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 8 commits - connectivity/JunitTest_complex.mk connectivity/Library_mozbootstrap.mk connectivity/Library_postgresql-sdbc-impl.mk connectivity/Library_postgresql-sdbc.mk connectivity/makefile.pmk connectivity/Module_connectivity.mk connectivity/qa connectivity/source connectivity/util connectivity/version.mk Makefile Module_tail_build.mk tail_build/prj
David Tardon
dtardon at kemper.freedesktop.org
Fri Apr 6 23:33:03 PDT 2012
Makefile | 2
Module_tail_build.mk | 4
connectivity/JunitTest_complex.mk | 77 +++++
connectivity/Library_mozbootstrap.mk | 1
connectivity/Library_postgresql-sdbc-impl.mk | 1
connectivity/Library_postgresql-sdbc.mk | 1
connectivity/Module_connectivity.mk | 4
connectivity/makefile.pmk | 62 ----
connectivity/qa/makefile.mk | 86 ------
connectivity/source/drivers/mozab/bootstrap/makefile.mk | 94 ------
connectivity/source/drivers/mozab/makefile.mk | 202 --------------
connectivity/source/drivers/mozab/makefile_mozab.mk | 127 ---------
connectivity/source/drivers/mozab/mozillasrc/makefile.mk | 76 -----
connectivity/source/drivers/odbc/makefile.mk | 91 ------
connectivity/source/drivers/postgresql/makefile.mk | 204 ---------------
connectivity/util/makefile.mk | 62 ----
connectivity/version.mk | 119 --------
tail_build/prj/build.lst | 2
18 files changed, 90 insertions(+), 1125 deletions(-)
New commits:
commit c0ca077e7bfe60aa1be4aee81a7cba0783a6b2e4
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 07:58:31 2012 +0200
move unixODBC to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index d0f3823..9d22ed6 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
test \
toolkit \
ucb \
+ unixODBC \
UnoControls \
unoxml \
uui \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index a3d0e92..0316df4 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain UNIXODBC:unixODBC VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools stoc sysui tools
ucbhelper udkapi unoil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools stoc sysui tools ucbhelper udkapi u
noil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 176987c13e90d5a22d9b7d8c94353c04847f06d1
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 07:55:32 2012 +0200
move sot to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 30c578b..d0f3823 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
sfx2 \
slideshow \
smoketest \
+ sot \
starmath \
svl \
svtools \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index c56f9f8..a3d0e92 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain UNIXODBC:unixODBC VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc sysui to
ols ucbhelper udkapi unoil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain UNIXODBC:unixODBC VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools stoc sysui tools
ucbhelper udkapi unoil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 56758db7019c0f5e956f962111c087ff7f8b48cb
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 07:54:01 2012 +0200
move svl to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 46be4f4..30c578b 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -77,6 +77,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
slideshow \
smoketest \
starmath \
+ svl \
svtools \
svx \
sw \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 5b435ff..c56f9f8 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain UNIXODBC:unixODBC VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysu
i tools ucbhelper udkapi unoil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain UNIXODBC:unixODBC VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc sysui to
ols ucbhelper udkapi unoil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit c4fbd16d4774f09ee28e4c3b0bcad1ff8b5c1526
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 07:49:41 2012 +0200
move connectivity to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index dcbbdda..46be4f4 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
canvas \
chart2 \
configmgr \
+ connectivity \
cppcanvas \
cui \
dbaccess \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 9b0442b..5b435ff 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil uno
test unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain UNIXODBC:unixODBC VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysu
i tools ucbhelper udkapi unoil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 2fd58218094f9766cf16085319cc93b3f584810c
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 07:42:17 2012 +0200
add connectivity to gbuild modules
diff --git a/Makefile b/Makefile
index d29f244..89e77a3 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ chart2\
clucene\
comphelper\
configmgr\
+connectivity\
cppcanvas\
cppu\
cppuhelper\
@@ -148,7 +149,6 @@ bridges\
cairo\
cli_ure\
codemaker\
-connectivity\
cosv\
cppunit\
cpputools\
commit f8238c2dd95fb256ba6cc662cd4f849f7f36f867
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 08:22:44 2012 +0200
remove stray makefiles
diff --git a/connectivity/makefile.pmk b/connectivity/makefile.pmk
deleted file mode 100755
index fe56884..0000000
--- a/connectivity/makefile.pmk
+++ /dev/null
@@ -1,62 +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.
-#
-#*************************************************************************
-
-XSLDIR=$(SOLARXMLDIR)$/processing
-ABSXCSROOT=$(PWD)$/$(MISC)
-# ABSXCSROOT=$(MISC)
-XCSROOT=..
-# XCSROOT=$(SOLARXMLDIR)
-# ABSXCSROOT=$(SOLARXMLDIR)
-DTDDIR=$(SOLARXMLDIR)
-PROCESSOUT=$(MISC)
-PROCESSORDIR=$(SOLARBINDIR)
-
-
-# no validation by inspector class
-NO_INSPECTION=TRUE
-
-JAVAPREPRO=
-.IF "$(JDK_VERSION)" == "110"
-JAVAPREPRO=-jdk11
-.ENDIF
-.IF "$(PRODUCT)" != ""
-JAVAPREPRO=$(JAVAPREPRO) + " -product"
-.ENDIF
-
-# --- Settings -----------------------------------------------------
-PACKAGE=org.openoffice.Office.DataAccess
-.INCLUDE : settings.mk
-
-COMPONENT_CONFIG_DATA*=$(TARGET).xcu
-
-LOCALIZEDFILES= \
- $(COMPONENT_CONFIG_DATA)
-
-XCUFILES= \
- $(LOCALIZEDFILES) \
-
-
diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk
deleted file mode 100644
index c3179d5..0000000
--- a/connectivity/qa/makefile.mk
+++ /dev/null
@@ -1,86 +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 = ..
-TARGET = ConnectivityComplexTests
-PRJNAME = connectivity
-PACKAGE = complex/connectivity
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)"
-
-all:
-# nothing
-
-.ELSE
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES := $(shell @$(FIND) complex -name "*.java")
-
-.IF "$(SYSTEM_HSQLDB)" == "YES"
-EXTRAJARFILES = $(HSQLDB_JAR)
-.ELSE
-JARFILES += hsqldb.jar
-.ENDIF
-
-#----- make a jar from compiled files ------------------------------
-
-JARCLASSDIRS = $(PACKAGE)
-JARTARGET = $(TARGET).jar
-
-# --- Runner Settings ----------------------------------------------
-
-# classpath and argument list
-RUNNER_CLASSPATH = -cp "$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar"
-RUNNER_ARGS = org.openoffice.Runner -TestBase java_complex
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL : ALLTAR
- @echo -----------------------------------------------------
- @echo - do a 'dmake show_targets' to show available targets
- @echo -----------------------------------------------------
-.ELSE
-ALL: ALLDEP
-.ENDIF
-.ENDIF # QADEVOOO option
-
-.INCLUDE : target.mk
-
-show_targets:
- +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
-
-run: $(CLASSDIR)$/$(JARTARGET)
- +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce scenarios.sce
-
-run_%: $(CLASSDIR)$/$(JARTARGET)
- +$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o complex.$(PRJNAME).$(@:s/run_//)
-
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
deleted file mode 100644
index c259fa9..0000000
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ /dev/null
@@ -1,94 +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=..$/..$/..$/..
-PRJINC=..$/..$/..
-PRJNAME=connectivity
-TARGET=mozbootstrap
-
-# --- Settings ----------------------------------
-
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- begin of mozilla specific stuff
-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-# --- end of mozilla specific stuff
-
-.INCLUDE : settings.mk
-
-.INCLUDE : $(PRJ)$/version.mk
-
-.INCLUDE : ../makefile_mozab.mk
-
-INCPRE += -I../mozillasrc
-
-# --- Files -------------------------------------
-
-SLOFILES += \
- $(SLO)$/MNSINIParser.obj \
- $(SLO)$/MNSProfileDiscover.obj \
- $(SLO)$/MMozillaBootstrap.obj \
- $(SLO)$/MNSFolders.obj
-
-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES" ) || ( "$(WITH_MOZILLA)" == "NO" ) || ( "$(OS)" == "MACOSX" )
-CDEFS+=-DMINIMAL_PROFILEDISCOVER
-
-SHL1TARGET=$(TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(COMPHELPERLIB)
-
-ALLTAR : $(MISC)/mozbootstrap.component
-
-$(MISC)/mozbootstrap.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
-
-.ELSE
-SLOFILES += \
- $(SLO)$/MNSInit.obj \
- $(SLO)$/MNSProfileManager.obj \
- $(SLO)$/MNSRunnable.obj \
- $(SLO)$/MNSProfile.obj \
- $(SLO)$/MNSProfileDirServiceProvider.obj
-.ENDIF
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
deleted file mode 100644
index d1d4873..0000000
--- a/connectivity/source/drivers/mozab/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=..$/..$/..
-PRJINC=..$/..
-PRJNAME=connectivity
-TARGET=mozab
-TARGET2=$(TARGET)drv
-VISIBILITY_HIDDEN=TRUE
-
-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" )
-all:
- @echo " Not building the mozilla address book driver"
- @echo " dependency to Mozilla developer snapshots not feasable at the moment"
- @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"
- @echo " see http://www.mozilla.org/issues/show_bug.cgi?id=91209"
-.ENDIF
-
-# --- begin of mozilla specific stuff
-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-
-.IF "$(OS)"=="WNT"
- MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
- MOZ_REG_LIB := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
-
- MOZ_EMBED_LIB *:= $(MOZ_LIB)$/baseembed_s.lib
- MOZ_REG_LIB *:= $(MOZ_LIB)$/mozreg.lib
-
- .IF "$(COM)"=="GCC"
- MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
- .ELSE
- LIB += $(MOZ_LIB)
- MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
- .ENDIF
-
-.ELSE "$(OS)"=="WNT"
- MOZ_LIB_XPCOM = -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
-.ENDIF
-# --- end of mozilla specific stuff
-
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-.IF "$(OS)"!="WNT"
-COMPONENT_CONFIG_DATA=$(TARGET)2.xcu
-COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
-.ENDIF
-
-# --- Settings ----------------------------------
-
-.INCLUDE : $(PRJ)$/makefile.pmk
-
-.INCLUDE : $(PRJ)$/version.mk
-
-# --- Files -------------------------------------
-
-SLOFILES=\
- $(SLO)$/MDriver.obj \
- $(SLO)$/MServices.obj
-
-# --- MOZAB BASE Library -----------------------------------
-
-.IF "$(GUI)"=="WNT"
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-.ELSE # just a quick hack for GCC fdo#42865
-SHL1USE_EXPORTS = name
-.ENDIF
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(DBTOOLSLIB)
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)$(DLLPOSTFIX)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \
- $(SLB)$/$(TARGET).lib
-DEFLIB1NAME=$(TARGET)
-
-
-# --- Files -------------------------------------
-MOZSLOFILES=\
- $(SLO)$/MNSInit.obj \
- $(SLO)$/MQueryHelper.obj \
- $(SLO)$/MDatabaseMetaDataHelper.obj \
- $(SLO)$/MQuery.obj \
- $(SLO)$/MTypeConverter.obj \
- $(SLO)$/MNameMapper.obj \
- $(SLO)$/MNSMozabProxy.obj \
- $(SLO)$/MNSTerminateListener.obj \
- $(SLO)$/MMozillaBootstrap.obj \
- $(SLO)$/MNSFolders.obj \
- $(SLO)$/MNSProfileDiscover.obj \
- $(SLO)$/MNSProfileManager.obj \
- $(SLO)$/MNSINIParser.obj \
- $(SLO)$/MNSRunnable.obj \
- $(SLO)$/MNSProfile.obj \
- $(SLO)$/MNSProfileDirServiceProvider.obj \
- $(SLO)$/MLdapAttributeMap.obj
-
-
-SLO2FILES=\
- $(SLO)$/MConfigAccess.obj \
- $(SLO)$/MCatalog.obj \
- $(SLO)$/MColumns.obj \
- $(SLO)$/MTable.obj \
- $(SLO)$/MTables.obj \
- $(SLO)$/MColumnAlias.obj \
- $(SLO)$/MPreparedStatement.obj \
- $(SLO)$/MStatement.obj \
- $(SLO)$/MResultSetMetaData.obj \
- $(SLO)$/MResultSet.obj \
- $(SLO)$/MDatabaseMetaData.obj \
- $(SLO)$/MConnection.obj \
- $(MOZSLOFILES)
-
-DEPOBJFILES=$(SLO2FILES)
-
-# --- MOZAB BASE Library -----------------------------------
-
-.IF "$(GUI)"=="WNT"
-SHL2VERSIONMAP=$(TARGET2).map
-.ELSE # just a quick hack for GCC fdo#42865
-SHL2USE_EXPORTS = name
-.ENDIF
-SHL2NOCHECK=TRUE
-SHL2TARGET= $(TARGET2)$(DLLPOSTFIX)
-SHL2OBJS=$(SLO2FILES)
-SHL2STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(DBTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(MOZ_LIB_XPCOM)
-
-.IF "$(GUI)"=="WNT"
- SHL2STDLIBS += \
- $(SHELL32LIB)
-.ENDIF # "$(GUI)"=="WNT"
-
-SHL2DEPN=
-SHL2IMPLIB= i$(TARGET2)
-SHL2DEF= $(MISC)$/$(SHL2TARGET).def
-DEF2NAME= $(SHL2TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : $(PRJ)$/target.pmk
-
-# --- filter file ------------------------------
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo _TI >$@
- @echo _real >>$@
-
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo _TI >$@
- @echo _real >>$@
-
-
-ALLTAR : $(MISC)/mozab.component
-
-$(MISC)/mozab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- mozab.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt mozab.component
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
deleted file mode 100755
index c984f12..0000000
--- a/connectivity/source/drivers/mozab/makefile_mozab.mk
+++ /dev/null
@@ -1,127 +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.
-#
-#*************************************************************************
-
-CDEFS += -DMOZILLA_INTERNAL_API
-
-.IF "$(GUI)"=="UNX"
- .IF "$(COMNAME)"=="sunpro5"
- CFLAGS += -features=tmplife
- #This flag is needed to build mozilla 1.7 code
- .ENDIF # "$(COMNAME)"=="sunpro5"
-.ENDIF
-
-MOZINC = . \
- -I.. \
- -I$(MOZ_INC) \
- -I$(MOZ_INC)$/nspr \
- -I$(MOZ_INC)$/xpcom \
- -I$(MOZ_INC)$/string \
- -I$(MOZ_INC)$/rdf \
- -I$(MOZ_INC)$/msgbase \
- -I$(MOZ_INC)$/addrbook \
- -I$(MOZ_INC)$/mork \
- -I$(MOZ_INC)$/locale \
- -I$(MOZ_INC)$/pref \
- -I$(MOZ_INC)$/mime \
- -I$(MOZ_INC)$/chrome \
- -I$(MOZ_INC)$/necko \
- -I$(MOZ_INC)$/intl \
- -I$(MOZ_INC)$/profile \
- -I$(MOZ_INC)$/embed_base \
- -I$(MOZ_INC)$/mozldap \
- -I$(MOZ_INC)$/uconv \
- -I$(MOZ_INC)$/xpcom_obsolete \
- -I$(MOZ_INC)$/content
-
-.IF "$(GUI)" == "WNT"
- CDEFS += \
- -DMOZILLA_CLIENT \
- -DXP_PC \
- -DXP_WIN \
- -DXP_WIN32 \
- -DOJI \
- -DWIN32 \
- -D_WINDOWS \
- -DMOZ_XUL \
- -DMOZ_REFLOW_PERF \
- -DMOZ_REFLOW_PERF_DSP
- .IF "$(COM)" == "GCC"
- INCPOST += $(MOZINC)
- CFLAGSCXX += \
- -fno-rtti \
- -Wall \
- -Wconversion \
- -Wpointer-arith \
- -Wcast-align \
- -Woverloaded-virtual \
- -Wsynth \
- -Wno-long-long
- .ELSE # .IF "$(COM)" == "GCC"
- INCPRE += $(MOZINC)
- .IF "$(DBG_LEVEL)" != "0"
- .IF "$(CCNUMVER)" >= "001399999999"
- CDEFS += -D_STL_NOFORCE_MANIFEST
- .ENDIF # .IF "$(CCNUMVER)" >= "001399999999"
- .ENDIF # .IF "$(DBG_LEVEL)" != "0"
- .ENDIF # .IF "$(COM)" == "GCC"
-.ENDIF # .IF "$(GUI)" == "WNT"
-
-.IF "$(GUI)" == "UNX"
- INCPOST += $(MOZINC)
- CDEFS+= -DMOZILLA_CLIENT \
- -DXP_UNIX
- .IF "$(OS)" == "LINUX"
- CFLAGS += -fPIC -g
- CDEFS += -DOJI
- CFLAGSCXX += \
- -fno-rtti \
- -Wconversion \
- -Wpointer-arith \
- -Wcast-align \
- -Woverloaded-virtual \
- -Wsynth \
- -Wno-long-long \
- -pthread
- CDEFS += -DTRACING
- .ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
- CFLAGS += -fPIC
- CFLAGSCXX += \
- -fno-rtti \
- -Wconversion \
- -Wpointer-arith \
- -Wcast-align \
- -Woverloaded-virtual \
- -Wsynth \
- -Wno-long-long \
- -Wno-deprecated
- CDEFS += -DTRACING
- .ENDIF # "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
-
- SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
-
-.ENDIF # "$(GUI)" == "UNX"
-
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
deleted file mode 100644
index 0b4884f..0000000
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ /dev/null
@@ -1,76 +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.
-#
-#*************************************************************************
-
-#mozilla specific stuff.
-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-#End of mozilla specific stuff.
-
-PRJ=..$/..$/..$/..
-PRJINC=..$/..$/..
-PRJNAME=connectivity
-TARGET=mozabsrc
-
-# --- Settings ----------------------------------
-
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-.INCLUDE : settings.mk
-
-.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
-dummy:
- @echo " Not building the mozillasrc stuff in LibreOffice build"
- @echo " dependency to Mozilla developer snapshots not feasable at the moment"
- @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"
-.ELSE
-
-.INCLUDE : $(PRJ)$/version.mk
-
-.INCLUDE : ../makefile_mozab.mk
-
-INCPRE += -I../bootstrap
-
-# --- Files -------------------------------------
-
-SLOFILES = \
- $(SLO)$/MQueryHelper.obj \
- $(SLO)$/MDatabaseMetaDataHelper.obj \
- $(SLO)$/MQuery.obj \
- $(SLO)$/MTypeConverter.obj \
- $(SLO)$/MNameMapper.obj \
- $(SLO)$/MNSMozabProxy.obj \
- $(SLO)$/MNSTerminateListener.obj \
- $(SLO)$/MLdapAttributeMap.obj \
-
-.ENDIF
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
deleted file mode 100644
index 3c79b49..0000000
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ /dev/null
@@ -1,91 +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=..$/..$/..
-PRJINC=..$/..
-PRJNAME=connectivity
-TARGET=odbc
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-USE_DEFFILE=TRUE
-LDUMP=ldump2.exe
-
-.IF "$(GUI)$(COM)" == "WNTGCC"
-EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
-.ENDIF
-
-# --- Settings ----------------------------------
-
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-.INCLUDE : $(PRJ)$/makefile.pmk
-.INCLUDE : $(PRJ)$/version.mk
-
-.IF "$(SYSTEM_ODBC_HEADERS)" == "YES"
-CFLAGS+=-DSYSTEM_ODBC_HEADERS
-.ENDIF
-
-# --- ODBC Library -----------------------------------
-# --- Files -------------------------------------
-
-SLOFILES=\
- $(SLO)$/oservices.obj \
- $(SLO)$/ORealDriver.obj \
- $(SLO)$/OFunctions.obj
-
-# --- ODBC Library -----------------------------------
-
-SHL1TARGET= $(ODBC_TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
- $(ODBCBASELIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(SALHELPERLIB)
-
-SHL1IMPLIB= i$(ODBC_TARGET)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Targets ----------------------------------
-
-.INCLUDE : $(PRJ)$/target.pmk
-
-ALLTAR : $(MISC)/odbc.component
-
-$(MISC)/odbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- odbc.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt odbc.component
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
deleted file mode 100644
index acf8b8c..0000000
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ /dev/null
@@ -1,204 +0,0 @@
-##########################################################################
-#
-# Effective License of whole file:
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License version 2.1, as published by the Free Software Foundation.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-# Parts "Copyright by Sun Microsystems, Inc" prior to August 2011:
-#
-# The Contents of this file are made available subject to the terms of
-# the GNU Lesser General Public License Version 2.1
-#
-# Copyright: 2000 by Sun Microsystems, Inc.
-#
-# All parts contributed on or after August 2011:
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv2.1+
-#
-# 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) 2011 Lionel Elie Mamane <lionel at mamane.lu> ]
-#
-# 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 2.1 or later (the "LGPLv2.1+"),
-# in which case the provisions of the GPLv3+ or the LGPLv2.1+ are applicable
-# instead of those above.
-#
-##########################################################################
-
-PRJ=../../..
-
-PRJNAME=postgresql
-TARGET=postgresql
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-USE_DEFFILE=TRUE
-NO_DEFAULT_STL=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: $(PRJ)/makefile.pmk
-
-.IF "$(BUILD_POSTGRESQL_SDBC)" == "YES"
-
-#-------------------------------------------------------------------
-
-# uno component naming scheme
-DLLPRE=
-
-PQ_SDBC_MAJOR=0
-PQ_SDBC_MINOR=8
-PQ_SDBC_MICRO=2
-
-LIBPQ_DEP_LIBS=
-.IF "$(SYSTEM_POSTGRESQL)"=="YES"
-LIBPQ_LINK=-lpq
-.ELSE #SYSTEM_POSTGRESQL==NO
-.IF "$(GUI)$(COM)"=="WNTMSC"
-LIBPQ_LINK:=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib
-LIBPQ_DEP_LIBS += \
- $(OPENSSLLIB)
-.IF "$(WITH_LDAP)" == "YES"
-LIBPQ_DEP_LIBS+=\
- $(LDAPSDKLIB)
-.ENDIF
-.ELSE # "$(GUI)$(COM)"!="WNTMSC"
-LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
-LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--as-needed)
-.INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
-LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed)
-.ENDIF
-POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
-.ENDIF # SYSTEM_POSTGRESQL
-
-CFLAGS+=$(POSTGRESQL_INC) \
- -DPQ_SDBC_MAJOR=$(PQ_SDBC_MAJOR) \
- -DPQ_SDBC_MINOR=$(PQ_SDBC_MINOR) \
- -DPQ_SDBC_MICRO=$(PQ_SDBC_MICRO)
-
-SHL1TARGET=postgresql-sdbc.uno
-LIB1TARGET=$(SLB)/$(SHL1TARGET).lib
-LIB1OBJFILES= \
- $(SLO)/pq_driver.obj
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB)
-
-SHL1LIBS= $(LIB1TARGET)
-SHL1DEF= $(MISC)/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL2TARGET=postgresql-sdbc-impl.uno
-LIB2TARGET=$(SLB)/$(SHL2TARGET).lib
-LIB2OBJFILES= \
- $(SLO)/pq_connection.obj \
- $(SLO)/pq_statement.obj \
- $(SLO)/pq_resultset.obj \
- $(SLO)/pq_preparedstatement.obj \
- $(SLO)/pq_resultsetmetadata.obj \
- $(SLO)/pq_databasemetadata.obj \
- $(SLO)/pq_sequenceresultset.obj \
- $(SLO)/pq_baseresultset.obj \
- $(SLO)/pq_statics.obj \
- $(SLO)/pq_xtable.obj \
- $(SLO)/pq_xcontainer.obj \
- $(SLO)/pq_xbase.obj \
- $(SLO)/pq_xtables.obj \
- $(SLO)/pq_xcolumns.obj \
- $(SLO)/pq_xcolumn.obj \
- $(SLO)/pq_tools.obj \
- $(SLO)/pq_xkey.obj \
- $(SLO)/pq_xkeys.obj \
- $(SLO)/pq_xkeycolumn.obj \
- $(SLO)/pq_xkeycolumns.obj \
- $(SLO)/pq_xuser.obj \
- $(SLO)/pq_xusers.obj \
- $(SLO)/pq_xview.obj \
- $(SLO)/pq_xviews.obj \
- $(SLO)/pq_xindex.obj \
- $(SLO)/pq_xindexes.obj \
- $(SLO)/pq_xindexcolumn.obj \
- $(SLO)/pq_xindexcolumns.obj \
- $(SLO)/pq_updateableresultset.obj \
- $(SLO)/pq_fakedupdateableresultset.obj \
- $(SLO)/pq_array.obj \
- $(SLO)/pq_sequenceresultsetmetadata.obj
-
-
-SHL2STDLIBS= \
- $(POSTGRESQL_LIB) \
- $(LIBPQ_LINK) \
- $(LIBPQ_DEP_LIBS) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(SALHELPERLIB)
-
-SHL2LIBS= $(LIB2TARGET)
-SHL2DEF= $(MISC)/$(SHL2TARGET).def
-DEF2NAME= $(SHL2TARGET)
-SHL2VERSIONMAP=$(SOLARENV)/src/component.map
-
-
-SLOFILES= $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-.INCLUDE: $(PRJ)/target.pmk
-
-ALLTAR : $(MISC)/postgresql-sdbc.rdb
-
-$(MISC)/postgresql-sdbc.rdb .ERRREMOVE : \
- $(SOLARENV)/bin/packcomponents.xslt $(MISC)/postgresql-sdbc.input \
- $(MISC)/postgresql-sdbc.component $(MISC)/postgresql-sdbc-impl.component
- $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
- $(SOLARENV)/bin/packcomponents.xslt $(MISC)/postgresql-sdbc.input
-
-$(MISC)/postgresql-sdbc.input : makefile.mk
- echo '<list><filename>postgresql-sdbc.component</filename>' \
- '<filename>postgresql-sdbc-impl.component</filename></list>' > $@
-
-$(MISC)/postgresql-sdbc.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt postgresql-sdbc.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt postgresql-sdbc.component
-
-$(MISC)/postgresql-sdbc-impl.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt postgresql-sdbc-impl.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt postgresql-sdbc-impl.component
-
-.ELSE
-
-ALLTAR:
-
-.ENDIF # BUILD_POSTGRESQL_SDBC
diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk
deleted file mode 100644
index d92fe00..0000000
--- a/connectivity/util/makefile.mk
+++ /dev/null
@@ -1,62 +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 = connectivity
-TARGET = connectivity
-
-.INCLUDE : settings.mk
-.INCLUDE : target.mk
-
-# For any given platform, for each driver .xcu (in $(MY_XCUS)) built on that
-# platform (in $(MISC)/registry/data/org/openoffice/Office/DataAccess) there are
-# corresponding language-specific .xcu files (in
-# $(MISC)/registry/res/%/org/openoffice/Office/DataAccess). For each language,
-# all language-specific .xcu files for that language are assembled into
-# $(BIN)$/fcfg_drivers_%.zip. To meet the requirements of dmake percent rules,
-# the first item from $(MY_XCUS) is arbitrarily taken to be the main
-# prerequisite while all the items from $(MY_XCUS) are made into indirect
-# prerequisites (harmlessly doubling the first item).
-
-MY_XCUS := \
- $(shell cd $(MISC)/registry/data/org/openoffice/Office/DataAccess && \
- ls *.xcu)
-
-.IF "$(MY_XCUS)" != ""
-
-ALLTAR : $(BIN)/fcfg_drivers_{$(alllangiso)}.zip
-
-$(BIN)/fcfg_drivers_{$(alllangiso)}.zip : \
- $(MISC)/registry/res/$$(@:b:s/fcfg_drivers_//)/org/openoffice/Office/DataAccess/{$(MY_XCUS)}
-
-$(BIN)/fcfg_drivers_%.zip : \
- $(MISC)/registry/res/%/org/openoffice/Office/DataAccess/$(MY_XCUS:1)
- zip -j $@ \
- $(foreach,i,$(MY_XCUS) \
- $(MISC)/registry/res/$*/org/openoffice/Office/DataAccess/$i)
-
-.ENDIF
diff --git a/connectivity/version.mk b/connectivity/version.mk
deleted file mode 100755
index fd2235c..0000000
--- a/connectivity/version.mk
+++ /dev/null
@@ -1,119 +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.
-#
-#*************************************************************************
-
-# ----------------------------ADO settings------------------------------------#
-# target
-ADO_TARGET=ado
-
-# ----------------------------ODBC BASE settings-----------------------------------#
-# target
-ODBC2_TARGET=odbcbase
-
-# ----------------------------ODBC settings-----------------------------------#
-# target
-ODBC_TARGET=odbc
-
-# ----------------------------JDBC settings-----------------------------------#
-# target
-JDBC_TARGET=jdbc
-
-# ----------------------------dbtools settings-----------------------------------#
-# target
-DBTOOLS_TARGET=dbtools
-
-# -----------------------DRIVER MANAGER settings--------------------------------#
-# target
-SDBC_TARGET=sdbc
-
-# the major
-SDBC_MAJOR=2
-# the minor
-SDBC_MINOR=0
-# the micro
-SDBC_MICRO=0
-
-
-# -----------------------Connection Pool settings--------------------------------#
-# target
-DBPOOL_TARGET=dbpool
-
-# the major
-DBPOOL_MAJOR=2
-# the minor
-DBPOOL_MINOR=0
-# the micro
-DBPOOL_MICRO=0
-
-
-# ----------------------------DBASE settings-----------------------------------#
-# target
-DBASE_TARGET=dbase
-
-# ----------------------------MOZAB settings-----------------------------------#
-# the major
-MOZAB_MAJOR=2
-# the minor
-MOZAB_MINOR=0
-# the micro
-MOZAB_MICRO=0
-
-# ----------------------------MySQL settings-----------------------------------#
-# target
-MYSQL_TARGET=mysql
-
-
-# ----------------------------Evoab settings-----------------------------------#
-# target
-EVOAB_TARGET=evoab
-
-# ----------------------------Kab settings-------------------------------------#
-# target
-KAB_TARGET=kab
-
-# the major
-KAB_MAJOR=1
-# the minor
-KAB_MINOR=0
-# the micro
-KAB_MICRO=0
-
-
-# ----------------------------Macab settings-------------------------------------#
-# target
-MACAB_TARGET=macab
-
-# the major
-MACAB_MAJOR=1
-# the minor
-MACAB_MINOR=0
-# the micro
-MACAB_MICRO=0
-
-# ----------------------------HSQLDB settings-----------------------------------#
-# target
-HSQLDB_TARGET=hsqldb
-
commit b3447b239b737ec4c0de9831e853b24431b8f5d6
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 07:39:39 2012 +0200
add missing $(gb_STDLIBS)
diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk
index 2635494..38d39c9 100644
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,mozbootstrap,\
cppu \
cppuhelper \
sal \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,mozbootstrap,\
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index e02d8cc..a401e1d 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,postgresql-sdbc-impl,\
cppuhelper \
sal \
salhelper \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk
index c145fce..fe79128 100644
--- a/connectivity/Library_postgresql-sdbc.mk
+++ b/connectivity/Library_postgresql-sdbc.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_linked_libs,postgresql-sdbc,\
cppu \
cppuhelper \
sal \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc))
commit ba4d10331ecb03a622aa327201b2a5a62db841d2
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 07:33:39 2012 +0200
connectivity: convert subsequent test
diff --git a/connectivity/JunitTest_complex.mk b/connectivity/JunitTest_complex.mk
new file mode 100644
index 0000000..f560c55
--- /dev/null
+++ b/connectivity/JunitTest_complex.mk
@@ -0,0 +1,77 @@
+# -*- 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 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (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_JunitTest_JunitTest,connectivity_complex))
+
+$(eval $(call gb_JunitTest_set_defs,connectivity_complex,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/connectivity/qa/scenearios.sce \
+))
+
+# TODO: add use_externals to JunitTest
+$(eval $(call gb_JunitTest_add_jars,connectivity_complex,\
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(if $(filter YES,$(SYSTEM_HSQLDB)),$(HSQLDB_JAR),$(OUTDIR)/bin/hsqldb.jar) \
+))
+
+$(eval $(call gb_JunitTest_add_classes,connectivity_complex,\
+ org.openoffice.test.UnoApiTest \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,connectivity_complex,\
+ connectivity/qa/complex/connectivity/DBaseDriverTest \
+ connectivity/qa/complex/connectivity/FlatFileAccess \
+ connectivity/qa/complex/connectivity/HsqlDriverTest \
+ connectivity/qa/complex/connectivity/JdbcLongVarCharTest \
+ connectivity/qa/complex/connectivity/SubTestCase \
+ connectivity/qa/complex/connectivity/TestCase \
+ connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions \
+ connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions \
+ connectivity/qa/complex/connectivity/dbase/DBaseSqlTests \
+ connectivity/qa/complex/connectivity/dbase/DBaseStringFunctions \
+ connectivity/qa/complex/connectivity/hsqldb/DatabaseMetaData \
+ connectivity/qa/complex/connectivity/hsqldb/TestCacheSize \
+ connectivity/qa/connectivity/tools/AbstractDatabase \
+ connectivity/qa/connectivity/tools/CRMDatabase \
+ connectivity/qa/connectivity/tools/CsvDatabase \
+ connectivity/qa/connectivity/tools/DataSource \
+ connectivity/qa/connectivity/tools/DatabaseAccess \
+ connectivity/qa/connectivity/tools/DbaseDatabase \
+ connectivity/qa/connectivity/tools/FlatFileDatabase \
+ connectivity/qa/connectivity/tools/HsqlColumnDescriptor \
+ connectivity/qa/connectivity/tools/HsqlDatabase \
+ connectivity/qa/connectivity/tools/HsqlTableDescriptor \
+ connectivity/qa/connectivity/tools/QueryDefinition \
+ connectivity/qa/connectivity/tools/RowSet \
+ connectivity/qa/connectivity/tools/sdb/Connection \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index fb0cfe7..94b0bab 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -130,4 +130,8 @@ endif
endif
+$(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\
+ JunitTest_complex \
+))
+
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list