[Libreoffice-commits] .: 5 commits - android/qa config_host.mk.in configure.in desktop/Pagein_common.mk extensions/CppunitTest_extensions_test_update.mk hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk Module_tail_build.mk postprocess/packcomponents RepositoryExternal.mk RepositoryFixes.mk Repository.mk RepositoryModule_ooo.mk sc/CppunitTest_sc_cellrangesbase.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_spreadsheetobj.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_ucalc.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_regression_test.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_swdoc_test.mk tail_build/prj ucb/inc ucb/Library_cached1.mk ucb/Library_srtrs1.mk ucb/Library _ucb1.mk ucb/Library_ucpcmis1.mk ucb/Library_ucpdav1.mk ucb/Library_ucpexpand1.mk ucb/Library_ucpext.mk ucb/Library_ucpfile1.mk ucb/Library_ucpftp1.mk ucb/Library_ucpgio1.mk ucb/Library_ucpgvfs1.mk ucb/Library_ucphier1.mk ucb/Library_ucpodma1.mk ucb/Library_ucppkg1.mk ucb/Library_ucptdoc1.mk ucb/Module_ucb.mk ucb/Package_odma_inc.mk ucb/Package_xml.mk ucb/prj ucb/source ucb/StaticLibrary_odma_lib.mk writerfilter/CppunitTest_writerfilter_rtftok.mk
Matus Kukan
mkukan at kemper.freedesktop.org
Sun Jan 15 07:31:06 PST 2012
Module_tail_build.mk | 1
Repository.mk | 22 +
RepositoryExternal.mk | 86 ++++++
RepositoryFixes.mk | 4
RepositoryModule_ooo.mk | 6
android/qa/sc/Makefile | 7
config_host.mk.in | 6
configure.in | 6
desktop/Pagein_common.mk | 6
extensions/CppunitTest_extensions_test_update.mk | 7
hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 6
lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 7
postprocess/packcomponents/makefile.mk | 28 +-
sc/CppunitTest_sc_cellrangesbase.mk | 9
sc/CppunitTest_sc_databaserangeobj.mk | 9
sc/CppunitTest_sc_datapilotfieldobj.mk | 9
sc/CppunitTest_sc_filters_test.mk | 6
sc/CppunitTest_sc_macros_test.mk | 9
sc/CppunitTest_sc_namedrangeobj.mk | 9
sc/CppunitTest_sc_spreadsheetobj.mk | 9
sc/CppunitTest_sc_subsequent_filters_test.mk | 6
sc/CppunitTest_sc_tableautoformatfield.mk | 9
sc/CppunitTest_sc_ucalc.mk | 7
sd/CppunitTest_sd_filters_test.mk | 6
sd/CppunitTest_sd_regression_test.mk | 12
sw/CppunitTest_sw_filters_test.mk | 20 -
sw/CppunitTest_sw_macros_test.mk | 9
sw/CppunitTest_sw_swdoc_test.mk | 15 -
tail_build/prj/build.lst | 2
ucb/Library_cached1.mk | 54 ++++
ucb/Library_srtrs1.mk | 50 ++++
ucb/Library_ucb1.mk | 63 +++++
ucb/Library_ucpcmis1.mk | 59 ++++
ucb/Library_ucpdav1.mk | 91 +++++++
ucb/Library_ucpexpand1.mk | 49 +++
ucb/Library_ucpext.mk | 55 ++++
ucb/Library_ucpfile1.mk | 63 +++++
ucb/Library_ucpftp1.mk | 66 +++++
ucb/Library_ucpgio1.mk | 61 ++++
ucb/Library_ucpgvfs1.mk | 62 +++++
ucb/Library_ucphier1.mk | 58 ++++
ucb/Library_ucpodma1.mk | 57 ++++
ucb/Library_ucppkg1.mk | 57 ++++
ucb/Library_ucptdoc1.mk | 62 +++++
ucb/Module_ucb.mk | 45 +++
ucb/Package_odma_inc.mk | 33 ++
ucb/Package_xml.mk | 46 +++
ucb/StaticLibrary_odma_lib.mk | 39 +++
ucb/inc/makefile.mk | 39 ---
ucb/prj/build.lst | 19 -
ucb/prj/d.lst | 54 ----
ucb/prj/makefile.mk | 1
ucb/source/cacher/makefile.mk | 75 ------
ucb/source/core/exports2.dxp | 3
ucb/source/core/makefile.mk | 80 ------
ucb/source/regexp/makefile.mk | 41 ---
ucb/source/sorter/makefile.mk | 71 -----
ucb/source/ucp/cmis/makefile.mk | 95 -------
ucb/source/ucp/expand/makefile.mk | 68 -----
ucb/source/ucp/ext/makefile.mk | 69 -----
ucb/source/ucp/file/exports2.dxp | 7
ucb/source/ucp/file/makefile.mk | 83 ------
ucb/source/ucp/ftp/makefile.mk | 96 -------
ucb/source/ucp/gio/makefile.mk | 86 ------
ucb/source/ucp/gvfs/makefile.mk | 90 -------
ucb/source/ucp/hierarchy/makefile.mk | 91 -------
ucb/source/ucp/odma/makefile.mk | 110 --------
ucb/source/ucp/package/makefile.mk | 96 -------
ucb/source/ucp/tdoc/makefile.mk | 101 --------
ucb/source/ucp/webdav/makefile.mk | 161 -------------
writerfilter/CppunitTest_writerfilter_rtftok.mk | 9
71 files changed, 1269 insertions(+), 1684 deletions(-)
New commits:
commit 9e82d6f5fd1d67c8ecb46a1df0a0099b1b0716b8
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Jan 15 05:00:43 2012 +0100
ucb: add to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ef4e8c7..994064f 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
svx \
sw \
swext \
+ ucb \
UnoControls \
unoxml \
uui \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 463a246..289a1ad 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 HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr 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 XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools 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 XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 58b8a4d25dc9bf29d7b3b4d21f03257c11f70693
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Jan 15 02:59:40 2012 +0100
these are not old component files anymore
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 3499906..cd09db1 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -132,13 +132,10 @@ copy-stuff:
for F in xml/ure/services; do \
sed -e 's!uri="vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \
done
- for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx unoxml/source/service/unoxml configmgr/source/configmgr; do \
+ for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml configmgr/source/configmgr; do \
mkdir -p assets/ComponentTarget/`dirname $$F`; \
sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(WORKDIR)/ComponentTarget/$$F.component >assets/ComponentTarget/$$F.component; \
done
- for F in ucb1 ucpfile1; do \
- sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/xml/$$F.component >assets/xml/$$F.component; \
- done
for F in uno_services uno_types; do \
sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$$F.rdb >assets/lib/$$F.rdb; \
done
@@ -170,7 +167,7 @@ uninstall:
adb uninstall $(APP_PACKAGE)
run:
- echo "STAR_RESOURCEPATH=$(APP_DATA_PATH)/bin FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector libunoexceptionprotector.so unoexceptionprotector '-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/ComponentTarget/framework/util/fwk.component file:///assets/ComponentTarget/i18npool/util/i18npool.component file:///assets/ComponentTarget/sfx2/util/sfx.component file:///assets/ComponentTarget/unoxml/source/service/unoxml.component file:///assets/ComponentTarget/configmgr/source/configmgr.component file:///assets/xml/ucb1.component file:///assets/xml/ucpfile1.component' -env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
+ echo "STAR_RESOURCEPATH=$(APP_DATA_PATH)/bin FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector libunoexceptionprotector.so unoexceptionprotector '-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/ComponentTarget/framework/util/fwk.component file:///assets/ComponentTarget/i18npool/util/i18npool.component file:///assets/ComponentTarget/sfx2/util/sfx.component file:///assets/ComponentTarget/unoxml/source/service/unoxml.component file:///assets/ComponentTarget/configmgr/source/configmgr.component file:///assets/ComponentTarget/ucb/source/core/ucb1.component file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' -env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
adb push cmdline $(APP_DATA_PATH)/cmdline
adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index a81b585..22c30bb 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -71,14 +71,11 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,extensions_test_update,\
$(eval $(call gb_CppunitTest_add_components,extensions_test_update,\
configmgr/source/configmgr \
extensions/source/update/feed/updatefeed \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,extensions_test_update,\
- ucb1 \
- ucpfile1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,extensions_test_update,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 7beda1a..540db59 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -64,10 +64,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,hwpfilter_test_hwpfilter,\
$(eval $(call gb_CppunitTest_add_components,hwpfilter_test_hwpfilter,\
configmgr/source/configmgr \
hwpfilter/source/hwp \
-))
-$(eval $(call gb_CppunitTest_add_old_components,hwpfilter_test_hwpfilter,\
- ucb1 \
- ucpfile1 \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
))
$(eval $(call gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 0f73599..72f87d6 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -64,11 +64,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,lotuswordpro_test_lotuswordpro,\
$(eval $(call gb_CppunitTest_add_components,lotuswordpro_test_lotuswordpro,\
configmgr/source/configmgr \
lotuswordpro/util/lwpfilter \
-))
-
-$(eval $(call gb_CppunitTest_add_old_components,lotuswordpro_test_lotuswordpro,\
- ucb1 \
- ucpfile1 \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
))
$(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\
diff --git a/sc/CppunitTest_sc_cellrangesbase.mk b/sc/CppunitTest_sc_cellrangesbase.mk
index 051ee27..3dff643 100644
--- a/sc/CppunitTest_sc_cellrangesbase.mk
+++ b/sc/CppunitTest_sc_cellrangesbase.mk
@@ -115,17 +115,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_cellrangesbase,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 187f13a..a5ba678 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -114,17 +114,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_databaserangeobj,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_databaserangeobj,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_databaserangeobj,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 236ffb9..8039ecc 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -115,17 +115,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_datapilotfieldobj,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_datapilotfieldobj,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 4ad57ba..259d308 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -111,6 +111,9 @@ $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
sot/util/sot \
svl/util/svl \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
@@ -118,9 +121,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
$(eval $(call gb_CppunitTest_add_old_components,sc_filters_test,\
embobj \
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
))
$(eval $(call gb_CppunitTest_set_args,sc_filters_test,\
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index e760cb2..b8205ac 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -113,17 +113,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_macros_test,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_macros_test,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_macros_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index c41c29e..ee96b02 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -115,17 +115,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_namedrangeobj,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_namedrangeobj,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_namedrangeobj,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_spreadsheetobj.mk b/sc/CppunitTest_sc_spreadsheetobj.mk
index f29818b..62d3272 100644
--- a/sc/CppunitTest_sc_spreadsheetobj.mk
+++ b/sc/CppunitTest_sc_spreadsheetobj.mk
@@ -114,17 +114,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_spreadsheetobj,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_spreadsheetobj,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_spreadsheetobj,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 2fe33e9..a72b09f 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -110,6 +110,9 @@ $(eval $(call gb_CppunitTest_add_components,sc_subsequent_filters_test,\
sot/util/sot \
svl/util/svl \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
@@ -131,9 +134,6 @@ endif
$(eval $(call gb_CppunitTest_add_old_components,sc_subsequent_filters_test,\
embobj \
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
))
$(eval $(call gb_CppunitTest_set_args,sc_subsequent_filters_test,\
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 1a65fa6..b8f1838 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -114,17 +114,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_tableautoformatfield,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_tableautoformatfield,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_tableautoformatfield,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 3862ff2..f3d5c02 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -100,14 +100,11 @@ $(eval $(call gb_CppunitTest_add_components,sc_ucalc,\
framework/util/fwk \
i18npool/util/i18npool \
sfx2/util/sfx \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_ucalc,\
- ucb1 \
- ucpfile1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 9216515..b4de440 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -106,6 +106,9 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\
sfx2/util/sfx \
sot/util/sot \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
@@ -115,9 +118,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\
$(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\
embobj \
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
))
$(eval $(call gb_CppunitTest_set_args,sd_filters_test,\
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index 85b5c6d..42a7d99 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -110,6 +110,12 @@ $(eval $(call gb_CppunitTest_add_components,sd_regression_test,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/expand/ucpexpand1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/gio/ucpgio \
+ ucb/source/ucp/package/ucppkg1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
@@ -119,12 +125,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_regression_test,\
$(eval $(call gb_CppunitTest_add_old_components,sd_regression_test,\
embobj \
- ucb1 \
- ucpexpand1 \
- ucpfile1 \
- ucpgio \
- ucppkg1 \
- ucptdoc1 \
))
$(eval $(call gb_CppunitTest_set_args,sd_regression_test,\
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 34d6afb..ce85a4c 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -79,24 +79,24 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\
))
$(eval $(call gb_CppunitTest_add_components,sw_filters_test,\
+ comphelper/util/comphelp \
configmgr/source/configmgr \
- sw/util/sw \
- sw/util/msword \
- forms/util/frm \
dbaccess/util/dba \
- sfx2/util/sfx \
+ fileaccess/source/fileacc \
+ forms/util/frm \
framework/util/fwk \
+ i18npool/util/i18npool \
+ package/util/package2 \
+ sfx2/util/sfx \
+ sw/util/msword \
+ sw/util/sw \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
- fileaccess/source/fileacc \
- comphelper/util/comphelp \
- i18npool/util/i18npool \
- package/util/package2 \
))
$(eval $(call gb_CppunitTest_add_old_components,sw_filters_test,\
- ucb1 \
- ucpfile1 \
ucpchelp1 \
))
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 58d11fa..0a2a81d 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -115,17 +115,14 @@ $(eval $(call gb_CppunitTest_add_components,sw_macros_test,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sw_macros_test,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sw_macros_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 8cea3f7..d5056ed 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -94,18 +94,15 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_swdoc_test,\
))
$(eval $(call gb_CppunitTest_add_components,sw_swdoc_test,\
+ comphelper/util/comphelp \
configmgr/source/configmgr \
- sfx2/util/sfx \
- framework/util/fwk \
- unoxml/source/service/unoxml \
fileaccess/source/fileacc \
- comphelper/util/comphelp \
+ framework/util/fwk \
i18npool/util/i18npool \
-))
-
-$(eval $(call gb_CppunitTest_add_old_components,sw_swdoc_test,\
- ucb1 \
- ucpfile1 \
+ sfx2/util/sfx \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml \
))
$(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 737cde3..564a73a 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -59,15 +59,12 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,writerfilter_rtftok,\
))
$(eval $(call gb_CppunitTest_add_components,writerfilter_rtftok,\
- configmgr/source/configmgr \
+ configmgr/source/configmgr \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
writerfilter/util/writerfilter \
))
-$(eval $(call gb_CppunitTest_add_old_components,writerfilter_rtftok,\
- ucb1 \
- ucpfile1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,writerfilter_rtftok,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
commit cbd2e67d20788922e5bd6c374e32d810d209bc90
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Jan 15 02:58:30 2012 +0100
ucb: convert to gbuild
diff --git a/Repository.mk b/Repository.mk
index d781001..c9a8dfb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -310,6 +310,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
affine_uno \
avmediagst \
avmediawin \
+ cached1 \
collator_data \
deployment \
deploymentgui \
@@ -324,20 +325,24 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
localedata_others \
log_uno \
mcnttype \
- neon \
package2 \
reg \
scriptframe \
sofficeapp \
+ srtrs1 \
store \
test \
- unotest \
textconv_dict \
- ucb \
- ucpfile \
+ ucb1 \
+ ucpdav1 \
+ ucpfile1 \
+ ucpftp1 \
+ ucphier1 \
+ ucppkg1 \
unopkgapp \
- updchk \
+ unotest \
unsafe_uno \
+ updchk \
xmlsecurity \
xsec_fw \
xsec_xmlsec \
@@ -346,6 +351,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
lo-bootstrap \
) \
$(if $(filter $(OS),WNT), \
+ ucpodma1 \
uwinapi \
) \
))
@@ -414,6 +420,12 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
slideshow \
stocservices \
stringresource \
+ ucpcmis1 \
+ ucpexpand1 \
+ ucpext \
+ ucpgio1 \
+ ucpgvfs1 \
+ ucptdoc1 \
updatefeed \
vbaevents \
vbaobj \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index bcbbdc3..70ff3a7 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -40,8 +40,6 @@ gb_Library_FILENAMES := $(patsubst log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$
gb_Library_FILENAMES := $(patsubst purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst unsafe_uno:libunsafe_uno%,unsafe_uno:libunsafe_uno_uno%,$(gb_Library_FILENAMES))
endif
@@ -51,8 +49,6 @@ gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp
gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst log_uno:log_uno%,log_uno:log_uno_uno%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index f36055f..3f0f023 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
twain \
toolkit \
tools \
+ ucb \
ucbhelper \
udkapi \
unixODBC \
@@ -127,9 +128,4 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
endif
endif
-# these have only migrated subsequentcheck for now
-$(eval $(call gb_Module_add_moduledirs,ooo,\
- ucb \
-))
-
# vim: set noet ts=4 sw=4:
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 85a7d18..c7c1f0c 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -42,8 +42,8 @@ $(eval $(call desktop_Pagein_add_libs,common,\
fwi \
fwl \
package2 \
- ucpfile \
- ucb \
+ ucpfile1 \
+ ucb1 \
configmgr \
vclplug_gen \
$(if $(findstring TRUE,$(ENABLE_GTK)),vclplug_gtk) \
@@ -88,7 +88,7 @@ $(eval $(call desktop_Pagein_add_objects,common,\
$(eval $(call desktop_Pagein_add_libs,common,\
deployment \
deploymentmisc \
- ucb \
+ ucb1 \
xstor \
package2 \
filterconfig \
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 41540d3..26549ff 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -32,7 +32,6 @@ TARGET = packcomponents
.INCLUDE: settings.mk
my_components = \
- cached1 \
calc \
component/animations/source/animcore/animcore \
component/avmedia/util/avmedia \
@@ -126,6 +125,17 @@ my_components = \
component/sw/util/swd \
component/sw/util/vbaswobj \
component/toolkit/util/tk \
+ component/ucb/source/sorter/srtrs1 \
+ component/ucb/source/core/ucb1 \
+ component/ucb/source/cacher/cached1 \
+ component/ucb/source/ucp/cmis/ucpcmis1 \
+ component/ucb/source/ucp/expand/ucpexpand1 \
+ component/ucb/source/ucp/ext/ucpext \
+ component/ucb/source/ucp/file/ucpfile1 \
+ component/ucb/source/ucp/ftp/ucpftp1 \
+ component/ucb/source/ucp/hierarchy/ucphier1 \
+ component/ucb/source/ucp/package/ucppkg1 \
+ component/ucb/source/ucp/tdoc/ucptdoc1 \
component/UnoControls/util/ctl \
component/unotools/util/utl \
component/unoxml/source/rdf/unordf \
@@ -152,16 +162,6 @@ my_components = \
mysql \
odbc \
sdbc2 \
- srtrs1 \
- ucb1 \
- ucpexpand1 \
- ucpext \
- ucpfile1 \
- ucpftp1 \
- ucphier1 \
- ucppkg1 \
- ucptdoc1 \
- ucpcmis1 \
.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
my_components += \
@@ -202,7 +202,7 @@ my_components += emboleobj
.END
.IF "$(DISABLE_NEON)" != "TRUE"
-my_components += ucpdav1
+my_components += component/ucb/source/ucp/webdav/ucpdav1
.END
.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
@@ -214,11 +214,11 @@ my_components += gconfbe1
.END
.IF "$(ENABLE_GIO)" != ""
-my_components += ucpgio
+my_components += component/ucb/source/ucp/gio/ucpgio
.END
.IF "$(ENABLE_GNOMEVFS)" != ""
-my_components += ucpgvfs
+my_components += component/ucb/source/ucp/gvfs/ucpgvfs
.END
.IF "$(ENABLE_KAB)" != ""
diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk
new file mode 100644
index 0000000..70f8af1
--- /dev/null
+++ b/ucb/Library_cached1.mk
@@ -0,0 +1,54 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,cached1))
+
+$(eval $(call gb_Library_set_componentfile,cached1,ucb/source/cacher/cached1))
+
+$(eval $(call gb_Library_add_api,cached1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,cached1,\
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cached1,\
+ ucb/source/cacher/cachedcontentresultset \
+ ucb/source/cacher/cachedcontentresultsetstub \
+ ucb/source/cacher/cacheddynamicresultset \
+ ucb/source/cacher/cacheddynamicresultsetstub \
+ ucb/source/cacher/cacheserv \
+ ucb/source/cacher/contentresultsetwrapper \
+ ucb/source/cacher/dynamicresultsetwrapper \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk
new file mode 100644
index 0000000..8d6b2f7
--- /dev/null
+++ b/ucb/Library_srtrs1.mk
@@ -0,0 +1,50 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,srtrs1))
+
+$(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1))
+
+$(eval $(call gb_Library_add_api,srtrs1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,srtrs1,\
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,srtrs1,\
+ ucb/source/sorter/sortdynres \
+ ucb/source/sorter/sortmain \
+ ucb/source/sorter/sortresult \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk
new file mode 100644
index 0000000..00b87b7
--- /dev/null
+++ b/ucb/Library_ucb1.mk
@@ -0,0 +1,63 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucb1))
+
+$(eval $(call gb_Library_set_componentfile,ucb1,ucb/source/core/ucb1))
+
+$(eval $(call gb_Library_set_include,ucb1,\
+ -I$(SRCDIR)/ucb/source/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,ucb1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucb1,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucb1,\
+ ucb/source/core/cmdenv \
+ ucb/source/core/identify \
+ ucb/source/core/provprox \
+ ucb/source/core/ucb \
+ ucb/source/core/ucbcmds \
+ ucb/source/core/ucbprops \
+ ucb/source/core/ucbserv \
+ ucb/source/core/ucbstore \
+ ucb/source/regexp/regexp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk
new file mode 100644
index 0000000..20ad4aa
--- /dev/null
+++ b/ucb/Library_ucpcmis1.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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucpcmis1))
+
+$(eval $(call gb_Library_set_componentfile,ucpcmis1,ucb/source/ucp/cmis/ucpcmis1))
+
+$(eval $(call gb_Library_add_api,ucpcmis1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpcmis1,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ ucbhelper \
+ tl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,ucpcmis1,\
+ cmis \
+ curl \
+ libxml2 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpcmis1,\
+ ucb/source/ucp/cmis/cmis_content \
+ ucb/source/ucp/cmis/cmis_provider \
+ ucb/source/ucp/cmis/cmis_url \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
new file mode 100644
index 0000000..6134871
--- /dev/null
+++ b/ucb/Library_ucpdav1.mk
@@ -0,0 +1,91 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucpdav1))
+
+$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1))
+
+$(eval $(call gb_Library_add_api,ucpdav1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpdav1,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,ucpdav1,\
+ libxml2 \
+ neon \
+ openssl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpdav1,\
+ ucb/source/ucp/webdav/ContentProperties \
+ ucb/source/ucp/webdav/DateTimeHelper \
+ ucb/source/ucp/webdav/DAVProperties \
+ ucb/source/ucp/webdav/DAVResourceAccess \
+ ucb/source/ucp/webdav/DAVSessionFactory \
+ ucb/source/ucp/webdav/LinkSequence \
+ ucb/source/ucp/webdav/LockEntrySequence \
+ ucb/source/ucp/webdav/LockSequence \
+ ucb/source/ucp/webdav/NeonHeadRequest \
+ ucb/source/ucp/webdav/NeonInputStream \
+ ucb/source/ucp/webdav/NeonLockStore \
+ ucb/source/ucp/webdav/NeonPropFindRequest \
+ ucb/source/ucp/webdav/NeonSession \
+ ucb/source/ucp/webdav/NeonUri \
+ ucb/source/ucp/webdav/UCBDeadPropertyValue \
+ ucb/source/ucp/webdav/webdavcontentcaps \
+ ucb/source/ucp/webdav/webdavcontent \
+ ucb/source/ucp/webdav/webdavdatasupplier \
+ ucb/source/ucp/webdav/webdavprovider \
+ ucb/source/ucp/webdav/webdavresultset \
+ ucb/source/ucp/webdav/webdavservices \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,ucpdav1,\
+ ws2_32 \
+))
+endif
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_linked_libs,ucpdav1,\
+ dl \
+ nsl \
+ socket \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk
new file mode 100644
index 0000000..0209bfc
--- /dev/null
+++ b/ucb/Library_ucpexpand1.mk
@@ -0,0 +1,49 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucpexpand1))
+
+$(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpexpand1))
+
+$(eval $(call gb_Library_add_api,ucpexpand1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpexpand1,\
+ cppu \
+ cppuhelper \
+ sal \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpexpand1,\
+ ucb/source/ucp/expand/ucpexpand \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk
new file mode 100644
index 0000000..5a60171
--- /dev/null
+++ b/ucb/Library_ucpext.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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucpext))
+
+$(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext))
+
+$(eval $(call gb_Library_add_api,ucpext,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpext,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpext,\
+ ucb/source/ucp/ext/ucpext_content \
+ ucb/source/ucp/ext/ucpext_datasupplier \
+ ucb/source/ucp/ext/ucpext_provider \
+ ucb/source/ucp/ext/ucpext_resultset \
+ ucb/source/ucp/ext/ucpext_services \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk
new file mode 100644
index 0000000..6d513ce
--- /dev/null
+++ b/ucb/Library_ucpfile1.mk
@@ -0,0 +1,63 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucpfile1))
+
+$(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1))
+
+$(eval $(call gb_Library_add_api,ucpfile1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpfile1,\
+ cppu \
+ cppuhelper \
+ sal \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpfile1,\
+ ucb/source/ucp/file/bc \
+ ucb/source/ucp/file/filcmd \
+ ucb/source/ucp/file/filglob \
+ ucb/source/ucp/file/filid \
+ ucb/source/ucp/file/filinpstr \
+ ucb/source/ucp/file/filinsreq \
+ ucb/source/ucp/file/filnot \
+ ucb/source/ucp/file/filprp \
+ ucb/source/ucp/file/filrec \
+ ucb/source/ucp/file/filrow \
+ ucb/source/ucp/file/filrset \
+ ucb/source/ucp/file/filstr \
+ ucb/source/ucp/file/filtask \
+ ucb/source/ucp/file/prov \
+ ucb/source/ucp/file/shell \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk
new file mode 100644
index 0000000..e4d5d56
--- /dev/null
+++ b/ucb/Library_ucpftp1.mk
@@ -0,0 +1,66 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucpftp1))
+
+$(eval $(call gb_Library_set_componentfile,ucpftp1,ucb/source/ucp/ftp/ucpftp1))
+
+$(eval $(call gb_Library_add_api,ucpftp1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpftp1,\
+ cppu \
+ cppuhelper \
+ sal \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,ucpftp1,\
+ curl \
+ zlib \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpftp1,\
+ ucb/source/ucp/ftp/ftpcfunc \
+ ucb/source/ucp/ftp/ftpcontentcaps \
+ ucb/source/ucp/ftp/ftpcontent \
+ ucb/source/ucp/ftp/ftpcontentidentifier \
+ ucb/source/ucp/ftp/ftpcontentprovider \
+ ucb/source/ucp/ftp/ftpdirp \
+ ucb/source/ucp/ftp/ftpdynresultset \
+ ucb/source/ucp/ftp/ftpintreq \
+ ucb/source/ucp/ftp/ftploaderthread \
+ ucb/source/ucp/ftp/ftpresultsetbase \
+ ucb/source/ucp/ftp/ftpresultsetI \
+ ucb/source/ucp/ftp/ftpservices \
+ ucb/source/ucp/ftp/ftpurl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk
new file mode 100644
index 0000000..ec3dc9b
--- /dev/null
+++ b/ucb/Library_ucpgio1.mk
@@ -0,0 +1,61 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucpgio1))
+
+$(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio))
+
+$(eval $(call gb_Library_add_api,ucpgio1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpgio1,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,ucpgio1,\
+ gio \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpgio1,\
+ ucb/source/ucp/gio/gio_content \
+ ucb/source/ucp/gio/gio_datasupplier \
+ ucb/source/ucp/gio/gio_inputstream \
+ ucb/source/ucp/gio/gio_mount \
+ ucb/source/ucp/gio/gio_outputstream \
+ ucb/source/ucp/gio/gio_provider \
+ ucb/source/ucp/gio/gio_resultset \
+ ucb/source/ucp/gio/gio_seekable \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk
new file mode 100644
index 0000000..787d9a6
--- /dev/null
+++ b/ucb/Library_ucpgvfs1.mk
@@ -0,0 +1,62 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucpgvfs1))
+
+$(eval $(call gb_Library_set_componentfile,ucpgvfs1,ucb/source/ucp/gvfs/ucpgvfs))
+
+$(eval $(call gb_Library_set_include,ucpgvfs1,\
+ $(GNOMEVFS_CFLAGS) \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,ucpgvfs1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_libs,ucpgvfs1,\
+ $(GNOMEVFS_LIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpgvfs1,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpgvfs1,\
+ ucb/source/ucp/gvfs/gvfs_content \
+ ucb/source/ucp/gvfs/gvfs_directory \
+ ucb/source/ucp/gvfs/gvfs_provider \
+ ucb/source/ucp/gvfs/gvfs_stream \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk
new file mode 100644
index 0000000..059e408
--- /dev/null
+++ b/ucb/Library_ucphier1.mk
@@ -0,0 +1,58 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucphier1))
+
+$(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1))
+
+$(eval $(call gb_Library_add_api,ucphier1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucphier1,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucphier1,\
+ ucb/source/ucp/hierarchy/dynamicresultset \
+ ucb/source/ucp/hierarchy/hierarchycontentcaps \
+ ucb/source/ucp/hierarchy/hierarchycontent \
+ ucb/source/ucp/hierarchy/hierarchydata \
+ ucb/source/ucp/hierarchy/hierarchydatasource \
+ ucb/source/ucp/hierarchy/hierarchydatasupplier \
+ ucb/source/ucp/hierarchy/hierarchyprovider \
+ ucb/source/ucp/hierarchy/hierarchyservices \
+ ucb/source/ucp/hierarchy/hierarchyuri \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk
new file mode 100644
index 0000000..aa6c81c
--- /dev/null
+++ b/ucb/Library_ucpodma1.mk
@@ -0,0 +1,57 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucpodma1))
+
+$(eval $(call gb_Library_set_componentfile,ucpodma1,ucb/source/ucp/odma/ucpodma1))
+
+$(eval $(call gb_Library_add_api,ucpodma1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpodma1,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpodma1,\
+ ucb/source/ucp/odma/odma_contentcaps \
+ ucb/source/ucp/odma/odma_content \
+ ucb/source/ucp/odma/odma_datasupplier \
+ ucb/source/ucp/odma/odma_inputstream \
+ ucb/source/ucp/odma/odma_lib \
+ ucb/source/ucp/odma/odma_provider \
+ ucb/source/ucp/odma/odma_resultset \
+ ucb/source/ucp/odma/odma_services \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk
new file mode 100644
index 0000000..b3a5764
--- /dev/null
+++ b/ucb/Library_ucppkg1.mk
@@ -0,0 +1,57 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucppkg1))
+
+$(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1))
+
+$(eval $(call gb_Library_add_api,ucppkg1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucppkg1,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucppkg1,\
+ ucb/source/ucp/package/pkgcontentcaps \
+ ucb/source/ucp/package/pkgcontent \
+ ucb/source/ucp/package/pkgdatasupplier \
+ ucb/source/ucp/package/pkgprovider \
+ ucb/source/ucp/package/pkgresultset \
+ ucb/source/ucp/package/pkgservices \
+ ucb/source/ucp/package/pkguri \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk
new file mode 100644
index 0000000..a84212c
--- /dev/null
+++ b/ucb/Library_ucptdoc1.mk
@@ -0,0 +1,62 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Library_Library,ucptdoc1))
+
+$(eval $(call gb_Library_set_componentfile,ucptdoc1,ucb/source/ucp/tdoc/ucptdoc1))
+
+$(eval $(call gb_Library_add_api,ucptdoc1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucptdoc1,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ ucbhelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucptdoc1,\
+ ucb/source/ucp/tdoc/tdoc_contentcaps \
+ ucb/source/ucp/tdoc/tdoc_content \
+ ucb/source/ucp/tdoc/tdoc_datasupplier \
+ ucb/source/ucp/tdoc/tdoc_docmgr \
+ ucb/source/ucp/tdoc/tdoc_documentcontentfactory \
+ ucb/source/ucp/tdoc/tdoc_passwordrequest \
+ ucb/source/ucp/tdoc/tdoc_provider \
+ ucb/source/ucp/tdoc/tdoc_resultset \
+ ucb/source/ucp/tdoc/tdoc_services \
+ ucb/source/ucp/tdoc/tdoc_stgelems \
+ ucb/source/ucp/tdoc/tdoc_storage \
+ ucb/source/ucp/tdoc/tdoc_uri \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk
index 47df6d3..7ddde7a 100644
--- a/ucb/Module_ucb.mk
+++ b/ucb/Module_ucb.mk
@@ -28,9 +28,50 @@
$(eval $(call gb_Module_Module,ucb))
+$(eval $(call gb_Module_add_targets,ucb,\
+ Library_cached1 \
+ Library_srtrs1 \
+ Library_ucb1 \
+ Library_ucpcmis1 \
+ Library_ucpexpand1 \
+ Library_ucpext \
+ Library_ucpfile1 \
+ Library_ucpftp1 \
+ Library_ucphier1 \
+ Library_ucppkg1 \
+ Library_ucptdoc1 \
+ Package_xml \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,ucb,\
+ Library_ucpodma1 \
+ Package_odma_inc \
+ StaticLibrary_odma_lib \
+))
+endif
+
+ifneq ($(DISABLE_NEON),TRUE)
+$(eval $(call gb_Module_add_targets,ucb,\
+ Library_ucpdav1 \
+))
+endif
+
+ifeq ($(ENABLE_GIO),TRUE)
+$(eval $(call gb_Module_add_targets,ucb,\
+ Library_ucpgio1 \
+))
+endif
+
+ifeq ($(ENABLE_GNOMEVFS),TRUE)
+$(eval $(call gb_Module_add_targets,ucb,\
+ Library_ucpgvfs1 \
+))
+endif
+
$(eval $(call gb_Module_add_subsequentcheck_targets,ucb,\
- JunitTest_ucb_complex \
- JunitTest_ucb_unoapi \
+ JunitTest_ucb_complex \
+ JunitTest_ucb_unoapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/ucb/Package_odma_inc.mk b/ucb/Package_odma_inc.mk
new file mode 100644
index 0000000..e9cd52a
--- /dev/null
+++ b/ucb/Package_odma_inc.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 Matúš Kukan <matus.kukan at gmail.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_Package_Package,ucb_odma_inc,$(SRCDIR)/ucb/source/ucp/odma))
+
+$(eval $(call gb_Package_add_file,ucb_odma_inc,inc/odma.h,odma.h))
+$(eval $(call gb_Package_add_file,ucb_odma_inc,inc/odma_lib.hxx,odma_lib.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/Package_xml.mk b/ucb/Package_xml.mk
new file mode 100644
index 0000000..c54af98
--- /dev/null
+++ b/ucb/Package_xml.mk
@@ -0,0 +1,46 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.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_Package_Package,ucb_xml,$(SRCDIR)/ucb/source))
+
+$(eval $(call gb_Package_add_file,ucb_xml,xml/cached.xml,cacher/cached.xml))
+$(eval $(call gb_Package_add_file,ucb_xml,xml/ucb.xml,core/ucb.xml))
+$(eval $(call gb_Package_add_file,ucb_xml,xml/srtrs.xml,sorter/srtrs.xml))
+$(eval $(call gb_Package_add_file,ucb_xml,xml/ucpfile.xml,ucp/file/ucpfile.xml))
+$(eval $(call gb_Package_add_file,ucb_xml,xml/ucpftp.xml,ucp/ftp/ucpftp.xml))
+$(eval $(call gb_Package_add_file,ucb_xml,xml/ucpgvfs.xml,ucp/gvfs/ucpgvfs.xml))
+$(eval $(call gb_Package_add_file,ucb_xml,xml/ucphier.xml,ucp/hierarchy/ucphier.xml))
+$(eval $(call gb_Package_add_file,ucb_xml,xml/ucppkg.xml,ucp/package/ucppkg.xml))
+$(eval $(call gb_Package_add_file,ucb_xml,xml/ucptdoc.xml,ucp/tdoc/ucptdoc.xml))
+$(eval $(call gb_Package_add_file,ucb_xml,xml/ucpdav.xml,ucp/webdav/ucpdav.xml))
+
+# These were not delivered:
+# $(eval $(call gb_Package_add_file,ucb_xml,xml/ucpcmis.xml,ucp/cmis/ucpcmis.xml))
+# $(eval $(call gb_Package_add_file,ucb_xml,xml/ucpgio.xml,ucp/gio/ucpgio.xml))
+# $(eval $(call gb_Package_add_file,ucb_xml,xml/ucpodma.xml,ucp/odma/ucpodma.xml))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/StaticLibrary_odma_lib.mk b/ucb/StaticLibrary_odma_lib.mk
new file mode 100644
index 0000000..2c0c537
--- /dev/null
+++ b/ucb/StaticLibrary_odma_lib.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 Matúš Kukan <matus.kukan at gmail.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_StaticLibrary_StaticLibrary,odma_lib))
+
+$(eval $(call gb_StaticLibrary_add_api,odma_lib,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,odma_lib,\
+ ucb/source/ucp/odma/odma_lib \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ucb/inc/makefile.mk b/ucb/inc/makefile.mk
deleted file mode 100644
index 3e86b0a..0000000
--- a/ucb/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=ucb
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst
index 350d3f9..eb59cbe 100644
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -1,22 +1,5 @@
uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt LIBCMIS:libcmis offapi sal salhelper ucbhelper udkapi comphelper tools NULL
-uc ucb usr1 - all uc_mkout NULL
-uc ucb\inc nmake - all uc_inc NULL
-uc ucb\source\regexp nmake - all uc_regexp uc_inc NULL
-uc ucb\source\core nmake - all uc_core uc_regexp uc_inc NULL
-uc ucb\source\cacher nmake - all uc_cacher uc_inc NULL
-uc ucb\source\sorter nmake - all uc_sorter uc_inc NULL
-uc ucb\source\ucp\ftp nmake - all uc_ftp uc_inc NULL
-uc ucb\source\ucp\file nmake - all uc_file uc_inc NULL
-uc ucb\source\ucp\gvfs nmake - u uc_gvfs uc_inc NULL
-uc ucb\source\ucp\gio nmake - u uc_gio uc_inc NULL
-uc ucb\source\ucp\hierarchy nmake - all uc_hierarchy uc_inc NULL
-uc ucb\source\ucp\webdav nmake - all uc_webdav uc_inc NULL
-uc ucb\source\ucp\package nmake - all uc_package uc_inc NULL
-uc ucb\source\ucp\tdoc nmake - all uc_tdoc uc_inc NULL
-uc ucb\source\ucp\expand nmake - all uc_expand uc_inc NULL
-uc ucb\source\ucp\ext nmake - all uc_ext uc_inc NULL
-uc ucb\source\ucp\odma nmake - w uc_odma uc_inc NULL
-uc ucb\source\ucp\cmis nmake - all uc_cmis uc_inc NULL
+uc ucb\prj nmake - all uc_prj NULL
#uc ucb\qa\complex\ucb nmake - all uc_complex_ucb uc_inc NULL
# fails, please fix
# uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL
diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst
index 080d900..e69de29 100644
--- a/ucb/prj/d.lst
+++ b/ucb/prj/d.lst
@@ -1,54 +0,0 @@
-..\%__SRC%\bin\cached*.dll %_DEST%\bin\cached*.dll
-..\%__SRC%\lib\libcached*.* %_DEST%\lib\libcached*.*
-..\%__SRC%\bin\cached*.map %_DEST%\bin\cached*.map
-..\%__SRC%\bin\cached*.sym %_DEST%\bin\cached*.sym
-..\source\cacher\cached.xml %_DEST%\xml\cached.xml
-
-..\%__SRC%\bin\srtrs*.dll %_DEST%\bin\srtrs*.dll
-..\%__SRC%\lib\libsrtrs*.* %_DEST%\lib\libsrtrs*.*
-..\%__SRC%\bin\srtrs*.map %_DEST%\bin\srtrs*.map
-..\%__SRC%\bin\srtrs*.sym %_DEST%\bin\srtrs*.sym
-..\source\sorter\srtrs.xml %_DEST%\xml\srtrs.xml
-
-..\%__SRC%\bin\ucb*.dll %_DEST%\bin\ucb*.dll
-..\%__SRC%\lib\libucb*.* %_DEST%\lib\libucb*.*
-..\%__SRC%\misc\ucb*.map %_DEST%\bin\ucb*.map
-..\%__SRC%\misc\ucb*.sym %_DEST%\bin\ucb*.sym
-..\source\core\ucb.xml %_DEST%\xml\ucb.xml
-
-..\%__SRC%\bin\ucp*.dll %_DEST%\bin\ucp*.dll
-..\%__SRC%\lib\libucp*.so %_DEST%\lib\libucp*.so
-..\%__SRC%\lib\libucp*.dylib %_DEST%\lib\libucp*.dylib
-..\%__SRC%\lib\ucp*.uno.so %_DEST%\lib\ucp*.uno.so
-..\%__SRC%\lib\ucp*.uno.dylib %_DEST%\lib\ucp*.uno.dylib
-..\%__SRC%\misc\ucp*.map %_DEST%\bin\ucp*.map
-..\%__SRC%\misc\ucp*.sym %_DEST%\bin\ucp*.sym
-
-..\%__SRC%\lib\odma_lib.lib %_DEST%\lib\odma_lib.lib
-..\%__SRC%\lib\libodma_lib.a %_DEST%\lib\libodma_lib.a
-
-..\source\ucp\odma\odma.h %_DEST%\inc\odma.h
-..\source\ucp\odma\odma_lib.hxx %_DEST%\inc\odma_lib.hxx
-
-..\source\ucp\file\ucpfile.xml %_DEST%\xml\ucpfile.xml
-..\source\ucp\ftp\ucpftp.xml %_DEST%\xml\ucpftp.xml
-..\source\ucp\hierarchy\ucphier.xml %_DEST%\xml\ucphier.xml
-..\source\ucp\package\ucppkg.xml %_DEST%\xml\ucppkg.xml
-..\source\ucp\webdav\ucpdav.xml %_DEST%\xml\ucpdav.xml
-..\source\ucp\gvfs\ucpgvfs.xml %_DEST%\xml\ucpgvfs.xml
-..\source\ucp\tdoc\ucptdoc.xml %_DEST%\xml\ucptdoc.xml
-
-..\%__SRC%\misc\ucpgvfs.component %_DEST%\xml\ucpgvfs.component
-..\%__SRC%\misc\ucpgio.component %_DEST%\xml\ucpgio.component
-..\%__SRC%\misc\ucpcmis1.component %_DEST%\xml\ucpcmis1.component
-..\%__SRC%\misc\cached1.component %_DEST%\xml\cached1.component
-..\%__SRC%\misc\srtrs1.component %_DEST%\xml\srtrs1.component
-..\%__SRC%\misc\ucb1.component %_DEST%\xml\ucb1.component
-..\%__SRC%\misc\ucpdav1.component %_DEST%\xml\ucpdav1.component
-..\%__SRC%\misc\ucpexpand1.component %_DEST%\xml\ucpexpand1.component
-..\%__SRC%\misc\ucpext.component %_DEST%\xml\ucpext.component
-..\%__SRC%\misc\ucpfile1.component %_DEST%\xml\ucpfile1.component
-..\%__SRC%\misc\ucpftp1.component %_DEST%\xml\ucpftp1.component
-..\%__SRC%\misc\ucphier1.component %_DEST%\xml\ucphier1.component
-..\%__SRC%\misc\ucppkg1.component %_DEST%\xml\ucppkg1.component
-..\%__SRC%\misc\ucptdoc1.component %_DEST%\xml\ucptdoc1.component
diff --git a/ucb/prj/makefile.mk b/ucb/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/ucb/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk
deleted file mode 100644
index 6e508ff..0000000
--- a/ucb/source/cacher/makefile.mk
+++ /dev/null
@@ -1,75 +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=ucb
-TARGET=cached
-ENABLE_EXCEPTIONS=TRUE
-
-# Version
-UCB_MAJOR=1
-
-.INCLUDE: settings.mk
-.IF "$(L10N_framework)"==""
-
-SLOFILES=\
- $(SLO)$/contentresultsetwrapper.obj \
- $(SLO)$/cachedcontentresultsetstub.obj \
- $(SLO)$/cachedcontentresultset.obj \
- $(SLO)$/dynamicresultsetwrapper.obj \
- $(SLO)$/cacheddynamicresultsetstub.obj \
- $(SLO)$/cacheddynamicresultset.obj \
- $(SLO)$/cacheserv.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(UCB_MAJOR)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1STDLIBS=\
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF # L10N_framework
-
-.INCLUDE: target.mk
-
-
-ALLTAR : $(MISC)/cached1.component
-
-$(MISC)/cached1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- cached1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt cached1.component
diff --git a/ucb/source/core/exports2.dxp b/ucb/source/core/exports2.dxp
deleted file mode 100644
index eb53b56..0000000
--- a/ucb/source/core/exports2.dxp
+++ /dev/null
@@ -1,3 +0,0 @@
-component_getFactory
-
-_ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE
diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk
deleted file mode 100644
index 916bf1a..0000000
--- a/ucb/source/core/makefile.mk
+++ /dev/null
@@ -1,80 +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=ucb
-TARGET=ucb
-ENABLE_EXCEPTIONS=TRUE
-
-# Version
-UCB_MAJOR=1
-
-.INCLUDE: settings.mk
-.IF "$(L10N_framework)"==""
-
-SLOFILES=\
- $(SLO)$/identify.obj \
- $(SLO)$/ucb.obj \
- $(SLO)$/ucbserv.obj \
- $(SLO)$/ucbstore.obj \
- $(SLO)$/ucbprops.obj \
- $(SLO)$/provprox.obj \
- $(SLO)$/ucbcmds.obj \
- $(SLO)$/cmdenv.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(UCB_MAJOR)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1STDLIBS=\
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(COMPHELPERLIB) \
- $(SALLIB) \
- $(UCBHELPERLIB)
-SHL1LIBS=\
- $(LIB1TARGET) \
- $(SLB)$/regexp.lib
-SHL1IMPLIB=i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-
-.ENDIF # L10N_framework
-
-.INCLUDE: target.mk
-
-
-ALLTAR : $(MISC)/ucb1.component
-
-$(MISC)/ucb1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ucb1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ucb1.component
diff --git a/ucb/source/regexp/makefile.mk b/ucb/source/regexp/makefile.mk
deleted file mode 100644
index e748f05..0000000
--- a/ucb/source/regexp/makefile.mk
+++ /dev/null
@@ -1,41 +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=ucb
-TARGET=regexp
-AUTOSEG=true
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-
-SLOFILES=\
- $(SLO)$/regexp.obj
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
diff --git a/ucb/source/sorter/makefile.mk b/ucb/source/sorter/makefile.mk
deleted file mode 100644
index 008e39b..0000000
--- a/ucb/source/sorter/makefile.mk
+++ /dev/null
@@ -1,71 +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=ucb
-TARGET=srtrs
-ENABLE_EXCEPTIONS=TRUE
-
-# Version
-UCB_MAJOR=1
-
-.INCLUDE: settings.mk
-.IF "$(L10N_framework)"==""
-
-SLOFILES=\
- $(SLO)$/sortdynres.obj \
- $(SLO)$/sortresult.obj \
- $(SLO)$/sortmain.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(UCB_MAJOR)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1STDLIBS=\
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF # L10N_framework
-
-.INCLUDE: target.mk
-
-
-ALLTAR : $(MISC)/srtrs1.component
-
-$(MISC)/srtrs1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- srtrs1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt srtrs1.component
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
deleted file mode 100644
index 4170bba..0000000
--- a/ucb/source/ucp/cmis/makefile.mk
+++ /dev/null
@@ -1,95 +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 = ucb
-UCPCMIS_MAJOR = 1
-TARGET = ucpcmis$(UCPCMIS_MAJOR).uno
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN=TRUE
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-.IF "$(L10N_framework)"==""
-
-.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
-
-.IF "$(SYSTEM_LIBCMIS)"=="YES"
-CMISLIB=$(LIBCMIS_LIBS)
-INCPRE+=$(LIBCMIS_CFLAGS)
-.ELSE
-CMISLIB=-lcmislib
-.ENDIF
-
-.ELSE
-
-CMISLIB=$(LIBPRE) cmislib.lib
-
-.ENDIF
-
-SLOFILES= \
- $(SLO)$/cmis_provider.obj\
- $(SLO)$/cmis_content.obj \
- $(SLO)$/cmis_url.obj
-
-SHL1STDLIBS = \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(UCBHELPERLIB) \
- $(TOOLSLIB) \
- $(CMISLIB) \
- $(CURLLIB) \
- $(LIBXML2LIB)
-
-SHL1TARGET = $(TARGET)
-
-.IF "$(GUI)"=="WNT"
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-.ELSE # just a quick hack for GCC fdo#42865
-SHL1USE_EXPORTS = name
-.ENDIF
-SHL1DEPN =
-SHL1IMPLIB = i$(TARGET)
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME = $(SHL1TARGET)
-
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/ucpcmis1.component
-
-$(MISC)/ucpcmis1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ucpcmis1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ucpcmis1.component
diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk
deleted file mode 100644
index ea6d595..0000000
--- a/ucb/source/ucp/expand/makefile.mk
+++ /dev/null
@@ -1,68 +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 = ucb
-UCPEXPAND_MAJOR = 1
-TARGET = $(ENFORCEDSHLPREFIX)ucpexpand$(UCPEXPAND_MAJOR).uno
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-.IF "$(L10N_framework)"==""
-
-SLOFILES= \
- $(SLO)$/ucpexpand.obj
-
-SHL1STDLIBS = \
- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-SHL1TARGET = $(TARGET)
-
-SHL1DEPN =
-SHL1IMPLIB = i$(TARGET)
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME = $(SHL1TARGET)
-
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/ucpexpand1.component
-
-$(MISC)/ucpexpand1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ucpexpand1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ucpexpand1.component
diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk
deleted file mode 100644
index b9e9a11..0000000
--- a/ucb/source/ucp/ext/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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 = ucb
-TARGET = $(ENFORCEDSHLPREFIX)ucpext.uno
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-SLOFILES= \
- $(SLO)$/ucpext_provider.obj \
- $(SLO)$/ucpext_content.obj \
- $(SLO)$/ucpext_services.obj \
- $(SLO)$/ucpext_resultset.obj \
- $(SLO)$/ucpext_datasupplier.obj
-
-SHL1STDLIBS = \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(SALHELPERLIB)
-
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-SHL1TARGET = $(TARGET)
-
-SHL1DEPN =
-SHL1IMPLIB = i$(TARGET)
-SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/ucpext.component
-
-$(MISC)/ucpext.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ucpext.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ucpext.component
diff --git a/ucb/source/ucp/file/exports2.dxp b/ucb/source/ucp/file/exports2.dxp
deleted file mode 100644
index 803f1cc..0000000
--- a/ucb/source/ucp/file/exports2.dxp
+++ /dev/null
@@ -1,7 +0,0 @@
-component_getFactory
-
-_ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE
-_ZTIN3com3sun4star3ucb22InteractiveIOExceptionE
-_ZTIN3com3sun4star4task28ClassifiedInteractionRequestE
-_ZTIN3com3sun4star3ucb18NameClashExceptionE
-_ZTIN3com3sun4star3ucb27UnsupportedCommandExceptionE
diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk
deleted file mode 100644
index 48baf5c..0000000
--- a/ucb/source/ucp/file/makefile.mk
+++ /dev/null
@@ -1,83 +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=ucb
-TARGET=ucpfile
-ENABLE_EXCEPTIONS=TRUE
-
-# Version
-UCPFILE_MAJOR=1
-
-.INCLUDE: settings.mk
-.IF "$(L10N_framework)"==""
-
-SLOFILES=\
- $(SLO)$/prov.obj \
- $(SLO)$/bc.obj \
- $(SLO)$/shell.obj \
- $(SLO)$/filtask.obj \
- $(SLO)$/filrow.obj \
- $(SLO)$/filrset.obj \
- $(SLO)$/filid.obj \
- $(SLO)$/filnot.obj \
- $(SLO)$/filprp.obj \
- $(SLO)$/filinpstr.obj \
- $(SLO)$/filstr.obj \
- $(SLO)$/filcmd.obj \
- $(SLO)$/filglob.obj \
- $(SLO)$/filinsreq.obj \
- $(SLO)$/filrec.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(UCPFILE_MAJOR)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=\
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(UCBHELPERLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF # L10N_framework
-
-.INCLUDE: target.mk
-
-
-ALLTAR : $(MISC)/ucpfile1.component
-
-$(MISC)/ucpfile1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ucpfile1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ucpfile1.component
diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk
deleted file mode 100644
index 5980fc7..0000000
--- a/ucb/source/ucp/ftp/makefile.mk
+++ /dev/null
@@ -1,96 +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=ucb
-TARGET=ucpftp
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-# Version
-UCPFTP_MAJOR=1
-
-
-# --- Settings ---------------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# --- General -----------------------------------------------------
-.IF "$(L10N_framework)"==""
-# first target ( shared library )
-
-SLOFILES1=\
- $(SLO)$/ftpservices.obj \
- $(SLO)$/ftpcontentprovider.obj \
- $(SLO)$/ftpcontent.obj \
- $(SLO)$/ftpcontentidentifier.obj \
- $(SLO)$/ftpcontentcaps.obj \
- $(SLO)$/ftpdynresultset.obj \
- $(SLO)$/ftpresultsetbase.obj \
- $(SLO)$/ftpresultsetI.obj \
- $(SLO)$/ftploaderthread.obj \
- $(SLO)$/ftpdirp.obj \
- $(SLO)$/ftpcfunc.obj \
- $(SLO)$/ftpurl.obj \
- $(SLO)$/ftpintreq.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES1)
-
-# --- Shared-Library 1 ---------------------------------------------------
-
-SHL1TARGET=$(TARGET)$(UCPFTP_MAJOR)
-SHL1IMPLIB=i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS=\
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(UCBHELPERLIB) \
- $(CURLLIB) \
- $(ZLIB3RDLIB)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS= \
- $(LIB1TARGET)
-
-# --- Def-File ---------------------------------------------------------
-
-DEF1NAME=$(SHL1TARGET)
-
-.ENDIF # L10N_framework
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/ucpftp1.component
-
-$(MISC)/ucpftp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ucpftp1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ucpftp1.component
diff --git a/ucb/source/ucp/gio/makefile.mk b/ucb/source/ucp/gio/makefile.mk
deleted file mode 100644
index 5787e96..0000000
--- a/ucb/source/ucp/gio/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=..$/..$/..
-PRJNAME=ucb
-# Version
-UCPGIO_MAJOR=1
-TARGET=ucpgio
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-.INCLUDE: settings.mk
-.IF "$(L10N_framework)"==""
-
-.IF "$(ENABLE_GIO)"!=""
-COMPILER_WARN_ALL=TRUE
-PKGCONFIG_MODULES=gio-2.0
-.INCLUDE: pkg_config.mk
-
-.IF "$(OS)" == "SOLARIS"
-LINKFLAGS+=-z nodefs
-.ENDIF # "$(OS)" == "SOLARIS"
-
-# no "lib" prefix
-DLLPRE =
-
-SLOFILES=$(SLO)$/gio_provider.obj\
- $(SLO)$/gio_content.obj\
- $(SLO)$/gio_resultset.obj\
- $(SLO)$/gio_datasupplier.obj\
- $(SLO)$/gio_seekable.obj\
- $(SLO)$/gio_inputstream.obj\
- $(SLO)$/gio_outputstream.obj\
- $(SLO)$/gio_mount.obj
-
-SHL1TARGET=$(TARGET)$(UCPGIO_MAJOR).uno
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=\
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(UCBHELPERLIB)
-
-SHL1STDLIBS+=$(PKGCONFIG_LIBS)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-.ENDIF # "$(ENABLE_GIO)"!=""
-.ENDIF # L10N_framework
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/ucpgio.component
-
-$(MISC)/ucpgio.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ucpgio.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ucpgio.component
diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk
deleted file mode 100644
index d38e274..0000000
--- a/ucb/source/ucp/gvfs/makefile.mk
+++ /dev/null
@@ -1,90 +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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list