Hello,
i'm trying to do some work finishing --disable-extensions, see attached
patch, unfortunately it does not work.
At compile time i get these, i assume because extensions module is not
providing anything at all:
cat: workdir/unxlngx6.pro/InstallModuleTarget/scp2/extensions.filelist:
File or directory does not exist
cat: workdir/unxlngx6.pro/InstallModuleTarget/scp2/extensions.filelist:
File or directory does not exist
While at make install i get these:
: ERROR: Removing file libbiblo.so from file list.
: ERROR: Removing file libpcrlo.so from file list.
: ERROR: Removing file libscnlo.so from file list.
: ERROR: Removing file libabplo.so from file list.
: ERROR: Removing file libdbplo.so from file list.
: ERROR: Removing file libldapbe2lo.so from file list.
: ERROR: Removing file libloglo.so from file list.
: ERROR: Removing file libreslo.so from file list.
: ERROR: Removing file libupdatefeedlo.so from file list.
: ERROR: Removing file abpen-US.res from file list.
: ERROR: Removing file biben-US.res from file list.
: ERROR: Removing file dbpen-US.res from file list.
: ERROR: Removing file pcren-US.res from file list.
: ERROR: Removing file scnen-US.res from file list.
: ERROR: Removing file upden-US.res from file list.
But i have these files both in workdir and solver, e.g:
./workdir/unxlngx6/Headers/Library/libbiblo.so
./workdir/unxlngx6/LinkTarget/Library/libbiblo.so
./workdir/unxlngx6/ExternalHeaders/Library/libbiblo.so
./solver/unxlngx6/lib/libbiblo.so
Any hint?
thanks,
riccardo
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index d17a73b..7256c9a 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -60,7 +60,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,EPM,epm) \
eventattacher \
$(call gb_Helper_optional,EXPAT,expat) \
- extensions \
+ $(call gb_Helper_optional,EXTENSIONS,extensions) \
external \
extras \
fileaccess \
diff --git a/configure.ac b/configure.ac
index 41dd1cd..c975e5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2201,6 +2201,8 @@ fi
if test "$enable_extensions" = yes; then
BUILD_TYPE="$BUILD_TYPE EXTENSIONS"
AC_DEFINE(HAVE_FEATURE_EXTENSIONS)
+else
+ SCPDEFS="$SCPDEFS -DDISABLE_EXTENSIONS"
fi
if test -z "$enable_scripting"; then
@@ -8503,7 +8505,8 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents])
# Obviously no such thing on iOS or Android. Also not possible when building
# 64-bit OS X code as the plugin code uses QuickTime and Carbon.
-if test "$_os" != Android -a "$_os" != iOS -a \( $_os != Darwin -o "$BITNESS_OVERRIDE" = "" \)
+if test "$_os" != Android -a "$_os" != iOS -a \( $_os != Darwin -o "$BITNESS_OVERRIDE" = "" \) -a \
+ "$enable_headless" != yes
then
AC_MSG_RESULT([yes])
ENABLE_NPAPI_FROM_BROWSER=YES
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index be86ff7..3fadbe6 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -149,11 +149,13 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(filter-out WNT,$(OS)), \
embeddedobj/source/msole/emboleobj \
) \
- $(if $(DISABLE_ATL),, \
- $(if $(filter WNT,$(OS)), \
- embeddedobj/source/msole/emboleobj.windows \
- embedserv/util/emser \
- extensions/source/ole/oleautobridge \
+ $(if $(filter EXTENSIONS,$(BUILD_TYPE)),\
+ $(if $(DISABLE_ATL),, \
+ $(if $(filter WNT,$(OS)), \
+ embeddedobj/source/msole/emboleobj.windows \
+ embedserv/util/emser \
+ extensions/source/ole/oleautobridge \
+ ) \
) \
) \
$(if $(DISABLE_NEON),, \
@@ -215,9 +217,11 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_KDE4), \
shell/source/backends/kde4be/kde4be1 \
) \
- $(if $(ENABLE_ONLINE_UPDATE), \
- extensions/source/update/check/updchk.uno \
- extensions/source/update/ui/updchk \
+ $(if $(filter EXTENSIONS,$(BUILD_TYPE)),\
+ $(if $(ENABLE_ONLINE_UPDATE), \
+ extensions/source/update/check/updchk.uno \
+ extensions/source/update/ui/updchk \
+ ) \
) \
$(if $(ENABLE_OPENGL), \
slideshow/source/engine/OGLTrans/ogltrans \
@@ -277,15 +281,17 @@ $(eval $(call gb_Rdb_add_components,services,\
desktop/source/migration/services/migrationoo3 \
desktop/source/offacc/offacc \
$(if $(ENABLE_HEADLESS),,desktop/source/splash/spl) \
- extensions/source/abpilot/abp \
- extensions/source/bibliography/bib \
- extensions/source/config/ldap/ldapbe2 \
- extensions/source/dbpilots/dbp \
- extensions/source/logging/log \
- extensions/source/propctrlr/pcr \
- extensions/source/resource/res \
- extensions/source/scanner/scn \
- extensions/source/update/feed/updatefeed \
+ $(if $(filter EXTENSIONS,$(BUILD_TYPE)),\
+ extensions/source/abpilot/abp \
+ extensions/source/bibliography/bib \
+ extensions/source/config/ldap/ldapbe2 \
+ extensions/source/dbpilots/dbp \
+ extensions/source/logging/log \
+ extensions/source/propctrlr/pcr \
+ extensions/source/resource/res \
+ extensions/source/scanner/scn \
+ extensions/source/update/feed/updatefeed \
+ ) \
xmlhelp/source/treeview/tvhlp1 \
xmlhelp/util/ucpchelp1 \
xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows) \
@@ -325,11 +331,13 @@ endif # WNT
endif # DESKTOP
+ifeq (EXTENSIONS,$(filter EXTENSIONS,$(BUILD_TYPE)))
ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
$(eval $(call gb_Rdb_add_components,services,\
extensions/source/plugin/pl \
))
endif
+endif
ifeq ($(ENABLE_PDFIMPORT),TRUE)
$(eval $(call gb_Rdb_add_components,services,\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 41fbf96..7171dfa 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -19,7 +19,9 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_calc \
InstallModule_canvas \
InstallModule_draw \
- InstallModule_extensions \
+ $(if $(filter EXTENSIONS,$(BUILD_TYPE)),\
+ InstallModule_extensions \
+ ) \
InstallModule_graphicfilter \
InstallModule_impress \
InstallModule_math \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index fb2b35e..068b081 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -753,7 +753,7 @@ UI_FILELIST(dbtdata, "UIConfig/modules/dbtdata.filelist")
#endif
UI_FILELIST(desktop, "UIConfig/desktop.filelist")
UI_FILELIST(filter, "UIConfig/filter.filelist")
-#ifdef DBCONNECTIVITY
+#if defined DBCONNECTIVITY && !defined DISABLE_EXTENSIONS
UI_FILELIST(sbibliography, "UIConfig/modules/sbibliography.filelist")
#endif
UI_FILELIST(scalc, "UIConfig/modules/scalc.filelist")
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 6cc023f..8306d5f 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -96,7 +96,7 @@ gb_EXTRAMERGEDLIBS := \
textfd \
$(call gb_Helper_optional,DESKTOP,unopkgapp) \
unotest \
- $(call gb_Helper_optional,DESKTOP,updatefeed) \
+ $(if $(HAVE_FEATURE_EXTENSIONS),$(call gb_Helper_optional,DESKTOP,updatefeed),) \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
xmlfa \
xmlfd \
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
