[Libreoffice-commits] core.git: android/experimental ios/CustomTarget_MobileLibreOffice_app.mk ios/CustomTarget_TiledLibreOffice_app.mk ios/Executable_LibreOffice.mk solenv/bin

[Matúš Kukan]

 android/experimental/DocumentLoader/Makefile      |    3 --
 android/experimental/LibreOffice4Android/Makefile |    4 +--
 ios/CustomTarget_MobileLibreOffice_app.mk         |    1 
 ios/CustomTarget_TiledLibreOffice_app.mk          |    1 
 ios/Executable_LibreOffice.mk                     |    1 
 solenv/bin/native-code.py                         |   29 +---------------------
 6 files changed, 5 insertions(+), 34 deletions(-)

New commits:
commit 4be366de5833c284f21393e99fb7b11199f4b0ff
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Jan 2 13:26:31 2014 +0100

    native code generator: Do not use single_component_map anymore.
    
    Put cui and spl into extended_code and ignore the rest.
    
    Also change DocumentLoader and LibreOffice4Android to use only
    extended_core and writer as all the ios apps do, without knowing what is
    really needed there.
    
    Change-Id: Ic6a256ea47cc96132c0e7658d6ef2838b295ca71

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 092292d..74c497a 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -13,8 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
 	$< \
-		-g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \
-		-s protocolhandler -s sb \
+		-g extended_core -g writer \
 		> $@
 
 copy-stuff:
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 4eadb65..33a7e55 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -13,8 +13,8 @@ BOOTSTRAPDIR=../../Bootstrap
 include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
-	$< -g extended_core -g base_core -g calc_core -g draw_core -g math -g writer \
-		-s dlgprov -s protocolhandler -s scriptframe -s sb -s stringresource -s vbaswobj -s vbaevents \
+	$< \
+		-g extended_core -g writer \
 		> $@
 
 copy-stuff:
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk
index cb25385..ec59df0 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -35,7 +35,6 @@ $(call gb_CustomTarget_get_target,ios/MobileLibreOffice): $(call gb_CustomTarget
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
 	$(SRCDIR)/solenv/bin/native-code.py \
 		-g extended_core -g writer \
-		-s cui -s spl \
 		> $(SRCDIR)/ios/shared/ios_sharedlo/cxx/native-code.mm
 	$(call MobileLibreOfficeXcodeBuild, clean build)
 
diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk
index 5097f0d..95e7fbd 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -30,7 +30,6 @@ $(call gb_CustomTarget_get_target,ios/TiledLibreOffice): $(call gb_CustomTarget_
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
 	$(SRCDIR)/solenv/bin/native-code.py \
 		-g extended_core -g writer \
-		-s cui -s spl \
 		> $(SRCDIR)/ios/experimental/TiledLibreOffice/TiledLibreOffice/native-code.mm
 	$(call TiledLibreOfficeXcodeBuild, clean build)
 
diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index f35b9cb..ccf69c7 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -29,7 +29,6 @@ $(call gb_CustomTarget_get_workdir,ios/LibreOffice)/native-code.cxx :
 	mkdir -p `dirname $@`
 	$(SRCDIR)/solenv/bin/native-code.py \
 		-g extended_core -g writer \
-		-s cui -s spl \
 		> $@
 
 $(eval $(call gb_Executable_add_objcxxobjects,LibreOffice,\
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 065772e..ba8ebc2 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -64,10 +64,12 @@ extended_core_factory_list = core_factory_list + [
     ("libanimcorelo.a", "animcore_component_getFactory"),
     ("libavmedialo.a", "avmedia_component_getFactory"),
     ("libchartcorelo.a", "chartcore_component_getFactory"),
+    ("libcuilo.a", "cui_component_getFactory"),
     ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
     ("libfrmlo.a", "frm_component_getFactory"),
     ("libfwklo.a", "fwk_component_getFactory"),
     ("libfwmlo.a", "fwm_component_getFactory"),
+    ("libspllo.a", "spl_component_getFactory"),
     ("libsvxcorelo.a", "svxcore_component_getFactory"),
     ("libtextfdlo.a", "textfd_component_getFactory"),
     ("libtklo.a", "tk_component_getFactory"),
@@ -138,26 +140,9 @@ core_constructor_list = [
     "com_sun_star_drawing_EnhancedCustomShapeEngine_implementation_getFactory",
     ]
 
-# Components which are not in any group yet:
-single_component_map = {
-    'basprov' : ("libbasprovlo.a", "basprov_component_getFactory"),
-    'cui' : ("libcuilo.a", "cui_component_getFactory"),
-    'dlgprov' : ("libdlgprovlo.a", "dlgprov_component_getFactory"),
-    'protocolhandler' : ("libprotocolhandlerlo.a", "protocolhandler_component_getFactory"),
-    'scriptframe' : ("libscriptframe.a", "scriptframe_component_getFactory"),
-    'sb' : ("libsblo.a", "sb_component_getFactory"),
-    'spl' : ("libspllo.a", "spl_component_getFactory"),
-    'stringresource' :("libstringresourcelo.a", "stringresource_component_getFactory"),
-    'vbaswobj' : ("libvbaswobjlo.a", "vbaswobj_component_getFactory"),
-    'vbaevents' : ("libvbaeventslo.a", "vbaevents_component_getFactory"),
-    }
-
 opts = OptionParser()
 opts.add_option("-j", "--java-guard", action="store_true", help="include external java functions", dest="java", default=False)
 opts.add_option("-g", "--group", action="append", help="group of implementations to make available in application", dest="groups")
-# TODO: components from single_component_map should be put into
-# one of the groups too and --single-component should die.
-opts.add_option("-s", "--single-component", action="append", help="list of single getFactories to get into lib_to_factory_mapping", dest="components")
 
 (options, args) = opts.parse_args()
 
@@ -176,11 +161,6 @@ if options.groups:
         for (factory_name,factory_function) in factory_map[factory_group]:
             print ('void * '+factory_function+'( const char* , void* , void* );')
 
-if options.components:
-    for c in options.components:
-        (c_name, c_function) = single_component_map[c]
-        print ('void * '+c_function+'( const char* , void* , void* );')
-
 print ('')
 for constructor in core_constructor_list:
     print ('void * '+constructor+'( void *, void * );')
@@ -196,11 +176,6 @@ if options.groups:
         for (factory_name,factory_function) in factory_map[factory_group]:
             print ('        { "'+factory_name+'", '+factory_function+' },')
 
-if options.components:
-    for c in options.components:
-        (c_name, c_function) = single_component_map[c]
-        print ('        { "'+c_name+'", '+c_function+' },')
-
 print ("""
         { 0, 0 }
     };""")