Repository.mk | 109 ++++++++++----------
bridges/Library_cpp_uno.mk | 36 ++----
desktop/Module_desktop.mk | 2
scp2/AutoInstallLibs_writer.mk | 12 ++
scp2/InstallModule_writer.mk | 2
scp2/source/ooo/file_library_ooo.scp | 136 -------------------------
scp2/source/ooo/module_hidden_ooo.scp | 59 ----------
scp2/source/writer/file_writer.scp | 4
scp2/source/writer/module_writer.scp | 11 --
shell/Module_shell.mk | 2
solenv/gbuild/Helper.mk | 2
solenv/gbuild/extensions/pre_MergedLibsList.mk | 4
solenv/gbuild/platform/WNT_X86_64_MSC.mk | 2
13 files changed, 94 insertions(+), 287 deletions(-)
New commits:
commit 3d8acc0cd860cd808e9bbf5d8a78494b560170c4
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Apr 9 20:28:27 2013 +0200
bridge_lib_name is $(gb_CPPU_ENV)_uno
Also fix gb_CPPU_ENV := msc6 in WNT_X86_64_MSC.mk
to be consistent with the name we register in Repository.mk.
Change-Id: I1520d78c378f8c48d65defb22c4c77277bd061f7
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 7ce51f5..f7153c3 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -7,17 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-ifeq ($(COM),GCC)
-bridge_lib_name := gcc3_uno
-else ifeq ($(COM),MSC)
-ifeq ($(CPU),I)
-bridge_lib_name := msci_uno
-else ifeq ($(CPU),X)
-bridge_lib_name := mscx_uno
-endif # COM=WNT
-endif
-
-$(eval $(call gb_Library_Library,$(bridge_lib_name)))
+$(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno))
ifeq ($(OS)$(CPU),AIXP)
@@ -157,24 +147,24 @@ bridge_exception_objects := except
endif
-$(eval $(call gb_Library_use_external,$(bridge_lib_name),boost_headers))
+$(eval $(call gb_Library_use_external,$(gb_CPPU_ENV)_uno,boost_headers))
-$(eval $(call gb_Library_use_internal_comprehensive_api,$(bridge_lib_name),\
+$(eval $(call gb_Library_use_internal_comprehensive_api,$(gb_CPPU_ENV)_uno,\
udkapi \
))
-$(eval $(call gb_Library_set_include,$(bridge_lib_name),\
+$(eval $(call gb_Library_set_include,$(gb_CPPU_ENV)_uno,\
-I$(SRCDIR)/bridges/inc \
$$(INCLUDE) \
))
ifeq ($(HAVE_POSIX_FALLOCATE),YES)
-$(eval $(call gb_Library_add_defs,$(bridge_lib_name),\
+$(eval $(call gb_Library_add_defs,$(gb_CPPU_ENV)_uno,\
-DHAVE_POSIX_FALLOCATE \
))
endif
ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_defs,$(bridge_lib_name),\
+$(eval $(call gb_Library_add_defs,$(gb_CPPU_ENV)_uno,\
$(if $(filter GCC,$(COM)),\
$(if $(filter sjlj,$(EXCEPTIONS)),\
-DBROKEN_ALLOCA \
@@ -205,31 +195,31 @@ $(eval $(call gb_Library_add_libs,gcc3_uno,\
endif
endif
-$(eval $(call gb_Library_use_libraries,$(bridge_lib_name),\
+$(eval $(call gb_Library_use_libraries,$(gb_CPPU_ENV)_uno,\
cppu \
sal \
))
$(foreach obj,$(bridge_exception_objects),\
- $(eval $(call gb_Library_add_exception_objects,$(bridge_lib_name),\
+ $(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\
bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \
)
$(foreach obj,$(bridge_noopt_objects),\
- $(eval $(call gb_Library_add_cxxobjects,$(bridge_lib_name),\
+ $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj) \
, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS))) \
)
$(foreach obj,$(bridge_cxx_objects),\
- $(eval $(call gb_Library_add_cxxobjects,$(bridge_lib_name),\
+ $(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \
)
$(foreach obj,$(bridge_asm_objects),\
-$(eval $(call gb_Library_add_asmobjects,$(bridge_lib_name),\
+$(eval $(call gb_Library_add_asmobjects,$(gb_CPPU_ENV)_uno,\
bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/$(obj))) \
)
-$(eval $(call gb_Library_add_exception_objects,$(bridge_lib_name),\
+$(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno,\
bridges/source/cpp_uno/shared/bridge \
bridges/source/cpp_uno/shared/component \
bridges/source/cpp_uno/shared/types \
@@ -238,7 +228,7 @@ $(eval $(call
gb_Library_add_exception_objects,$(bridge_lib_name),\
bridges/source/cpp_uno/shared/vtables \
))
-$(eval $(call gb_Library_add_cxxobjects,$(bridge_lib_name),\
+$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
bridges/source/cpp_uno/shared/cppinterfaceproxy \
, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
diff --git a/solenv/gbuild/platform/WNT_X86_64_MSC.mk
b/solenv/gbuild/platform/WNT_X86_64_MSC.mk
index 7a54dcb..dc6f585 100644
--- a/solenv/gbuild/platform/WNT_X86_64_MSC.mk
+++ b/solenv/gbuild/platform/WNT_X86_64_MSC.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-gb_CPPU_ENV := msc6
+gb_CPPU_ENV := mscx
gb_CPUDEFS := -D_AMD64_=1
include $(GBUILDDIR)/platform/com_MSC_defs.mk
commit 90750f0cbc775505e284d085998d326b2abc1471
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Apr 15 13:36:02 2013 +0200
autoinstall more OOOLIBS libraries
Change-Id: I02c86d7ab6814bfcf559af7408e5d0e1eef59666
diff --git a/Repository.mk b/Repository.mk
index f77022a..4bd7c68 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -232,23 +232,46 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
dbmm \
dbtools \
dbaxml \
+ deploymentmisc \
+ $(if $(filter unx,$(GUIBASE)),desktop_detector) \
drawinglayer \
+ editeng \
$(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
file \
+ filterconfig \
for \
forui \
frm \
fwe \
fwi \
+ fwk \
fwl \
fwm \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
lng \
$(if $(MERGELIBS),merged) \
- sdbt \
+ msfilter \
odbcbase \
+ sax \
+ sb \
+ sdbt \
+ sfx \
+ sot \
+ $(if $(ENABLE_HEADLESS),,spl) \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tk \
+ tl \
$(if $(ENABLE_TELEPATHY),tubes) \
unordf \
unoxml \
+ utl \
+ uui \
+ vcl \
+ xmlscript \
+ xo \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
@@ -287,9 +310,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
calc \
dbp \
dbu \
- deploymentmisc \
- desktop_detector \
- editeng \
egi \
eme \
epb \
@@ -301,14 +321,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
eti \
evoab \
exp \
- filterconfig \
filtertracer \
flash \
flat \
- fwk \
graphicfilter \
guesslang \
- helplinker \
hyphen \
icd \
icg \
@@ -331,7 +348,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
mork \
mozab2 \
mozabdrv \
- msfilter \
mysql \
odfflatxml \
offacc \
@@ -345,8 +361,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
rpt \
rptui \
rptxml \
- sax \
- sb \
sc \
scd \
scfilt \
@@ -356,34 +370,22 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
sdd \
sdfilt \
sdui \
- sfx \
simplecm \
sm \
smd \
solver \
- sot \
spa \
spell \
- spl \
sts \
svgfilter \
svgio \
- svl \
- svt \
- svx \
- svxcore \
sw \
tdeab1 \
tdeabdrv1 \
textconversiondlgs \
textfd \
- tk \
- tl \
updatecheckui \
- utl \
- uui \
vbahelper \
- vcl \
vclplug_gen \
vclplug_gtk \
vclplug_gtk3 \
@@ -392,10 +394,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
vclplug_kde4 \
vclplug_svp \
wpftdraw \
- xmlscript \
xmlfa \
xmlfd \
- xo \
xof \
xsltdlg \
xsltfilter \
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a2e960b..c062fd0 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_deploymentmisc \
Library_offacc \
Library_sofficeapp \
- Library_spl \
+ $(if $(ENABLE_HEADLESS),,Library_spl) \
Package_intro \
UIConfig_deployment \
Zip_brand \
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index bb4c0f2..8602c2b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -430,8 +430,6 @@ STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
STD_LIB_FILE(gid_File_Lib_Evtatt, evtatt)
-STD_LIB_FILE(gid_File_Lib_Filterconfig1, filterconfig)
-
STD_LIB_FILE( gid_File_Lib_Flat, flat)
#ifdef WNT
@@ -568,17 +566,8 @@ End
#endif
-File gid_File_Lib_Fwk
- Name = LIBNAME(fwk);
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
-End
-
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory,
hatchwindowfactory.uno )
-STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
-
File gid_File_Lib_I18nsearch
LIB_FILE_BODY;
Styles = (PACKED);
@@ -806,19 +795,11 @@ SPECIAL_LIB_FILE(gid_File_Lib_Deployment,deployment)
SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
-STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
-
#if defined ENABLE_NPAPI_FROM_BROWSER
STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
#if defined(UNX) && ! defined(MACOSX) && ! defined(LIBO_HEADLESS)
-File gid_File_Lib_Desktop_Detector
- Name = LIBNAME(desktop_detector);
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
-End
File gid_File_Lib_Vclplug_Gen
Name = LIBNAME(vclplug_gen);
LIB_FILE_BODY;
@@ -967,12 +948,8 @@ File gid_File_Lib_Fastsax_Uno
#endif
End
-STD_LIB_FILE( gid_File_Lib_Sax , sax)
-
STD_LIB_FILE( gid_File_Lib_Oox , oox)
-STD_LIB_FILE( gid_File_Lib_Sb , sb)
-
STD_LIB_FILE( gid_File_Lib_Scn, scn)
STD_LIB_FILE( gid_File_Lib_Sd , sd)
@@ -1002,13 +979,6 @@ End
STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
-File gid_File_Lib_Sfx
- Name = LIBNAME(sfx);
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
-End
-
#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Instooofiltmsi
@@ -1031,8 +1001,6 @@ End
#endif
-STD_LIB_FILE( gid_File_Lib_Sot, sot )
-
#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
File gid_File_Lib_Spa
@@ -1051,25 +1019,13 @@ File gid_File_Lib_Spell
Dir = SCP2_OOO_BIN_DIR;
End
-#if !defined LIBO_HEADLESS
-STD_LIB_FILE( gid_File_Lib_Spl, spl)
-#endif
-
#if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS
STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
#endif
SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
-STD_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_LIB_FILE( gid_File_Lib_Svtools, svt )
-
-STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
-STD_LIB_FILE( gid_File_Lib_Svx, svx)
STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
-STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
-
-STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
STD_LIB_FILE( gid_File_Lib_Sw , sw)
@@ -1092,11 +1048,8 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe,
wininetbe1.uno )
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
#endif
-STD_LIB_FILE( gid_File_Lib_Tk, tk )
STD_LIB_FILE( gid_File_Lib_Acc, acc )
-STD_LIB_FILE( gid_File_Lib_Tools, tl )
-
File gid_File_Lib_Tvhlp1
LIB_FILE_BODY;
Styles = (PACKED);
@@ -1197,29 +1150,8 @@ File gid_File_Lib_Hyph
Dir = SCP2_OOO_BIN_DIR;
End
-STD_LIB_FILE( gid_File_Lib_Utl , utl)
-
-STD_LIB_FILE( gid_File_Lib_Uui, uui )
-
STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
-
-File gid_File_Lib_Vcl
- Name = LIBNAME(vcl);
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
-End
-
-STD_LIB_FILE( gid_File_Lib_Xcr, xmlscript)
STD_LIB_FILE( gid_File_Lib_Xof, xof)
-
-File gid_File_Lib_Xo
- Name = LIBNAME(xo);
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
-End
-
STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 2db76d5..afa4b9d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -181,10 +181,7 @@ Module gid_Module_Root_Files_4
gid_File_Filter_Itg,
gid_File_Filter_Iti,
gid_File_Lib_Bib,
- gid_File_Lib_Editeng,
gid_File_Lib_Flat,
- gid_File_Lib_Fwk,
- gid_File_Lib_Helplinker,
gid_File_Lib_J,
gid_File_Lib_Offacc,
gid_File_Lib_Oox,
@@ -193,19 +190,11 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Pl,
gid_File_Lib_Sf_Prothdlr,
gid_File_Lib_Res,
- gid_File_Lib_Sax,
- gid_File_Lib_Sb,
gid_File_Lib_Scn,
gid_File_Lib_Sd,
gid_File_Lib_Sdd,
gid_File_Lib_Sdui,
- gid_File_Lib_Sfx,
- gid_File_Lib_Sot,
gid_File_Lib_Spa,
- gid_File_Lib_Spl,
- gid_File_Lib_Svl,
- gid_File_Lib_Svtools,
- gid_File_Lib_Svx,
gid_File_Lib_AVMediaWin,
gid_File_Lib_AVMediaGStreamer,
gid_File_Lib_AVMediaGStreamer_0_10,
@@ -213,17 +202,10 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Sysdtrans,
gid_File_Lib_Sw,
gid_File_Lib_TextConversionDlgs,
- gid_File_Lib_Tk,
gid_File_Lib_Acc,
gid_File_Lib_BaseBmp,
- gid_File_Lib_Tools,
- gid_File_Lib_Utl,
- gid_File_Lib_Uui,
- gid_File_Lib_Vcl,
- gid_File_Lib_Xcr,
gid_File_Lib_Xmlfa,
gid_File_Lib_Xmlfd,
- gid_File_Lib_Xo,
gid_File_Lib_Xof,
gid_File_Lib_Xsltdlg,
gid_File_Lib_Xsltfilter,
@@ -274,7 +256,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Macab_1,
gid_File_Lib_Macab_Drv_1,
gid_File_Lib_Evtatt,
- gid_File_Lib_Filterconfig1,
gid_File_Lib_I18nsearch,
gid_File_Lib_I18nisolang,
gid_File_Lib_Icudata,
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index fa5d150..21c7f2d 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -127,7 +127,7 @@ gb_MERGEDLIBS := \
sfx \
sofficeapp \
sot \
- spl \
+ $(if $(ENABLE_HEADLESS),,spl) \
svl \
svt \
svx \
commit ceb54bc2eba86ea9f8a1ea7b3f4dc9b8fa23cf06
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Apr 15 12:57:35 2013 +0200
autoinstall more PLAINLIBS_OOO libraries
Change-Id: I569a47816281b16fc84fdb859ecce4ab83d0a9ee
diff --git a/Repository.mk b/Repository.mk
index 82f3033..f77022a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -444,6 +444,15 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(if $(filter WNT,$(OS)),jpipx) \
))
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \
+ fileacc \
+ i18nutil \
+ package2 \
+ sofficeapp \
+ ucb1 \
+ ucpfile1 \
+ xstor \
+))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
avmediagst \
avmediagst_0_10 \
@@ -458,7 +467,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
dict_zh \
embobj \
emboleobj \
- fileacc \
hsqldb \
index_data \
java_uno_accessbridge \
@@ -472,22 +480,18 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,
\
mcnttype \
mozbootstrap \
officebean \
- package2 \
pyuno \
pyuno_wrapper \
recentfile \
scriptframe \
sdbc2 \
smoketest \
- sofficeapp \
srtrs1 \
subsequenttest \
test \
textconv_dict \
tvhlp1 \
- ucb1 \
ucpdav1 \
- ucpfile1 \
ucpftp1 \
ucpchelp1 \
ucphier1 \
@@ -500,7 +504,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsecurity \
xsec_fw \
xsec_xmlsec \
- xstor \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
@@ -546,7 +549,6 @@ endif
$(eval $(call gb_Helper_register_libraries,RTLIBS, \
comphelper \
i18nlangtag \
- i18nutil \
ucbhelper \
))
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 9214f17..bb4c0f2 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -430,8 +430,6 @@ STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
STD_LIB_FILE(gid_File_Lib_Evtatt, evtatt)
-SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
-
STD_LIB_FILE(gid_File_Lib_Filterconfig1, filterconfig)
STD_LIB_FILE( gid_File_Lib_Flat, flat)
@@ -601,17 +599,6 @@ File gid_File_Lib_I18nisolang
PACKED_LIB_FILE_BODY;
End
-File gid_File_Lib_I18nutil
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT3(libi18nutil,COMID,UNXSUFFIX));
- #else
- Name = STRING(CONCAT3(i18nutil,COMID,.dll));
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
#ifndef SYSTEM_ICU
File gid_File_Lib_Icudata
@@ -807,8 +794,6 @@ End
#endif
-SPECIAL_LIB_FILE(gid_File_Lib_Package2,package2)
-
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer,
passwordcontainer.uno )
STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
@@ -1123,17 +1108,6 @@ File gid_File_Lib_Tvhlp1
#endif
End
-File gid_File_Lib_Ucb1
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libucb1,UNXSUFFIX));
- #else
- Name = "ucb1.dll";
- #endif
-End
-
File gid_File_Lib_Ucbhelper
LIB_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
@@ -1195,8 +1169,6 @@ End
#endif
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
-
SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
@@ -1248,8 +1220,6 @@ File gid_File_Lib_Xo
Dir = SCP2_OOO_BIN_DIR;
End
-SPECIAL_LIB_FILE(gid_File_Lib_Xstor,xstor)
-
STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
@@ -1416,13 +1386,6 @@ File gid_File_Lib_Crypto
End
#endif
-File gid_File_Lib_Soffice
- LIB_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = SCP2_URE_DL_NORMAL("sofficeapp");
- Styles = (PACKED);
-End
-
File gid_File_Lib_Unopkgapp
LIB_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 1d8daac..2db76d5 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -101,7 +101,6 @@ Module gid_Module_Root_Files_2
gid_File_Bin_Uri_Encode,
gid_File_Bin_UIPreviewer,
gid_File_Exe_Nsplugin,
- gid_File_Lib_Soffice,
gid_File_Lib_Unopkgapp,
gid_File_Txt_Pagein_Common,
gid_File_Txt_Pagein_Calc,
@@ -275,11 +274,9 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Macab_1,
gid_File_Lib_Macab_Drv_1,
gid_File_Lib_Evtatt,
- gid_File_Lib_Fileacc,
gid_File_Lib_Filterconfig1,
gid_File_Lib_I18nsearch,
gid_File_Lib_I18nisolang,
- gid_File_Lib_I18nutil,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
gid_File_Lib_Icule,
@@ -298,7 +295,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Odbc,
gid_File_Lib_Officebean,
gid_File_Lib_Openssl,
- gid_File_Lib_Package2,
gid_File_Lib_Deployment,
gid_File_Lib_DeploymentGui,
gid_File_Lib_Expwrap_Uno,
@@ -335,12 +331,10 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Ssl3,
gid_File_Lib_Sndfile,
gid_File_Lib_Tvhlp1,
- gid_File_Lib_Ucb1,
gid_File_Lib_Ucbhelper,
gid_File_Lib_Ucpchelp1,
gid_File_Lib_Ucpdav1,
gid_File_Lib_Neon,
- gid_File_Lib_Ucpfile1,
gid_File_Lib_Ucpftp1,
gid_File_Lib_Ucphier1,
gid_File_Lib_Ucppkg1,
@@ -353,7 +347,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_XSec_XMLSecurity,
gid_File_Lib_XSec_Framework,
gid_File_Lib_XSec_XmlSec,
- gid_File_Lib_Xstor,
gid_File_CanvasFactory,
gid_File_SimpleCanvas,
gid_File_Lib_Cmdmail,
commit 6078d32763dc4441ce6e4772776a60b3c16688e5
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Apr 15 12:41:49 2013 +0200
autoinstall more common libraries
Change-Id: I293cca130137f35b6ff29925228284ced3d9b1b7
diff --git a/Repository.mk b/Repository.mk
index fa77122..82f3033 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -560,14 +560,20 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
mtfrenderer \
OGLTrans \
))
+
+$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
+ configmgr \
+ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
+ fsstorage \
+ i18npool \
+ localebe1 \
+))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
PresenterScreen \
basprov \
cairocanvas \
canvasfactory \
cmdmail \
- configmgr \
- desktopbe1 \
directx5canvas \
directx9canvas \
dlgprov \
@@ -575,16 +581,13 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
fastsax \
fpicker \
fps_office \
- fsstorage \
gconfbe1 \
gdipluscanvas \
hatchwindowfactory \
- i18npool \
i18nsearch \
kdebe1 \
kde4be1 \
ldapbe2 \
- localebe1 \
losessioninstall \
macbe1 \
migrationoo2 \
@@ -615,16 +618,13 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
$(if $(filter $(OS),MACOSX), \
fps_aqua \
) \
+ $(if $(filter $(OS),WNT), \
+ oleautobridge \
+ smplmail \
+ wininetbe1 \
+ ) \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
- oleautobridge \
- smplmail \
- wininetbe1 \
-))
-endif
-
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
acceptor \
binaryurp \
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 604bcca..9214f17 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -107,8 +107,6 @@ File gid_File_Lib_CLucene
End
#endif
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
-
File gid_File_Lib_Ldapbe2
LIB_FILE_BODY;
Styles = (PACKED);
@@ -450,16 +448,7 @@ End
#endif
#if defined UNX && ! defined MACOSX
-
-File gid_File_Lib_Desktopbe
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
-End
-
#ifdef ENABLE_TDE
-#ifndef MACOSX
File gid_File_Bin_TdeFilePicker
BIN_FILE_BODY;
Styles = (PACKED);
@@ -467,10 +456,8 @@ File gid_File_Bin_TdeFilePicker
Name = "tdefilepicker";
End
#endif
-#endif
#ifdef ENABLE_KDE
-#ifndef MACOSX
File gid_File_Bin_KdeFilePicker
BIN_FILE_BODY;
Styles = (PACKED);
@@ -479,7 +466,6 @@ File gid_File_Bin_KdeFilePicker
End
#endif
#endif
-#endif
#ifdef MACOSX
File gid_File_Lib_Fps_Aqua
@@ -573,8 +559,6 @@ End
#endif
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
-
#ifdef WNT
File gid_File_Lib_Ftransl
@@ -597,17 +581,6 @@ SPECIAL_COMPONENT_LIB_FILE(
gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.
STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
-File gid_File_Lib_I18npool
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX));
- #else
- Name = STRING(CONCAT2(i18npool.uno,.dll));
- #endif
-End
-
File gid_File_Lib_I18nsearch
LIB_FILE_BODY;
Styles = (PACKED);
@@ -1125,7 +1098,6 @@ End
#endif
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno )
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno )
#ifdef WNT
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 1c069d7..1d8daac 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -254,7 +254,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Index_Data,
gid_File_Lib_Textconv_Dict,
gid_File_Lib_Basprov,
- gid_File_Lib_Configmgr,
gid_File_Lib_Crypto,
gid_File_Lib_Dlgprov,
gid_File_Lib_Stringresource,
@@ -278,7 +277,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Evtatt,
gid_File_Lib_Fileacc,
gid_File_Lib_Filterconfig1,
- gid_File_Lib_I18npool,
gid_File_Lib_I18nsearch,
gid_File_Lib_I18nisolang,
gid_File_Lib_I18nutil,
@@ -312,7 +310,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Srtrs1,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
- gid_File_Lib_Localebe,
gid_File_Lib_Migrationoo2,
gid_File_Lib_Migrationoo3,
gid_File_Lib_Syssh,
@@ -384,7 +381,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Macbe,
gid_File_Lib_Fps_Office,
gid_File_Lib_Fpicker,
- gid_File_Lib_Fsstorage,
gid_File_Lib_Hatchwindowfactory,
gid_File_Lib_Passwordcontainer,
gid_File_Lib_Updatefeed,
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 0b46299..8fcd4b4 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Module_Module,shell))
$(eval $(call gb_Module_add_targets,shell,\
- Library_desktopbe \
+ $(if $(filter-out MACOSX WNT,$(OS)),Library_desktopbe) \
Library_localebe \
))
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index bf4bd06..fa5d150 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -105,7 +105,7 @@ gb_MERGEDLIBS := \
configmgr \
cppcanvas \
deploymentmisc \
- desktopbe1 \
+ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
drawinglayer \
editeng \
commit 997d71cdd00e8fafd36b776ab3f0a4806f74e3e8
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Apr 12 11:39:12 2013 +0200
fdo#60924 scp2: use one variable listing them all
Change-Id: I9c5d55300d53d8778e926be8de0bea7a9a57b522
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index ebe6972..1c069d7 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -157,6 +157,7 @@ Module gid_Module_Root_Files_4
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Dat_Root4,
+ auto_File_Lib_ALL,
gid_File_Filter_Eme,
gid_File_Filter_Sdfilt,
gid_File_Filter_Icg,
@@ -180,32 +181,12 @@ Module gid_Module_Root_Files_4
gid_File_Filter_Ira,
gid_File_Filter_Itg,
gid_File_Filter_Iti,
- auto_File_Lib_basctl,
gid_File_Lib_Bib,
- auto_File_Lib_chartcore,
- auto_File_Lib_chartcontroller,
- auto_File_Lib_ctl,
- auto_File_Lib_cui,
- auto_File_Lib_sdbt,
- auto_File_Lib_dbmm,
- auto_File_Lib_dba,
- auto_File_Lib_dbase,
- auto_File_Lib_dbaxml,
- auto_File_Lib_dbt,
- auto_File_Lib_file,
- auto_File_Lib_drawinglayer,
gid_File_Lib_Editeng,
gid_File_Lib_Flat,
- auto_File_Lib_for,
- auto_File_Lib_forui,
- auto_File_Lib_frm,
- auto_File_Lib_fwe,
- auto_File_Lib_fwi,
gid_File_Lib_Fwk,
- auto_File_Lib_fwl,
gid_File_Lib_Helplinker,
gid_File_Lib_J,
- auto_File_Lib_lng,
gid_File_Lib_Offacc,
gid_File_Lib_Oox,
gid_File_Lib_Pcr,
@@ -226,12 +207,10 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Svl,
gid_File_Lib_Svtools,
gid_File_Lib_Svx,
- auto_File_Lib_avmedia,
gid_File_Lib_AVMediaWin,
gid_File_Lib_AVMediaGStreamer,
gid_File_Lib_AVMediaGStreamer_0_10,
gid_File_Lib_BaseGfx,
- auto_File_Lib_merged,
gid_File_Lib_Sysdtrans,
gid_File_Lib_Sw,
gid_File_Lib_TextConversionDlgs,
@@ -256,9 +235,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Vclplug_Kde,
gid_File_Lib_Vclplug_Kde4,
gid_File_Lib_Vclplug_Svp,
- auto_File_Lib_canvastools,
- auto_File_Lib_cppcanvas,
- auto_File_Lib_fwm,
gid_File_Lib_Guesslang);
End
@@ -336,7 +312,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Srtrs1,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
- auto_File_Lib_unoxml,
gid_File_Lib_Localebe,
gid_File_Lib_Migrationoo2,
gid_File_Lib_Migrationoo3,
@@ -361,7 +336,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Smime3,
gid_File_Lib_Sqlite3,
gid_File_Lib_Ssl3,
- auto_File_Lib_unordf,
gid_File_Lib_Sndfile,
gid_File_Lib_Tvhlp1,
gid_File_Lib_Ucb1,
@@ -395,7 +369,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Dl,
gid_File_Lib_Dnd,
gid_File_Lib_Dtrans,
- auto_File_Lib_emser,
gid_File_Lib_Inprocserv,
gid_File_Lib_Fps,
gid_File_Lib_Ftransl,
commit 8008b66bf6fc7444fd889308e58870137f16f8d2
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Apr 12 11:21:10 2013 +0200
fdo#60924 autoinstall: add writer section; also add more libs
Change-Id: I765e36aa95d0bcfb62b696d5db1fb151ba33da2c
diff --git a/Repository.mk b/Repository.mk
index dbeddbd..fa77122 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -243,16 +243,23 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwl \
fwm \
lng \
- lwpft \
$(if $(MERGELIBS),merged) \
sdbt \
odbcbase \
- t602filter \
$(if $(ENABLE_TELEPATHY),tubes) \
unordf \
unoxml \
- wpftwriter \
- writerfilter \
+))
+
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
+ hwp \
+ lwpft \
+ msword \
+ swd \
+ swui \
+ t602filter \
+ wpftwriter \
+ writerfilter \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
@@ -302,7 +309,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
graphicfilter \
guesslang \
helplinker \
- hwp \
hyphen \
icd \
icg \
@@ -326,7 +332,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
mozab2 \
mozabdrv \
msfilter \
- msword \
mysql \
odfflatxml \
offacc \
@@ -368,8 +373,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
svx \
svxcore \
sw \
- swd \
- swui \
tdeab1 \
tdeabdrv1 \
textconversiondlgs \
diff --git a/scp2/AutoInstallLibs_writer.mk b/scp2/AutoInstallLibs_writer.mk
new file mode 100644
index 0000000..68bd7a4
--- /dev/null
+++ b/scp2/AutoInstallLibs_writer.mk
@@ -0,0 +1,12 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,writer,WRITER,LIBO_LIB_FILE,auto_Writer_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_writer.mk b/scp2/InstallModule_writer.mk
index 7306f8c..072fb17 100644
--- a/scp2/InstallModule_writer.mk
+++ b/scp2/InstallModule_writer.mk
@@ -27,6 +27,8 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/writer))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/writer,writer))
+
$(eval $(call gb_InstallModule_add_templates,scp2/writer,\
scp2/source/templates/module_langpack_writer \
))
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index edb4467..604bcca 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1114,9 +1114,6 @@ STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
STD_LIB_FILE( gid_File_Lib_Sw , sw)
-STD_LIB_FILE( gid_File_Lib_Swui, swui)
-
-STD_LIB_FILE( gid_File_Lib_Msword, msword )
#if ! defined UNX
File gid_File_Lib_Sysdtrans
diff --git a/scp2/source/writer/file_writer.scp
b/scp2/source/writer/file_writer.scp
index a7cd9ed..19e4efa 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -27,10 +27,6 @@
#include "macros.inc"
-STD_LIB_FILE(gid_File_Lib_Swd, swd)
-
-STD_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
-
File gid_File_Exe_Swriter
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/writer/module_writer.scp
b/scp2/source/writer/module_writer.scp
index 8aafb19..1efaec2 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -27,6 +27,8 @@
#include "macros.inc"
+#include "AutoInstallLibs/writer"
+
Module gid_Module_Prg_Wrt
MOD_NAME_DESC(MODULE_PRG_WRT);
ParentID = gid_Module_Prg;
@@ -44,15 +46,8 @@ Module gid_Module_Prg_Wrt_Bin
Styles = (HIDDEN_ROOT);
Files =
(gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
- gid_File_Lib_Hwpreader,
- gid_File_Lib_Swd,
- gid_File_Lib_Swui,
- gid_File_Lib_Msword,
- auto_File_Lib_wpftwriter,
- auto_File_Lib_t602filter,
+ auto_Writer_Lib_ALL,
gid_File_Lib_Vbaswobj,
- auto_File_Lib_writerfilter,
- auto_File_Lib_lwpft,
gid_File_Jar_Email,
gid_File_Jar_Mail,
gid_File_Jar_Activation,
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 05e5489..520a4d9 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -118,7 +118,7 @@ endef
define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO
RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := OOO URE
+gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
