[Libreoffice-commits] core.git: 3 commits - Repository.mk scp2/AutoInstall.mk scp2/source
Michael Stahl
mstahl at redhat.com
Fri Jun 13 10:31:06 PDT 2014
Repository.mk | 33 ++++++++++++-------------------
scp2/AutoInstall.mk | 2 -
scp2/source/base/file_base.scp | 4 ---
scp2/source/ooo/file_library_ooo.scp | 29 ---------------------------
scp2/source/ooo/module_hidden_ooo.scp | 1
scp2/source/ooo/module_reportbuilder.scp | 3 --
6 files changed, 14 insertions(+), 58 deletions(-)
New commits:
commit ae0bd94d6b0ea73063501f2f23268a8f0da9bc43
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 13 16:43:49 2014 +0200
Repository.mk: remove 10 obsolete libraries
Change-Id: I16e551802181f1daebc49769ece7b9397b8fe52d
diff --git a/Repository.mk b/Repository.mk
index 9171624..dcd9f54 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -432,18 +432,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
writerfilter \
))
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- adabas \
- adabasui \
- agg \
- communi \
- ooxml \
- $(call gb_Helper_optional,DBCONNECTIVITY,sdbc) \
- filtertracer \
- simplecm \
- sts \
-))
-
ifneq (,$(filter ANDROID IOS,$(OS)))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
commit ea9f2c7ce7f14ac2b027f8425e7216aa1ae5b2a5
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 13 16:43:10 2014 +0200
scp2: move reportbuilder libraries to AutoInstall
Change-Id: I3369b4c5c412741e82279db95cb517a8ae69b25c
diff --git a/Repository.mk b/Repository.mk
index dc2b36b..9171624 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -414,6 +414,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
) \
))
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,reportbuilder, \
+ rpt \
+ rptui \
+ rptxml \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
@@ -434,9 +440,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
ooxml \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbc) \
filtertracer \
- rpt \
- rptui \
- rptxml \
simplecm \
sts \
))
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 4176039..744c6cf 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -23,7 +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,reportbuilder,LIBO_LIB_FILE,,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/source/base/file_base.scp b/scp2/source/base/file_base.scp
index c111056..4aec6bb 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -46,14 +46,10 @@ STD_RES_FILE( gid_File_Res_Cnr, cnr)
STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
-STD_LIB_FILE( gid_File_Lib_Rpt, rpt )
STD_RES_FILE( gid_File_Res_Rpt, rpt)
-STD_LIB_FILE( gid_File_Lib_Rptui, rptui )
STD_RES_FILE( gid_File_Res_Rptui, rptui)
-STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
-
#if defined WITH_HELP
File gid_File_Help_Sdatabase_Zip
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp
index ff2502b..2aa6a5f 100644
--- a/scp2/source/ooo/module_reportbuilder.scp
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -20,9 +20,6 @@ Module gid_Module_Reportbuilder
Default = YES;
Dirs = (gid_Dir_Share_Reportbuilder);
Files = (auto_reportbuilder_ALL,
- gid_File_Lib_Rpt,
- gid_File_Lib_Rptui,
- gid_File_Lib_Rptxml,
gid_File_Xcd_Reportbuilder,
gid_Filelist_ReportbuilderTemplates);
End
commit 0b49cc5b03b39aa1dfddf924c6eaf8cb42e791a8
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 13 16:38:15 2014 +0200
scp2: move basebmp, avmediaQuickTime, avmediaMacAVF libs to AutoInstall
Change-Id: I1b7a8fd5272cb56b2a45c89de79165cfd71711c4
diff --git a/Repository.mk b/Repository.mk
index 9e14103..dc2b36b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -226,8 +226,15 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
acc \
$(call gb_Helper_optional,AVMEDIA,avmedia) \
+ $(if $(filter MACOSX,$(OS)),\
+ $(if $(filter-out 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \
+ $(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \
+ ) \
$(if $(DISABLE_SCRIPTING),,basctl) \
$(if $(DISABLE_SCRIPTING),,basprov) \
+ $(if $(filter $(OS),ANDROID),, \
+ basebmp \
+ ) \
basegfx \
bib \
$(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \
@@ -423,14 +430,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
adabas \
adabasui \
agg \
- $(if $(filter $(OS),ANDROID),, \
- basebmp \
- ) \
communi \
ooxml \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbc) \
- avmediaMacAVF \
- avmediaQuickTime \
filtertracer \
rpt \
rptui \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 06c0e1e..f756a8b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -92,35 +92,6 @@ End
#endif
-#ifdef MACOSX
-
-#ifndef ENABLE_MACOSX_SANDBOX
-File gid_File_Lib_avmediaQuickTime
- PACKED_LIB_FILE_BODY;
- Name = LIBNAME(avmediaQuickTime);
-End
-#endif
-
-#if MAXOSX_SDK_VERSION >= 1070
-File gid_File_Lib_avmediaMacAVF
- PACKED_LIB_FILE_BODY;
- Name = LIBNAME(avmediaMacAVF);
-End
-#endif
-
-#endif
-
-#if defined(MACOSX)
-File gid_File_Lib_Basebmp
- Name = LIBNAME(basebmp);
- PACKED_LIB_FILE_BODY;
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
-STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
-#endif
-
#if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building
//we need the nss libs for libxmlsec (or if the internal mozilla is enabled)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 6b36645..e01c2c3 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -129,7 +129,6 @@ Module gid_Module_Root_Files_4
auto_ooobinarytable_ALL,
gid_File_Lib_Bib,
gid_File_Lib_J,
- gid_File_Lib_BaseBmp,
gid_File_Lib_Zip);
End
More information about the Libreoffice-commits
mailing list