Sending to list, because maybe _mst is very busy and some other guy can
help me on this :)
-------- Mensagem original --------
Assunto: Problem while moving oox to autoinstallation
Data: Tue, 19 Nov 2013 09:07:13 -0200
De: Marcos Souza <marcos.souza@libreoffice.org>
Para: mstahl@redhat.com
Hi Michail, how are you?
I hope fine :)
So, I told you when I was in Germany about an problem while I tried to
move oox module to autoinstallation. Attached is a patch that I did
yesterday moving this an another libs.
I got this errror:
: *****************************************************************
: ERROR: Could not find file gid_File_Lib_Oox in list of files! at
/home/marcos/gitroot/core/solenv/bin/modules/installer/profiles.pm line 84.
: *****************************************************************
And, I did and git grep:
marcos@jedi:~/gitroot/core$ git grep gid_File_Lib_Oox
instsetoo_native/util/openoffice.lst.in: GLOBALFILEGID
gid_File_Lib_Oox
instsetoo_native/util/openoffice.lst.in: GLOBALFILEGID
gid_File_Lib_Oox
solenv/bin/modules/installer/profiles.pm: # Taking the base data from
the "gid_File_Lib_Oox"
solenv/bin/modules/installer/profiles.pm: my $vclgid =
"gid_File_Lib_Oox";
So, it seems to use oox as base to another libs to move or I'm missing
something?
Thanks a lot for looking at this!
PATCH:
diff --git a/Repository.mk b/Repository.mk
index eca28ce..c4a6b57 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -305,6 +305,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
odbcbase \
odfflatxml \
offacc \
+ oox \
passwordcontainer \
pcr \
$(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \
@@ -323,6 +324,12 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
simplecanvas \
slideshow \
sot \
+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+ $(if $(ENABLE_HEADLESS),, \
+ spa \
+ spl_unx \
+ ) \
+ ) \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
$(if $(DISABLE_SCRIPTING),,stringresource) \
@@ -352,7 +359,13 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
vcl \
vclcanvas \
- $(if $(and $(filter unx,$(GUIBASE)),$(filter-out
MACOSX,$(OS))),vclplug_gen) \
+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+ vclplug_gen \
+ $(if $(ENABLE_TDE),vclplug_tde) \
+ $(if $(ENABLE_KDE),vclplug_kde) \
+ $(if $(ENABLE_KDE4),vclplug_kde4) \
+ $(if $(ENABLE_HEADLESS),,vclplug_svp) \
+ ) \
xmlscript \
xmlfa \
xmlfd \
@@ -404,7 +417,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basebmp \
) \
communi \
- oox \
ooxml \
sdbc \
avmediaQuickTime \
@@ -413,12 +425,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
rptui \
rptxml \
simplecm \
- spa \
sts \
- vclplug_tde \
- vclplug_kde \
- vclplug_kde4 \
- vclplug_svp \
))
ifneq (,$(filter ANDROID IOS,$(OS)))
@@ -429,14 +436,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif
-ifeq ($(filter MACOSX WNT,$(OS)),)
-
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- spl_unx \
-))
-
-endif
-
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
getuid \
smoketest \
@@ -528,6 +527,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
) \
$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
package2 \
+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out
MACOSX,$(OS))),recentfile) \
$(if $(DISABLE_SCRIPTING),,scriptframe) \
sdbc2 \
sofficeapp \
@@ -563,7 +563,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
pyuno \
pyuno_wrapper \
- recentfile \
ucpdav1 \
xsec_xmlsec \
$(if $(filter $(OS),ANDROID), \
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index d8245c9..10ab3ce 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -244,27 +244,6 @@ End
#endif
-#if defined(UNX) && ! defined(MACOSX)
-#ifdef ENABLE_TDE
-File gid_File_Lib_Vclplug_Tde
- Name = LIBNAME(vclplug_tde);
- PACKED_LIB_FILE_BODY;
-End
-#endif
-#ifdef ENABLE_KDE
-File gid_File_Lib_Vclplug_Kde
- Name = LIBNAME(vclplug_kde);
- PACKED_LIB_FILE_BODY;
-End
-#endif
-#ifdef ENABLE_KDE4
-File gid_File_Lib_Vclplug_Kde4
- Name = LIBNAME(vclplug_kde4);
- PACKED_LIB_FILE_BODY;
-End
-#endif
-#endif
-
#if defined(MACOSX)
File gid_File_Lib_Basebmp
Name = LIBNAME(basebmp);
@@ -273,36 +252,9 @@ End
#endif
#if defined UNX && ! defined MACOSX
-#if ! defined LIBO_HEADLESS
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
-#endif
STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#endif
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Lib_Recentfile
- PACKED_LIB_FILE_BODY;
- Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
-End
-
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Oox , oox)
-
-#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
-
-File gid_File_Lib_Spa
- Name = LIBNAME(spa);
- PACKED_LIB_FILE_BODY;
-End
-
-#endif
-
-#if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS
-STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
-#endif
-
#if ! defined UNX
File gid_File_Lib_Sysdtrans
PACKED_LIB_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 22edd6c..bd3225a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -144,15 +144,9 @@ Module gid_Module_Root_Files_4
auto_ooobinarytable_ALL,
gid_File_Lib_Bib,
gid_File_Lib_J,
- gid_File_Lib_Oox,
- gid_File_Lib_Spa,
gid_File_Lib_Sysdtrans,
gid_File_Lib_BaseBmp,
- gid_File_Lib_Zip,
- gid_File_Lib_Vclplug_Tde,
- gid_File_Lib_Vclplug_Kde,
- gid_File_Lib_Vclplug_Kde4,
- gid_File_Lib_Vclplug_Svp);
+ gid_File_Lib_Zip);
End
Module gid_Module_Root_Files_5
@@ -175,7 +169,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Icui18n,
gid_File_Lib_Icuuc,
gid_File_Lib_Openssl,
- gid_File_Lib_Recentfile,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
gid_File_Lib_Raptor,
diff --git a/Repository.mk b/Repository.mk
index eca28ce..c4a6b57 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -305,6 +305,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
odbcbase \
odfflatxml \
offacc \
+ oox \
passwordcontainer \
pcr \
$(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \
@@ -323,6 +324,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
simplecanvas \
slideshow \
sot \
+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+ $(if $(ENABLE_HEADLESS),, \
+ spa \
+ spl_unx \
+ ) \
+ ) \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
$(if $(DISABLE_SCRIPTING),,stringresource) \
@@ -352,7 +359,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
vcl \
vclcanvas \
- $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \
+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+ vclplug_gen \
+ $(if $(ENABLE_TDE),vclplug_tde) \
+ $(if $(ENABLE_KDE),vclplug_kde) \
+ $(if $(ENABLE_KDE4),vclplug_kde4) \
+ $(if $(ENABLE_HEADLESS),,vclplug_svp) \
+ ) \
xmlscript \
xmlfa \
xmlfd \
@@ -404,7 +417,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basebmp \
) \
communi \
- oox \
ooxml \
sdbc \
avmediaQuickTime \
@@ -413,12 +425,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
rptui \
rptxml \
simplecm \
- spa \
sts \
- vclplug_tde \
- vclplug_kde \
- vclplug_kde4 \
- vclplug_svp \
))
ifneq (,$(filter ANDROID IOS,$(OS)))
@@ -429,14 +436,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif
-ifeq ($(filter MACOSX WNT,$(OS)),)
-
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- spl_unx \
-))
-
-endif
-
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
getuid \
smoketest \
@@ -528,6 +527,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
) \
$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
package2 \
+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),recentfile) \
$(if $(DISABLE_SCRIPTING),,scriptframe) \
sdbc2 \
sofficeapp \
@@ -563,7 +563,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
pyuno \
pyuno_wrapper \
- recentfile \
ucpdav1 \
xsec_xmlsec \
$(if $(filter $(OS),ANDROID), \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index d8245c9..10ab3ce 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -244,27 +244,6 @@ End
#endif
-#if defined(UNX) && ! defined(MACOSX)
-#ifdef ENABLE_TDE
-File gid_File_Lib_Vclplug_Tde
- Name = LIBNAME(vclplug_tde);
- PACKED_LIB_FILE_BODY;
-End
-#endif
-#ifdef ENABLE_KDE
-File gid_File_Lib_Vclplug_Kde
- Name = LIBNAME(vclplug_kde);
- PACKED_LIB_FILE_BODY;
-End
-#endif
-#ifdef ENABLE_KDE4
-File gid_File_Lib_Vclplug_Kde4
- Name = LIBNAME(vclplug_kde4);
- PACKED_LIB_FILE_BODY;
-End
-#endif
-#endif
-
#if defined(MACOSX)
File gid_File_Lib_Basebmp
Name = LIBNAME(basebmp);
@@ -273,36 +252,9 @@ End
#endif
#if defined UNX && ! defined MACOSX
-#if ! defined LIBO_HEADLESS
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
-#endif
STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#endif
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Lib_Recentfile
- PACKED_LIB_FILE_BODY;
- Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
-End
-
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Oox , oox)
-
-#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
-
-File gid_File_Lib_Spa
- Name = LIBNAME(spa);
- PACKED_LIB_FILE_BODY;
-End
-
-#endif
-
-#if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS
-STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
-#endif
-
#if ! defined UNX
File gid_File_Lib_Sysdtrans
PACKED_LIB_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 22edd6c..bd3225a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -144,15 +144,9 @@ Module gid_Module_Root_Files_4
auto_ooobinarytable_ALL,
gid_File_Lib_Bib,
gid_File_Lib_J,
- gid_File_Lib_Oox,
- gid_File_Lib_Spa,
gid_File_Lib_Sysdtrans,
gid_File_Lib_BaseBmp,
- gid_File_Lib_Zip,
- gid_File_Lib_Vclplug_Tde,
- gid_File_Lib_Vclplug_Kde,
- gid_File_Lib_Vclplug_Kde4,
- gid_File_Lib_Vclplug_Svp);
+ gid_File_Lib_Zip);
End
Module gid_Module_Root_Files_5
@@ -175,7 +169,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Icui18n,
gid_File_Lib_Icuuc,
gid_File_Lib_Openssl,
- gid_File_Lib_Recentfile,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
gid_File_Lib_Raptor,
Attachment:
signature.asc
Description: OpenPGP digital signature