[Libreoffice-commits] core.git: 3 commits - Repository.mk scp2/AutoInstallLibs_gnome.mk scp2/AutoInstallLibs_tde.mk scp2/InstallModule_gnome.mk scp2/InstallModule_tde.mk scp2/Module_scp2.mk scp2/source solenv/gbuild
Marcos Paulo de Souza
marcos.souza.org at gmail.com
Tue May 7 13:37:20 PDT 2013
Repository.mk | 8 +++++++-
scp2/AutoInstallLibs_gnome.mk | 12 ++++++++++++
scp2/AutoInstallLibs_tde.mk | 12 ++++++++++++
scp2/InstallModule_gnome.mk | 2 ++
scp2/InstallModule_tde.mk | 9 +--------
scp2/Module_scp2.mk | 2 ++
scp2/source/gnome/module_gnome.scp | 4 +++-
scp2/source/tde/file_tde.scp | 28 ----------------------------
scp2/source/tde/module_tde.scp | 9 +++------
solenv/gbuild/Helper.mk | 2 +-
10 files changed, 43 insertions(+), 45 deletions(-)
New commits:
commit 36564f36a8db30a9bd8ea4a50d2137b80c5052b6
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Tue May 7 11:44:32 2013 -0300
fdo#60924 autoinstall - gbuild/scp2: add gnome module
Conflicts:
Repository.mk
scp2/Module_scp2.mk
solenv/gbuild/Helper.mk
Change-Id: I37570787815d85d30eed3b5291e1e4450e5ffd51
diff --git a/Repository.mk b/Repository.mk
index 89e1459..7e6c051 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -225,6 +225,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
$(if $(ENABLE_TDE),tdebe1) \
))
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
$(if $(ENABLE_KDE),kdebe1) \
$(if $(ENABLE_KDE4),kde4be1) \
diff --git a/scp2/AutoInstallLibs_gnome.mk b/scp2/AutoInstallLibs_gnome.mk
new file mode 100644
index 0000000..c388a29
--- /dev/null
+++ b/scp2/AutoInstallLibs_gnome.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,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index 816f3b2..3a8dd51 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
+
$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
ENABLE_EVOAB2 \
ENABLE_GCONF \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index b5bb1f0..67e8a81 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,scp2))
$(eval $(call gb_Module_add_targets,scp2,\
AutoInstallLibs_tde \
+ AutoInstallLibs_gnome \
AutoInstallLibs_kde \
AutoInstallLibs_ooo \
AutoInstallLibs_ure \
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 3a2604d..b496ced 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -27,6 +27,8 @@
#include "macros.inc"
+#include "AutoInstallLibs/gnome"
+
Module gid_Module_Optional_Gnome
ParentID = gid_Module_Optional;
Default = YES;
@@ -36,7 +38,7 @@ Module gid_Module_Optional_Gnome
#ifdef ENABLE_GNOMEVFS
XpdCheckSolaris = "SUNWgnome-vfs";
#endif
- Files = (
+ Files = (auto_Gnome_lib_ALL
#ifdef ENABLE_EVOAB2
gid_File_Lib_Evoab,
#endif
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index fd395f7..168cdf7 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 RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := TDE KDE OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := GNOME TDE KDE OOO URE WRITER
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT NONE
commit 71ab998159e294ed91c24f483175de8696b3ae34
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Tue May 7 08:08:02 2013 -0300
fdo#60924: autoinstall tde libraries
Change-Id: Id986bc7f9f09902dfda849bc86f9c48ccb0f30c3
diff --git a/Repository.mk b/Repository.mk
index 8d86cb6..89e1459 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -222,6 +222,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
+ $(if $(ENABLE_TDE),tdebe1) \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
@@ -627,7 +628,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
slideshow \
stringresource \
syssh \
- tdebe1 \
ucpcmis1 \
ucpext \
ucpgio1 \
diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk
index ad7655e..0e5dae6 100644
--- a/scp2/InstallModule_tde.mk
+++ b/scp2/InstallModule_tde.mk
@@ -11,15 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/tde))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/tde,tde))
-$(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
- ENABLE_TDE \
- ENABLE_TDEAB \
-))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\
- scp2/source/tde/file_tde \
-))
-
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/tde,\
scp2/source/tde/module_tde \
))
diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp
deleted file mode 100644
index 945b0de..0000000
--- a/scp2/source/tde/file_tde.scp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- * Timothy Pearson <kb9vqf at pearsoncomputing.net> (C) 2012, All Rights Reserved.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- *
- ************************************************************************/
-#include "macros.inc"
-
-#ifdef ENABLE_TDE
-STD_LIB_FILE( gid_File_Lib_Tdebe, tdebe1 )
-#endif
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index 2cadd97..d3ff16b 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -26,7 +26,6 @@
#include "AutoInstallLibs/tde"
-#if defined( ENABLE_TDE )
Module gid_Module_Optional_Tde
ParentID = gid_Module_Optional;
Default = YES;
@@ -34,10 +33,6 @@ Module gid_Module_Optional_Tde
MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
Styles = ();
Files = (auto_Tde_Lib_ALL
-#ifdef ENABLE_TDE
- gid_File_Lib_Tdebe
-#endif // ENABLE_TDE
);
End
-#endif
commit 4656a89b0b126c45e359c24ad3f4906eb17a1fcc
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Mon May 6 23:21:25 2013 -0300
fdo#60924 autoinstall - gbuild/scp2: add tde module
Change-Id: I4c13d1cd4b7490a0b4db8f0dd40d823a5906c8aa
diff --git a/Repository.mk b/Repository.mk
index 0160fe7..8d86cb6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -221,6 +221,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
endif
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
$(if $(ENABLE_KDE),kdebe1) \
$(if $(ENABLE_KDE4),kde4be1) \
diff --git a/scp2/AutoInstallLibs_tde.mk b/scp2/AutoInstallLibs_tde.mk
new file mode 100644
index 0000000..daea3c3
--- /dev/null
+++ b/scp2/AutoInstallLibs_tde.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,tde,TDE,LIBO_LIB_FILE,auto_Tde_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_tde.mk b/scp2/InstallModule_tde.mk
index f42ef03..ad7655e 100644
--- a/scp2/InstallModule_tde.mk
+++ b/scp2/InstallModule_tde.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/tde))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/tde,tde))
+
$(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
ENABLE_TDE \
ENABLE_TDEAB \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 4173445..b5bb1f0 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_Module_Module,scp2))
$(eval $(call gb_Module_add_targets,scp2,\
+ AutoInstallLibs_tde \
AutoInstallLibs_kde \
AutoInstallLibs_ooo \
AutoInstallLibs_ure \
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index e302c54..2cadd97 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -24,6 +24,8 @@
#include "macros.inc"
+#include "AutoInstallLibs/tde"
+
#if defined( ENABLE_TDE )
Module gid_Module_Optional_Tde
ParentID = gid_Module_Optional;
@@ -31,7 +33,7 @@ Module gid_Module_Optional_Tde
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
Styles = ();
- Files = (
+ Files = (auto_Tde_Lib_ALL
#ifdef ENABLE_TDE
gid_File_Lib_Tdebe
#endif // ENABLE_TDE
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index ded46b9..fd395f7 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 RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := KDE OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := TDE KDE OOO URE WRITER
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT NONE
More information about the Libreoffice-commits
mailing list