Make postprocess build for iOS and --disable-database-connectivity

Whether anything that's done in postprocess is relevant for iOS
remains to be seen.

2 files changed, 65 insertions, 26 deletions

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index c46ceabd1869..f3a98a678b57 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -32,7 +32,6 @@ TARGET = packcomponents
 .INCLUDE: settings.mk
 
 my_components = \
-    calc \
     component/animations/source/animcore/animcore \
     component/avmedia/util/avmedia \
     component/chart2/source/controller/chartcontroller \
@@ -46,11 +45,6 @@ my_components = \
     component/configmgr/source/configmgr \
     component/cppcanvas/source/uno/mtfrenderer \
     component/cui/util/cui \
-    component/dbaccess/source/ext/macromigration/dbmm \
-    component/dbaccess/source/filter/xml/dbaxml \
-    component/dbaccess/util/dba \
-    component/dbaccess/util/dbu \
-    component/dbaccess/util/sdbt \
     component/dtrans/util/mcnttype \
     component/embeddedobj/util/embobj \
     component/eventattacher/source/evtatt \
@@ -67,7 +61,6 @@ my_components = \
     component/filter/source/xmlfilterdetect/xmlfd \
     component/filter/source/xsltdialog/xsltdlg \
     component/filter/source/xsltfilter/xsltfilter \
-    component/forms/util/frm \
     component/formula/util/for \
     component/framework/util/fwk \
     component/framework/util/fwl \
@@ -84,9 +77,6 @@ my_components = \
     component/oox/util/oox \
     component/package/source/xstor/xstor \
     component/package/util/package2 \
-    component/reportdesign/util/rpt \
-    component/reportdesign/util/rptui \
-    component/reportdesign/util/rptxml \
     component/sax/source/expatwrap/expwrap \
     component/sax/source/fastparser/fastsax \
     component/sc/util/sc \
@@ -131,17 +121,25 @@ my_components = \
     component/unoxml/source/rdf/unordf \
     component/unoxml/source/service/unoxml \
     component/uui/util/uui \
-    component/writerfilter/util/writerfilter \
-    component/writerperfect/util/msworksfilter \
-    component/writerperfect/util/visiofilter \
-    component/writerperfect/util/wpft \
-    component/writerperfect/util/wpgfilter \
-    component/writerperfect/util/cdrfilter \
     component/xmloff/source/transform/xof \
     component/xmloff/util/xo \
     component/xmlscript/util/xcr \
     component/xmlsecurity/util/xmlsecurity \
     component/xmlsecurity/util/xsec_fw \
+
+.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
+
+my_components += \
+    calc \
+    component/dbaccess/source/ext/macromigration/dbmm \
+    component/dbaccess/source/filter/xml/dbaxml \
+    component/dbaccess/util/dba \
+    component/dbaccess/util/dbu \
+    component/dbaccess/util/sdbt \
+    component/forms/util/frm \
+    component/reportdesign/util/rpt \
+    component/reportdesign/util/rptui \
+    component/reportdesign/util/rptxml \
     dbase \
     dbpool2 \
     dbtools \
@@ -151,7 +149,10 @@ my_components = \
     odbc \
     sdbc2 \
 
+.ENDIF
+
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
+
 my_components += \
     component/desktop/source/deployment/deployment \
     component/desktop/source/deployment/gui/deploymentgui \
@@ -191,16 +192,34 @@ my_components += \
     component/scripting/source/vbaevents/vbaevents \
     component/scripting/util/scriptframe \
     component/sw/util/vbaswobj \
-    component/vbahelper/util/msforms
+    component/vbahelper/util/msforms \
 
 .ENDIF
 
 .IF "$(DISABLE_PYTHON)" != "TRUE"
-my_components += pythonloader
+
+my_components += \
+    pythonloader \
+
+.ENDIF
+
+.IF "$(OS)" != "IOS"
+
+my_components += \
+    component/writerfilter/util/writerfilter \
+    component/writerperfect/util/msworksfilter \
+    component/writerperfect/util/visiofilter \
+    component/writerperfect/util/wpft \
+    component/writerperfect/util/wpgfilter \
+    component/writerperfect/util/cdrfilter \
+
 .ENDIF
 
 .IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID" && "$(GUIBASE)" != "headless"
