[Libreoffice-commits] .: postprocess/packcomponents postprocess/packregistry

[Tor Lillqvist]

 postprocess/packcomponents/makefile.mk |   48 +++++++++++++++++----------------
 postprocess/packregistry/makefile.mk   |    4 ++
 2 files changed, 30 insertions(+), 22 deletions(-)

New commits:
commit 063a37930799b5b487e03525896f98af9cb53232
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Aug 26 14:38:43 2011 +0300

    Bypass stuff not built for iOS and non-desktop OSes

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 959492f..33f0f01 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -39,9 +39,7 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
 .END
 
 my_components = \
-    abp \
     basprov \
-    bib \
     cached1 \
     calc \
     component/animations/source/animcore/animcore \
@@ -127,11 +125,8 @@ my_components = \
     configmgr \
     ctl \
     dbase \
-    dbp \
     dbpool2 \
     dbtools \
-    deployment \
-    deploymentgui \
     dlgprov \
     embobj \
     evtatt \
@@ -144,33 +139,22 @@ my_components = \
     hyphen \
     lnth \
     localebe1 \
-    log \
-    migrationoo2 \
-    migrationoo3 \
     msfilter \
     mysql \
     odbc \
     odfflatxml \
-    offacc \
-    oooimprovecore \
-    pcr \
     pdffilter \
     placeware \
     protocolhandler \
-    res \
-    scn \
     scriptframe \
     sdbc2 \
     spell \
-    spl \
     srtrs1 \
     stringresource \
     svgfilter \
     syssh \
     t602filter \
-    tvhlp1 \
     ucb1 \
-    ucpchelp1 \
     ucpexpand1 \
     ucpext \
     ucpfile1 \
@@ -178,21 +162,41 @@ my_components = \
     ucphier1 \
     ucppkg1 \
     ucptdoc1 \
-    updatefeed \
-    updchk \
-    updchk.uno \
     vbaevents \
     xmlfa \
     xmlfd \
-    xmx \
     xsltdlg \
     xsltfilter \
 
+.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
+my_components += \
+    abp \
+    bib \
+    dbp \
+    deployment \
+    deploymentgui \
+    log \
+    migrationoo2 \
+    migrationoo3 \
+    offacc \
+    oooimprovecore \
+    pcr \
+    res \
+    scn \
+    spl \
+    tvhlp1 \
+    ucpchelp1 \
+    updatefeed \
+    updchk \
+    updchk.uno \
+    xmx
+.ENDIF
+
 .IF "$(DISABLE_PYTHON)" != "TRUE"
 my_components += pythonloader
 .ENDIF
 
-.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
+.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" && "$(OS)" != "IOS"
 my_components += splash
 .ENDIF
     
@@ -316,7 +320,7 @@ my_components += \
     component/vcl/vcl.windows
 .END
 
-.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT"
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "IOS"
 my_components += \
     desktopbe1 \
     component/vcl/vcl.unx
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 1b67b07..ce9f3cd 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -313,6 +313,8 @@ MY_FILES_main += \
     $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
     $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu
         # Inet-wnt.xcu must come after Inet.xcu
+.ELIF "$(GUIBASE)" == "cocoatouch"
+# ?
 .ELSE
 ERROR : unknown-GUIBASE
 .END
@@ -354,6 +356,7 @@ MY_FILES_math = \
     $(MY_MOD)/org/openoffice/Office/Embedding-math.xcu \
     $(MY_MOD)/org/openoffice/Setup-math.xcu
 
+.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
 MY_DEPS_onlineupdate = main
 MY_FILES_onlineupdate = \
     $(MY_MOD)/org/openoffice/Office/Addons/Addons-onlineupdate.xcu \
@@ -363,6 +366,7 @@ MY_DEPS_oooimprovement = main
 MY_FILES_oooimprovement = \
     $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-oooimprovement.xcu \
     $(MY_MOD)/org/openoffice/Office/Logging/Logging-oooimprovement.xcu
+.ENDIF
 
 MY_DEPS_palm = main
 MY_FILES_palm = \