[Libreoffice-commits] .: 5 commits - .gitignore set_soenv.in solenv/inc

[Tor Lillqvist]

 .gitignore                       |    2 ++
 set_soenv.in                     |    2 ++
 solenv/inc/settings.mk           |   12 ++++++++++++
 solenv/inc/startup/wnt/macros.mk |   12 ++----------
 solenv/inc/unx.mk                |    4 ++++
 solenv/inc/unxandr.mk            |   34 ++++++++++++++++++++++++++++++++++
 6 files changed, 56 insertions(+), 10 deletions(-)

New commits:
commit 5b77e4957d895d4a972fa299a0275805f2dc3dfd
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 23:59:52 2011 +0300

    Set some FOO_FOR_BUILD variables also when not cross-compiling

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 80c6b72..e533c14 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -52,6 +52,18 @@ MACOSX_DEPLOYMENT_TARGET:=$(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
 .EXPORT: MACOSX_DEPLOYMENT_TARGET
 .ENDIF
 
+# To simplify some of these .mk files we occasionally check FOO_FOR_BUILD
+# variables even when not cross-compiling, so set them. (set_soenv.in doesn't
+# except when CROSS_COMPILING==YES.)
+.IF "$(CROSS_COMPILING)"==""
+COM_FOR_BUILD:=$(COM)
+GUI_FOR_BUILD:=$(GUI)
+GUIBASE_FOR_BUILD:=$(GUIBASE)
+OS_FOR_BUILD:=$(OS)
+CPU_FOR_BUILD:=$(CPU)
+CPUNAME_FOR_BUILD:=$(CPUNAME)
+.ENDIF
+
 .INCLUDE .IGNORE : ooo_vendor.mk
 
 # --- common tool makros --------------------------------------
commit 3f785dba521cc56256aaa51dcc71d536805c5c1c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 17:23:00 2011 +0300

    Use specific OS value for Android

diff --git a/set_soenv.in b/set_soenv.in
index 0a04b62..534f0dd 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -585,6 +585,8 @@ elsif ( $platform =~ m/linux/ )
    }
    elsif ($platform =~ m/^arm.*-androideabi/)
    {  print "Setting Android ARM specific values... ";
+      $OS             = "ANDROID";
+      
       $outfile        = "AndroidARMEnv.Set.sh";
       $CPU            = "R";
       $CPUNAME        = "ARM";
commit f1395415b92f0159a333308fc4f5ac4ab8e3374a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 17:22:00 2011 +0300

    Add Android .mk file

diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 58a9e2b..c3bc016 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -111,6 +111,10 @@
 .INCLUDE : unxlngr.mk
 .ENDIF
 
+.IF "$(COM)$(OS)$(CPU)" == "GCCANDROIDR"
+.INCLUDE : unxandr.mk
+.ENDIF
+
 .IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA"
 .INCLUDE : unxlnga.mk
 .ENDIF
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
new file mode 100644
index 0000000..c1929dc
--- /dev/null
+++ b/solenv/inc/unxandr.mk
@@ -0,0 +1,34 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# mk file for Android Linux ARM using GCC, please make generic modifications to unxlng.mk
+
+CDEFAULTOPT=-Os
+.INCLUDE : unxlng.mk
+CDEFS+=-DARM32
+CFLAGS+=-fno-omit-frame-pointer
+DLLPOSTFIX=lr
commit d88c8ba72c4b4a039641f87777a252092f99719d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 17:21:08 2011 +0300

    Drop unuse GUWCMD

diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk
index 2d81814..391c1a9 100644
--- a/solenv/inc/startup/wnt/macros.mk
+++ b/solenv/inc/startup/wnt/macros.mk
@@ -1,12 +1,7 @@
-# Define additional MSDOS specific settings.
+# Define additional Windows-specific settings.
 #
 
-# --- Set Wrapper command ---
-# Provide a macro that can be used to access the wrapper and to avoid
-# hardcoding the program name everywhere
-GUWCMD*=guw.exe
-
-# This is a no-op for native W32 dmake
+# This is a no-op for native Windows dmake
 .WINPATH !:= yes
 
 # Directory cache configuration.
@@ -24,9 +19,6 @@ E *:= .exe	# Executables
    __.DIVSEP-sh-no  *:= \\
    DIRSEPSTR :=/
 
-.EXPORT : GUWCMD
-
 # Does not respect case of filenames.
 .DIRCACHERESPCASE := no
 NAMEMAX	=	256
-
commit 9a4f58f1a326b0a1d18bb30c015eda3888ff23d9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun May 15 17:19:48 2011 +0300

    Add Android directories

diff --git a/.gitignore b/.gitignore
index b9a2ecd..14df675 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@
 /*/unxaig??.pro
 /*/unxios?
 /*/unxios?.pro
+/*/unxand?
+/*/unxand?.pro
 /solver/*
 
 # autoconf generated stuff