-my_components += component/desktop/unx/splash/splash
+
+my_components += \
+    component/desktop/unx/splash/splash \
+
 .ENDIF
 
 .IF "$(DISABLE_ATL)" == ""
@@ -348,12 +367,14 @@ my_components += \
     component/canvas/source/directx/gdipluscanvas
 .END
 
+.IF "$(OS)" != "IOS" && "$(OS)" != "ANDROID"
 .IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
     "$(WITH_MOZILLA)" != "NO"
 my_components += mozab
 .ELSE
 my_components += mozbootstrap
 .END
+.ENDIF
 
 .IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_KDE4)" != ""
 my_components += component/fpicker/source/unx/kde4/fps_kde4
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 843a8802c54b..f17b9446d32d 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -68,13 +68,17 @@ MY_FILES_calc = \
     $(MY_XCS)/Office/UI/CalcWindowState.xcs \
     $(MY_XCU)/Office/UI/CalcCommands.xcu \
     $(MY_XCU)/Office/UI/CalcWindowState.xcu \
-    $(MY_MOD)/DataAccess/calc.xcu \
     $(MY_MOD)/fcfg_calc_filters.xcu \
     $(MY_MOD)/fcfg_calc_types.xcu \
     $(MY_MOD)/org/openoffice/Office/Common-calc.xcu \
     $(MY_MOD)/org/openoffice/Office/Embedding-calc.xcu \
     $(MY_MOD)/org/openoffice/Setup-calc.xcu
 
+.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
+MY_FILES_calc += \
+    $(MY_MOD)/DataAccess/calc.xcu
+.ENDIF
+
 MY_DEPS_cjk = main
 MY_FILES_cjk = \
     $(MY_MOD)/org/openoffice/Office/Common-cjk.xcu \
@@ -261,10 +265,6 @@ MY_FILES_main = \
     $(MY_XCU)/UserProfile.xcu \
     $(MY_XCU)/VCL.xcu \
     $(MY_XCU)/ucb/Configuration.xcu \
-    $(MY_MOD)/DataAccess/dbase.xcu \
-    $(MY_MOD)/DataAccess/flat.xcu \
-    $(MY_MOD)/DataAccess/mysql.xcu \
-    $(MY_MOD)/DataAccess/odbc.xcu \
     $(MY_MOD)/fcfg_base_filters.xcu \
     $(MY_MOD)/fcfg_base_others.xcu \
     $(MY_MOD)/fcfg_base_types.xcu \
@@ -280,6 +280,13 @@ MY_FILES_main = \
     $(MY_MOD)/org/openoffice/TypeDetection/UISort-impress.xcu \
     $(MY_MOD)/org/openoffice/TypeDetection/UISort-math.xcu \
     $(MY_MOD)/org/openoffice/TypeDetection/UISort-writer.xcu
+.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
+MY_FILES_main += \
+    $(MY_MOD)/DataAccess/dbase.xcu \
+    $(MY_MOD)/DataAccess/flat.xcu \
+    $(MY_MOD)/DataAccess/mysql.xcu \
+    $(MY_MOD)/DataAccess/odbc.xcu
+.ENDIF
 .IF "$(GUIBASE)" == "aqua"
 MY_FILES_main += \
     $(MY_MOD)/DataAccess/macab.xcu \
@@ -521,22 +528,33 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
 
-$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip \
-        $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip
+$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip
+
+.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
+$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip
+.ENDIF
 
 $(MISC)/lang/registry_%.xcd .ERRREMOVE :
     $(MKDIRHIER) $(@:d)
     rm -rf $(MISC)/$(@:b).unzip
     mkdir $(MISC)/$(@:b).unzip
     cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
+.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
     rm -rf $(MISC)/fcfg_drivers_$*.unzip
     mkdir $(MISC)/fcfg_drivers_$*.unzip
     cd $(MISC)/fcfg_drivers_$*.unzip && \
         unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
+.ENDIF
     - $(RM) $(MISC)/$(@:b).list
     # filter out filenames starting with "."
+.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)"
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
         find $(@:b).unzip fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
+.ELSE
+    echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
+        find $(@:b).unzip -name \[!.\]\*.xcu -print) \
+        '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
+.ENDIF
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list