diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-13 23:38:59 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-15 19:31:40 +0100 |
commit | c743324292a9994e20353734846b5045199d8e93 (patch) | |
tree | 503e4194dcf0f017b229babdfc0136dac1687adc /scp2 | |
parent | Resolves: rhbz#895196 sc filter float a11y parent of itself loop/recurse (diff) | |
download | core-c743324292a9994e20353734846b5045199d8e93.tar.gz core-c743324292a9994e20353734846b5045199d8e93.zip |
Remove the need to manually register libs in scp2
- we have all the needed information in gbuild
- reduce the amount of double and triple bookkeeping
- hopefully the generated files for scp2 are only a intermediate step
and we can do whatever perl voodoo scp2 does directly in gbuild
- currently using basctl as an example
- this also means we have to be more strict in Repository.mk with what
we register:
- if we dont build a libs, it shouldnt be registered (otherwise scp2
will want the nonexisting lib)
- in the end, this is a Good Thing(tm): we dont want anyone trying to
e.g. link against a lib we dont build
- should now hopefully work on all platforms
- added module bookkeeping to gbuild
Change-Id: I241ca67edbfabae83859274f9aa35d2d26165ef6
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/AutoInstallLibs_ooo.mk | 12 | ||||
-rw-r--r-- | scp2/InstallModule_ooo.mk | 2 | ||||
-rw-r--r-- | scp2/Module_scp2.mk | 1 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 3 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/scp2/AutoInstallLibs_ooo.mk b/scp2/AutoInstallLibs_ooo.mk new file mode 100644 index 000000000000..c3544c24ebba --- /dev/null +++ b/scp2/AutoInstallLibs_ooo.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,ooo,OOO,STD_LIB_FILE(gid_File_Lib_$$(1)_auto_installed,$$(1)))) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 985865bebdf3..c1915b69bc24 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -27,6 +27,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ooo)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,ooolibs)) + $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ DISABLE_ATL \ DISABLE_NEON \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 0339ec379495..8052b91090c2 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ + AutoInstallLibs_ooo \ CustomTarget_langmacros \ InstallModule_accessories \ InstallModule_base \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 8feb75d46328..2859a32b6295 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -25,6 +25,7 @@ * ************************************************************************/ #include "macros.inc" +#include "AutoInstallLibs/ooo" #if defined SOLAR_JAVA && defined WNT File gid_File_Lib_Accessbridge @@ -41,8 +42,6 @@ STD_LIB_FILE( gid_File_Lib_Ado, ado) #ifndef DISABLE_SCRIPTING -STD_LIB_FILE( gid_File_Lib_Basctl, basctl) - File gid_File_Lib_Basprov LIB_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 195a3fde562c..41124fc22eff 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -180,6 +180,7 @@ Module gid_Module_Root_Files_4 gid_File_Filter_Ira, gid_File_Filter_Itg, gid_File_Filter_Iti, + gid_File_Lib_basctl_auto_installed, gid_File_Lib_Bib, gid_File_Lib_Chartcore, gid_File_Lib_Chartcontroller, @@ -255,7 +256,6 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Vclplug_Kde, gid_File_Lib_Vclplug_Kde4, gid_File_Lib_Vclplug_Svp, - gid_File_Lib_Basctl, gid_File_Lib_CanvasTools, gid_File_Lib_CppCanvas, gid_File_Lib_Fwm, |