Repository.mk | 26 +++++++++----------
scp2/source/ooo/file_library_ooo.scp | 45 ----------------------------------
scp2/source/ooo/module_hidden_ooo.scp | 6 ----
3 files changed, 13 insertions(+), 64 deletions(-)
New commits:
commit f29966b22a38e98df83f49f9285370e7ca49bcb7
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri Jun 14 11:02:19 2013 +0200
fix previous commit
Change-Id: Ifc8723e9dd453e14911a5c46175bb7795ebb064c
diff --git a/Repository.mk b/Repository.mk
index d03394a..3c6a543 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -357,6 +357,17 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
xof \
xsltdlg \
xsltfilter \
+ $(if $(filter $(OS),WNT), \
+ ado \
+ $(if $(DISABLE_ATL),,oleautobridge) \
+ smplmail \
+ wininetbe1 \
+ ) \
+ $(if $(filter $(OS),MACOSX), \
+ AppleRemote \
+ fps_aqua \
+ MacOSXSpell \
+ ) \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
@@ -475,6 +486,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_GSTREAMER),avmediagst) \
$(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \
+ $(if $(ENABLE_DIRECTX),avmediawin) \
cached1 \
collator_data \
comphelper \
@@ -512,18 +524,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
xmlsecurity \
xsec_fw \
xstor \
- $(if $(filter $(OS),WNT), \
- ado \
- $(if $(ENABLE_DIRECTX),avmediawin) \
- $(if $(DISABLE_ATL),,oleautobridge) \
- smplmail \
- wininetbe1 \
- ) \
- $(if $(filter $(OS),MACOSX), \
- AppleRemote \
- fps_aqua \
- MacOSXSpell \
- ) \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
bluez_bluetooth \
commit 1492a2f09c05a03289e46fbd4e453d1ac03d06f9
Author: Marcos Paulo de Souza <marcos.souza....@gmail.com>
Date: Thu Jun 13 11:32:09 2013 -0300
fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Change-Id: I7a3511172ac8ddd060c51c0339a4b9ff16216668
diff --git a/Repository.mk b/Repository.mk
index 7ee8588..d03394a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -291,6 +291,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
log \
lng \
lnth \
+ $(if $(filter $(OS),MACOSX),macbe1) \
$(if $(MERGELIBS),merged) \
migrationoo2 \
migrationoo3 \
@@ -373,7 +374,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
adabas \
adabasui \
- ado \
agg \
$(if $(filter $(OS),ANDROID),, \
basebmp \
@@ -382,10 +382,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
oox \
ooxml \
sdbc \
- AppleRemote \
avmediaQuickTime \
filtertracer \
- MacOSXSpell \
mork \
mozab2 \
mozabdrv \
@@ -514,9 +512,20 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
xmlsecurity \
xsec_fw \
xstor \
+ $(if $(filter $(OS),WNT), \
+ ado \
+ $(if $(ENABLE_DIRECTX),avmediawin) \
+ $(if $(DISABLE_ATL),,oleautobridge) \
+ smplmail \
+ wininetbe1 \
+ ) \
+ $(if $(filter $(OS),MACOSX), \
+ AppleRemote \
+ fps_aqua \
+ MacOSXSpell \
+ ) \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- avmediawin \
bluez_bluetooth \
emboleobj \
java_uno_accessbridge \
@@ -578,20 +587,11 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cmdmail \
- macbe1 \
OGLTrans \
pdfimport \
postgresql-sdbc \
postgresql-sdbc-impl \
pythonloader \
- $(if $(filter $(OS),MACOSX), \
- fps_aqua \
- ) \
- $(if $(filter $(OS),WNT), \
- oleautobridge \
- smplmail \
- wininetbe1 \
- ) \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 8e57fb7..cad2d7c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -35,10 +35,6 @@ File gid_File_Lib_Accessbridge
End
#endif
-#if defined(WNT)
-STD_LIB_FILE( gid_File_Lib_Ado, ado)
-#endif
-
#ifndef SYSTEM_CLUCENE
File gid_File_Lib_CLucene
LIB_FILE_BODY;
@@ -215,15 +211,6 @@ End
#endif
#ifdef MACOSX
-STD_LIB_FILE( gid_File_Lib_Fps_Aqua, fps_aqua )
-
-File gid_File_Lib_MacOSXSpell
- LIB_FILE_BODY;
- Styles = (PACKED);
- Name = LIBNAME(MacOSXSpell);
- Dir = SCP2_OOO_BIN_DIR;
-End
-
#ifndef X86_64
File gid_File_Lib_avmediaQuickTime
LIB_FILE_BODY;
@@ -425,10 +412,6 @@ End
#endif
#endif
-#if defined(WNT) && !defined(DISABLE_ATL)
-STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
-#endif
-
#if defined ENABLE_NPAPI_FROM_BROWSER
STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
@@ -461,15 +444,6 @@ End
#endif
#if defined(MACOSX)
-File gid_File_Lib_AppleRemote
- Name = LIBNAME(AppleRemote);
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-
-#if defined(MACOSX)
File gid_File_Lib_Basebmp
Name = LIBNAME(basebmp);
LIB_FILE_BODY;
@@ -535,10 +509,6 @@ End
#endif
-#ifdef WNT
-STD_LIB_FILE( gid_File_Lib_Smplmail, smplmail )
-#endif
-
#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
File gid_File_Lib_Spa
@@ -570,15 +540,6 @@ File gid_File_Lib_Sysdtrans
End
#endif
-
-#ifdef WNT
-STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 )
-#endif
-
-#ifdef MACOSX
-STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 )
-#endif
-
#ifndef DISABLE_NEON
SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#ifndef SYSTEM_NEON
@@ -657,12 +618,6 @@ File gid_File_Lib_eXslt
End
#endif
-#if defined WNT
-#ifdef ENABLE_DIRECTX
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
-#endif
-#endif
-
#ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore
LIB_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 52894dd..7128021 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -146,7 +146,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Oox,
gid_File_Lib_Pl,
gid_File_Lib_Spa,
- gid_File_Lib_AVMediaWin,
gid_File_Lib_Sysdtrans,
gid_File_Lib_BaseBmp,
gid_File_Lib_Zip,
@@ -218,7 +217,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Cmdmail,
gid_File_Lib_I18n,
gid_File_Lib_Accessbridge,
- gid_File_Lib_Ado,
gid_File_Lib_Dl,
gid_File_Lib_Dnd,
gid_File_Lib_Dtrans,
@@ -227,14 +225,10 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Ftransl,
gid_File_Lib_sn_tools,
GID_FILE_LIB_WPD,
- gid_File_Lib_Ole,
gid_File_Lib_Reg4allmsdoc,
gid_File_Lib_Qslnkmsi,
gid_File_Lib_Sdqsmsi,
gid_File_Lib_Instooofiltmsi,
- gid_File_Lib_Smplmail,
- gid_File_Lib_Wininetbe,
- gid_File_Lib_Macbe,
gid_File_Lib_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Config);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
