[Libreoffice-commits] .: 5 commits - cpputools/source jvmaccess/source jvmaccess/util README.cross solenv/gbuild

[Tor Lillqvist]

 README.cross                                   |    4 ++--
 cpputools/source/registercomponent/makefile.mk |    5 +++++
 cpputools/source/regsingleton/makefile.mk      |    5 +++++
 cpputools/source/unoexe/makefile.mk            |    4 ++++
 jvmaccess/source/makefile.mk                   |    5 +++++
 jvmaccess/util/makefile.mk                     |    5 +++++
 solenv/gbuild/Package.mk                       |    2 +-
 7 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 0b4a9bd2b49da8441d873a52ae5ec2c86937c839
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Nov 26 00:32:31 2011 +0200

    Compile as Objective-C++ for iOS thanks to current sal/main.h idea

diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
index 5869f18..e4317b0 100755
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -72,6 +72,10 @@ APP1TARGET=$(TARGET)
 APP1OBJS=$(DEPOBJFILES)  
 APP1RPATH=UREBIN
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += $(OBJCXXFLAGS)
+.ENDIF
+
 # Include all relevant (see ure/source/README) dynamic libraries, so that C++
 # UNO components running in the uno executable have a defined environment
 # (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
commit 649f45fdcd0bb01e087bfd1ab1056b9b02c7b7af
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Nov 26 00:30:40 2011 +0200

    No sense building these for iOS

diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk
index 6808e0b..536d864 100644
--- a/cpputools/source/registercomponent/makefile.mk
+++ b/cpputools/source/registercomponent/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+ALL:
+    @echo Nothing done for $(OS)
+.ENDIF
+
 UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
 UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 
diff --git a/cpputools/source/regsingleton/makefile.mk b/cpputools/source/regsingleton/makefile.mk
index e90b0c8..9d8812c 100644
--- a/cpputools/source/regsingleton/makefile.mk
+++ b/cpputools/source/regsingleton/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+ALL:
+    @echo Nothing done for $(OS)
+.ENDIF
+
 UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
 UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 
commit 177fd47a8c77848c00632398ec233464cb8575e2
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Nov 26 00:28:49 2011 +0200

    Don't bother building anything here for iOS

diff --git a/jvmaccess/source/makefile.mk b/jvmaccess/source/makefile.mk
index 44e0313..8c19c93 100644
--- a/jvmaccess/source/makefile.mk
+++ b/jvmaccess/source/makefile.mk
@@ -33,6 +33,11 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(OS)" == "IOS"
+ALL:
+    @echo Nothing done for $(OS)
+.ENDIF
+
 SLOFILES = \
     $(SLO)$/classpath.obj \
     $(SLO)$/unovirtualmachine.obj \
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk
index 1d6106f..9553973 100644
--- a/jvmaccess/util/makefile.mk
+++ b/jvmaccess/util/makefile.mk
@@ -37,6 +37,11 @@ UNIXVERSIONNAMES = UDK
 
 .INCLUDE: settings.mk
 
+.IF "$(OS)" == "IOS"
+ALL:
+    @echo Nothing done for $(OS)
+.ENDIF
+
 .IF "$(UNIXVERSIONNAMES)" == ""
 SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)
 .ELSE # UNIXVERSIONNAMES
commit a5cdc4cbc70f479f0c06ec6f36d6a9139484bb34
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Nov 25 18:04:19 2011 +0200

    xargs on MacOSX seems a bit broken, work around that

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 7420757..0179dd1 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -45,7 +45,7 @@ endef
 $(call gb_Package_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PKG,2)
 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
-	&& cat $${RESPONSEFILE} | xargs rm -f \
+	&& cat $${RESPONSEFILE} | xargs $(if $(filter MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -f \
  	&& rm -f $${RESPONSEFILE}
 
 $(call gb_Package_get_preparation_target,%) :
commit fad4076a20242c94f9887984e431118a8e6aec89
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Nov 25 15:18:19 2011 +0200

    Use the 5.0 SDK for the iOS simulator example

diff --git a/README.cross b/README.cross
index 6918ec6..204b86d 100644
--- a/README.cross
+++ b/README.cross
@@ -291,8 +291,8 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4
 --without-myspell-dicts
 
 And here for the iOS simulator:
-CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++ -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
-CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++ -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk
+CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk
 CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4
 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4
 --with-distro=LibreOfficeiOS