[Libreoffice-commits] core.git: 11 commits - RepositoryExternal.mk scp2/AutoInstall.mk scp2/inc scp2/InstallModule_extensions.mk scp2/InstallModule_ooo.mk scp2/InstallModule_python.mk scp2/source solenv/gbuild
Michael Stahl
mstahl at redhat.com
Tue Mar 18 14:24:30 PDT 2014
RepositoryExternal.mk | 50 ++++++++++++---------------
scp2/AutoInstall.mk | 6 ++-
scp2/InstallModule_extensions.mk | 6 +--
scp2/InstallModule_ooo.mk | 26 --------------
scp2/InstallModule_python.mk | 2 +
scp2/inc/macros.inc | 8 ++++
scp2/source/extensions/file_extensions.scp | 6 ---
scp2/source/extensions/module_extensions.scp | 9 ++--
scp2/source/ooo/directory_ooo.scp | 8 ----
scp2/source/ooo/file_extra_ooo.scp | 9 ----
scp2/source/ooo/file_ooo.scp | 14 -------
scp2/source/ooo/module_hidden_ooo.scp | 3 -
scp2/source/ooo/module_reportbuilder.scp | 39 +--------------------
scp2/source/python/file_python.scp | 7 ---
scp2/source/python/module_python.scp | 5 ++
solenv/gbuild/AutoInstall.mk | 6 +--
16 files changed, 57 insertions(+), 147 deletions(-)
New commits:
commit 4c3626af6beb2a06b04bb2dbed9375a359c37a36
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 22:03:00 2014 +0100
scp2: move jfreereport to AutoInstall
Change-Id: I13bf9d1b75b3da1a8b6925f12eca938141fc9baf
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e356b47..e9b0261 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3257,7 +3257,7 @@ endef
else # !SYSTEM_JFREEREPORT
-$(eval $(call gb_Helper_register_jars,OOO,\
+$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
flow-engine \
flute-1.1.6 \
libbase-1.1.6 \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index ea11a30..8eafe81 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -7,12 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-ifeq ($(ENABLE_REPORTBUILDER),TRUE)
-ifeq ($(SYSTEM_JFREEREPORT),)
-include $(SRCDIR)/external/jfreereport/version.mk
-endif
-endif
-
$(eval $(call gb_InstallModule_InstallModule,scp2/ooo))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
@@ -40,7 +34,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
SYSTEM_HUNSPELL \
SYSTEM_HYPH \
SYSTEM_ICU \
- SYSTEM_JFREEREPORT \
SYSTEM_JPEG \
SYSTEM_LCMS2 \
SYSTEM_LIBEXTTEXTCAT \
@@ -105,21 +98,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \
))
-ifeq ($(SYSTEM_JFREEREPORT),)
-
-$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
- -DFLUTE_VERSION=$(FLUTE_VERSION) \
- -DLIBBASE_VERSION=$(LIBBASE_VERSION) \
- -DLIBFONTS_VERSION=$(LIBFONTS_VERSION) \
- -DLIBFORMULA_VERSION=$(LIBFORMULA_VERSION) \
- -DLIBLOADER_VERSION=$(LIBLOADER_VERSION) \
- -DLIBREPOSITORY_VERSION=$(LIBREPOSITORY_VERSION) \
- -DLIBSERIALIZER_VERSION=$(LIBSERIALIZER_VERSION) \
- -DLIBXML_VERSION=$(LIBXML_VERSION) \
-))
-
-endif
-
$(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
scp2/source/templates/module_helppack \
scp2/source/templates/module_helppack_root \
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp
index d57aff8..1245e7f 100644
--- a/scp2/source/ooo/module_reportbuilder.scp
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -20,19 +20,6 @@ Module gid_Module_Reportbuilder
Default = YES;
Dirs = (gid_Dir_Share_Reportbuilder);
Files = (auto_reportbuilder_ALL,
-#if ! defined SYSTEM_JFREEREPORT
- gid_File_Jar_FlowEngine,
- gid_File_Jar_Flute,
- gid_File_Jar_Libbase,
- gid_File_Jar_Libfonts,
- gid_File_Jar_Libformula,
- gid_File_Jar_Liblayout,
- gid_File_Jar_Libloader,
- gid_File_Jar_Librepository,
- gid_File_Jar_Libserializer,
- gid_File_Jar_Libxml,
- gid_File_Jar_Sac,
-#endif
gid_File_Lib_Rpt,
gid_File_Lib_Rptui,
gid_File_Lib_Rptxml,
@@ -50,21 +37,6 @@ End
STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder )
STD_JAR_FILE( gid_File_Jar_Reportbuilderwizard, reportbuilderwizard )
-/* Not sure, if can we use CONCAT3 in that context here? */
-#ifndef SYSTEM_JFREEREPORT
- STD_JAR_FILE( gid_File_Jar_FlowEngine, flow-engine )
- STD_JAR_FILE( gid_File_Jar_Flute, CONCAT3(flute,-,FLUTE_VERSION) )
- STD_JAR_FILE( gid_File_Jar_Libbase, CONCAT3(libbase,-,LIBBASE_VERSION) )
- STD_JAR_FILE( gid_File_Jar_Libfonts, CONCAT3(libfonts,-,LIBFONTS_VERSION) )
- STD_JAR_FILE( gid_File_Jar_Libformula, CONCAT3(libformula,-,LIBFORMULA_VERSION) )
- STD_JAR_FILE( gid_File_Jar_Liblayout, liblayout )
- STD_JAR_FILE( gid_File_Jar_Libloader, CONCAT3(libloader,-,LIBLOADER_VERSION) )
- STD_JAR_FILE( gid_File_Jar_Librepository, CONCAT3(librepository,-,LIBREPOSITORY_VERSION) )
- STD_JAR_FILE( gid_File_Jar_Libserializer, CONCAT3(libserializer,-,LIBSERIALIZER_VERSION) )
- STD_JAR_FILE( gid_File_Jar_Libxml, CONCAT3(libxml,-,LIBXML_VERSION) )
- STD_JAR_FILE( gid_File_Jar_Sac, sac )
-#endif
-
File gid_File_Xcd_Reportbuilder
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Share_Registry;
commit 2bec9f49504765ed9f2abe6eb16d2e331eb6be38
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 21:54:33 2014 +0100
scp2: move apache-commons to AutoInstall
Change-Id: I5a50e7fcf5eafb18a63d250a82810703d3d8b11d
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1854e40..e356b47 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3165,7 +3165,7 @@ gb_ExternalProject__use_commons-logging :=
else # !SYSTEM_APACHE_COMMONS
-$(eval $(call gb_Helper_register_jars,OOO,\
+$(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
commons-logging-1.1.1 \
))
$(eval $(call gb_Helper_register_jars,OXT,\
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index e963336..e66a705 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCOND
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,python))
+$(eval $(call gb_AutoInstall_add_module,reportbuilder,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 6a4eb7e..ea11a30 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ooo))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
ooo \
ooobinarytable \
+ reportbuilder \
))
$(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
@@ -29,7 +30,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_NPAPI_INTO_BROWSER \
ENABLE_ONLINE_UPDATE \
ENABLE_TDE \
- SYSTEM_APACHE_COMMONS \
SYSTEM_BOOST \
SYSTEM_CAIRO \
SYSTEM_CLUCENE \
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp
index 9e0ba42..d57aff8 100644
--- a/scp2/source/ooo/module_reportbuilder.scp
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -9,6 +9,8 @@
#include "macros.inc"
+#include "AutoInstall/reportbuilder"
+
Module gid_Module_Reportbuilder
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_REPORTDESIGN);
@@ -17,10 +19,7 @@ Module gid_Module_Reportbuilder
Minimal = NO;
Default = YES;
Dirs = (gid_Dir_Share_Reportbuilder);
- Files = (
-#if !defined SYSTEM_APACHE_COMMONS
- gid_File_Jar_CommonsLogging,
-#endif
+ Files = (auto_reportbuilder_ALL,
#if ! defined SYSTEM_JFREEREPORT
gid_File_Jar_FlowEngine,
gid_File_Jar_Flute,
@@ -51,10 +50,6 @@ End
STD_JAR_FILE( gid_File_Jar_Reportbuilder, reportbuilder )
STD_JAR_FILE( gid_File_Jar_Reportbuilderwizard, reportbuilderwizard )
-#if !defined SYSTEM_APACHE_COMMONS
-STD_JAR_FILE(gid_File_Jar_CommonsLogging, commons-logging-1.1.1)
-#endif
-
/* Not sure, if can we use CONCAT3 in that context here? */
#ifndef SYSTEM_JFREEREPORT
STD_JAR_FILE( gid_File_Jar_FlowEngine, flow-engine )
commit 7b56d303300fbf592473b28b654fd22fec110962
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 21:53:18 2014 +0100
gbuild: AutoInstall: substitute "." in jar names
Change-Id: Icdb628164c53d212871171ab7dea2617f79a7a36
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index d8daec8..c25c935 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -11,7 +11,7 @@
define gb_AutoInstall__make_define
echo "#define auto_$*_ALL \ " >> $@
-$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo " $(subst -,_,$(binary)), \ " >> $@;)
+$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo " $(subst .,_,$(subst -,_,$(binary))), \ " >> $@;)
echo " $(lastword $(1))" >> $@;
echo "" >> $@
endef
@@ -34,9 +34,9 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \
$(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../ure-link/lib/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;)
$(foreach exe,$(gb_Executable_MODULE_$*),\
- echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst -,_,$(exe)),$(call gb_Executable_get_filename,$(exe)))" >> $@;)
+ echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst .,_,$(subst -,_,$(exe))),$(call gb_Executable_get_filename,$(exe)))" >> $@;)
$(foreach jar,$(gb_Jar_MODULE_$*),\
- echo '$(SCP2JARTEMPLATE)(auto_$*_jar_$(subst -,_,$(jar)),$(jar).jar)' >> $@;)
+ echo '$(SCP2JARTEMPLATE)(auto_$*_jar_$(subst .,_,$(subst -,_,$(jar))),$(jar).jar)' >> $@;)
$(foreach pkg,$(gb_Package_MODULE_$*),\
echo 'PACKAGE_FILELIST(auto_$*_pkg_$(subst -,_,$(pkg)),$(pkg).filelist)' >> $@;)
commit 6474d1c13b36a7b8def221e5de27de11b15dd9d8
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 20:50:02 2014 +0100
scp2: move rhino to AutoInstall
Change-Id: I5282632315dab9002784da22e24544798f63bc47
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ede09bf..1854e40 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3131,7 +3131,7 @@ endef
else # !SYSTEM_RHINO
-$(eval $(call gb_Helper_register_jars,OOO,\
+$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
js \
))
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 7edab00..e963336 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYT
$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
+$(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index 8f36eb5..3b1b43e 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -10,10 +10,7 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/extensions))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_bsh))
-
-$(eval $(call gb_InstallModule_define_if_set,scp2/extensions,\
- SYSTEM_RHINO \
-))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_rhino))
$(eval $(call gb_InstallModule_add_defs,scp2/extensions,\
$(if $(SYSTEM_BSH),\
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 1ac77f2..95b94c7 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -228,8 +228,6 @@ End
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
-STD_JAR_FILE( gid_File_Jar_Js, js )
-
STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
File gid_File_Rdb_Scriptproviderforjavascript
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index ea7939c..523c21a 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -19,6 +19,7 @@
#include "macros.inc"
#include "AutoInstall/extensions_bsh"
+#include "AutoInstall/extensions_rhino"
Module gid_Module_Optional_Extensions
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS);
@@ -266,8 +267,7 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_JS
PackageInfo = "packinfo_extensions.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
ParentID = gid_Module_Optional_Extensions;
- Files = (
- gid_File_Jar_Js,
+ Files = (auto_extensions_rhino_ALL,
gid_File_Jar_Scriptproviderforjavascript,
gid_File_Rdb_Scriptproviderforjavascript );
Minimal = NO;
commit 376d1b594a3df8c04a2cf879561dfe0bd5dbd8a5
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 20:25:04 2014 +0100
scp2: move hsqldb to AutoInstall
Change-Id: Ib72e509df6df51c4a42ea56ce7b1927a051baad4
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4364d12..ede09bf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3090,7 +3090,7 @@ endef
else # !SYSTEM_HSQLDB
-$(eval $(call gb_Helper_register_jars,OOO,\
+$(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \
hsqldb \
))
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 7b5b13e..7edab00 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
-$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,python))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a2a9356..00b6e3d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -316,9 +316,6 @@ STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
#endif
#ifdef ENABLE_JAVA
-#ifndef SYSTEM_HSQLDB
-STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
-#endif
STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
#endif
commit 8475eb98beb07d955a391e4c8f71846a24b38667
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 20:38:30 2014 +0100
scp2: move bsh to AutoInstall
Change-Id: Ib030d8fc3bd7c3c38f8728c80414fde505b36537
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f13ed63..4364d12 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3112,7 +3112,7 @@ endef
else # !SYSTEM_BSH
-$(eval $(call gb_Helper_register_jars,OOO,\
+$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \
bsh \
))
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 8e872b0..7b5b13e 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_AutoInstall_AutoInstall))
$(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index 7250d12..8f36eb5 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -9,8 +9,9 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/extensions))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_bsh))
+
$(eval $(call gb_InstallModule_define_if_set,scp2/extensions,\
- SYSTEM_BSH \
SYSTEM_RHINO \
))
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 8375644..bed8deb 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -251,6 +251,14 @@ End
Styles = (PACKED); \
End
+#define LIBO_JAR_FILE(id,name) \
+ File id \
+ TXT_FILE_BODY; \
+ Name = name; \
+ Dir = gid_Dir_Classes; \
+ Styles = (PACKED); \
+ End
+
#define URE_JAR_FILE(id,name) \
File id \
TXT_FILE_BODY; \
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 09966f7..1ac77f2 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -213,10 +213,6 @@ End
#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
-#if !defined SYSTEM_BSH
-STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
-#endif
-
STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
File gid_File_Rdb_Scriptproviderforbeanshell
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index b088131..ea7939c 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -18,6 +18,8 @@
#include "macros.inc"
+#include "AutoInstall/extensions_bsh"
+
Module gid_Module_Optional_Extensions
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS);
ParentID = gid_Module_Optional;
@@ -246,8 +248,7 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_BS
PackageInfo = "packinfo_extensions.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
ParentID = gid_Module_Optional_Extensions;
- Files = (
- gid_File_Jar_Bsh,
+ Files = (auto_extensions_bsh_ALL,
gid_File_Jar_Scriptproviderforbeanshell,
gid_File_Rdb_Scriptproviderforbeanshell );
Minimal = NO;
commit 720ca8e1a9535bb14fcdb284b7739e98285df12f
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 18:24:15 2014 +0100
scp2: move python3 to AutoInstall
Change-Id: I6ca298bb51fd707bcda7eabc607307701a0722ac
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0d1000b..f13ed63 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2794,6 +2794,10 @@ endef
else # !SYSTEM_PYTHON
+$(eval $(call gb_Helper_register_packages_for_install,python,\
+ python3 \
+))
+
# depend on external project because on MACOSX the Package is disabled...
define gb_LinkTarget__use_python_headers
$(call gb_LinkTarget_use_external_project,$(1),python3)
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 7871455..8e872b0 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
+$(eval $(call gb_AutoInstall_add_module,python))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index 3c79ed1..a8137db 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/python))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,python))
+
ifeq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DDISABLE_PYUNO \
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index fda0ba5..43a8316 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -82,13 +82,6 @@ Directory gid_Dir_Py_PythonCore_Lib
End
#endif
-File gid_File_Py_Python_Core
- TXT_FILE_BODY;
- Dir = FILELIST_DIR;
- Name = "python3.filelist";
- Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End
-
#ifdef WNT
Directory gid_Dir_Py_PythonCore_Bin
ParentID = gid_Dir_Py_PythonCore;
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index faa157d..26c16b1 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -18,6 +18,8 @@
#include "macros.inc"
+#include "AutoInstall/python"
+
#ifndef DISABLE_PYUNO
Module gid_Module_Pyuno
@@ -36,7 +38,8 @@ Module gid_Module_Pyuno
gid_Dir_Py_PythonCore,
gid_Dir_Py_PythonCore_Bin,
gid_Dir_Py_PythonCore_Lib);
- Files = (gid_File_Pyuno,
+ Files = (auto_python_ALL,
+ gid_File_Pyuno,
gid_File_Pyuno_Rdb,
gid_File_Lib_Pyuno,
gid_File_Lib_Pythonloader,
commit 589d63451c52f7df2e5f5758432f0aa6d7a9b6c5
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 17:56:10 2014 +0100
scp2: move moz_runtime to AutoInstall
... and why is this not conditional on WITH_MOZAB4WIN but DESKTOP?
Change-Id: I6ba3780eb7472b72d4e1338948bd6ce8dcfff529
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2a6243b..0d1000b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2566,7 +2566,11 @@ endef
endif # SYSTEM_POSTGRESQL
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifneq ($(WITH_MOZAB4WIN),)
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ moz_runtime \
+))
define gb_LinkTarget__use_mozilla
@@ -2646,7 +2650,7 @@ endif # !GCC
endef
-endif # DESKTOP
+endif # WITH_MOZAB4WIN
ifeq ($(ENABLE_KDE),TRUE)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 27719e4..a2a9356 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -415,17 +415,6 @@ File gid_File_xmloff_dtd
Name = "xmloff_dtd.filelist";
End
-#if defined WITH_MOZAB4WIN
-
-File gid_File_Mozilla_Runtime
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Dir = FILELIST_DIR;
- Name = "moz_runtime.filelist";
-End
-
-#endif
-
File gid_File_Share_Labels_Xml
TXT_FILE_BODY;
Styles = (FILELIST, PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index fad9607..0d91f6e 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -306,8 +306,7 @@ Module gid_Module_Root_Files_7
Sortkey = "1900";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Help_Help_Zip,
- gid_File_Mozilla_Runtime);
+ Files = (gid_File_Help_Help_Zip);
End
#ifndef LIBO_HEADLESS
commit a8dd38dd4bab84de4525d2e96d11610525d07ffc
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 17:47:28 2014 +0100
cleanup some obsolete externals
Change-Id: I7f845d19e8a6a3b73ff79405600dec50c87fc882
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a102641..2a6243b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -973,10 +973,6 @@ endef
endif # SYSTEM_LIBXSLT
-define gb_LinkTarget__use_glib
-$(error gb_LinkTarget__use_glib should not be called any more)
-endef
-
ifeq ($(ENABLE_LIBLANGTAG),TRUE)
ifneq ($(SYSTEM_LIBLANGTAG),)
@@ -2215,22 +2211,6 @@ gb_LinkTarget__use_telepathy :=
endif # ENABLE_TELEPATHY
-define gb_LinkTarget__use_croco
-$(error gb_LinkTarget__use_croco should not be used any more)
-endef
-
-define gb_LinkTarget__use_pango
-$(error gb_LinkTarget__use_pango should not be used any more)
-endef
-
-define gb_LinkTarget__use_gsf
-$(error gb_LinkTarget__use_gsf should not be used any more)
-endef
-
-define gb_LinkTarget__use_pixbuf
-$(error gb_LinkTarget__use_pixbuf should not be used any more)
-endef
-
ifneq ($(SYSTEM_LIBPNG),)
define gb_LinkTarget__use_png
commit 01adcd8024f496c36f0d6caac2f063d048fa90e0
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 17:38:06 2014 +0100
scp2: move liblangtag to AutoInstall
Change-Id: If79d57cf1743427106c0e4202fb4d5e42b5a807e
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f55e585..a102641 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -993,6 +993,10 @@ endef
else # !SYSTEM_LIBLANGTAG
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ liblangtag_data \
+))
+
define gb_LinkTarget__use_liblangtag
$(call gb_LinkTarget_use_unpacked,$(1),langtag)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index d76394c..6a4eb7e 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
$(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_GTK \
ENABLE_KDE \
- ENABLE_LIBLANGTAG \
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
ENABLE_MACOSX_SANDBOX \
ENABLE_NPAPI_FROM_BROWSER \
@@ -46,7 +45,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
SYSTEM_LCMS2 \
SYSTEM_LIBEXTTEXTCAT \
SYSTEM_LIBJPEG \
- SYSTEM_LIBLANGTAG \
SYSTEM_LIBXML \
SYSTEM_LIBXSLT \
SYSTEM_LUCENE \
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index eb51cd8..322f282 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -242,14 +242,6 @@ Directory gid_Dir_Autotext
DosName = "autotext";
End
-#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
-Directory gid_Dir_Share_Liblangtag
- ParentID = gid_Brand_Dir_Share;
- DosName = "liblangtag";
- Styles = (WORKSTATION, CREATE);
-End
-#endif
-
Directory gid_Dir_Basic
ParentID = gid_Brand_Dir_Share;
DosName = "basic";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index f1cb3b4..62714c7 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -85,15 +85,6 @@ File gid_File_Extra_Databasebiblio
Name = "extras_databasebiblio.filelist";
End
-#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
-File gid_File_Extra_Liblangtag
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST);
- Name = "liblangtag_data.filelist";
-End
-#endif
-
#ifdef UNX
#ifndef WITHOUT_PPDS
commit 0c94f23959cd923ce642704ab9d64ab35948efec
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Mar 18 17:17:04 2014 +0100
install GLEW package in "ooo" module
Change-Id: I435d631be270daabadc348c18301931d316f5509
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 39bed26..f55e585 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -241,6 +241,10 @@ endef
else # !SYSTEM_GLEW
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ glew \
+))
+
define gb_LinkTarget__use_glew
$(call gb_LinkTarget_use_external_project,$(1),glew)
$(call gb_LinkTarget_set_include,$(1),\
More information about the Libreoffice-commits
mailing list