[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 6 commits - connectivity/AllLangResTarget_cnr.mk connectivity/Configuration_evoab2.mk connectivity/Configuration_evoab.mk connectivity/Library_evoab2.mk connectivity/Library_evoab.mk connectivity/Module_connectivity.mk postprocess/packcomponents postprocess/packregistry reportbuilder/Extension_reportbuilder.mk Repository.mk
David Tardon
dtardon at kemper.freedesktop.org
Sat Apr 14 01:11:15 PDT 2012
Repository.mk | 12 ++--
connectivity/AllLangResTarget_cnr.mk | 12 ++--
connectivity/Configuration_evoab.mk | 38 ++++++++++++++
connectivity/Configuration_evoab2.mk | 38 --------------
connectivity/Library_evoab.mk | 82 +++++++++++++++++++++++++++++++
connectivity/Library_evoab2.mk | 82 -------------------------------
connectivity/Module_connectivity.mk | 4 -
postprocess/packcomponents/makefile.mk | 19 +------
postprocess/packregistry/makefile.mk | 32 +++++++++---
reportbuilder/Extension_reportbuilder.mk | 24 ++++-----
10 files changed, 174 insertions(+), 169 deletions(-)
New commits:
commit fba02bc9fd7dc567c900508e8f354c031e45a527
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 14 10:10:43 2012 +0200
fix name of .res file
diff --git a/connectivity/AllLangResTarget_cnr.mk b/connectivity/AllLangResTarget_cnr.mk
index 2cf9bc5..3a6327a 100644
--- a/connectivity/AllLangResTarget_cnr.mk
+++ b/connectivity/AllLangResTarget_cnr.mk
@@ -25,20 +25,20 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,connectivity))
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,cnr))
-$(eval $(call gb_AllLangResTarget_add_srs,connectivity,\
- connectivity/res \
+$(eval $(call gb_AllLangResTarget_add_srs,cnr,\
+ cnr/res \
))
-$(eval $(call gb_SrsTarget_SrsTarget,connectivity/res))
+$(eval $(call gb_SrsTarget_SrsTarget,cnr/res))
-$(eval $(call gb_SrsTarget_set_include,connectivity/res,\
+$(eval $(call gb_SrsTarget_set_include,cnr/res,\
$$(INCLUDE) \
-I$(SRCDIR)/connectivity/source/inc \
))
-$(eval $(call gb_SrsTarget_add_files,connectivity/res,\
+$(eval $(call gb_SrsTarget_add_files,cnr/res,\
connectivity/source/resource/conn_shared_res.src \
))
commit 4253e1d752c96af04e60548f70ad679dedced71b
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 14 09:53:48 2012 +0200
rename evoab2 back to evoab
diff --git a/Repository.mk b/Repository.mk
index 701cdd9..22e43ee 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -218,7 +218,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
ept \
era \
eti \
- evoab2 \
+ evoab \
exp \
file \
filterconfig \
diff --git a/connectivity/Configuration_evoab.mk b/connectivity/Configuration_evoab.mk
new file mode 100644
index 0000000..ad82268
--- /dev/null
+++ b/connectivity/Configuration_evoab.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_evoab))
+
+$(eval $(call gb_Configuration_add_spool_modules,driver_evoab,connectivity/registry/evoab2,\
+ org/openoffice/Office/DataAccess/Drivers-evoab2.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,driver_evoab,connectivity/registry/evoab2,\
+ org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Configuration_evoab2.mk b/connectivity/Configuration_evoab2.mk
deleted file mode 100644
index 9221efe..0000000
--- a/connectivity/Configuration_evoab2.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Configuration_Configuration,driver_evoab2))
-
-$(eval $(call gb_Configuration_add_spool_modules,driver_evoab2,connectivity/registry/evoab2,\
- org/openoffice/Office/DataAccess/Drivers-evoab2.xcu \
-))
-
-$(eval $(call gb_Configuration_add_localized_datas,driver_evoab2,connectivity/registry/evoab2,\
- org/openoffice/Office/DataAccess/Drivers.xcu \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
new file mode 100644
index 0000000..8902c0b
--- /dev/null
+++ b/connectivity/Library_evoab.mk
@@ -0,0 +1,82 @@
+# -*- 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) 2011 Peter Foley <pefoley2 at verizon.net> (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,evoab))
+
+$(eval $(call gb_Library_add_package_headers,calc,\
+ connectivity_generated \
+))
+
+$(eval $(call gb_Library_set_include,evoab,\
+ -I$(SRCDIR)/connectivity/source/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_externals,evoab,\
+ gtk \
+ gobject \
+))
+
+$(eval $(call gb_Library_set_componentfile,evoab,connectivity/source/drivers/evoab2/evoab))
+
+$(eval $(call gb_Library_add_api,evoab,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,evoab,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ svl \
+ tl \
+ utl \
+ ucbhelper \
+ sal \
+ salhelper \
+ dbtools \
+ file \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,evoab,\
+ connectivity/source/drivers/evoab2/NDriver \
+ connectivity/source/drivers/evoab2/NTable \
+ connectivity/source/drivers/evoab2/NColumns \
+ connectivity/source/drivers/evoab2/NTables \
+ connectivity/source/drivers/evoab2/NCatalog \
+ connectivity/source/drivers/evoab2/NConnection \
+ connectivity/source/drivers/evoab2/NDatabaseMetaData \
+ connectivity/source/drivers/evoab2/NStatement \
+ connectivity/source/drivers/evoab2/NPreparedStatement \
+ connectivity/source/drivers/evoab2/NServices \
+ connectivity/source/drivers/evoab2/NResultSet \
+ connectivity/source/drivers/evoab2/NResultSetMetaData \
+ connectivity/source/drivers/evoab2/EApi \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_evoab2.mk b/connectivity/Library_evoab2.mk
deleted file mode 100644
index 1497838..0000000
--- a/connectivity/Library_evoab2.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (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,evoab2))
-
-$(eval $(call gb_Library_add_package_headers,calc,\
- connectivity_generated \
-))
-
-$(eval $(call gb_Library_set_include,evoab2,\
- -I$(SRCDIR)/connectivity/source/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_use_externals,evoab2,\
- gtk \
- gobject \
-))
-
-$(eval $(call gb_Library_set_componentfile,evoab2,connectivity/source/drivers/evoab2/evoab))
-
-$(eval $(call gb_Library_add_api,evoab2,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_add_linked_libs,evoab2,\
- comphelper \
- cppu \
- cppuhelper \
- svl \
- tl \
- utl \
- ucbhelper \
- sal \
- salhelper \
- dbtools \
- file \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,evoab2,\
- connectivity/source/drivers/evoab2/NDriver \
- connectivity/source/drivers/evoab2/NTable \
- connectivity/source/drivers/evoab2/NColumns \
- connectivity/source/drivers/evoab2/NTables \
- connectivity/source/drivers/evoab2/NCatalog \
- connectivity/source/drivers/evoab2/NConnection \
- connectivity/source/drivers/evoab2/NDatabaseMetaData \
- connectivity/source/drivers/evoab2/NStatement \
- connectivity/source/drivers/evoab2/NPreparedStatement \
- connectivity/source/drivers/evoab2/NServices \
- connectivity/source/drivers/evoab2/NResultSet \
- connectivity/source/drivers/evoab2/NResultSetMetaData \
- connectivity/source/drivers/evoab2/EApi \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 94b0bab..92d6ade 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -92,8 +92,8 @@ endif
ifeq ($(ENABLE_EVOAB2),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
- Configuration_evoab2 \
- Library_evoab2 \
+ Configuration_evoab \
+ Library_evoab \
))
endif
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 6a965bb..1a8e873 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -330,9 +330,9 @@ MY_DRIVERS += ado
ERROR : unknown-GUIBASE
.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
-MY_DRIVERS += evoab2
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab.xcu
+MY_DRIVERS += evoab
.END
.IF "$(SOLAR_JAVA)" == "TRUE"
MY_FILES_main += \
commit 0e1e691e7fea49b8002f4901918557d51c6d28d0
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 14 09:49:44 2012 +0200
place new libs into the right layers
diff --git a/Repository.mk b/Repository.mk
index 99049e9..701cdd9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -200,7 +200,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
dbase \
dbaxml \
dbmm \
- dbpool2 \
dbp \
dbtools \
dbu \
@@ -235,7 +234,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
fwm \
guesslang \
helplinker \
- hsqldb \
hwp \
hyphen \
i18nregexp \
@@ -262,8 +260,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
macabdrv1 \
MacOSXSpell \
merged \
+ mozab2 \
mozabdrv \
- mozbootstrap \
msfilter \
msword \
msworks \
@@ -289,7 +287,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
scn \
scui \
sd \
- sdbc2 \
sdbt \
sdd \
sdfilt \
@@ -379,6 +376,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
cached1 \
clucene \
collator_data \
+ dbpool2 \
deployment \
deploymentgui \
dict_ja \
@@ -386,6 +384,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
embobj \
emboleobj \
fileacc \
+ hsqldb \
index_data \
java_uno_accessbridge \
localedata_en \
@@ -393,8 +392,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
localedata_euro \
localedata_others \
mcnttype \
+ mozbootstrap \
package2 \
scriptframe \
+ sdbc2 \
smoketest \
sofficeapp \
srtrs1 \
@@ -478,7 +479,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
lomenubar \
migrationoo2 \
migrationoo3 \
- mozab2 \
msforms \
mtfrenderer \
nullcanvas \
commit 69c6a8a88a880b71932a5e4c2dee9ac2b528daf3
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 14 09:36:13 2012 +0200
fix extension name
diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk
index 2a77ae5..03fdbe8 100644
--- a/reportbuilder/Extension_reportbuilder.mk
+++ b/reportbuilder/Extension_reportbuilder.mk
@@ -25,9 +25,9 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Extension_Extension,sun-report-builder,reportbuilder/util))
+$(eval $(call gb_Extension_Extension,report-builder,reportbuilder/util))
-$(eval $(call gb_Extension_add_files,sun-report-builder,,\
+$(eval $(call gb_Extension_add_files,report-builder,,\
$(call gb_Jar_get_outdir_target,reportbuilderwizard) \
$(call gb_Jar_get_outdir_target,sun-report-builder) \
$(SRCDIR)/reportbuilder/license/readme_en-US.html \
@@ -37,14 +37,14 @@ $(eval $(call gb_Extension_add_files,sun-report-builder,,\
))
ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call gb_Extension_add_files,sun-report-builder,,\
+$(eval $(call gb_Extension_add_files,report-builder,,\
$(OUTDIR)/bin/commons-logging-1.1.1.jar \
))
endif
ifneq ($(SYSTEM_JFREEREPORT),YES)
include $(OUTDIR)/bin/jfreereport_version.mk
-$(eval $(call gb_Extension_add_files,sun-report-builder,,\
+$(eval $(call gb_Extension_add_files,report-builder,,\
$(OUTDIR)/bin/flow-engine-$(FLOW_ENGINE_VERSION).jar \
$(OUTDIR)/bin/flute-$(FLUTE_VERSION).jar \
$(OUTDIR)/bin/libbase-$(LIBBASE_VERSION).jar \
@@ -59,15 +59,15 @@ $(eval $(call gb_Extension_add_files,sun-report-builder,,\
))
endif
-$(eval $(call gb_Extension_add_files,sun-report-builder,images,\
+$(eval $(call gb_Extension_add_files,report-builder,images,\
$(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
))
-$(eval $(call gb_Extension_add_files,sun-report-builder,registry/data/org/openoffice,\
+$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice,\
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \
))
-$(eval $(call gb_Extension_add_files,sun-report-builder,registry/data/org/openoffice/Office,\
+$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office,\
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \
@@ -76,26 +76,26 @@ $(eval $(call gb_Extension_add_files,sun-report-builder,registry/data/org/openof
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu) \
))
-$(eval $(call gb_Extension_add_files,sun-report-builder,registry/data/org/openoffice/Office/UI,\
+$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \
))
-$(eval $(call gb_Extension_add_files,sun-report-builder,registry/data/org/openoffice/TypeDetection,\
+$(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/TypeDetection,\
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \
$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \
))
-$(eval $(call gb_Extension_add_files,sun-report-builder,registry/schema/org/openoffice/Office,\
+$(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office,\
$(call gb_XcsTarget_get_target,reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs) \
))
-$(eval $(call gb_Extension_add_files,sun-report-builder,registry/schema/org/openoffice/Office/UI,\
+$(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office/UI,\
$(call gb_XcsTarget_get_target,reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs) \
$(call gb_XcsTarget_get_target,reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs) \
))
-$(eval $(call gb_Extension_add_files,sun-report-builder,template/en-US/wizard/report,\
+$(eval $(call gb_Extension_add_files,report-builder,template/en-US/wizard/report,\
$(SRCDIR)/reportbuilder/template/en-US/wizard/report/default.otr \
))
commit c0b2e687a1f4e358907e05aabd22fd4b9419606a
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 14 08:32:14 2012 +0200
fix packing of DB drivers
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 5c74d41..6a965bb 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -32,6 +32,7 @@ TARGET = packregistry
MY_XCS = registry/schema/org/openoffice
MY_XCU = registry/data/org/openoffice
MY_MOD = registry/spool
+MY_DRIVERS =
MY_XCDS = \
$(MISC)/base.xcd \
@@ -77,6 +78,7 @@ MY_FILES_calc = \
.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
MY_FILES_calc += \
$(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-calc.xcu
+MY_DRIVERS += calc
.ENDIF
MY_DEPS_cjk = main
@@ -286,6 +288,7 @@ MY_FILES_main += \
$(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \
$(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \
$(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
+MY_DRIVERS += dbase flat mysql odbc
.ENDIF
.IF "$(GUIBASE)" == "aqua"
MY_FILES_main += \
@@ -295,6 +298,7 @@ MY_FILES_main += \
$(MY_MOD)/org/openoffice/Office/Common-macosx.xcu \
$(MY_MOD)/org/openoffice/Office/Paths-macosx.xcu
# Inet-macosx.xcu must come after Inet.xcu
+MY_DRIVERS += macab
.ELIF "$(GUIBASE)" == "unx"
MY_FILES_main += \
$(MY_MOD)/org/openoffice/Inet-unixdesktop.xcu \
@@ -315,6 +319,7 @@ MY_FILES_main += \
$(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
$(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu
# Inet-wnt.xcu must come after Inet.xcu
+MY_DRIVERS += ado
.ELIF "$(GUIBASE)" == "cocoatouch"
# ?
.ELIF "$(GUIBASE)" == "android"
@@ -327,21 +332,26 @@ ERROR : unknown-GUIBASE
.IF "$(ENABLE_EVOAB2)" == "TRUE"
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
+MY_DRIVERS += evoab2
.END
.IF "$(SOLAR_JAVA)" == "TRUE"
MY_FILES_main += \
$(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \
$(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu
+MY_DRIVERS += hsqldb jdbc
.END
.IF "$(ENABLE_KAB)" == "TRUE"
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-kab.xcu
+MY_DRIVERS += kab
.END
.IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO" && \
"$(OS)" != "MACOSX"
.IF "$(OS)" == "WNT"
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
+MY_DRIVERS += mozab
.ELSE
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab2.xcu
+MY_DRIVERS += mozab2
.END
.END
.IF "$(SYSTEM_LIBEXTTEXTCAT_DATA)" != ""
@@ -445,6 +455,7 @@ MY_FILES_binfilter = \
MY_XCDS += $(MISC)/postgresqlsdbc.xcd
MY_DEPS_postgresqlsdbc = main
MY_FILES_postgresqlsdbc = $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu
+MY_DRIVERS += postgresql
.END
.IF "$(GUIBASE)" == "unx" && \
@@ -479,6 +490,8 @@ MY_FILES_forcedefault = \
$(MY_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu
.END
+DRIVERS = driver_{$(MY_DRIVERS)}
+
.INCLUDE : settings.mk
.INCLUDE : target.mk
@@ -531,7 +544,7 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip
.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
-$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip
+$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/{$(DRIVERS)}_$$(@:b:s/registry_//).zip
.ENDIF
$(MISC)/lang/registry_%.xcd .ERRREMOVE :
@@ -540,16 +553,19 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
mkdir $(MISC)/$(@:b).unzip
cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
- rm -rf $(MISC)/fcfg_drivers_$*.unzip
- mkdir $(MISC)/fcfg_drivers_$*.unzip
- cd $(MISC)/fcfg_drivers_$*.unzip && \
- unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
+ rm -rf $(MISC)/{$(DRIVERS)}_$*.unzip
+ mkdir $(MISC)/{$(DRIVERS)}_$*.unzip
+ cd $(MISC) \
+ $(foreach,driver,$(DRIVERS) \
+ && cd $(driver)_$*.unzip && \
+ unzip $(SOLARPCKDIR)/$(driver)_$*.zip && \
+ cd ..)
.ENDIF
- $(RM) $(MISC)/$(@:b).list
# filter out filenames starting with "."
.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
- find $(@:b).unzip fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \
+ find $(@:b).unzip {$(DRIVERS)}_$*.unzip -name \[!.\]\*.xcu -print) \
'<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
.ELSE
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
commit 9e218a1199a32d09eec515c7a5c223ab7689a448
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 14 08:27:49 2012 +0200
fix component paths
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 0b48fa1..dabe053 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -141,24 +141,13 @@ my_components += \
component/reportdesign/util/rptui \
component/reportdesign/util/rptxml \
component/connectivity/source/drivers/dbase/dbase \
- component/connectivity/source/drivers/cpool/dbpool2 \
- component/connectivity/source/drivers/dbtools/dbtools \
- embobj \
+ component/connectivity/source/cpool/dbpool2 \
+ component/connectivity/source/dbtools/dbtools \
component/connectivity/source/drivers/flat/flat \
localebe1 \
component/connectivity/source/drivers/mysql/mysql \
component/connectivity/source/drivers/odbc/odbc \
- component/connectivity/source/drivers/sdbc2/sdbc2 \
- srtrs1 \
- ucb1 \
- ucpexpand1 \
- ucpext \
- ucpfile1 \
- ucpftp1 \
- ucphier1 \
- ucppkg1 \
- ucptdoc1 \
- ucpcmis1 \
+ component/connectivity/source/manager/sdbc2 \
.ENDIF
@@ -382,7 +371,7 @@ my_components += \
"$(WITH_MOZILLA)" != "NO"
my_components += component/connectivity/source/drivers/mozab/mozab
.ELSE
-my_components += mozbootstrap
+my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
.END
.ENDIF
More information about the Libreoffice-commits
mailing list