removetooltypes01: rebase to DEV300_m96

author: Mikhail Voytenko <mav@openoffice.org> 2011-01-06 14:57:12 +0100
committer: Mikhail Voytenko <mav@openoffice.org> 2011-01-06 14:57:12 +0100
commit: 125087d3a4ac8ffd111391fe27b71027c90acadc (patch)
tree: 6afc6264ea33686546be829e768b5522e978d88f
parent: 97f62a9636225cf2b9dd15b25752e570842f3c13 (diff)
parent: 2ad19fc838f554a2f9883fc7a8cda849dc414a94 (diff)
110 files changed, 12098 insertions, 3722 deletions
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100644
index 000000000..018b21e3f
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/Module_*.mk))))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Module_ooo.mk b/Module_ooo.mk
new file mode 100644
index 000000000..bc8d42079
--- /dev/null
+++ b/Module_ooo.mk
@@ -0,0 +1,41 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,ooo))
+
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    framework \
+    sfx2 \
+    svl \
+    svtools \
+    sw \
+    toolkit \
+    tools \
+    xmloff \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/Repository.mk b/Repository.mk
new file mode 100644
index 000000000..be8017031
--- /dev/null
+++ b/Repository.mk
@@ -0,0 +1,127 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Helper_register_repository,SRCDIR))
+
+
+$(eval $(call gb_Helper_register_executables,NONE, \
+    bmp \
+    bmpsum \
+    g2g \
+    mkunroll \
+    rscdep \
+    so_checksum \
+    sspretty \
+))
+
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+    avmedia \
+    basegfx \
+    cui \
+    drawinglayer \
+    editeng \
+    eggtray \
+    fwe \
+    fwi \
+    fwk \
+    fwl \
+    fwm \
+    lng \
+    msfilter \
+    msword \
+    qstart_gtk \
+    sax \
+    sb \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    sw \
+    swd \
+    swui \
+    textconversiondlgs \
+    tk \
+    tl \
+    utl \
+    vbahelper \
+    vcl \
+    xcr \
+    xo \
+    xof \
+))
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+    xml2 \
+))
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+    icuuc \
+))
+
+
+$(eval $(call gb_Helper_register_libraries,RTLIBS, \
+    comphelper \
+    i18nisolang1 \
+    i18nutil \
+    ucbhelper \
+    vos3 \
+))
+
+$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
+    cppuhelper \
+    salhelper \
+))
+
+$(eval $(call gb_Helper_register_libraries,STLLIBS, \
+    stl \
+))
+
+$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+    fsstorage \
+    hatchwindowfactory \
+    passwordcontainer \
+    productregistration \
+    vbaswobj \
+))
+
+
+$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
+    cppu \
+    jvmfwk \
+    sal \
+))
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    jpeglib \
+    ooopathutils \
+    salcpprt \
+    zlib \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
new file mode 100644
index 000000000..24b2dc96b
--- /dev/null
+++ b/RepositoryFixes.mk
@@ -0,0 +1,138 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# fixes for all the libraries that are named with too much creativity and do
+# not follow any of the established nameschemes
+
+ifeq ($(OS),LINUX)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+endif
+
+
+ifeq ($(OS),MACOSX)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+endif
+
+
+ifeq ($(OS),WNT)
+gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
+else
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
+endif
+gb_Library_NOILIBFILENAMES:=\
+    advapi32 \
+    gdi32 \
+    gnu_getopt \
+    icuuc \
+    kernel32 \
+    msvcrt \
+    mpr \
+    oldnames \
+    ole32 \
+    oleaut32 \
+    shell32 \
+    sot \
+    unicows \
+    user32 \
+    uuid \
+    uwinapi \
+
+gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+ifneq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
+endif
+
+gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp4%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
+
+endif
+
+ifeq ($(OS),SOLARIS)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+#$(info libnames: $(gb_Library_FILENAMES))
+
+endif
+
+# we do not require a known rule for these, when using system libs
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+ifeq ($(SYSTEM_LIBXML),YES)
+gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
+endif
+
+ifeq ($(SYSTEM_ICU),YES)
+gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
+endif
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/buildscript.sh b/buildscript.sh
new file mode 100644
index 000000000..82211c363
--- /dev/null
+++ b/buildscript.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+cd tools
+../solenv/bin/build.pl -P4 -- -P4
+../solenv/bin/deliver.pl
+cd -
+cd framework
+../solenv/bin/build.pl -P4 -- -P4
+../solenv/bin/deliver.pl
+cd -
+cd toolkit
+../solenv/bin/build.pl -P4 -- -P4
+../solenv/bin/deliver.pl
+cd -
+cd sw
+../solenv/bin/build.pl -P4 -- -P4
+../solenv/bin/deliver.pl
+cd -
diff --git a/configure b/configure
index abb52724d..8ba6c16ca 100755
--- a/configure
+++ b/configure
@@ -5082,23 +5082,13 @@ echo "$as_me:$LINENO: checking the GNU make version" >&5
 echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6
 _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
 _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-if test "$_make_longver" -ge "037901" ; then
+if test "$_make_longver" -ge "038100" ; then
    echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
 echo "${ECHO_T}$GNUMAKE $_make_version" >&6
 else
-   if test "$_os" = "Darwin"; then
-       if test "$_make_longver" -ge "037900" ; then
-		   echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5
-echo "${ECHO_T}$GNUMAKE $_make_version" >&6
-       else
-           { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5
-echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;}
-       fi
-   else
-       { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
-echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
+   { { echo "$as_me:$LINENO: error: failed ($GNUMAKE version >= 3.81 needed" >&5
+echo "$as_me: error: failed ($GNUMAKE version >= 3.81 needed" >&2;}
    { (exit 1); exit 1; }; }
-   fi
 fi
 
 
@@ -13815,9 +13805,7 @@ if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
     echo "$as_me:$LINENO: result: external" >&5
 echo "${ECHO_T}external" >&6
     SYSTEM_CPPUNIT=YES
-    # might work for earlier, too but go sure. We didn't have
-    # a system-cppunit before the first version using a proper cppunit
-    # (and that being 1.12.1) anyway
+    # might work for earlier, too but go sure:
 
   succeeded=no
 
@@ -13872,23 +13860,23 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for cppunit >= 1.12.1 " >&5
-echo $ECHO_N "checking for cppunit >= 1.12.1 ... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for cppunit >= 1.12.0 " >&5
+echo $ECHO_N "checking for cppunit >= 1.12.0 ... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "cppunit >= 1.12.1 " ; then
+        if $PKG_CONFIG --exists "cppunit >= 1.12.0 " ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
             echo "$as_me:$LINENO: checking CPPUNIT_CFLAGS" >&5
 echo $ECHO_N "checking CPPUNIT_CFLAGS... $ECHO_C" >&6
-            CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.1 "`
+            CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.0 "`
             echo "$as_me:$LINENO: result: $CPPUNIT_CFLAGS" >&5
 echo "${ECHO_T}$CPPUNIT_CFLAGS" >&6
 
             echo "$as_me:$LINENO: checking CPPUNIT_LIBS" >&5
 echo $ECHO_N "checking CPPUNIT_LIBS... $ECHO_C" >&6
-            CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.1 "`
+            CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.0 "`
             echo "$as_me:$LINENO: result: $CPPUNIT_LIBS" >&5
 echo "${ECHO_T}$CPPUNIT_LIBS" >&6
         else
@@ -13896,7 +13884,7 @@ echo "${ECHO_T}$CPPUNIT_LIBS" >&6
             CPPUNIT_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.12.1 "`
+            CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.12.0 "`
             echo $CPPUNIT_PKG_ERRORS
         fi
 
@@ -13911,8 +13899,8 @@ echo "${ECHO_T}$CPPUNIT_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { echo "$as_me:$LINENO: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+     { { echo "$as_me:$LINENO: error: Library requirements (cppunit >= 1.12.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (cppunit >= 1.12.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -22452,23 +22440,23 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5
-echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6
+        echo "$as_me:$LINENO: checking for neon >= 0.26.0" >&5
+echo $ECHO_N "checking for neon >= 0.26.0... $ECHO_C" >&6
 
-        if $PKG_CONFIG --exists "neon >= 0.24.0" ; then
+        if $PKG_CONFIG --exists "neon >= 0.26.0" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
             echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5
 echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6
-            NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.24.0"`
+            NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.26.0"`
             echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5
 echo "${ECHO_T}$NEON_CFLAGS" >&6
 
             echo "$as_me:$LINENO: checking NEON_LIBS" >&5
 echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6
-            NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.24.0"`
+            NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.26.0"`
             echo "$as_me:$LINENO: result: $NEON_LIBS" >&5
 echo "${ECHO_T}$NEON_LIBS" >&6
         else
@@ -22476,7 +22464,7 @@ echo "${ECHO_T}$NEON_LIBS" >&6
             NEON_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            NEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "neon >= 0.24.0"`
+            NEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "neon >= 0.26.0"`
 
         fi
 
@@ -22491,8 +22479,8 @@ echo "${ECHO_T}$NEON_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { echo "$as_me:$LINENO: error: you need neon >= 0.24.x for system-neon" >&5
-echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;}
+     { { echo "$as_me:$LINENO: error: you need neon >= 0.26.x for system-neon" >&5
+echo "$as_me: error: you need neon >= 0.26.x for system-neon" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -25610,9 +25598,9 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
       GNUPATCH=$PATCH
    else
       if test -x "$with_gnu_patch"; then
-	GNUPATCH=$with_gnu_patch
+	      GNUPATCH=$with_gnu_patch
       else
-        { { echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5
+         { { echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5
 echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;}
    { (exit 1); exit 1; }; }
       fi
@@ -25621,17 +25609,18 @@ echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;}
    echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5
 echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6
    if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	echo "$as_me:$LINENO: result: yes" >&5
+	   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
    else
-  	{ { echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5
+      { { echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5
 echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;}
    { (exit 1); exit 1; }; }
    fi
+fi
 
 
-  if test -z "$with_gnu_cp"; then
-    for ac_prog in gnucp cp
+if test -z "$with_gnu_cp"; then
+   for ac_prog in gnucp cp
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -25675,47 +25664,46 @@ fi
   test -n "$GNUCP" && break
 done
 
-    if test -z $GNUCP; then
+   if test -z $GNUCP; then
       { { echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5
 echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;}
    { (exit 1); exit 1; }; }
-    fi
-  else
-    if test -x "$with_gnu_cp"; then
+   fi
+else
+   if test -x "$with_gnu_cp"; then
       GNUCP=$with_gnu_cp
-    else
+   else
       { { echo "$as_me:$LINENO: error: --with-gnu-cp did not point to an executable" >&5
 echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;}
    { (exit 1); exit 1; }; }
-    fi
-  fi
+   fi
+fi
 
-  echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5
+echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5
 echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6
-  if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	echo "$as_me:$LINENO: result: yes" >&5
+if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-  else
+else
    if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
-	echo "$as_me:$LINENO: result: yes" >&5
+      echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
    else
-      if test "$_os" = "Darwin"; then
-         GNUCP=''
-         echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5
-echo "${ECHO_T}no gnucp found - using the system's cp command" >&6
-      else
+      if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then
          { { echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5
 echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;}
    { (exit 1); exit 1; }; }
+      else
+         GNUCP=''
+         echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5
+echo "${ECHO_T}no gnucp found - using the system's cp command" >&6
       fi
    fi
-  fi
-
 fi
 
 
 
+
 if test "$_os" = "WINNT"; then
     CYGWIN_PATH=""
     # Extract the first word of "bash", so it can be a program name with args.
diff --git a/configure.in b/configure.in
index df50904f7..57b54a4fa 100644
--- a/configure.in
+++ b/configure.in
@@ -1554,18 +1554,10 @@ fi
 AC_MSG_CHECKING([the GNU make version])
 _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
 _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
-if test "$_make_longver" -ge "037901" ; then
+if test "$_make_longver" -ge "038100" ; then
    AC_MSG_RESULT([$GNUMAKE $_make_version])
 else
-   if test "$_os" = "Darwin"; then
-       if test "$_make_longver" -ge "037900" ; then
-		   AC_MSG_RESULT([$GNUMAKE $_make_version])
-       else
-           AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.0+)])
-       fi
-   else
-       AC_MSG_ERROR([failed ($GNUMAKE $_make_version need 3.79.1+)])
-   fi
+   AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
 fi
 AC_SUBST(GNUMAKE)
 
@@ -3639,10 +3631,8 @@ if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
         test "$with_system_cppunit" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_CPPUNIT=YES
-    # might work for earlier, too but go sure. We didn't have
-    # a system-cppunit before the first version using a proper cppunit
-    # (and that being 1.12.1) anyway
-    PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.1 )
+    # might work for earlier, too but go sure:
+    PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.0 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_CPPUNIT=NO
@@ -4966,7 +4956,7 @@ AC_MSG_CHECKING([which neon to use])
 if test -n "$with_system_neon" -o -n "$with_system_libs" && \
 	test "$with_system_neon" != "no"; then
         AC_MSG_RESULT([external])
-        PKG_CHECK_MODULES(NEON, neon >= 0.24.0, , AC_MSG_ERROR([you need neon >= 0.24.x for system-neon]))
+        PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
         NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
         SYSTEM_NEON=YES
@@ -5450,51 +5440,51 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
       GNUPATCH=$PATCH
    else
       if test -x "$with_gnu_patch"; then
-	GNUPATCH=$with_gnu_patch
+	      GNUPATCH=$with_gnu_patch
       else
-        AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
+         AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
       fi
    fi
 
    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
    if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	AC_MSG_RESULT([yes])
+	   AC_MSG_RESULT([yes])
    else
-  	AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
+      AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
    fi
+fi
 
 dnl We also need to check for --with-gnu-cp
 
-  if test -z "$with_gnu_cp"; then
-    AC_PATH_PROGS(GNUCP, gnucp cp)
-    if test -z $GNUCP; then
+if test -z "$with_gnu_cp"; then
+   AC_PATH_PROGS(GNUCP, gnucp cp)
+   if test -z $GNUCP; then
       AC_MSG_ERROR([Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it])
-    fi
-  else
-    if test -x "$with_gnu_cp"; then
+   fi
+else
+   if test -x "$with_gnu_cp"; then
       GNUCP=$with_gnu_cp
-    else
+   else
       AC_MSG_ERROR([--with-gnu-cp did not point to an executable])
-    fi
-  fi
+   fi
+fi
 
-  AC_MSG_CHECKING([whether $GNUCP is GNU cp])
-  if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
-	AC_MSG_RESULT([yes])
-  else
+AC_MSG_CHECKING([whether $GNUCP is GNU cp])
+if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+   AC_MSG_RESULT([yes])
+else
    if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then
-	AC_MSG_RESULT([yes])
+      AC_MSG_RESULT([yes])
    else
-      if test "$_os" = "Darwin"; then
+      if test "$_os" = "SunOS" -o "$_os" = "FreeBSD"; then
+         AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
+      else
          GNUCP=''
          AC_MSG_RESULT([no gnucp found - using the system's cp command])
-      else      
-         AC_MSG_ERROR([no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it])
       fi
    fi
-  fi	
-
 fi
+
 AC_SUBST(GNUPATCH)
 AC_SUBST(GNUCP)
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 9bb051e56..3968375a8 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -2,4 +2,6 @@ Property	Signature_
 s72	s72
 AppSearch	Property	Signature_
 INSTALLLOCATION	installuser
+INSTALLLOCATION	installuser_
 INSTALLLOCATION	installmachine
+INSTALLLOCATION	installmachine_
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index 2fb2d2963..661b9a4be 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,7 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-installuser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
-installmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser	1	Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installuser_	1	Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine	2	Software\OpenOffice.org\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
+installmachine_	2	Software\OpenOffice.org\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]	INSTALLLOCATION	2
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
index 41ff15217..9a3dac511 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt
@@ -2,4 +2,6 @@ Property	Signature_
 s72	s72
 AppSearch	Property	Signature_
 INSTALLLOCATION	basisinstalluser
+INSTALLLOCATION	basisinstalluser_
 INSTALLLOCATION	basisinstallmachine
+INSTALLLOCATION	basisinstallmachine_
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 5121f7870..072fdcf6c 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,5 +1,7 @@
 Signature_	Root	Key	Name	Type
 s72	i2	s255	S255	I2
 RegLocator	Signature_
-basisinstalluser	1	Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
-basisinstallmachine	2	Software\OpenOffice.org\LAYERNAMETEMPLATE\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstalluser	1	Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstalluser_	1	Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstallmachine	2	Software\OpenOffice.org\Layers\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
+basisinstallmachine_	2	Software\OpenOffice.org\Layers_\Basis\[OOOBASEVERSION]	BASISINSTALLLOCATION	2
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index e1f630ee1..a682cd8f0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -106,7 +106,7 @@ OpenOffice
 		script			setup_osl
 		downloadname	OOo_{productversion}_{os}_install_{languages}
 		langpackdownloadname	OOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -170,7 +170,7 @@ OpenOffice_wJRE
 		compression		5
 		script			setup_osljre
 		downloadname	OOo_{productversion}_{os}_installwjre_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -242,7 +242,7 @@ OpenOffice_Dev
 		script			setup_osljre
 		downloadname	OOo-dev_{productversion}_{os}_install_{languages}
 		langpackdownloadname	OOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -327,7 +327,7 @@ OpenOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor},{solarenvpath}/{os}/MS
     }
 }
 
@@ -379,7 +379,7 @@ OpenOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarcommonpath}/bin.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/bin.{minor},{solarenvpath}/{os}/MS
     }
 }
 
@@ -448,7 +448,7 @@ BrOffice
 		script			setup_osl
 		downloadname	BrOo_{productversion}_{os}_install_{languages}
 		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -518,7 +518,7 @@ BrOffice_wJRE
 		compression		5
 		script			setup_osljre
 		downloadname	BrOo_{productversion}_{os}_installwjre_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
 
@@ -590,6 +590,6 @@ BrOffice_Dev
 		script			setup_osljre
 		downloadname	BrOo-dev_{productversion}_{os}_install_{languages}
 		langpackdownloadname	BrOo_{productversion}_languagepack_{os}_install_{languages}
-		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarcommonpath}/bin.{minor}/broffice,{solarcommonpath}/bin.{minor}/osl,{solarcommonpath}/bin.{minor},{solarcommonpath}/pck.{minor}/broffice_dev,{solarcommonpath}/pck.{minor}/broffice,{solarcommonpath}/pck.{minor}/openoffice_dev,{solarcommonpath}/pck.{minor}/openoffice,{solarcommonpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
+		include			{solarenvpath}/{os}/loader2,.,{solarpath}/bin.{minor}/broffice,{localpath}/bin/broffice_dev,{localcommonpath}/bin,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},{solarpath}/bin.{minor}/broffice,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/pck.{minor}/broffice_dev,{solarpath}/pck.{minor}/broffice,{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
 	}
 }
diff --git a/ooo.lst b/ooo.lst
index f49780f8e..e61ad60f4 100755
--- a/ooo.lst
+++ b/ooo.lst
@@ -27,18 +27,13 @@ ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
-5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip
 b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
-67b42915c8432abf0a922438f00860a2-libxml.zip
 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
-79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip
 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
-8ea307d71d11140574bfb9fcc2487e33-libbase.zip
 bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
-a06a496d7a43cbdc35e69dbe678efadb-libloader.zip
 a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
 a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -55,7 +50,6 @@ d1a3205871c3c52e8a50c9f18510ae12-libformula.zip
 d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
 d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
 d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
-dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip
 dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz
 e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
 e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
@@ -63,8 +57,6 @@ e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
 ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
 ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
 ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz
-f3e2febd267c8e4b13df00dac211dd6d-flute.zip
-f7925ba8491fe570e5164d2c72791358-libfonts.zip
 fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
 fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
@@ -73,3 +65,13 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
+3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index ca3c94b75..4857ecf38 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -60,7 +60,7 @@ Module gid_Module_Langpack_Binfilter_Template
     ParentID = gid_Module_Optional_Binfilter;
     Name = "gid_Module_Langpack_Binfilter_Template";
     Description = "gid_Module_Langpack_Binfilter_Template";
-    Default = NO;
+    Default = YES;
     Styles = (TEMPLATEMODULE);
     Files = (gid_File_Res_Bf_Sch,
              gid_File_Res_Bf_Svx,
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7c306e19f..899059ec2 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -98,7 +98,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Xdg_JavaFilter,
              gid_Brand_File_Share_Xdg_Math,
              gid_Brand_File_Share_Xdg_Printeradmin,
-             gid_Brand_File_Share_Xdg_QStart,
+//             gid_Brand_File_Share_Xdg_QStart,
              gid_Brand_File_Share_Xdg_StartCenter,
              gid_Brand_File_Share_Xdg_Writer,
              gid_Brand_File_Txt_Package);
@@ -739,16 +739,16 @@ File gid_Brand_File_Share_Xdg_Printeradmin
 End
 #endif
 
-#if defined UNX && ! defined MACOSX
-#ifdef ENABLE_GTK
-File gid_Brand_File_Share_Xdg_QStart
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Styles = (PACKED,SCPZIP_REPLACE);
-    Name = "qstart.desktop";
-End
-#endif
-#endif
+//#if defined UNX && ! defined MACOSX
+//#ifdef ENABLE_GTK
+//File gid_Brand_File_Share_Xdg_QStart
+//    TXT_FILE_BODY;
+//    Dir = gid_Brand_Dir_Share_Xdg;
+//    Styles = (PACKED,SCPZIP_REPLACE);
+//    Name = "qstart.desktop";
+//End
+//#endif
+//#endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Writer
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index cc805f9e8..4b20c6de7 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -965,6 +965,11 @@ Directory gid_Dir_Share_Template_Wizard
     DosName = "wizard";
 End
 
+Directory gid_Dir_Share_Template_Wizard_Bitmap
+    ParentID = gid_Dir_Share_Template_Wizard;
+    DosName = "bitmap";
+End
+
 Directory gid_Dir_Share_Template_Wizard_Letter
     ParentID = gid_Dir_Share_Template_Wizard;
     DosName = "letter";
@@ -1025,11 +1030,6 @@ Directory gid_Dir_Template_Wizard
     DIR_IDENT_ALL_LANG(wizard);
 End
 
-Directory gid_Dir_Template_Wizard_Bitmap
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(bitmap);
-End
-
 Directory gid_Dir_Template_Wizard_Web
     ParentID = gid_Dir_Template_Wizard;
     DIR_IDENT_ALL_LANG(web);
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index dbea12eee..ee8c46f2c 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -365,10 +365,9 @@ File gid_File_Extra_Tplpresntimpr_Lang
 End
 
 File gid_File_Extra_Tplwizbitmap
-    Dir = gid_Dir_Template_Wizard_Bitmap;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_IDENT_ALL_LANG(tplwizbitmap.zip);
+    Dir = gid_Dir_Share_Template_Wizard_Bitmap;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "tplwizbitmap.zip";
 End
 
 File gid_File_Extra_Tplwizdesktop_Lang
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index cacfb19ca..228f70ee1 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -210,25 +210,25 @@ End
 
 #endif
 
-#ifdef UNX
-#ifdef ENABLE_GTK
-#ifdef ENABLE_SYSTRAY_GTK
-File gid_File_Lib_Egg_Tray
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
-End
-
-File gid_File_Lib_QStart_Gtk
-    Name = LIBNAME(qstart_gtk);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-#endif
-#endif
+//#ifdef UNX
+//#ifdef ENABLE_GTK
+//#ifdef ENABLE_SYSTRAY_GTK
+//File gid_File_Lib_Egg_Tray
+// TXT_FILE_BODY;
+// Styles = (PACKED);
+// Dir = SCP2_OOO_BIN_DIR;
+// Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
+//End
+//
+//File gid_File_Lib_QStart_Gtk
+//    Name = LIBNAME(qstart_gtk);
+//    TXT_FILE_BODY;
+//    Styles = (PACKED);
+//    Dir = SCP2_OOO_BIN_DIR;
+//End
+//#endif
+//#endif
+//#endif
 
 STD_LIB_FILE( gid_File_Lib_Dba, dba)
 
@@ -355,9 +355,9 @@ File gid_File_Lib_Vbaswobj
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(vbaswobj,.uno,.dll));
   #endif
 End
 
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index edaea2027..cbd8ff609 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -89,7 +89,7 @@ STD_RES_FILE( gid_File_Res_Spa, spa )
 STD_RES_FILE( gid_File_Res_Stt, stt )
 STD_RES_FILE( gid_File_Res_Sb, sb )
 
-STD_RES_FILE( gid_File_Res_Svs, svs )
+STD_RES_FILE( gid_File_Res_Svl, svl )
 
 STD_RES_FILE( gid_File_Res_Svt, svt )
 
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index e8c20f99c..e1bc26118 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -454,6 +454,7 @@ Module gid_Module_Root_Files_6
 	gid_File_Extra_Gallwwwgraf,
 	gid_File_Extra_Migration,
 	gid_File_Extra_Migration_Lang_Multi,
+	gid_File_Extra_Tplwizbitmap,
 	gid_File_Extra_Tplwizletter,
 	gid_File_Extra_Tplwizletter_en_US,
 	gid_File_Extra_Tplwizletter_de,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 8ffeadc2e..0769df7ed 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -35,7 +35,6 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Extra_Tpllayoutimpr_Lang,
              gid_File_Extra_Tplpresntimpr_Lang,
              gid_File_Extra_Tplwizagenda_Lang,
-             gid_File_Extra_Tplwizbitmap,
              gid_File_Extra_Tplwizdesktop_Lang,
              gid_File_Extra_Tplwizfax_Lang,
              gid_File_Extra_Tplwizletter_Lang,
@@ -86,9 +85,8 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Sd,
              gid_File_Res_Sfx,
              gid_File_Res_Spa,
-             gid_File_Res_Svs,
+             gid_File_Res_Svl,
              gid_File_Res_Svt,
-             gid_File_Res_Svp,
              gid_File_Res_Svx,
              gid_File_Res_Cui,
              gid_File_Res_TextConversionDlgs,
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 3127cdd8b..591c84a6a 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -685,8 +685,32 @@ en-US = "Mongolian"
 [STR_DESC_MODULE_LANGPACK_MN]
 en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
+[STR_NAME_MODULE_LANGPACK_OC]
+en-US = "Occitan"
 
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_OC]
+en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UG]
+en-US = "Uighur"
+
+[STR_DESC_MODULE_LANGPACK_UG]
+en-US = "Installs Uighur support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_LANGPACK_SI]
+en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OM]
+en-US = "Oromo"
+
+[STR_DESC_MODULE_LANGPACK_OM]
+en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_LANGPACK_AST]
+en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
index 72c209228..ffcabf0cf 100644
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ b/scp2/source/templates/module_langpack_binfilter.sct
@@ -28,7 +28,7 @@
 Module gid_Module_Langpack_Binfilter_<LANGUAGE_>
     ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
     Sortkey = "900";
-    Default = NO;
+    Default = YES;
     Language = "<LANGUAGE>";
     Assigns = gid_Module_Langpack_Binfilter_Template;
     Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
diff --git a/set_soenv.in b/set_soenv.in
index 6bd65867a..0f31cc3e1 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -79,7 +79,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV
 # Environment variables.
 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
      $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR ,
-     $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
+     $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, 
      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
      $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
      $MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
@@ -1009,6 +1009,10 @@ else
 #Location of Solar version.
 $SOLARVERSION         = '$SOLARVER';
 
+#Location of gnu make directories.
+$WORKDIR              = '$SOLARVER/$INPATH/workdir';
+$OUTDIR              = '$SOLARVER/$INPATH';
+
 $SOLARENVINC          = '$SOLARENV'.$INC;
 # Location of 
 $LOCALINI             = '$SOLARENV'.$CONFIG;
@@ -1730,6 +1734,8 @@ ToFile( "UPD",               $UPD,               "e" );
 ToFile( "WORK_STAMP",        $WORK_STAMP,        "e" );
 ToFile( "SOLARVER",          $SOLARVER,          "e" );
 ToFile( "SOLARVERSION",      $SOLARVERSION,      "e" );
+ToFile( "WORKDIR",           $WORKDIR,           "e" );
+ToFile( "OUTDIR",            $OUTDIR,            "e" );
 ToFile( "SOLARENV",          $SOLARENV,          "e" );
 ToFile( "SOLARENVINC",       $SOLARENVINC,       "e" );
 ToFile( "LOCALINI",          $LOCALINI,          "e" );
diff --git a/soldep/bootstrp/appdef.cxx b/soldep/bootstrp/appdef.cxx
index d1c94efe7..6c982eda8 100644
--- a/soldep/bootstrp/appdef.cxx
+++ b/soldep/bootstrp/appdef.cxx
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <appdef.hxx>
+#include <soldep/appdef.hxx>
 
 const char* GetDefStandList()
 {
diff --git a/soldep/bootstrp/command.cxx b/soldep/bootstrp/command.cxx
new file mode 100644
index 000000000..4766d7302
--- /dev/null
+++ b/soldep/bootstrp/command.cxx
@@ -0,0 +1,683 @@
+/************************************************************************* 
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifdef SCO
+#define _IOSTREAM_H
+#endif
+
+#include <tools/fsys.hxx>
+#include <tools/stream.hxx>
+#include "soldep/command.hxx"
+#include <tools/debug.hxx>
+#include <soldep/appdef.hxx>
+
+#ifdef _MSC_VER
+#pragma warning (push,1)
+#endif
+
+#include <iostream>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>
+
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
+//#define MH_TEST2	1			// fuers direkte Testen
+
+#if defined(WNT) || defined(OS2)
+#ifdef _MSC_VER
+#pragma warning (push,1)
+#endif
+#include <process.h>    // for _SPAWN
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+#endif
+#ifdef UNX
+#include <sys/types.h>
+#include <unistd.h>
+#if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \
+    || defined (HPUX) || defined (MACOSX)
+#include <sys/wait.h>
+#else
+#include <wait.h>
+#endif
+#define P_WAIT 1 		// erstmal einen dummz
+#endif
+
+#if defined WNT
+#include <tools/svwin.h>
+#endif
+
+#if defined(WNT) || defined(OS2)
+#define  	cPathSeperator ';'
+#endif
+#ifdef UNX
+#define	 	cPathSeperator	':'
+#endif
+
+/*****************************************************************************/
+CommandLine::CommandLine(sal_Bool bWrite)
+/*****************************************************************************/
+                : bTmpWrite(bWrite)
+{
+    CommandBuffer = new char [1];
+    if (CommandBuffer == NULL) {
+        //cout << "Error: nospace" << endl;
+        exit(0);
+    }
+    CommandBuffer[0] = '\0';
+    nArgc = 0;
+    ppArgv = new char * [1];
+    ppArgv[0] = NULL;
+
+    ComShell = new char [128];
+    char* pTemp = getenv("COMMAND_SHELL");
+    if(!pTemp)
+        strcpy(ComShell,COMMAND_SHELL);
+    else
+        strcpy(ComShell,pTemp);
+
+    strcpy(&ComShell[strlen(ComShell)]," -C ");
+}
+
+/*****************************************************************************/
+CommandLine::CommandLine(const char *CommandString, sal_Bool bWrite)
+/*****************************************************************************/
+                : bTmpWrite(bWrite)
+{
+    CommandBuffer = new char [1];
+    if (CommandBuffer == NULL) {
+        //cout << "Error: nospace" << endl;
+        exit(0);
+    }
+    nArgc = 0;
+    ppArgv = new char * [1];
+    ppArgv[0] = NULL;
+
+    ComShell = new char [128];
+    char* pTemp = getenv("COMMAND_SHELL");
+    if(!pTemp)
+        strcpy(ComShell,COMMAND_SHELL);
+    else
+        strcpy(ComShell,pTemp);
+
+    strcpy(&ComShell[strlen(ComShell)]," -C ");
+
+    BuildCommand(CommandString);
+}
+
+/*****************************************************************************/
+CommandLine::CommandLine(const CommandLine& CCommandLine, sal_Bool bWrite)
+/*****************************************************************************/
+                : bTmpWrite(bWrite)
+{
+    CommandBuffer = new char [1];
+    if (CommandBuffer == NULL) {
+        //cout << "Error: nospace" << endl;
+        exit(0);
+    }
+    nArgc = 0;
+    ppArgv = new char * [1];
+    ppArgv[0] = NULL;
+
+    ComShell = new char [128];
+    char* pTemp = getenv("COMMAND_SHELL");
+    if(!pTemp)
+        strcpy(ComShell,COMMAND_SHELL);
+    else
+        strcpy(ComShell,pTemp);
+
+    strcpy(&ComShell[strlen(ComShell)]," -C ");
+
+    BuildCommand(CCommandLine.CommandBuffer);
+}
+
+/*****************************************************************************/
+CommandLine::~CommandLine()
+/*****************************************************************************/
+{
+    delete [] CommandBuffer;
+    delete [] ComShell;
+    //for (int i = 0; ppArgv[i] != '\0'; i++) {
+    for (int i = 0; ppArgv[i] != 0; i++) {
+        delete [] ppArgv[i];
+    }
+    delete [] ppArgv;
+
+}
+
+/*****************************************************************************/
+CommandLine& CommandLine::operator=(const CommandLine& CCommandLine)
+/*****************************************************************************/
+{
+    strcpy (CommandBuffer, CCommandLine.CommandBuffer);
+    for (int i = 0; i != nArgc; i++) {
+        delete [] ppArgv[i];
+    }
+    delete [] ppArgv;
+        ppArgv = new char * [1];
+        ppArgv[0] = NULL;
+    BuildCommand(CommandBuffer);
+    return *this;
+}
+
+/*****************************************************************************/
+CommandLine& CommandLine::operator=(const char *CommandString)
+/*****************************************************************************/
+{
+    strcpy (CommandBuffer, CommandString);
+    for (int i = 0; i != nArgc; i++) {
+        delete [] ppArgv[i];
+    }
+    delete [] ppArgv;
+        ppArgv = new char * [1];
+        ppArgv[0] = NULL;
+    BuildCommand(CommandBuffer);
+
+    return *this;
+}
+
+/*****************************************************************************/
+void CommandLine::Print()
+/*****************************************************************************/
+{
+    //cout << "******* start print *******" << endl;
+    //cout << "nArgc = " << nArgc << endl;
+    //cout << "CommandBuffer = " << CommandBuffer << endl;
+    for (int i = 0; ppArgv[i] != NULL; i++) {
+        //cout << "ppArgv[" << i << "] = " << ppArgv[i] << endl;
+    }
+    //cout << "******** end print ********" << endl;
+}
+
+/*****************************************************************************/
+void CommandLine::BuildCommand(const char *CommandString)
+/*****************************************************************************/
+{
+    int index = 0, pos=0;
+    char buffer[1024];
+    char WorkString[1024];
+
+    strcpy(WorkString,CommandString);
+
+    //falls LogWindow -> in tmpfile schreiben
+    if(bTmpWrite)
+    {
+        strcpy(&WorkString[strlen(WorkString)]," >&");
+        strcpy(&WorkString[strlen(WorkString)],getenv("TMP"));
+        strcpy(&WorkString[strlen(WorkString)],TMPNAME);
+    }
+
+    // delete old memory and get some new memory for CommandBuffer
+
+    delete [] CommandBuffer;
+    CommandBuffer =  new char [strlen(ComShell)+strlen(WorkString)+1];
+    if (CommandBuffer == NULL) {
+        //cout << "Error: nospace" << endl;
+        exit(0);
+    }
+    strcpy (CommandBuffer, ComShell);
+    strcpy (&CommandBuffer[strlen(ComShell)], WorkString);
+
+    CommandString = CommandBuffer;
+
+    // get the number of tokens
+    Strtokens(CommandString);
+
+    // delete the space for the old CommandLine
+
+    for (int i = 0; ppArgv[i] != 0; i++) {
+        delete [] ppArgv[i];
+    }
+    delete [] ppArgv;
+
+    /* get space for the new command line */
+
+    ppArgv = (char **) new char * [nArgc+1];
+    if (ppArgv == NULL) {
+        //cout << "Error: no space" << endl;
+        exit(0);
+    }
+
+    // flush the white space
+
+    while ( isspace(*CommandString) )
+        CommandString++;
+
+    index = 0;
+
+    // start the loop to build all the individual tokens
+
+    while (*CommandString != '\0') {
+
+        pos = 0;
+
+        // copy the token until white space is found
+
+        while ( !isspace(*CommandString) && *CommandString != '\0') {
+
+            buffer[pos++] = *CommandString++;
+
+        }
+
+        buffer[pos] = '\0';
+
+        // get space for the individual tokens
+
+        ppArgv[index] = (char *) new char [strlen(buffer)+1];
+        if (ppArgv[index] == NULL) {
+            //cout << "Error: nospace" << endl;
+            exit(0);
+        }
+
+        // copy the token
+
+        strcpy (ppArgv[index++], buffer);
+
+        // flush while space
+
+        while ( isspace(*CommandString) )
+            CommandString++;
+
+    }
+
+    // finish by setting the las pointer to NULL
+    ppArgv[nArgc]= NULL;
+
+}
+
+/*****************************************************************************/
+void CommandLine::Strtokens(const char *CommandString)
+/*****************************************************************************/
+{
+    int count = 0;
+    const char *temp;
+
+    temp = CommandString;
+
+    /* bypass white space */
+
+    while (isspace(*temp)) temp++;
+
+    for (count=0; *temp != '\0'; count++) {
+
+        /* continue until white space of string terminator is found */
+
+        while ((!isspace(*temp)) && (*temp != '\0')) temp++;
+
+        /* bypass white space */
+
+        while (isspace(*temp)) temp++;
+
+    }
+    nArgc = count;
+}
+
+/*****************************************************************************/
+CCommand::CCommand( ByteString &rString )
+/*****************************************************************************/
+{
+    rString.SearchAndReplace( '\t', ' ' );
+    aCommand = rString.GetToken( 0, ' ' );
+    aCommandLine = Search( "PATH" );
+#ifndef UNX
+    aCommandLine += " /c ";
+#else
+    aCommandLine += " -c ";
+#endif
+
+    ByteString sCmd( rString.GetToken( 0, ' ' ));
+    ByteString sParam( rString.Copy( sCmd.Len()));
+
+    aCommandLine += Search( "PATH", sCmd );
+    aCommandLine += sParam;
+
+    ImplInit();
+}
+
+/*****************************************************************************/
+CCommand::CCommand( const char *pChar )
+/*****************************************************************************/
+{
+    ByteString aString = pChar;
+    aString.SearchAndReplace( '\t', ' ' );
+    aCommand = aString.GetToken( 0, ' ' );
+
+    aCommandLine = Search( "PATH" );
+#ifndef UNX
+    aCommandLine += " /c ";
+#else
+    aCommandLine += " -c ";
+#endif
+    ByteString rString( pChar );
+
+    ByteString sCmd( rString.GetToken( 0, ' ' ));
+    ByteString sParam( rString.Copy( sCmd.Len()));
+
+    aCommandLine += Search( "PATH", sCmd );
+    aCommandLine += sParam;
+
+    ImplInit();
+}
+
+/*****************************************************************************/
+void CCommand::ImplInit()
+/*****************************************************************************/
+{
+    char pTmpStr[255];
+    size_t *pPtr;
+    char *pChar;
+    int nVoid = sizeof( size_t * );
+    nArgc = aCommandLine.GetTokenCount(' ');
+    sal_uIntPtr nLen = aCommandLine.Len();
+
+    ppArgv = (char **) new char[ (sal_uIntPtr)(nLen + nVoid * (nArgc +2) + nArgc ) ];
+    pChar = (char *) ppArgv + ( (1+nArgc) * nVoid );
+    pPtr = (size_t *) ppArgv;
+    for ( xub_StrLen i=0; i<nArgc; i++ )
+    {
+        (void) strcpy( pTmpStr, aCommandLine.GetToken(i, ' ' ).GetBuffer() );
+        size_t nStrLen = strlen( pTmpStr ) + 1;
+        strcpy( pChar, pTmpStr );
+        *pPtr = (sal_uIntPtr) pChar;
+        pChar += nStrLen;
+        pPtr += 1;
+#ifdef UNX
+        if ( i == 1 )
+        {
+            sal_uInt16 nWo = aCommandLine.Search("csh -c ");
+            if (nWo != STRING_NOTFOUND)
+                aCommandLine.Erase(0, nWo + 7);
+            else
+                aCommandLine.Erase(0, 16);
+            i = nArgc;
+            strcpy( pChar, aCommandLine.GetBuffer() );
+            *pPtr = (sal_uIntPtr) pChar;
+            pPtr += 1;
+        }
+#endif
+    }
+    *pPtr = 0;
+}
+
+/*****************************************************************************/
+CCommand::operator int()
+/*****************************************************************************/
+{
+    int nRet;
+#if defined WNT
+    nRet = _spawnv( P_WAIT, ppArgv[0], (const char **) ppArgv );
+#elif defined OS2
+    nRet = _spawnv( P_WAIT, ppArgv[0], ppArgv );
+#elif defined UNX
+    //fprintf( stderr, "CComand : operator (int) not implemented\n");
+    // **** Unix Implementierung ***************
+    pid_t pid;
+
+    if (( pid = fork()) < 0 )
+    {
+        DBG_ASSERT( sal_False, "fork error" );
+    }
+    else if ( pid == 0 )
+    {
+        if ( execv( ppArgv[0], (char * const *) ppArgv ) < 0 )
+        {
+            DBG_ASSERT( sal_False, "execv failed" );
+        }
+    }
+    //fprintf( stderr, "parent: %s %s\n", ppArgv[0] , ppArgv[1] );
+    if ( (nRet = waitpid( pid, NULL, 0 ) < 0) )
+    {
+        DBG_ASSERT( sal_False, "wait error" );
+    }
+#endif
+
+    switch ( errno )
+    {
+        case	E2BIG :
+                    nError = COMMAND_TOOBIG;
+                    break;
+        case	EINVAL :
+                    nError = COMMAND_INVALID;
+                    break;
+        case	ENOENT:
+                    nError = COMMAND_NOTFOUND;
+                    break;
+        case 	ENOEXEC :
+                    nError = COMMAND_NOEXEC;
+                    break;
+        case	ENOMEM :
+                    nError = COMMAND_NOMEM;
+                    break;
+        default:
+                nError = COMMAND_UNKNOWN;
+    }
+
+    if ( nRet )
+        fprintf( stderr, "Program returned with errros\n");
+    return nRet;
+}
+
+/*****************************************************************************/
+ByteString CCommand::Search(ByteString aEnv, ByteString sItem)
+/*****************************************************************************/
+{
+    // default wird eine Shell im Path gesucht,
+    // wenn aber compsec gestzt ist holen wir uns die
+    // Shell von dort
+    if ( sItem.Equals( COMMAND_SHELL ))
+    {
+        ByteString aComspec = GetEnv( "COMSPEC" );
+        if ( !aComspec.Equals(""))
+            return aComspec;
+    }
+
+    DirEntry aItem( String( sItem, RTL_TEXTENCODING_ASCII_US ));
+    if ( aItem.Exists()) 
+        return sItem;
+
+    ByteString aEntry, sReturn;
+    ByteString sEnv( aEnv );
+    ByteString sEnvironment = GetEnv( sEnv.GetBuffer());
+    xub_StrLen nCount = sEnvironment.GetTokenCount( cPathSeperator );
+
+    sal_Bool bFound = sal_False;
+
+    for ( xub_StrLen i=0; i<nCount && !bFound; i++ )
+    {
+        aEntry = sEnvironment.GetToken(i, cPathSeperator );
+#ifndef UNX
+        aEntry += '\\';
+#else
+        aEntry += '/';
+#endif
+        aEntry += sItem;
+
+        String sEntry( aEntry, RTL_TEXTENCODING_ASCII_US );
+        DirEntry aDirEntry( sEntry );
+        aDirEntry.ToAbs();
+        if ( aDirEntry.Exists()) {
+            sReturn = aEntry;
+            bFound = sal_True;
+        }
+    }
+    if ( !bFound )
+    {
+        sEnv = sEnv.ToUpperAscii();
+        ByteString sEnvironment2 = GetEnv(sEnv.GetBuffer() );
+        xub_StrLen nCount2 = sEnvironment2.GetTokenCount( cPathSeperator );
+        for ( xub_StrLen i=0; i<nCount2 && !bFound; i++ )
+        {
+            aEntry = sEnvironment2.GetToken(i, cPathSeperator );
+#ifndef UNX
+            aEntry += '\\';
+#else
+            aEntry += '/';
+#endif
+            aEntry += sItem;
+
+            String sEntry( aEntry, RTL_TEXTENCODING_ASCII_US );
+            DirEntry aDirEntry( sEntry );
+            aDirEntry.ToAbs();
+            if ( aDirEntry.Exists()) {
+                sReturn = aEntry;
+                bFound = sal_True;
+            }
+        }
+    }
+
+    if ( sReturn.Equals( "" ))
+        sReturn = sItem;
+
+    return sReturn;
+}
+
+/*****************************************************************************/
+CCommandd::CCommandd( ByteString &rString, CommandBits nBits )
+/*****************************************************************************/
+                : CCommand( rString ),
+                nFlag( nBits )
+{
+}
+
+
+/*****************************************************************************/
+CCommandd::CCommandd( const char *pChar, CommandBits nBits )
+/*****************************************************************************/
+                : CCommand( pChar ),
+                nFlag( nBits )
+{
+}
+
+/*****************************************************************************/
+CCommandd::operator int()
+/*****************************************************************************/
+{
+    int nRet = 0;
+
+#ifdef WNT
+    LPCTSTR lpApplicationName = NULL;
+    LPTSTR lpCommandLine = (char *) GetCommandLine_().GetBuffer();
+    LPSECURITY_ATTRIBUTES lpProcessAttributes = NULL;
+    LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL;
+    sal_Bool bInheritHandles = sal_True;
+
+    // wie wuenschen wir denn gestartet zu werden ??
+    DWORD dwCreationFlags;
+
+    if ( nFlag & COMMAND_EXECUTE_START )
+        dwCreationFlags = DETACHED_PROCESS;
+    else
+        dwCreationFlags = CREATE_NEW_CONSOLE;
+
+    // wir erben vom Vaterprozess
+    LPVOID lpEnvironment = NULL;
+
+    // das exe im Pfad suchen
+    LPCTSTR lpCurrentDirectory = NULL;
+
+    // in dieser Struktur bekommen wir die erzeugte Processinfo
+    // zurueck
+    PROCESS_INFORMATION aProcessInformation;
+
+    // weiteres Startupinfo anlegen
+    STARTUPINFO aStartupInfo;
+
+    aStartupInfo.cb = sizeof( STARTUPINFO );
+    aStartupInfo.lpReserved = NULL;
+    aStartupInfo.lpDesktop = NULL;
+
+    // das Fenster bekommt den Namen des Exes
+    aStartupInfo.lpTitle = NULL;
+    aStartupInfo.dwX = 100;
+    aStartupInfo.dwY = 100;
+    //aStartupInfo.dwXSize = 400;
+    //aStartupInfo.dwYSize = 400;
+    aStartupInfo.dwXCountChars = 40;
+    aStartupInfo.dwYCountChars = 40;
+
+    // Farben setzen
+    aStartupInfo.dwFillAttribute = FOREGROUND_RED | BACKGROUND_RED |
+                                BACKGROUND_BLUE | BACKGROUND_GREEN;
+
+//	aStartupInfo.dwFlags = STARTF_USESTDHANDLES;
+    //aStartupInfo.wShowWindow = SW_NORMAL; //SW_SHOWDEFAULT;
+    //aStartupInfo.wShowWindow = SW_HIDE; //SW_SHOWNOACTIVATE;
+    aStartupInfo.wShowWindow = SW_SHOWNOACTIVATE;
+    aStartupInfo.cbReserved2 = NULL;
+    aStartupInfo.lpReserved2 = NULL;
+    //aStartupInfo.hStdInput = stdin;
+    //aStartupInfo.hStdOutput = stdout;
+    //aStartupInfo.hStdError = stderr;
+
+    if ( nFlag & COMMAND_EXECUTE_HIDDEN )
+    {
+        aStartupInfo.wShowWindow = SW_HIDE;
+        aStartupInfo.dwFlags = aStartupInfo.dwFlags | STARTF_USESHOWWINDOW;
+    }
+
+    bool bProcess = CreateProcess( lpApplicationName,
+                        lpCommandLine, lpProcessAttributes,
+                        lpThreadAttributes, bInheritHandles,
+                        dwCreationFlags, lpEnvironment, lpCurrentDirectory,
+                        &aStartupInfo, &aProcessInformation );
+
+    LPVOID lpMsgBuf;
+
+    if ( bProcess )
+    {
+        FormatMessage(
+                FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+                NULL,
+                GetLastError(),
+                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+                (LPTSTR) &lpMsgBuf,
+                0,
+                NULL );
+
+        ByteString aErrorString = (char *) lpMsgBuf;
+
+        if ( nFlag & COMMAND_EXECUTE_WAIT )
+        {
+            DWORD aProcessState = STILL_ACTIVE;
+            while(aProcessState == STILL_ACTIVE)
+            {
+                GetExitCodeProcess(aProcessInformation.hProcess,&aProcessState);
+            }
+        }
+    }
+    else
+        fprintf( stderr, "Can not start Process !" );
+
+#endif
+    return nRet;
+}
diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk
index 56d3fa1f0..b27f79734 100644
--- a/soldep/bootstrp/makefile.mk
+++ b/soldep/bootstrp/makefile.mk
@@ -47,11 +47,13 @@ EXCEPTIONSFILES= \
                   $(SLO)$/prj.obj
 
 SLOFILES=\
+          $(SLO)$/command.obj \
           $(SLO)$/dep.obj \
           $(SLO)$/minormk.obj \
           $(SLO)$/prodmap.obj \
           $(SLO)$/appdef.obj \
            $(SLO)$/hashtbl.obj		\
+           $(SLO)$/sstring.obj		\
           $(SLO)$/prj.obj
 
 
@@ -62,7 +64,6 @@ SHL1DEF		=$(MISC)$/$(SHL1TARGET).def
 SHL1DEPN	=$(SHL1LIBS)
 SHL1STDLIBS=\
             $(TOOLSLIB) \
-            $(BTSTRPLIB)		\
             $(VOSLIB)			\
             $(SALLIB)   
 
diff --git a/soldep/bootstrp/minormk.cxx b/soldep/bootstrp/minormk.cxx
index 3fc17bd8e..e0b46d71c 100644
--- a/soldep/bootstrp/minormk.cxx
+++ b/soldep/bootstrp/minormk.cxx
@@ -27,7 +27,7 @@
 
 #include "minormk.hxx"
 #include "prodmap.hxx"
-#include <appdef.hxx>
+#include <soldep/appdef.hxx>
 #include <tools/fsys.hxx>
 #include <tools/geninfo.hxx>
 
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index ce63e6deb..df1109d5b 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -26,14 +26,14 @@
  ************************************************************************/
 #include <stdlib.h>
 #include <stdio.h>
-#include <bootstrp/sstring.hxx>
+#include <soldep/sstring.hxx>
 #include <vos/mutex.hxx>
 
 #define ENABLE_BYTESTRING_STREAM_OPERATORS
 #include <tools/stream.hxx>
 #include <tools/geninfo.hxx>
 #include <soldep/prj.hxx>
-#include <bootstrp/inimgr.hxx>
+//#include <bootstrp/inimgr.hxx>
 
 #ifndef MACOSX
 #pragma hdrstop
@@ -1212,24 +1212,21 @@ Star::Star(SolarFileList *pSolarFiles )
 }
 
 /*****************************************************************************/
-Star::Star(GenericInformationList *pStandLst, ByteString &rVersion,
-    BOOL bLocal, const char *pSourceRoot )
+Star::Star(GenericInformationList *pStandLst, ByteString &rVersion )
 /*****************************************************************************/
                 : pDepMode (NULL),
                 pAllDepMode (NULL)
 {
-    UpdateFileList (pStandLst, rVersion, TRUE, bLocal, pSourceRoot);
+    UpdateFileList (pStandLst, rVersion, TRUE );
 }
 
 /*****************************************************************************/
 void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion,
-    BOOL bRead, BOOL bLocal, const char *pSourceRoot )
+    BOOL bRead )
 /*****************************************************************************/
 {
     sSourceRoot=String::CreateFromAscii(""); // clear old SourceRoot
     ByteString sPath( rVersion );
-    if ( pSourceRoot )
-        sSourceRoot = String::CreateFromAscii( pSourceRoot );
 
 #ifdef UNX
     sPath += "/settings/UNXSOLARLIST";
@@ -1240,10 +1237,6 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi
 
     if( pInfo && pInfo->GetValue().Len()) {
         ByteString sFile( pInfo->GetValue());
-        if ( bLocal ) {
-            IniManager aIniManager;
-            aIniManager.ToLocal( sFile );
-        }
         String sFileName_l( sFile, RTL_TEXTENCODING_ASCII_US );
         nStarMode = STAR_MODE_SINGLE_PARSE;
         if (bRead)
@@ -1360,14 +1353,14 @@ void Star::UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersi
 
 /*****************************************************************************/
 void Star::FullReload( GenericInformationList *pStandLst, ByteString &rVersion,
-    BOOL bRead, BOOL bLocal, const char *pSourceRoot )
+    BOOL bRead )
 /*****************************************************************************/
 {
     ClearAvailableDeps();
     ClearCurrentDeps();
     ClearLoadedFilesList();
     RemoveAllPrj();
-    UpdateFileList( pStandLst, rVersion, bRead, bLocal, pSourceRoot );
+    UpdateFileList( pStandLst, rVersion, bRead );
 }
 
 /*****************************************************************************/
@@ -2419,13 +2412,11 @@ StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments )
 
 /*****************************************************************************/
 StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
-    ByteString &rMinor, BOOL bReadComments, BOOL bLocal, const char *pSourceRoot )
+    ByteString &rMinor, BOOL bReadComments )
 /*****************************************************************************/
                 : Star ()
 {
     ByteString sPath( rVersion );
-    if ( pSourceRoot )
-        sSourceRoot = String::CreateFromAscii( pSourceRoot );
 
 #ifdef UNX
     sPath += "/settings/UNXSOLARLIST";
@@ -2436,10 +2427,6 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
 
     if( pInfo_l && pInfo_l->GetValue().Len()) {
         ByteString sFile( pInfo_l->GetValue());
-        if ( bLocal ) {
-            IniManager aIniManager;
-            aIniManager.ToLocal( sFile );
-        }
         String sFileName_l( sFile, RTL_TEXTENCODING_ASCII_US );
         nStarMode = STAR_MODE_SINGLE_PARSE;
         Read( sFileName_l, bReadComments );
diff --git a/soldep/bootstrp/sstring.cxx b/soldep/bootstrp/sstring.cxx
new file mode 100644
index 000000000..9dcf2ac8d
--- /dev/null
+++ b/soldep/bootstrp/sstring.cxx
@@ -0,0 +1,314 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _TOOLS_STRINGLIST
+#  define _TOOLS_STRINGLIST
+#endif
+
+#define ENABLE_BYTESTRING_STREAM_OPERATORS 
+#include <tools/stream.hxx>
+#include "soldep/sstring.hxx"
+
+SByteStringList::SByteStringList()
+{
+}
+
+SByteStringList::~SByteStringList()
+{
+}
+
+sal_uIntPtr SByteStringList::IsString( ByteString* pStr )
+{
+    sal_uIntPtr nRet = NOT_THERE;
+    if ( (nRet = GetPrevString( pStr )) != 0 )
+    {
+        ByteString* pString = GetObject( nRet );
+        if ( *pString == *pStr )
+            return nRet;
+        else
+            return NOT_THERE;
+    }
+    else
+    {
+        ByteString* pString = GetObject( 0 );
+        if ( pString && (*pString == *pStr) )
+            return 0;
+        else
+            return NOT_THERE;
+    }
+}
+
+sal_uIntPtr SByteStringList::GetPrevString( ByteString* pStr )
+{
+    sal_uIntPtr nRet = 0;
+    sal_Bool bFound = sal_False;
+    sal_uIntPtr nCountMember = Count();
+    sal_uIntPtr nUpper = nCountMember;
+    sal_uIntPtr nLower = 0;
+    sal_uIntPtr nCurrent = nUpper / 2;
+    sal_uIntPtr nRem = 0;
+    ByteString* pString;
+
+    do
+    {
+        if ( (nCurrent == nLower) || (nCurrent == nUpper) )
+            return nLower;
+        pString = GetObject( nCurrent );
+        StringCompare nResult =  pStr->CompareTo( *pString );
+        if ( nResult == COMPARE_LESS )
+        {
+            nUpper = nCurrent;
+            nCurrent = (nCurrent + nLower) /2;
+        }
+        else if ( nResult == COMPARE_GREATER )
+        {
+            nLower = nCurrent;
+            nCurrent = (nUpper + nCurrent) /2;
+        }
+        else if ( nResult == COMPARE_EQUAL )
+            return nCurrent;
+        if ( nRem == nCurrent )
+            return nCurrent;
+        nRem = nCurrent;
+    }
+    while ( !bFound );
+    return nRet;
+}
+
+/**************************************************************************
+*
+*	Sortiert einen ByteString in die Liste ein und gibt die Position,
+*	an der einsortiert wurde, zurueck
+*
+**************************************************************************/
+
+sal_uIntPtr SByteStringList::PutString( ByteString* pStr )
+{
+    sal_uIntPtr nPos = GetPrevString ( pStr );
+    if ( Count() )
+    {
+        {
+            ByteString* pString = GetObject( 0 );
+            if ( pString->CompareTo( *pStr ) == COMPARE_GREATER )
+            {
+                Insert( pStr, (sal_uIntPtr)0 );
+                return (sal_uIntPtr)0;
+            }
+        }
+        ByteString* pString = GetObject( nPos );
+        if ( *pStr != *pString )
+        {
+            Insert( pStr, nPos+1 );
+            return ( nPos +1 );
+        }
+    }
+    else
+    {
+        Insert( pStr );
+        return (sal_uIntPtr)0;
+    }
+
+    return NOT_THERE;
+}
+
+ByteString* SByteStringList::RemoveString( const ByteString& rName )
+{
+    sal_uIntPtr i;
+    ByteString* pReturn;
+
+    for( i = 0 ; i < Count(); i++ )
+    {
+        if ( rName == *GetObject( i ) )
+        {
+            pReturn = GetObject(i);
+            Remove(i);
+            return pReturn;
+        }
+    }
+
+    return NULL;
+}
+
+void SByteStringList::CleanUp()
+{
+    ByteString* pByteString = First();
+    while (pByteString) {
+        delete pByteString;
+        pByteString = Next();
+    }
+    Clear();
+}
+
+SByteStringList& SByteStringList::operator<<  ( SvStream& rStream )
+{
+    sal_uInt32 nListCount;
+    rStream >> nListCount;
+    for ( sal_uInt16 i = 0; i < nListCount; i++ ) { 
+        ByteString* pByteString = new ByteString();
+        rStream >> *pByteString;
+        Insert (pByteString, LIST_APPEND);
+    }
+    return *this;
+}
+
+SByteStringList& SByteStringList::operator>>  ( SvStream& rStream )
+{
+    sal_uInt32 nListCount = Count();
+    rStream << nListCount;
+    ByteString* pByteString = First();
+    while (pByteString) {
+        rStream << *pByteString;
+        pByteString = Next();
+    }
+    return *this;
+}
+
+
+
+
+
+
+
+SUniStringList::SUniStringList()
+{
+}
+
+SUniStringList::~SUniStringList()
+{
+}
+
+sal_uIntPtr SUniStringList::IsString( UniString* pStr )
+{
+    sal_uIntPtr nRet = NOT_THERE;
+    if ( (nRet = GetPrevString( pStr )) != 0 )
+    {
+        UniString* pString = GetObject( nRet );
+        if ( *pString == *pStr )
+            return nRet;
+        else
+            return NOT_THERE;
+    }
+    else
+    {
+        UniString* pString = GetObject( 0 );
+        if ( pString && (*pString == *pStr) )
+            return 0;
+        else
+            return NOT_THERE;
+    }
+}
+
+sal_uIntPtr SUniStringList::GetPrevString( UniString* pStr )
+{
+    sal_uIntPtr nRet = 0;
+    sal_Bool bFound = sal_False;
+    sal_uIntPtr nCountMember = Count();
+    sal_uIntPtr nUpper = nCountMember;
+    sal_uIntPtr nLower = 0;
+    sal_uIntPtr nCurrent = nUpper / 2;
+    sal_uIntPtr nRem = 0;
+    UniString* pString;
+
+    do
+    {
+        if ( (nCurrent == nLower) || (nCurrent == nUpper) )
+            return nLower;
+        pString = GetObject( nCurrent );
+        StringCompare nResult =  pStr->CompareTo( *pString );
+        if ( nResult == COMPARE_LESS )
+        {
+            nUpper = nCurrent;
+            nCurrent = (nCurrent + nLower) /2;
+        }
+        else if ( nResult == COMPARE_GREATER )
+        {
+            nLower = nCurrent;
+            nCurrent = (nUpper + nCurrent) /2;
+        }
+        else if ( nResult == COMPARE_EQUAL )
+            return nCurrent;
+        if ( nRem == nCurrent )
+            return nCurrent;
+        nRem = nCurrent;
+    }
+    while ( !bFound );
+    return nRet;
+}
+
+/**************************************************************************
+*
+*	Sortiert einen UniString in die Liste ein und gibt die Position,
+*	an der einsortiert wurde, zurueck
+*
+**************************************************************************/
+
+sal_uIntPtr SUniStringList::PutString( UniString* pStr )
+{
+    sal_uIntPtr nPos = GetPrevString ( pStr );
+    if ( Count() )
+    {
+        {
+            UniString* pString = GetObject( 0 );
+            if ( pString->CompareTo( *pStr ) == COMPARE_GREATER )
+            {
+                Insert( pStr, (sal_uIntPtr)0);
+                return (sal_uIntPtr)0;
+            }
+        }
+        UniString* pString = GetObject( nPos );
+        if ( *pStr != *pString )
+        {
+            Insert( pStr, nPos+1 );
+            return ( nPos +1 );
+        }
+    }
+    else
+    {
+        Insert( pStr );
+        return (sal_uIntPtr)0;
+    }
+
+    return NOT_THERE;
+}
+
+UniString* SUniStringList::RemoveString( const UniString& rName )
+{
+    sal_uIntPtr i;
+    UniString* pReturn;
+
+    for( i = 0 ; i < Count(); i++ )
+    {
+        if ( rName == *GetObject( i ) )
+        {
+            pReturn = GetObject(i);
+            Remove(i);
+            return pReturn;
+        }
+    }
+
+    return NULL;
+}
diff --git a/soldep/inc/dep.hxx b/soldep/inc/dep.hxx
index a14dc077a..79649289e 100644
--- a/soldep/inc/dep.hxx
+++ b/soldep/inc/dep.hxx
@@ -28,7 +28,7 @@
 #ifndef _DEP_HXX
 #define _DEP_HXX
 
-#include <bootstrp/sstring.hxx>
+#include <soldep/sstring.hxx>
 
 class SByteExtStringList : public SByteStringList
 {
diff --git a/soldep/inc/prodmap.hxx b/soldep/inc/prodmap.hxx
index c7bdef71d..85b530bb0 100644
--- a/soldep/inc/prodmap.hxx
+++ b/soldep/inc/prodmap.hxx
@@ -28,9 +28,7 @@
 #ifndef PRODUCT_MAPPER_HXX
 #define PRODUCT_MAPPER_HXX
 
-#ifndef _SSTRING_HXX
-#include <bootstrp/sstring.hxx>
-#endif
+#include <soldep/sstring.hxx>
 
 class GenericInformation;
 class GenericInformationList;
diff --git a/soldep/inc/appdef.hxx b/soldep/inc/soldep/appdef.hxx
index 186bb1f1a..186bb1f1a 100644
--- a/soldep/inc/appdef.hxx
+++ b/soldep/inc/soldep/appdef.hxx
diff --git a/soldep/inc/soldep/command.hxx b/soldep/inc/soldep/command.hxx
new file mode 100644
index 000000000..5c642ba69
--- /dev/null
+++ b/soldep/inc/soldep/command.hxx
@@ -0,0 +1,163 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef COMMAND_HXX
+#define COMMAND_HXX
+
+#include <iostream>
+
+#include <tools/stream.hxx>
+#define STRLEN 100
+#ifndef UNX
+#define TMPNAME "\\command.tmp"
+#else
+#define TMPNAME "/tmp/command.tmp"
+#endif
+
+/** Different types of spawnable programs
+*/
+enum ExeType
+{
+    EXE,	/// programm is a native executable
+    BAT, 	/// programm is a DOS-Batch
+    BTM 	/// programm is a 4DOS-Batch
+};
+
+#define COMMAND_NOTFOUND	0x0001
+#define COMMAND_TOOBIG		0x0002
+#define COMMAND_INVALID		0x0004
+#define COMMAND_NOEXEC		0x0008
+#define COMMAND_NOMEM		0x0010
+#define COMMAND_UNKNOWN		0x0020
+
+#ifdef WNT
+#define COMMAND_SHELL	"4nt.exe"
+#endif
+#ifdef OS2
+#define COMMAND_SHELL  "4os2.exe"
+#endif
+#ifdef UNX
+#define COMMAND_SHELL	"csh"
+#endif
+
+class CommandLine;
+class LogWindow;
+
+class CommandLine
+{
+friend class ChildProcess;
+private:
+    char 			*CommandBuffer;
+    char 			*ComShell;
+    char 			**ppArgv;
+    sal_Bool			bTmpWrite;
+
+public:
+                    CommandLine(sal_Bool bTmpWrite = sal_False);
+                    CommandLine(const char *, sal_Bool bTmpWrite = sal_False);
+                    CommandLine(const CommandLine&, sal_Bool bTmpWrite = sal_False);
+    virtual 		~CommandLine();
+
+    int 			nArgc;
+
+    CommandLine& 	operator=(const CommandLine&);
+    CommandLine& 	operator=(const char *);
+    void 			BuildCommand(const char *);
+    char**			GetCommand(void) { return ppArgv; }
+    void 			Strtokens(const char *);
+    void 			Print();
+};
+
+/** Declares and spawns a child process.
+    The spawned programm could be a native executable or a schell script.
+*/
+class CCommand
+{
+private:
+    ByteString			aCommandLine;
+    ByteString			aCommand;
+    char				*pArgv;
+    char				**ppArgv;
+    sal_uIntPtr				nArgc;
+    int					nError;
+
+protected:
+    void			ImplInit();
+    void			Initpp( sal_uIntPtr nCount, ByteString &rStr );
+
+public:
+                    /** Creates the process specified without spawning it
+                        @param rString specifies the programm or shell scrip
+                    */
+                    CCommand( ByteString &rString );
+
+                    /** Creates the process specified without spawning it
+                        @param pChar specifies the programm or shell scrip
+                    */
+                    CCommand( const char *pChar );
+
+                    /** Try to find the given programm in specified path
+                        @param sEnv specifies the current search path, defaulted by environment
+                        @param sItem specifies the system shell
+                        @return the Location (when programm was found)
+                    */
+    static ByteString	Search( ByteString sEnv,
+                                    ByteString sItem = COMMAND_SHELL );
+
+                    /** Spawns the Process
+                        @return 0 when spawned without errors, otherwise a error code
+                    */
+    operator int();
+
+    ByteString			GetCommandLine_() { return aCommandLine; }
+    ByteString			GetCommand() { return aCommand; }
+
+    char**	GetCommandStr() { return ppArgv; }
+};
+
+#define COMMAND_EXECUTE_WINDOW	0x0000001
+#define COMMAND_EXECUTE_CONSOLE	0x0000002
+#define COMMAND_EXECUTE_HIDDEN  0x0000004
+#define COMMAND_EXECUTE_START   0x0000008
+#define COMMAND_EXECUTE_WAIT    0x0000010
+#define COMMAND_EXECUTE_REMOTE  0x1000000
+
+typedef sal_uIntPtr CommandBits;
+
+/** Allowes to spawn programms hidden, waiting etc.
+    @see CCommand
+*/
+class CCommandd : public CCommand
+{
+    CommandBits		nFlag;
+public:
+                    CCommandd( ByteString &rString, CommandBits nBits );
+                    CCommandd( const char *pChar, CommandBits nBits );
+    operator int();
+};
+
+#endif
diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx
index 85c7c6d96..b0296b019 100644
--- a/soldep/inc/soldep/connctr.hxx
+++ b/soldep/inc/soldep/connctr.hxx
@@ -30,10 +30,8 @@
 #define _FMRWRK_CONNCTR_HXX
 
 
-#ifndef _SV_WINDOW_HXX
 #include <vcl/window.hxx>
-#endif
-#include <bootstrp/listmacr.hxx>
+#include <soldep/listmacr.hxx>
 #include <tools/stream.hxx>
 
 class DepWin;
diff --git a/soldep/inc/soldep/listmacr.hxx b/soldep/inc/soldep/listmacr.hxx
new file mode 100644
index 000000000..f6db92ed1
--- /dev/null
+++ b/soldep/inc/soldep/listmacr.hxx
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _LISTMACR_HXX
+#define _LISTMACR_HXX
+
+#define DECL_DEST_LIST( TmpListType, ListType, PointerType )	\
+DECLARE_LIST(TmpListType, PointerType)							\
+class ListType : public TmpListType								\
+{                                                           	\
+public:															\
+    void ClearAndDelete()                                       \
+    {                                                       	\
+        while ( Count()) {                                  	\
+            PointerType pTmp = GetObject(( sal_uIntPtr ) 0 );     	\
+            delete pTmp;                                    	\
+            Remove(( sal_uIntPtr ) 0 );                           	\
+        }                                                   	\
+    }                                                       	\
+    ~ListType()                                             	\
+    {                                                       	\
+        ClearAndDelete();										\
+    }                                                   		\
+};																\
+
+#endif
+
+
+
+
+
+
+
+
+
+
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
index 4e6b44064..a53762621 100644
--- a/soldep/inc/soldep/objwin.hxx
+++ b/soldep/inc/soldep/objwin.hxx
@@ -33,7 +33,7 @@
 #endif
 #include <vcl/menu.hxx>
 #include <vcl/timer.hxx>
-#include <bootstrp/listmacr.hxx>
+#include <soldep/listmacr.hxx>
 #include <tools/stream.hxx>
 
 #include <soldep/connctr.hxx>
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index 81a9ada76..57e8f96a4 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -30,9 +30,7 @@
 
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
-#ifndef _LISTMACR_HXX
-#include <bootstrp/listmacr.hxx>
-#endif
+#include <soldep/listmacr.hxx>
 #include <vos/mutex.hxx>
 #include <tools/string.hxx>
 
@@ -406,8 +404,7 @@ public:
                     Star();
                     Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE );
                     Star( SolarFileList *pSolarFiles );
-                    Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE,
-                        const char *pSourceRoot = NULL  );
+                    Star( GenericInformationList *pStandLst, ByteString &rVersion );
 
                     ~Star();
 
@@ -430,10 +427,8 @@ public:
     BOOL			NeedsUpdate();
     SolarFileList*	NeedsFilesForUpdate();
     void			ReplaceFileEntry( StarFileList *pStarFiles, StarFile* pFile );
-    void			UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE,
-                        BOOL bLocal = FALSE, const char *pSourceRoot = NULL  );
-    void			FullReload( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE,
-                        BOOL bLocal = FALSE, const char *pSourceRoot = NULL  );
+    void			UpdateFileList( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE );
+    void			FullReload( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bRead = FALSE );
     void			GenerateFileLoadList( SolarFileList *pSolarFiles );
     BOOL			CheckFileLoadList(SolarFileList *pSolarFiles);
 
@@ -465,7 +460,7 @@ public:
                     StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE );
                     StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
                     StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, ByteString &rMinor,
-                        BOOL bReadComments = FALSE,	BOOL bLocal = FALSE, const char *pSourceRoot = NULL );
+                        BOOL bReadComments = FALSE );
 
     void			CleanUp();
 
diff --git a/soldep/inc/soldep/sstring.hxx b/soldep/inc/soldep/sstring.hxx
new file mode 100644
index 000000000..51ca88a24
--- /dev/null
+++ b/soldep/inc/soldep/sstring.hxx
@@ -0,0 +1,105 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef _SSTRING_HXX
+#define _SSTRING_HXX
+
+#include <tools/string.hxx>
+#include <tools/list.hxx>
+
+#define NOT_THERE		LIST_ENTRY_NOTFOUND
+
+#define  SStringList SUniStringList 
+#define  StringList UniStringList 
+
+DECLARE_LIST( ByteStringList, ByteString* )
+DECLARE_LIST( UniStringList, UniString* )
+
+class SvStream;
+
+// ---------------------
+// - class SStringList -
+// ---------------------
+
+class SByteStringList : public ByteStringList
+{
+public:
+                SByteStringList();
+                ~SByteStringList();
+
+                // neuen ByteString in Liste einfuegen
+    sal_uIntPtr		PutString( ByteString* );
+    ByteString* 	RemoveString( const ByteString& rName );
+
+                // Position des ByteString in Liste, wenn nicht enthalten, dann
+                // return = NOT_THERE
+    sal_uIntPtr		IsString( ByteString* );
+
+                // Vorgaenger ermitteln ( auch wenn selbst noch nicht in
+                // Liste enthalten
+    sal_uIntPtr		GetPrevString( ByteString* );
+    void		CleanUp();
+
+    SByteStringList& operator<<  ( SvStream& rStream );
+    SByteStringList& operator>>  ( SvStream& rStream );
+};
+
+// ---------------------
+// - class SUniStringList -
+// ---------------------
+
+class SUniStringList : public UniStringList
+{
+public:
+                SUniStringList();
+                ~SUniStringList();
+
+                // neuen UniString in Liste einfuegen
+    sal_uIntPtr		PutString( UniString* );
+    UniString* 	RemoveString( const UniString& rName );
+
+                // Position des UniString in Liste, wenn nicht enthalten, dann
+                // return = NOT_THERE
+    sal_uIntPtr		IsString( UniString* );
+
+                // Vorgaenger ermitteln ( auch wenn selbst noch nicht in
+                // Liste enthalten
+    sal_uIntPtr		GetPrevString( UniString* );
+};
+
+class Text
+{
+protected:
+    String		aString;
+
+public:
+                Text( char* pChar );
+                Text( String &rStr ) { aString = rStr; }
+    void		Stderr();
+};
+
+#endif
diff --git a/soldep/prj/d.lst b/soldep/prj/d.lst
index 73301a558..cfd605ed3 100644
--- a/soldep/prj/d.lst
+++ b/soldep/prj/d.lst
@@ -27,8 +27,11 @@ mkdir: %COMMON_DEST%\res%_EXT%\img\additional
 ..\inc\soldep\prj.hxx %_DEST%\inc%_EXT%\soldep\prj.hxx
 ..\inc\dep.hxx %_DEST%\inc%_EXT%\soldep\dep.hxx
 ..\inc\prodmap.hxx %_DEST%\inc%_EXT%\soldep\prodmap.hxx
-..\inc\appdef.hxx %_DEST%\inc%_EXT%\soldep\appdef.hxx
+..\inc\soldep\appdef.hxx %_DEST%\inc%_EXT%\soldep\appdef.hxx
 ..\inc\soldep\soldlg.hrc %_DEST%\inc%_EXT%\soldep\soldlg.hrc
+..\inc\soldep\sstring.hxx %_DEST%\inc%_EXT%\soldep\sstring.hxx
+..\inc\soldep\command.hxx %_DEST%\inc%_EXT%\soldep\command.hxx
+..\inc\soldep\listmacr.hxx %_DEST%\inc%_EXT%\soldep\listmacr.hxx
 
 ..\%__SRC%\lib\soldep.lib %_DEST%\lib%_EXT%\soldep.lib
 ..\%__SRC%\lib\bootstrpdt.lib %_DEST%\lib%_EXT%\bootstrpdt.lib
diff --git a/soldep/source/depapp.hxx b/soldep/source/depapp.hxx
index 608a59897..1c5f3dd64 100644
--- a/soldep/source/depapp.hxx
+++ b/soldep/source/depapp.hxx
@@ -34,7 +34,7 @@
 
 #include <svl/solar.hrc>
 #include <tools/resmgr.hxx>
-#include <bootstrp/sstring.hxx>
+#include <soldep/sstring.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk
index 5f6b188a5..25cc78ade 100644
--- a/soldep/source/makefile.mk
+++ b/soldep/source/makefile.mk
@@ -68,7 +68,6 @@ SHL1STDLIBS     = $(SVTOOLLIB)		\
                 $(VCLLIB)			\
                 $(UCBHELPERLIB)	\
                 $(SOTLIB)			\
-                $(BTSTRPLIB)		\
                 $(TOOLSLIB) 		\
                 $(VOSLIB)			\
                 $(SALLIB)           \
@@ -109,7 +108,6 @@ APP1STDLIBS= \
             $(UCBHELPERLIB)	\
             $(VCLLIB)			\
             $(SOTLIB)			\
-            $(BTSTRPLIB)		\
             $(TOOLSLIB) 		\
             $(VOSLIB)			\
             $(SALLIB)           \
diff --git a/soldep/source/soldep.cxx b/soldep/source/soldep.cxx
index 25fc1bf18..3080974d6 100644
--- a/soldep/source/soldep.cxx
+++ b/soldep/source/soldep.cxx
@@ -29,13 +29,13 @@
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/debug.hxx>
-#include <bootstrp/sstring.hxx>
+#include <soldep/sstring.hxx>
 #include <svtools/filedlg.hxx>
 #include <tools/iparser.hxx>
 #include <tools/geninfo.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/bitmap.hxx>
-#include <appdef.hxx>
+#include <soldep/appdef.hxx>
 #include "time.h"
 #include <soldep/depper.hxx>
 #include <soldep/soldep.hxx>
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 52efcb4ab..621ca2e4b 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -26,16 +26,29 @@
 #*************************************************************************
 
 # Add certain symbol patterns to the first global section.
+#
+# The below code fails with 'perverted' mapfiles (using a strange line layout,
+# or containing version UDK_3_0_0 without a global section, ...).
 
 BEGIN { state = 0 }
-/\{/ && state == 1 { exit 1 } #TODO: print error explanation to stderr?
-/^[\t ]*UDK_3_0_0[\t ]*\{/ && state == 0 { state = 1 }
-/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
-{ print }
+END {
+    if (state == 0) {
+        print "# Weak RTTI symbols for C++ exceptions:"
+        print "UDK_3_0_0 {"
+        print "global:"
+        print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+        if (ENVIRON["USE_SYSTEM_STL"] != "YES")
+            print "_ZN4_STL7num_put*; # for STLport"
+        print "};"
+    }
+}
 state == 2 {
     print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
     if (ENVIRON["USE_SYSTEM_STL"] != "YES")
         print "_ZN4_STL7num_put*; # for STLport"
     state = 3
 }
-END { if (state != 3) exit 1 } #TODO: print error explanation to stderr?
+# #i66636# - ???
+/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 }
+/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
+{ print }
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 710c7dd8e..1e0645340 100755..100644
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -230,6 +230,7 @@
     };
     my $workspace_path = get_workspace_path();   # This also sets $initial_module
     my $source_config = SourceConfig -> new($workspace_path);
+    check_partial_gnumake_build($initial_module);
     
     if ($html) {
         if (defined $html_path) {
@@ -786,6 +787,7 @@ sub dmake_dir {
         $error_code = run_job($dmake, $job_name);
         html_store_job_info(\%local_deps_hash, $job_name, $error_code) if (!$child);
     };
+    
     if ($error_code && $ignore) {
         push(@ignored_errors, $job_name);
         $error_code = 0;
@@ -802,6 +804,7 @@ sub dmake_dir {
         };
         _exit(0);
     } elsif ($error_code && ($error_code != -1)) {
+        $broken_build{$job_name} = $error_code;
         return $error_code;
     };
 };
@@ -1681,23 +1684,23 @@ sub cancel_build {
 
     };
     if ($broken_modules_number && $build_all_parents) {
-        print "\n";
-        print $broken_modules_number;
-        print " module(s): ";
+        print STDERR "\n";
+        print STDERR $broken_modules_number;
+        print STDERR " module(s): ";
         foreach (@broken_module_names) {
-            print "\n\t$_";
+            print STDERR "\n\t$_";
         };
-        print "\nneed(s) to be rebuilt\n\nReason(s):\n\n";
+        print STDERR "\nneed(s) to be rebuilt\n\nReason(s):\n\n";
         foreach (keys %broken_build) {
-            print "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
+            print STDERR "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
         };
-        print "\nAttention: if you fix the errors in above module(s) you may prolongue your the build issuing command:\n\n\t" . $message_part;
+        print STDERR "\nAttention: if you fix the errors in above module(s) you may prolongue your the build issuing command:\n\n\t" . $message_part;
     } else {
         while (children_number()) {
             handle_dead_children(1);
         }
         foreach (keys %broken_build) {
-            print "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
+            print STDERR "ERROR: error " . $broken_build{$_} . " occurred while making $_\n";
         };
     };
     print "\n";
@@ -2031,7 +2034,7 @@ sub do_custom_job {
         };
         if ($error_code) {
             $modules_with_errors{$dependencies_hash}++;
-            $broken_build{$module} = $error_code;
+#            $broken_build{$module_job} = $error_code;
         } else {
             remove_from_dependencies($module_job, $dependencies_hash);
         };
@@ -3525,3 +3528,20 @@ sub fill_modules_queue {
         mp_success_exit();
     };
 };
+
+sub is_gnumake_module {
+    my $module = shift;
+    my $bridgemakefile = $source_config->get_module_path($module) . "/prj/makefile.mk";
+    return (-e $bridgemakefile);
+}
+
+sub check_partial_gnumake_build {
+    if(!$build_all_parents && is_gnumake_module(shift)) {
+        print "This module has been migrated to GNU make.\n";
+        print "You can only use build --all/--since here with build.pl.\n";
+        print "To do the equivalent of 'build && deliver' call:\n";
+        print "\tmake -sr\n";
+        print "in the module root (This will modify the solver).\n";
+        exit 1;
+    }
+}
diff --git a/solenv/bin/buildalyzer b/solenv/bin/buildalyzer
new file mode 100644
index 000000000..8b278e66b
--- /dev/null
+++ b/solenv/bin/buildalyzer
@@ -0,0 +1,138 @@
+#!/usr/bin/env python
+import sys
+import os
+
+class CxxTarget:
+    def __init__(self, line):
+        self.directory = ''
+        self.outputfile = ''
+        self.includeflags = []
+        self.cxxflags = []
+        self.inputfiles = []
+        self.nolink = False
+        options = line[:-1].split(' ')
+        self.directory = options.pop(0)
+        parsing_outputfile = False
+        for option in options:
+            if parsing_outputfile:
+                self.outputfile = option
+                parsing_outputfile = False
+            elif option == '-o':
+                parsing_outputfile = True
+            elif option == '-c':
+                self.nolink = True
+            elif option.startswith('-I'):
+                self.includeflags.append(CxxFlag(option))
+            elif option.startswith('-'):
+                self.cxxflags.append(CxxFlag(option))
+            else:
+                self.inputfiles.append(option)
+        self.cxxflags.sort()
+        self.includeflags.sort()
+        cxxflags_tmp = dict()
+        for flag in self.cxxflags:
+            cxxflags_tmp[flag.name] = flag
+        self.cxxflags = cxxflags_tmp.values()
+        includeflags_tmp = dict()
+        for flag in self.includeflags:
+            includeflags_tmp[flag.name] = flag
+        self.includeflags = includeflags_tmp.values()
+        CxxTargets.by_name[self.getFullOutputname()] = self
+    def __str__(self):
+        return '%s' % (self.getFullOutputname())
+    def getFullOutputname(self):
+        return self.directory + '/' + self.outputfile
+    def __cmp__(self, other):
+        return cmp(self.getFullOutputname(), other.getFullOutputname())
+
+class CxxFlag:
+    def __init__(self, name):
+        self.name = name
+        CxxFlags.by_name[self.name] = self
+    def __str__(self):
+        return 'Flag %s' % (self.name)
+    def __cmp__(self, other):
+        return cmp(self.name, other.name)
+
+class CxxFlags:
+    by_name = dict()
+
+class CxxTargets:
+    by_name = dict()
+
+if __name__ == '__main__':
+    [CxxTarget(line) for line in sys.stdin.readlines()]
+    compile_targets = [target for target in CxxTargets.by_name.values() if target.nolink]
+    link_targets = [target for target in CxxTargets.by_name.values() if not target.nolink]
+    common_compile_flags = []
+    for flag in CxxFlags.by_name.values():
+        if sum((flag in target.cxxflags for target in compile_targets)) == len(compile_targets):
+            common_compile_flags.append(flag)
+    common_link_flags = []
+    for flag in CxxFlags.by_name.values():
+        if sum((flag in target.cxxflags for target in compile_targets)) == len(compile_targets):
+            common_link_flags.append(flag)
+
+    for target in compile_targets:
+        target.cxxflags = [flag for flag in target.cxxflags if flag not in common_compile_flags]
+        target.cxxflags.sort()
+    for target in link_targets:
+        target.cxxflags = [flag for flag in target.cxxflags if flag not in common_link_flags]
+        target.cxxflags.sort()
+
+    common_compile_flags.sort()
+    common_link_flags.sort()
+    print 'common compile flags: %s' % (' '.join(flag.name for flag in common_compile_flags))
+    print 'common link flags: %s' % (' '.join(flag.name for flag in common_link_flags))
+
+    by_flagset = dict()
+    for target in CxxTargets.by_name.values():
+        flagset = ' '.join((flag.name for flag in target.cxxflags))
+        if flagset not in by_flagset:
+            by_flagset[flagset] = list()
+        by_flagset[flagset].append(target)
+    for targetlist in by_flagset.values():
+        targetlist.sort()
+    flagsets = by_flagset.keys()
+    flagsets.sort()
+    print '%d compilerflag groups:' % (len(flagsets))
+    for flagset in flagsets:
+        print flagset
+        for target in by_flagset[flagset]:
+            print '%s' % (target)
+        print
+
+    by_flagset = dict()
+    for target in CxxTargets.by_name.values():
+        flagset = ' '.join((flag.name for flag in target.includeflags))
+        if flagset not in by_flagset:
+            by_flagset[flagset] = list()
+        by_flagset[flagset].append(target)
+    for targetlist in by_flagset.values():
+        targetlist.sort()
+    flagsets = by_flagset.keys()
+    flagsets.sort()
+    print '%d include flag groups:' % (len(flagsets))
+    for flagset in flagsets:
+        print flagset
+        for target in by_flagset[flagset]:
+            print '%s' % (target)
+        print
+
+    print 'sources:'
+    by_name = dict()
+    for target in CxxTargets.by_name.values():
+        by_name[os.path.basename(target.outputfile)] = target
+    names = by_name.keys()
+    names.sort()
+    for target in CxxTargets.by_name.values():
+        if len(target.inputfiles) > 1:
+            objects = [os.path.basename(object) for object in target.inputfiles]
+            sources = list()
+            for object in objects:
+                if object in by_name:
+                    sources.append(by_name[object].inputfiles[0])
+                else:
+                    sources.append('!!!!' + object)
+            sources.sort()
+            print '%s %s' % (target.getFullOutputname(), ' '.join(sources))
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index f241ea039..2c9930a7e 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -74,8 +74,8 @@ my @valid_commands = (
 my %valid_options_hash = ( 
                             'help'       => ['help'],
                             'create'     => ['help', 'milestone', 'migration', 'hg'],
-                            'fetch'      => ['help', 'milestone', 'childworkspace','platforms','quiet',
-                                            'onlysolver'],
+                            'fetch'      => ['help', 'milestone', 'childworkspace','platforms','noautocommon',
+                                            'quiet', 'onlysolver'],
                             'query'      => ['help', 'milestone','masterworkspace','childworkspace'],
                             'task'       => ['help'],
                             'setcurrent' => ['help', 'milestone'],
@@ -120,6 +120,7 @@ sub parse_command_line
                                              'profile',
                                              'commit|C',
                                              'platforms|p=s',
+                                             'noautocommon|x=s',
                                              'onlysolver|o',
                                              'quiet|q',
                                              'help|h'
@@ -445,7 +446,7 @@ sub hg_clone_cws_or_milestone
         require LWP::Simple;
         my $content = LWP::Simple::get($cws_remote_source);
         my $pattern = "<title>cws/". $cws->child();
-        if ( $content =~ /$pattern/ ) {
+        if ( $content && $content =~ /$pattern/ ) {
             $pull_from_remote = 1;
         }
         else {
@@ -1457,21 +1458,28 @@ sub do_help
         print STDERR "fetch: fetch a milestone or CWS\n";
         print STDERR "usage: fetch [-q] [-p platforms] [-o] <-m milestone> <workspace>\n";
         print STDERR "usage: fetch [-q] [-p platforms] [-o] <-c cws> <workspace>\n";
+        print STDERR "usage: fetch [-q] [-x platforms] [-o] <-m milestone> <workspace>\n";
+        print STDERR "usage: fetch [-q] [-x platforms] [-o] <-c cws> <workspace>\n";
         print STDERR "usage: fetch [-q] <-m milestone> <workspace>\n";
         print STDERR "usage: fetch [-q] <-c cws> <workspace>\n";
-        print STDERR "\t-m milestone:           Checkout milestone <milestone> to workspace <workspace>\n";
-        print STDERR "\t                        Use 'latest' for the for lastest published milestone on the current master\n";
-        print STDERR "\t                        For cross master checkouts use the form <MWS>:<milestone>\n";
-        print STDERR "\t--milestone milestone:  Same as -m milestone\n";
-        print STDERR "\t-c childworkspace:      Checkout CWS <childworkspace> to workspace <workspace>\n";
-        print STDERR "\t--child childworkspace: Same as -c childworkspace\n";
-        print STDERR "\t-p platform:            Copy one or more prebuilt platforms 'platform'. \n";
-        print STDERR "\t                        Separate multiple platforms with commas.\n";
-        print STDERR "\t--platforms platform:   Same as -p\n";
-        print STDERR "\t-o                      Omit checkout of sources, copy only solver. \n";
-        print STDERR "\t--onlysolver:           Same as -o\n";
-        print STDERR "\t-q                      Silence some of the output of the command.\n";
-        print STDERR "\t--quiet:                Same as -q\n";
+        print STDERR "\t-m milestone:            Checkout milestone <milestone> to workspace <workspace>\n";
+        print STDERR "\t                         Use 'latest' for the for lastest published milestone on the current master\n";
+        print STDERR "\t                         For cross master checkouts use the form <MWS>:<milestone>\n";
+        print STDERR "\t--milestone milestone:   Same as -m milestone\n";
+        print STDERR "\t-c childworkspace:       Checkout CWS <childworkspace> to workspace <workspace>\n";
+        print STDERR "\t--child childworkspace:  Same as -c childworkspace\n";
+        print STDERR "\t-p platform:             Copy one or more prebuilt platforms 'platform'. \n";
+        print STDERR "\t                         Separate multiple platforms with commas.\n";
+        print STDERR "\t                         Automatically adds 'common[.pro]' as required.\n";
+        print STDERR "\t--platforms platform:    Same as -p\n";
+        print STDERR "\t-x platform:             Copy one or more prebuilt platforms 'platform'. \n";
+        print STDERR "\t                         Separate multiple platforms with commas.\n";
+        print STDERR "\t                         Does not automatically adds 'common[.pro]'.\n";
+        print STDERR "\t--noautocommon platform: Same as -x\n";
+        print STDERR "\t-o:                      Omit checkout of sources, copy only solver. \n";
+        print STDERR "\t--onlysolver:            Same as -o\n";
+        print STDERR "\t-q:                      Silence some of the output of the command.\n";
+        print STDERR "\t--quiet:                 Same as -q\n";
     }
     elsif ($arg eq 'setcurrent') {
         print STDERR "setcurrent: Set the current milestone for the CWS (only hg based CWSs)\n";
@@ -1576,6 +1584,7 @@ sub do_fetch
     my $milestone_opt = $options_ref->{'milestone'};
     my $child = $options_ref->{'childworkspace'};
     my $platforms = $options_ref->{'platforms'};
+    my $noautocommon = $options_ref->{'noautocommon'};
     my $quiet  = $options_ref->{'quiet'}  ? 1 : 0 ;
     my $switch = $options_ref->{'switch'} ? 1 : 0 ;
     my $onlysolver = $options_ref->{'onlysolver'} ? 1 : 0 ;
@@ -1590,8 +1599,13 @@ sub do_fetch
         do_help(['fetch']);
     }
 
-    if ( $onlysolver && !defined($platforms) ) {
-        print_error("Option '-o' is Only usuable combination with option '-p'.", 0);
+    if ( defined($platforms) && defined($noautocommon) ) {
+        print_error("Options -p and -x are mutally exclusive", 0);
+        do_help(['fetch']);
+    }
+
+    if ( $onlysolver && !(defined($platforms) || defined($noautocommon)) ) {
+        print_error("Option '-o' is Only usuable combination with option '-p' or '-x'.", 0);
         do_help(['fetch']);
     }
 
@@ -1634,42 +1648,47 @@ sub do_fetch
     # Check early for platforms so we can bail out before anything time consuming is done
     # in case of a missing platform
     my @platforms;
-    if ( defined($platforms) ) {
+    if ( defined($platforms) || defined($noautocommon) ) {
         use Archive::Zip; # warn early if module is missing
         if ( !defined($prebuild_dir ) ) {
             print_error("PREBUILD_BINARIES not configured, can't find platform solvers", 99);
         }
         $prebuild_dir = "$prebuild_dir/$masterws";
 
-        @platforms = split(/,/, $platforms);
+        if ( defined($platforms) ) {
+            @platforms = split(/,/, $platforms);
 
-        my $added_product = 0;
-        my $added_nonproduct = 0;
-        foreach(@platforms) {
-            if ( $_ eq 'common.pro' ) {
-                $added_product = 1;
-                print_warning("'$_' is added automatically to the platform list, don't specify it explicit");
-            }
-            if ( $_ eq 'common' ) {
-                $added_nonproduct = 1;
-                print_warning("'$_' is added automatically to the platform list, don't specify it explicit");
-            }
-        }
-
-        # add common.pro/common to platform list
-        if ( $so_svn_server ) {
-            my $product = 0;
-            my $nonproduct = 0;
+            my $added_product = 0;
+            my $added_nonproduct = 0;
             foreach(@platforms) {
-                if ( /\.pro$/ ) {
-                    $product = 1;
+                if ( $_ eq 'common.pro' ) {
+                    $added_product = 1;
+                    print_warning("'$_' is added automatically to the platform list, don't specify it explicit");
                 }
-                else {
-                    $nonproduct = 1;
+                if ( $_ eq 'common' ) {
+                    $added_nonproduct = 1;
+                    print_warning("'$_' is added automatically to the platform list, don't specify it explicit");
                 }
             }
-            unshift(@platforms, 'common.pro') if ($product && !$added_product);
-            unshift(@platforms, 'common') if ($nonproduct && !$added_nonproduct);
+
+            # add common.pro/common to platform list
+            if ( $so_svn_server ) {
+                my $product = 0;
+                my $nonproduct = 0;
+                foreach(@platforms) {
+                    if ( /\.pro$/ ) {
+                        $product = 1;
+                    }
+                    else {
+                        $nonproduct = 1;
+                    }
+                }
+                unshift(@platforms, 'common.pro') if ($product && !$added_product);
+                unshift(@platforms, 'common') if ($nonproduct && !$added_nonproduct);
+            }
+        }
+        else {
+            @platforms = split(/,/, $noautocommon);
         }
 
         foreach(@platforms) {
@@ -1733,7 +1752,7 @@ sub do_fetch
         }
     }
 
-    if ( defined($platforms) ) {
+    if ( defined($platforms) || defined($noautocommon) ) {
         if ( !-d $workspace ) {
             if ( !mkdir($workspace) ) {
                 print_error("Can't create directory '$workspace': $!.", 8);
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index ab0b731c6..ca2b22ad6 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -789,11 +789,6 @@ sub copy_if_newer
     if ( $opt_delete ) {
         print "REMOVE: $to\n" if $opt_verbose;
         $rc = unlink($to) unless $opt_check;
-        # handle special packaging of *.dylib files for Mac OS X
-        if ( $to =~ s/\.dylib$/.jnilib/ ) {
-            print "REMOVE: $to\n" if $opt_verbose;
-            $rc += unlink "$to" unless $opt_check;
-        } 
         return 1 if $opt_check;
         return $rc;
     }
@@ -858,19 +853,6 @@ sub copy_if_newer
             # handle special packaging of *.dylib files for Mac OS X
             if ( $^O eq 'darwin' )
             {
-                if ( $to =~ /\.dylib/ ) {
-                    system("macosx-create-bundle", $to);
-                    my $bundlelib = $to;
-                    $bundlelib =~ s/\.dylib$//; 
-                    $bundlelib .= ".jnilib";
-                    if ( $opt_delete ) {
-                        print "REMOVE: $bundlelib\n" if $opt_verbose;
-                        unlink "$bundlelib" unless $opt_check;
-                    } else {
-                        push_on_ziplist($bundlelib) if $opt_zip;
-                        push_on_loglist("LINK", basename($to), "$bundlelib") if $opt_log;
-                    }
-                }
                 system("macosx-create-bundle", "$to=$from.app") if ( -d "$from.app" );
                 system("ranlib", "$to" ) if ( $to =~ /\.a/ );
             }
diff --git a/solenv/bin/macosx-create-bundle b/solenv/bin/macosx-create-bundle
index ba7d624e6..4b03e076f 100755
--- a/solenv/bin/macosx-create-bundle
+++ b/solenv/bin/macosx-create-bundle
@@ -96,7 +96,7 @@ while [ $# != 0 ]; do
 			# Link jnilib
 			ln -sf "$inputfilename" "$outputdir/$inputjnilibname"
 
-			printf "macosx-create-bundle: $outputdir/$inputjnilibname successfully created\n"
+			#printf "macosx-create-bundle: $outputdir/$inputjnilibname successfully created\n"
 		fi
 	else
 		printf "macosx-create-bundle: error: file is not an executable or shared library.\n" >&2
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index b62d2f838..208babc98 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -45,8 +45,11 @@ sub new
 {
     my $Object = shift;
     my $solarversion = shift;
+    my $workdir;
+    my $relworkdir;
     my $self = {};
-    my @repositories;
+    my @basedirs;
+    my @repos;
 
     if (!defined ($solarversion)) {
         $solarversion = $ENV{SOLARVERSION};
@@ -58,14 +61,33 @@ sub new
     
     $self->{SOLARVERSION} = $solarversion;
 
+    $workdir = $ENV{WORKDIR};
+    if ( !$workdir ) {
+        print STDERR "can't determine WORKDIR.\n";
+        exit (1);
+    }
+   
+    if ( $workdir =~ /^$solarversion/ ) {
+        $relworkdir = $workdir;
+        $relworkdir =~ s/^$solarversion\///;
+    } else {
+        print STDERR "ERROR: workdir outside $solarversion unsupported\n";
+        exit (2);
+    }
     my $SourceConfigObj = SourceConfig->new();
-    @repositories = $SourceConfigObj->get_repositories();
-    
-    if (!scalar @repositories) {
-        print STDERR "no repository and no working directory found.\n";
+    @repos = $SourceConfigObj->get_repositories();
+    if ( defined $ENV{UPDMINOREXT} ) {
+        foreach my $onedir ( @repos ) {
+            push( @basedirs, $onedir.$ENV{UPDMINOREXT} );
+        }
+    }
+    # basdirs is repositories (dmake) + workdir (gnu make)
+    push(@basedirs, $relworkdir);
+    if (!scalar @basedirs) {
+        print STDERR "no basedir and no working directory found.\n";
         exit (2);
     }
-    $self->{REPOSITORIES} = \@repositories;
+    $self->{BASEDIRS} = \@basedirs;
     bless($self, $Object);
     return $self; 
 }
@@ -106,10 +128,10 @@ sub create_pdb_relocators
     }
 
     # collect files
-    foreach my $repository (@{$self->{REPOSITORIES}}) {
+    foreach my $basedir (@{$self->{BASEDIRS}}) {
         my @pdb_files;
-        my $o = $self->{SOLARVERSION} . "/$repository";
-        $repository =~ s/(.*?)\.(.*)/$1/;
+        my $o = $self->{SOLARVERSION} . "/$basedir";
+        $basedir =~ s/(.*?)\.(.*)/$1/;
         $self->collect_files( $o, $inpath, \@pdb_files);
 
         foreach (@pdb_files) {
@@ -122,12 +144,12 @@ sub create_pdb_relocators
             my $target = "";
             if ( $src_location =~ /\/so\// )
             {
-                $location = "../../../$repository$milestoneext/" . $src_location;
+                $location = "../../../$basedir$milestoneext/" . $src_location;
                 $target = "$pdb_dir/so/$relocator";
             }
             else
             {
-                $location = "../../$repository$milestoneext/" . $src_location;
+                $location = "../../$basedir$milestoneext/" . $src_location;
                 $target = "$pdb_dir/$relocator";
             }
 
@@ -142,14 +164,14 @@ sub create_pdb_relocators
     return 1;
 }
 
-sub collect_files_from_all_repositories
+sub collect_files_from_all_basedirs
 {
     my $self = shift;
     my ($platform, $filesref) = @_;
-    my $repository;
+    my $basedir;
     my $ret;
-    foreach $repository (@{$self->{REPOSITORIES}}) {
-        my $srcdir = $self->{SOLARVERSION} . "/$repository";
+    foreach $basedir (@{$self->{BASEDIRS}}) {
+        my $srcdir = $self->{SOLARVERSION} . "/$basedir";
         $ret |= $self->collect_files ($srcdir, $platform, $filesref);
     }
     return $ret;
@@ -160,14 +182,16 @@ sub collect_files
     my $self = shift;
     my ($srcdir, $platform, $filesref) = @_; 
     my $template = "$srcdir/*/$platform";
+    my $template2 = "$srcdir/LinkTarget";
     if ( $ENV{GUI} eq "WNT" ) {
         # collect all pdb files on o:
         # regular glob does not work with two wildcard on WNT
         my @bin    = glob("$template/bin/*.pdb");
         my @bin_so = glob("$template/bin/so/*.pdb");
+        my @workdir = glob("$template2/*/*.pdb");
         # we are only interested in pdb files which are accompanied by
         # .exe or .dll which the same name
-        foreach (@bin, @bin_so) {
+        foreach (@bin, @bin_so, @workdir) {
             my $dir  = dirname($_);
             my $base = basename($_, ".pdb");
             my $exe = "$dir/$base.exe";
@@ -180,13 +204,16 @@ sub collect_files
     else {
         # collect all shared libraries on o:
         my @lib = glob("$template/lib/*.so*");
+        my @workdir_lib = glob("$template2/Library/*.so*");
         my @lib_so = glob("$template/lib/so/*.so*");
         my @mac_lib = glob("$template/lib/*.dylib*");
+        my @mac_workdir_lib = glob("$template2/Library/*.dylib*");
         my @mac_lib_so = glob("$template/lib/so/*.dylib*");
         # collect all binary executables on o:
         my @bin = $self->find_binary_execs("$template/bin");
+        my @workdir_bin = $self->find_binary_execs("$template2/Executable");
         my @bin_so = $self->find_binary_execs("$template/bin/so");
-        push(@$filesref, (@lib, @lib_so, @mac_lib, @mac_lib_so, @bin, @bin_so));
+        push(@$filesref, (@lib, @lib_so, @workdir_lib, @mac_lib, @mac_workdir_lib, @mac_lib_so, @bin, @workdir_bin, @bin_so));
     }
     return 1;
 }
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 45f63a7e1..6357cb210 100755
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -320,14 +320,14 @@ sub read_config_file {
                     next;
                 };
             };
-            croak("Line $line in " . $self->{SOURCE_CONFIG_FILE} . 'violates format. Please make your checks!!');
+            croak("Line $line in " . $self->{SOURCE_CONFIG_FILE} . ' violates format. Please make your checks!');
         };
         close SOURCE_CONFIG_FILE;
         if (!scalar keys %{$self->{REPOSITORIES}}) {
             get_fallback_repository($self);
         };
     } else {
-        croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . 'for reading');
+        croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . ' for reading');
     };
 };
 
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 4d3ff0bdb..d7c5658e3 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -328,6 +328,11 @@ sub check_logfile
     my @errors = ();
     my @output = ();
     my $contains_error = 0;
+    
+    my $ignore_error = 0;
+    my $make_error_to_warning = 0;
+    
+    if (( ! $installer::globals::pro ) && ( $installer::globals::ignore_error_in_logfile )) { $ignore_error = 1; }
 
     for ( my $i = 0; $i <= $#{$logfile}; $i++ )
     {
@@ -346,6 +351,12 @@ sub check_logfile
         {
             $contains_error = 1;
             push(@errors, $line);
+            
+            if ( $ignore_error )
+            {
+                $contains_error = 0;
+                $make_error_to_warning = 1;
+            }
         }
     }
 
@@ -368,7 +379,26 @@ sub check_logfile
     }
     else
     {
-        my $line = "\n***********************************************************\n";
+        my $line = "";
+        
+        if ( $make_error_to_warning )
+        {
+            $line = "\n*********************************************************************\n";
+            push(@output, $line);
+            $line = "The following errors in the log file were ignored:\n\n";
+            push(@output, $line);
+
+            for ( my $i = 0; $i <= $#errors; $i++ )
+            {
+                $line = "$errors[$i]";
+                push(@output, $line);
+            }
+        
+            $line = "*********************************************************************\n";
+            push(@output, $line);		
+        }
+        
+        $line = "\n***********************************************************\n";
         push(@output, $line);
         $line = "Successful packaging process!\n";
         push(@output, $line);
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 71b9ba756..f316be9bb 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -128,6 +128,7 @@ sub set_global_environment_variables
     if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; }
     if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
     if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; }
+    if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) { $installer::globals::ignore_error_in_logfile = 1; }
     if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; }
     
     if ( $installer::globals::localinstalldir ) { $installer::globals::localinstalldirset = 1; }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index d1ec99bbd..b280e8204 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -243,6 +243,7 @@ BEGIN
     @logfileinfo = ();
     @errorlogfileinfo = ();
     @globallogfileinfo = ();
+    $ignore_error_in_logfile = 0;
     $exitlog = "";
     $globalinfo_copied = 0;
     $quiet = 0;
diff --git a/solenv/bin/packmodule b/solenv/bin/packmodule
new file mode 100755
index 000000000..dd1ac0439
--- /dev/null
+++ b/solenv/bin/packmodule
@@ -0,0 +1,58 @@
+#! /usr/bin/env python
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+import os, os.path, sys, zipfile
+
+def paths_to_pack(loglines):
+    """Returns a generator iterating the outdir fields (with platform) of gb_deliver.log lines."""
+    return (line.split()[2] for line in loglines)
+
+def stripped_paths_to_pack(loglines):
+    """returns a generator iterating the outdir fields (stripped of the platform) of gb_deliver.log lines."""
+    return (path.partition('/')[2] for path in paths_to_pack(loglines))
+
+def main(args):
+    """creates/overwrites a file at OUTDIR/zip/MODULE.zip containing the contents of the gb_deliver.log."""
+    if len(args) != 3:
+        print('usage: packmodule OUTDIR MODULE')
+        sys.exit(2)
+    (executable, outdir, module) = args
+    os.chdir(outdir)
+    zipdir = 'zip'
+    try:
+        os.makedirs(zipdir)
+    except OSError:
+        pass
+    deliverlog = open(os.path.join('inc', module, 'gb_deliver.log'))
+    packedmodule = zipfile.ZipFile(os.path.join(zipdir,module+'.zip'), 'w')
+    [packedmodule.write(path) for path in stripped_paths_to_pack(deliverlog)]
+    packedmodule.close()
+
+if __name__ == "__main__":
+    main(sys.argv)
+
+# vim:set et sw=4 ts=4 filetype=python:
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index eeb72e2cb..85a490af1 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -1,2955 +1,2962 @@
 common
 {
-	environment
-	{
-		common
-		{
-			ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
-			BIG_SVX TRUE
-			BMP_WRITES_FLAG TRUE
-			BUILD_SPECIAL TRUE
-			BUILD_STAX YES
-			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS
-			common_build TRUE
-			COMMON_OUTDIR common
-			CONFIG_PROJECT config_office
-			DIC_ALL TRUE
-			ENABLEUNICODE TRUE
-			ENABLE_AGG YES
-			ENABLE_CUPS TRUE
-			ENABLE_DIRECTX TRUE
-			ENABLE_FONTCONFIG TRUE
-			ENABLE_GTK TRUE
-			ENABLE_MEDIAWIKI YES
-			ENABLE_MINIMIZER YES
- 			ENABLE_MYSQLC YES
-			ENABLE_NSS_MODULE YES
-			ENABLE_RANDR TRUE
-			ENABLE_REPORTBUILDER YES
-			ENABLE_SVCTAGS YES
-			ENABLE_VBA YES
-			ISERVER iserver.germany.sun.com
-			LU_HGFLAG ""
-			LU_NOSOURCE ""
-			LU_RFLAG ""
-			NEW_JAR_PACK TRUE
-			NO_REC_RES TRUE
-			OOODMAKEMODE YES
+    environment
+    {
+        common
+        {
+            ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
+            BIG_SVX TRUE
+            BMP_WRITES_FLAG TRUE
+            BUILD_SPECIAL TRUE
+            BUILD_STAX YES
+            BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS
+            CONFIG_PROJECT config_office
+            DIC_ALL TRUE
+            ENABLEUNICODE TRUE
+            ENABLE_AGG YES
+            ENABLE_CUPS TRUE
+            ENABLE_DIRECTX TRUE
+            ENABLE_FONTCONFIG TRUE
+            ENABLE_GTK TRUE
+            ENABLE_MEDIAWIKI YES
+            ENABLE_MINIMIZER YES
+            ENABLE_MYSQLC YES
+            ENABLE_NSS_MODULE YES
+            ENABLE_RANDR TRUE
+            ENABLE_REPORTBUILDER YES
+            ENABLE_SVCTAGS YES
+            ENABLE_VBA YES
+            ISERVER iserver.germany.sun.com
+            LU_HGFLAG ""
+            LU_NOSOURCE ""
+            LU_RFLAG ""
+            NEW_JAR_PACK TRUE
+            NO_REC_RES TRUE
+            OOODMAKEMODE YES
             OOO_SHELL /bin/bash
-			PCLEAN_PATH xxx
-			RES_ENUS TRUE
-			RES_GER TRUE
-			rsc_once TRUE
-			SHIPDRIVE /so/install
-			STLPORT4 NO_STLPORT4
-			STLPORT_VER 400
-			WITH_FONTOOO YES
-			WITH_LDAP YES
-			wrapper_override_cc_wrapper TRUE
-			MAXPROC maxproc=15
+            PCLEAN_PATH xxx
+            RES_ENUS TRUE
+            RES_GER TRUE
+            rsc_once TRUE
+            SHIPDRIVE /so/install
+            STLPORT4 NO_STLPORT4
+            STLPORT_VER 400
+            WITH_FONTOOO YES
+            WITH_LDAP YES
+            wrapper_override_cc_wrapper TRUE
+            MAXPROC maxproc=15
             XINERAMA_LINK dynamic
-		}
-		common:0 IF %UPDATER% == YES
-		{
-			DEFAULT_TO_ENGLISH_FOR_PACKING 1
-			DELIVER_TO_ZIP TRUE
-			DISABLE_SAL_DBGBOX 1
-		}
-		common:1 IF X%CWS_WORK_STAMP%X != XX
-		{
-			CWS_WORK_STAMP_EXT _%CWS_WORK_STAMP%
-		}
-		common:2 IF %UPDATER% == YES
-		{
-			WITH_LANG en-US de
+        }
+        common:0 IF %UPDATER% == YES
+        {
+            DEFAULT_TO_ENGLISH_FOR_PACKING 1
+            DISABLE_SAL_DBGBOX 1
+        }
+        common:1 IF X%CWS_WORK_STAMP%X != XX
+        {
+            CWS_WORK_STAMP_EXT _%CWS_WORK_STAMP%
+        }
+        common:2 IF %UPDATER% == YES
+        {
+            WITH_LANG en-US de
             BUILD_TYPE l10n
-		}
-		common:3 IF %UPDATER% != YES
-		{
-		}
-		crashdump
-		{
-			ENABLE_CRASHDUMP TRUE
-		}
-		hg
-		{
-			LU_HGFLAG hg_source
-		}
-		maxproc
-		{
-			MAXPROC maxproc=%MAXPROCESS%
-		}
-		minorext
-		{
-			UPDMINOREXT .%UPDMINOR%
-		}
-		nosource
-		{
-			LU_NOSOURCE no_source
-		}
-		pro:0 IF %UPDATER% == YES
-		{
-			DELIVER_TO_ZIP TRUE
-			product full
-			PROEXT .pro
-			PROFULLSWITCH product=full
-			WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar
-		}
-		pro:1 IF %UPDATER% != YES
-		{
-			product full
-			PROEXT .pro
-			PROFULLSWITCH product=full
-		}
-		r_only
-		{
-			LU_RFLAG r_only
-		}
-		tmp
-		{
-			SOL_TMP %SOL_TMP_DIR%
-		}
-		verbose
-		{
-			VERBOSE VERBOSE
-		}
-	}
-	extern
-	{
-		ENVROOT
-		PATH
-		SRC_ROOT
-		UPDATER
-	}
-	order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource
-	reset
-	{
-		ALT_L10N_MODULE
-		ENVCFLAGS
-		HOMEDRIVE
-		HOMEPATH
-		JAVAHOME
-		JAVA_HOME
- 		LU_HGFLAG
- 		LU_NOSOURCE
- 		LU_RFLAGS
+        }
+        common:3 IF %UPDATER% != YES
+        {
+        }
+        crashdump
+        {
+            ENABLE_CRASHDUMP TRUE
+        }
+        hg
+        {
+            LU_HGFLAG hg_source
+        }
+        maxproc
+        {
+            MAXPROC maxproc=%MAXPROCESS%
+        }
+        minorext
+        {
+            UPDMINOREXT .%UPDMINOR%
+        }
+        nosource
+        {
+            LU_NOSOURCE no_source
+        }
+        pro:0 IF %UPDATER% == YES
+        {
+            product full
+            PROEXT .pro
+            PROFULLSWITCH product=full
+            WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar
+        }
+        pro:1 IF %UPDATER% != YES
+        {
+            product full
+            PROEXT .pro
+            PROFULLSWITCH product=full
+        }
+        r_only
+        {
+            LU_RFLAG r_only
+        }
+        tmp
+        {
+            SOL_TMP %SOL_TMP_DIR%
+        }
+        verbose
+        {
+            VERBOSE VERBOSE
+        }
+    }
+    extern
+    {
+        ENVROOT
+        PATH
+        SRC_ROOT
+        UPDATER
+    }
+    order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource
+    reset
+    {
+        ALT_L10N_MODULE
+        ENVCFLAGS
+        HOMEDRIVE
+        HOMEPATH
+        JAVAHOME
+        JAVA_HOME
+        LU_HGFLAG
+        LU_NOSOURCE
+        LU_RFLAGS
         MKDIRHIER
-		PROEXT
-		PROFULLSWITCH
-		SHIPDRIVE
-		SOLARSRC
-		SOLAR_JAVA
-		SPEW
-		STLPORT4
-		UPDMINOREXT
-		WITH_FONTOOO
-		WITH_LANG
-	}
-	restore
-	{
-		PATH
-	}
-	standlst
-	{
-		DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
-		DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
-	}
-	switches
-	{
-		crashdump
-		cwsname CWS_WORK_STAMP
-		envroot
-		hg
-		minorext
-		nosource
-		pro
-		maxproc MAXPROCESS
-		r_only
-		tmp SOL_TMP_DIR
-		verbose VERBOSE
-	}
+        PROEXT
+        PROFULLSWITCH
+        SHIPDRIVE
+        SOLARSRC
+        SOLAR_JAVA
+        SPEW
+        STLPORT4
+        UPDMINOREXT
+        WITH_FONTOOO
+        WITH_LANG
+    }
+    restore
+    {
+        PATH
+    }
+    standlst
+    {
+        DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
+        DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
+    }
+    switches
+    {
+        crashdump
+        cwsname CWS_WORK_STAMP
+        envroot
+        hg
+        minorext
+        nosource
+        pro
+        maxproc MAXPROCESS
+        r_only
+        tmp SOL_TMP_DIR
+        verbose VERBOSE
+    }
 }
 finish
 {
-	environment
-	{
-		cap
-		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-		}
-		cax
-		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-		}
-		common_0:0 IF %OS% == MACOSX
-		{
-			ENABLE_GTK
-			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
-		}
-		common_0:3 IF %SOLARINCLUDES% ==
-		{
-			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
-		}
-		common_1
-		{
+    environment
+    {
+        cap
+        {
+            SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
+        }
+        cax
+        {
+            SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
+        }
+        common_0:0 IF %OS% == MACOSX
+        {
+            ENABLE_GTK
+            SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
+        }
+        common_0:3 IF %SOLARINCLUDES% ==
+        {
+            SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
+        }
+        common_1
+        {
         BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
         BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
-			DPKG %BUILD_TOOLS%$/dpkg
+            DPKG %BUILD_TOOLS%$/dpkg
             OOO_JUNIT_JAR %SOLARROOT%$/btools$/junit-4.8.1.jar
-			PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
-			PATH_SEPERATOR $;
-			SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
-			SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB%
-			SOLARSRC %SRC_ROOT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-			ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1
+            PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
+            PATH_SEPERATOR $;
+            SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
+            SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB%
+            SOLARSRC %SRC_ROOT%
+            SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
+            ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1
             DBGSV_INIT %SOLARENV%/bin/dbgsv.ini
-		}
-		common_2:0 IF X%CWS_WORK_STAMP%X == XX
-		{
-			MWS_BUILD TRUE
-		}
-		common_a
-		{
-			*o: cd %SOLARSRC%
-			ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
-			TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources
-		}
-		common_jre:0 IF %JREPATH% ==
-		{
-			HIER set
-		}
-		common_jre:1 IF %LD_LIBRARY_PATH% ==
-		{
-			PATH %PATH%$:$cp(%JREPATH%)
-		}
-		cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
-		{
-			*build
-			*deliver
-			DMAKEROOT SOURCE_ROOT_not_used
-			SOLARINC SOURCE_ROOT_not_used
-			SOLARINCLUDE SOURCE_ROOT_not_used
-			SOLARSRC SOURCE_ROOT_not_used
-			SOLARVER SOURCE_ROOT_not_used
-			SOLARVERSION SOURCE_ROOT_not_used
-			SOLAR_SOURCE_ROOT SOURCE_ROOT_not_used
-			SO_GEN_ERROR Error - Using -cwsname without -sourceroot switch is harmful...
-			SO_GEN_ERROR2 ...resetting path to source tree
-			SRC_ROOT SOURCE_ROOT_not_used
-		}
-		cwsname:1 IF X%SOURCE_ROOT%X == XX
-		{
-			*build
-			*deliver
-			DMAKEROOT SOURCE_ROOT_not_set
-			SOLARINC SOURCE_ROOT_not_set
-			SOLARINCLUDE SOURCE_ROOT_not_set
-			SOLARSRC SOURCE_ROOT_not_set
-			SOLARVER SOURCE_ROOT_not_set
-			SOLARVERSION SOURCE_ROOT_not_set
-			SOLAR_SOURCE_ROOT SOURCE_ROOT_not_set
-			SO_GEN_ERROR Error - Using -cwsname without SOURCE_ROOT set is harmful...
-			SO_GEN_ERROR2 ...resetting path to source tree
-			SRC_ROOT SOURCE_ROOT_not_set
-		}
-		cwsname:2 IF X%UPDMINOR%X == XX
-		{
-			*build
-			*deliver
-			DMAKEROOT UPDMINOR_not_used
-			SOLARINC UPDMINOR_not_used
-			SOLARINCLUDE UPDMINOR_not_used
-			SOLARSRC UPDMINOR_not_used
-			SOLARVER UPDMINOR_not_used
-			SOLARVERSION UPDMINOR_not_used
-			SOLAR_SOURCE_ROOT UPDMINOR_not_used
-			SO_GEN_ERROR Error - Using -cwsname without -ver switch is harmful...
-			SO_GEN_ERROR2 ...resetting path to source tree
-			SRC_ROOT UPDMINOR_not_used
-		}
-		jdk14
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
+            WORKDIR %SOLARVERSION%/%INPATH%/workdir
+            OUTDIR %SOLARVERSION%/%INPATH%
+
+        }
+        common_2:0 IF X%CWS_WORK_STAMP%X == XX
+        {
+            MWS_BUILD TRUE
+            DELIVER_TO_ZIP TRUE
+            gb_MAKETARGET packmodule
+        }
+        common_a
+        {
+            *o: cd %SOLARSRC%
+            ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
+            TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources
+            gb_REPOS %SOURCE_ROOT_DIR%/ooo %SOURCE_ROOT_DIR%/sun
+            gb_LOCALBUILDDIR %SOL_TMP%/gb_%CWS_WORK_STAMP%/%WORK_STAMP%
+        }
+        common_jre:0 IF %JREPATH% ==
+        {
+            HIER set
+        }
+        common_jre:1 IF %LD_LIBRARY_PATH% ==
+        {
+            PATH %PATH%$:$cp(%JREPATH%)
+        }
+        cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
+        {
+            *build
+            *deliver
+            DMAKEROOT SOURCE_ROOT_not_used
+            SOLARINC SOURCE_ROOT_not_used
+            SOLARINCLUDE SOURCE_ROOT_not_used
+            SOLARSRC SOURCE_ROOT_not_used
+            SOLARVER SOURCE_ROOT_not_used
+            SOLARVERSION SOURCE_ROOT_not_used
+            SOLAR_SOURCE_ROOT SOURCE_ROOT_not_used
+            SO_GEN_ERROR Error - Using -cwsname without -sourceroot switch is harmful...
+            SO_GEN_ERROR2 ...resetting path to source tree
+            SRC_ROOT SOURCE_ROOT_not_used
+        }
+        cwsname:1 IF X%SOURCE_ROOT%X == XX
+        {
+            *build
+            *deliver
+            DMAKEROOT SOURCE_ROOT_not_set
+            SOLARINC SOURCE_ROOT_not_set
+            SOLARINCLUDE SOURCE_ROOT_not_set
+            SOLARSRC SOURCE_ROOT_not_set
+            SOLARVER SOURCE_ROOT_not_set
+            SOLARVERSION SOURCE_ROOT_not_set
+            SOLAR_SOURCE_ROOT SOURCE_ROOT_not_set
+            SO_GEN_ERROR Error - Using -cwsname without SOURCE_ROOT set is harmful...
+            SO_GEN_ERROR2 ...resetting path to source tree
+            SRC_ROOT SOURCE_ROOT_not_set
+        }
+        cwsname:2 IF X%UPDMINOR%X == XX
+        {
+            *build
+            *deliver
+            DMAKEROOT UPDMINOR_not_used
+            SOLARINC UPDMINOR_not_used
+            SOLARINCLUDE UPDMINOR_not_used
+            SOLARSRC UPDMINOR_not_used
+            SOLARVER UPDMINOR_not_used
+            SOLARVERSION UPDMINOR_not_used
+            SOLAR_SOURCE_ROOT UPDMINOR_not_used
+            SO_GEN_ERROR Error - Using -cwsname without -ver switch is harmful...
+            SO_GEN_ERROR2 ...resetting path to source tree
+            SRC_ROOT UPDMINOR_not_used
+        }
+        jdk14
+        {
+            CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
+            ILIB %LIB%$;%JDKLIB%
+            LIB %LIB%$;%JDKLIB%
             JAVA_TARGET_FLAG -target 1.4
-		}
-		jdk15
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
+        }
+        jdk15
+        {
+            CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
+            ILIB %LIB%$;%JDKLIB%
+            LIB %LIB%$;%JDKLIB%
             JAVA_TARGET_FLAG -target 1.5
-		}
-		l10n
-		{
-			framework %L10N_framework%
-			L10N-framework %L10N_framework%
-		}
-		ojdk16
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
+        }
+        l10n
+        {
+            framework %L10N_framework%
+            L10N-framework %L10N_framework%
+        }
+        ojdk16
+        {
+            CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
+            ILIB %LIB%$;%JDKLIB%
+            LIB %LIB%$;%JDKLIB%
             JAVA_TARGET_FLAG -target 1.6
-		}
-	}
-	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
-	switches
-	{
-		cwsname CWS_WORK_STAMP
-	}
+        }
+    }
+    order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
+    switches
+    {
+        cwsname CWS_WORK_STAMP
+    }
 }
 unxfbsdi
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice perl %SOLARENV%/bin/build_client.pl
-			*copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver perl %SOLARENV%/bin/deliver.pl
-			*mkout perl %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep perl %SOLARENV%/bin/zipdep.pl
-			COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER perl %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
-			MKOUT perl %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
-			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice perl %SOLARENV%/bin/build_client.pl
+            *copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver perl %SOLARENV%/bin/deliver.pl
+            *mkout perl %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep perl %SOLARENV%/bin/zipdep.pl
+            COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER perl %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
+            MKOUT perl %SOLARENV%/bin/mkout.pl
+            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
+            SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP perl %SOLARENV%/bin/zipdep.pl
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
-			DEVROOT %SOLAR_ENV_ROOT%
-			PKGFORMAT some_dummy
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C300
-			ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxfbsdi%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			NO_BSYMBOLIC True
-			OS FREEBSD
-			OUTPATH unxfbsdi
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		debug
-		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
-			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
+            DEVROOT %SOLAR_ENV_ROOT%
+            PKGFORMAT some_dummy
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU I
+            CPUNAME INTEL
+            CVER C300
+            ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxfbsdi%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            NO_BSYMBOLIC True
+            OS FREEBSD
+            OUTPATH unxfbsdi
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /tmp
+            TMP /tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        debug
+        {
+            LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
+            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
+            JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
+            JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
+            JDKPATH %JDK14PATH%/bin
+            JDK_VERSION 142
+            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client
+            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 IF X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
+    reset
+    {
+        CLASSPATH
+        COPYALL
+    }
+    restore
+    {
+        INCLUDE
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        debug
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 unxlngi6
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            HAVE_GCC_VISIBILITY_FEATURE TRUE
             HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
             HAVE_LD_HASH_STYLE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+            LIBRARY_PATH %SYSBASE%/usr/lib
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
             FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
-			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
+            SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.5/glibc2.5
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.5
-			DEVROOT %SOLAR_ENV_ROOT%
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin/perl
-			PKGFORMAT rpm
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            GNUCOPY cp
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.5/glibc2.5
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.5
+            DEVROOT %SOLAR_ENV_ROOT%
+            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+            PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin/perl
+            PKGFORMAT rpm
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
+            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
             PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-			ENABLE_GSTREAMER TRUE
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
+            ENABLE_GSTREAMER TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C432
-			ENABLE_KAB TRUE
-			ENABLE_KDE TRUE
-			ENABLE_EVOAB2 TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux_libc2.5/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxlngi6%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU I
+            CPUNAME INTEL
+            CVER C432
+            ENABLE_KAB TRUE
+            ENABLE_KDE TRUE
+            ENABLE_EVOAB2 TRUE
+            ENV_TOOLS %SOLARROOT%/et_linux_libc2.5/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxlngi6%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            KDE_ROOT /so/env/kde/linux/kde-3.2.2
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6
-			NO_BSYMBOLIC True
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			OS LINUX
-			OUTPATH unxlngi6
-			RPM %SOLARENV%/bin/rpm-wrapper
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		common3:0 IF X%UPDATER%X == XX
-		{
-			FORCE2ARCHIVE TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
-			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client:%JDK15PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            NO_BSYMBOLIC True
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            OS LINUX
+            OUTPATH unxlngi6
+            RPM %SOLARENV%/bin/rpm-wrapper
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /tmp
+            TMP /tmp
+        }
+        common3:0 IF X%UPDATER%X == XX
+        {
+            FORCE2ARCHIVE TRUE
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
+            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
+            JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
+            JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
+            JDKPATH %JDK14PATH%/bin
+            JDK_VERSION 142
+            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client:%JDK15PATH%/jre/lib/i386/xawt
+            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        ojdk16
+        {
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
+            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
+            JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
+            JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client
+            JDKPATH %OJDK16PATH%/bin
+            JDK_VERSION 160
+            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+        }
+        ojdk16path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 IF X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
+    reset
+    {
+        CLASSPATH
+        COPYALL
+    }
+    restore
+    {
+        INCLUDE
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        debug
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 
 unxlngx6
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            HAVE_GCC_VISIBILITY_FEATURE TRUE
             HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
             HAVE_LD_HASH_STYLE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib64
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+            LIBRARY_PATH %SYSBASE%/usr/lib64
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
             FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
-			SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
+            SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc2.5/glibc2.5
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc2.5
-			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin/perl
-			PKGFORMAT rpm
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2.32
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			USE_SYSTEM_STL YES
-			XAU_LIBS -lXau
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc2.5/glibc2.5
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc2.5
+            DEVROOT %SOLAR_ENV_ROOT%
+            PERL %SOLAR_ENV_ROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin/perl
+            PKGFORMAT rpm
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2.32
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
+            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            USE_SYSTEM_STL YES
+            XAU_LIBS -lXau
             PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
-		}
-		common2
-		{
+        }
+        common2
+        {
             PKG_CONFIG_PATH %COMPATH%/glibc2.5/usr/lib64/pkgconfig
-			ENABLE_GRAPHITE TRUE
-			ENABLE_GSTREAMER TRUE
+            ENABLE_GRAPHITE TRUE
+            ENABLE_GSTREAMER TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU X
-			CPUNAME INTEL
-			CVER C341
-			ENABLE_KAB TRUE
-			ENABLE_KDE TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux64_libc2.5/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GUIENV sal
-			GVER VCL
-			INPATH unxlngx6%PROEXT%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU X
+            CPUNAME INTEL
+            CVER C341
+            ENABLE_KAB TRUE
+            ENABLE_KDE TRUE
+            ENV_TOOLS %SOLARROOT%/et_linux64_libc2.5/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GUIENV sal
+            GVER VCL
+            INPATH unxlngx6%PROEXT%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
-			NO_BSYMBOLIC True
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			OS LINUX
-			OUTPATH unxlngx6
-			PA_VER 18
-			RPM %SOLARENV%/bin/rpm-wrapper
-			SOLARUPD %UPD%
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		common3:0 IF X%UPDATER%X == XX
-		{
-			FORCE2ARCHIVE TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/amd64:%OJDK16PATH%/jre/lib/amd64/server:%OJDK16PATH%/jre/lib/amd64/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/amd64 -L%OJDK16PATH%/jre/lib/amd64/server
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            NO_BSYMBOLIC True
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            OS LINUX
+            OUTPATH unxlngx6
+            PA_VER 18
+            RPM %SOLARENV%/bin/rpm-wrapper
+            SOLARUPD %UPD%
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /tmp
+            TMP /tmp
+        }
+        common3:0 IF X%UPDATER%X == XX
+        {
+            FORCE2ARCHIVE TRUE
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
+            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
+            JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        ojdk16
+        {
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
+            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
+            JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/amd64:%OJDK16PATH%/jre/lib/amd64/server:%OJDK16PATH%/jre/lib/amd64/xawt
+            JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/amd64 -L%OJDK16PATH%/jre/lib/amd64/server
+            JDKPATH %OJDK16PATH%/bin
+            JDK_VERSION 160
+            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+        }
+        ojdk16path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 IF X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
+    reset
+    {
+        CLASSPATH
+        COPYALL
+    }
+    restore
+    {
+        INCLUDE
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        debug
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 
 unxmacxi
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include/c++/4.0.0 -I%SYSBASE%/usr/include/c++/4.0.0/i686-apple-darwin8 -I%SYSBASE%/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/usr/include/python2.3 -I%SYSBASE%/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
-			SOLAREXTRALIB -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-		}
-		common0
-		{
-			GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            HAVE_GCC_VISIBILITY_FEATURE TRUE
+            LIBRARY_PATH %SYSBASE%/usr/lib
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include/c++/4.0.0 -I%SYSBASE%/usr/include/c++/4.0.0/i686-apple-darwin8 -I%SYSBASE%/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/usr/include/python2.3 -I%SYSBASE%/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
+            SOLAREXTRALIB -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            GNUCOPY gnucp
+        }
+        common0
+        {
+            GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
             MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
-		}
-		common1
-		{
-			BUILD_OS_APPLEOSX TRUE
-			BUILD_OS_MAJOR 10
-			BUILD_OS_MINOR 4
-			BUILD_OS_REV 10
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.0.1_macosx
-			DEVROOT %SOLAR_ENV_ROOT%
-			DISABLE_DEPRECATION_WARNING TRUE
-			EXTRA_CDEFS -DBUILD_OS_APPLEOSX -DBUILD_OS_MAJOR=10 -DBUILD_OS_MINOR=4 -DBUILD_OS_REV=10
-			EXTRA_CFLAGS -isysroot %COMPATH%/MacOSX10.4u.sdk
-			EXTRA_LINKFLAGS -Wl,-syslibroot,%COMPATH%/MacOSX10.4u.sdk
-			GNUCOPY gnucp
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			LIBXML_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
-			LIBXML_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxml2 -lz -lpthread -liconv -lm
-			LIBXSLT_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
-			LIBXSLT_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxslt -lxml2 -lz -lpthread -liconv -lm
-			MACOSX_DEPLOYMENT_TARGET 10.4
-			OPENSSL_LIBS -lssl -lcrypto
-			PERL %SOLAR_ENV_ROOT%/bt_macosx_intel/%WORK_STAMP%/bin/perl
-			PKGFORMAT dmg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			SYSTEM_CURL YES
-			SYSTEM_LIBXML YES
-			SYSTEM_LIBXSLT YES
-			SYSTEM_OPENSSL YES
-			SYSTEM_PYTHON YES
-			SYSTEM_ZLIB YES
-			USE_SYSTEM_STL YES
-			BUILD_PIXMAN YES
-			WITH_MOZILLA YES
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C341
-			ENV_TOOLS %SOLARROOT%/et_macosx_intel/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE aqua
-			GVER VCL
-			INPATH unxmacxi%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK15PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
+        }
+        common1
+        {
+            BUILD_OS_APPLEOSX TRUE
+            BUILD_OS_MAJOR 10
+            BUILD_OS_MINOR 4
+            BUILD_OS_REV 10
+            COMPATH %SOLAR_ENV_ROOT%$/gcc_4.0.1_macosx
+            DEVROOT %SOLAR_ENV_ROOT%
+            DISABLE_DEPRECATION_WARNING TRUE
+            EXTRA_CDEFS -DBUILD_OS_APPLEOSX -DBUILD_OS_MAJOR=10 -DBUILD_OS_MINOR=4 -DBUILD_OS_REV=10
+            EXTRA_CFLAGS -isysroot %COMPATH%/MacOSX10.4u.sdk
+            EXTRA_LINKFLAGS -Wl,-syslibroot,%COMPATH%/MacOSX10.4u.sdk
+            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+            LIBXML_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
+            LIBXML_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxml2 -lz -lpthread -liconv -lm
+            LIBXSLT_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
+            LIBXSLT_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxslt -lxml2 -lz -lpthread -liconv -lm
+            MACOSX_DEPLOYMENT_TARGET 10.4
+            OPENSSL_LIBS -lssl -lcrypto
+            PERL %SOLAR_ENV_ROOT%/bt_macosx_intel/%WORK_STAMP%/bin/perl
+            PKGFORMAT dmg
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            SYSTEM_CURL YES
+            SYSTEM_LIBXML YES
+            SYSTEM_LIBXSLT YES
+            SYSTEM_OPENSSL YES
+            SYSTEM_PYTHON YES
+            SYSTEM_ZLIB YES
+            USE_SYSTEM_STL YES
+            BUILD_PIXMAN YES
+            WITH_MOZILLA YES
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU I
+            CPUNAME INTEL
+            CVER C341
+            ENV_TOOLS %SOLARROOT%/et_macosx_intel/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE aqua
+            GVER VCL
+            INPATH unxmacxi%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK15PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi
-			NO_BSYMBOLIC True
-			OS MACOSX
-			OUTPATH unxmacxi
-			PA_VER 18
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib
-			JDKLIBS -L%JDK15PATH%/jre/lib
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib
-			JDKLIBS -L%JDK15PATH%/jre/lib
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            NO_BSYMBOLIC True
+            OS MACOSX
+            OUTPATH unxmacxi
+            PA_VER 18
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /tmp
+            TMP /tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib
+            JDKLIBS -L%JDK15PATH%/jre/lib
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+            JDKLIB %JDK15PATH%/jre/lib
+            JDKLIBS -L%JDK15PATH%/jre/lib
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 IF X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 IF X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
+    reset
+    {
+        CLASSPATH
+        COPYALL
+    }
+    restore
+    {
+        INCLUDE
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        debug
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 unxsoli4
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
             FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
+            SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
-		}
-		common1
-		{
-			COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
-			DEVROOT %SOLAR_ENV_ROOT%
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl
-			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.intel
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.intel
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.intel
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
-			COM C52
-			COMEX 4
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C52
-			ENABLE_EVOAB2 TRUE
-			ENV_TOOLS %SOLARROOT%/et_solaris_intel/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxsoli4%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
+            GNUCOPY gnucp
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
+        }
+        common1
+        {
+            COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
+            DEVROOT %SOLAR_ENV_ROOT%
+            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+            PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl
+            PKGFORMAT pkg
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.intel
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.intel
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.intel
+            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
+            COM C52
+            COMEX 4
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU I
+            CPUNAME INTEL
+            CVER C52
+            ENABLE_EVOAB2 TRUE
+            ENV_TOOLS %SOLARROOT%/et_solaris_intel/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxsoli4%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			OS SOLARIS
-			OUTPATH unxsoli4
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /var/tmp
-			TMP /var/tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 if X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
-			JDKLIB %JDK14PATH%/jre/lib/i386:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/i386/native_threads:%JDK14PATH%/jre/plugin/i386:%JDK14PATH%/jre/lib/i386/motif21
-			JDKLIBS -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/i386/native_threads -L%JDK14PATH%/jre/plugin/i386 -L%JDK14PATH%/jre/lib/i386/motif21
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-			JDKLIB %JDK15PATH%/jre/lib/i386:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/i386/native_threads:%JDK15PATH%/jre/plugin/i386:%JDK15PATH%/jre/lib/i386/motif21
-			JDKLIBS -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/i386/native_threads -L%JDK15PATH%/jre/plugin/i386 -L%JDK15PATH%/jre/lib/i386/motif21
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
-			JDKLIB %OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/i386/native_threads:%OJDK16PATH%/jre/plugin/i386:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/i386/native_threads -L%OJDK16PATH%/jre/plugin/i386 -L%OJDK16PATH%/jre/lib/i386/xawt
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            OS SOLARIS
+            OUTPATH unxsoli4
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /var/tmp
+            TMP /var/tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 if X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
+            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
+            JDKLIB %JDK14PATH%/jre/lib/i386:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/i386/native_threads:%JDK14PATH%/jre/plugin/i386:%JDK14PATH%/jre/lib/i386/motif21
+            JDKLIBS -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/i386/native_threads -L%JDK14PATH%/jre/plugin/i386 -L%JDK14PATH%/jre/lib/i386/motif21
+            JDKPATH %JDK14PATH%/bin
+            JDK_VERSION 142
+            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
+            JDKLIB %JDK15PATH%/jre/lib/i386:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/i386/native_threads:%JDK15PATH%/jre/plugin/i386:%JDK15PATH%/jre/lib/i386/motif21
+            JDKLIBS -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/i386/native_threads -L%JDK15PATH%/jre/plugin/i386 -L%JDK15PATH%/jre/lib/i386/motif21
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        ojdk16
+        {
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
+            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
+            JDKLIB %OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/i386/native_threads:%OJDK16PATH%/jre/plugin/i386:%OJDK16PATH%/jre/lib/i386/xawt
+            JDKLIBS -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/i386/native_threads -L%OJDK16PATH%/jre/plugin/i386 -L%OJDK16PATH%/jre/lib/i386/xawt
+            JDKPATH %OJDK16PATH%/bin
+            JDK_VERSION 160
+            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+        }
+        ojdk16path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
+    reset
+    {
+        CLASSPATH
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 unxsols4
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
             FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
+            SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
-		}
-		common1
-		{
-			COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
-			DEVROOT %SOLAR_ENV_ROOT%
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
-			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.sparc
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.sparc
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.sparc
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
-			COM C52
-			COMEX 4
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU S
-			CPUNAME SPARC
-			CVER C52
-			ENABLE_EVOAB2 TRUE
-			ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxsols4%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
+            GNUCOPY gnucp
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+        }
+        common1
+        {
+            COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
+            DEVROOT %SOLAR_ENV_ROOT%
+            LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+            PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
+            PKGFORMAT pkg
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.sparc
+            SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.sparc
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.sparc
+            SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
+            COM C52
+            COMEX 4
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU S
+            CPUNAME SPARC
+            CVER C52
+            ENABLE_EVOAB2 TRUE
+            ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxsols4%PROEXT%
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4
-			LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			OS SOLARIS
-			OUTPATH unxsols4
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsols4%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxsols4%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /var/tmp
-			TMP /var/tmp
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 if X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
-			JDKLIB %JDK14PATH%/jre/lib/sparc:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/sparc/native_threads:%JDK14PATH%/jre/plugin/sparc:%JDK14PATH%/jre/lib/sparc/motif21
-			JDKLIBS -L%JDK14PATH%/jre/lib/sparc -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/sparc/native_threads -L%JDK14PATH%/jre/plugin/sparc -L%JDK14PATH%/jre/lib/sparc/motif21
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-			JDKLIB %JDK15PATH%/jre/lib/sparc:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparc/native_threads:%JDK15PATH%/jre/plugin/sparc:%JDK15PATH%/jre/lib/sparc/motif21
-			JDKLIBS -L%JDK15PATH%/jre/lib/sparc -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparc/native_threads -L%JDK15PATH%/jre/plugin/sparc -L%JDK15PATH%/jre/lib/sparc/motif21
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
-			JDKLIB %OJDK16PATH%/jre/lib/sparc:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/sparc/native_threads:%OJDK16PATH%/jre/plugin/sparc:%OJDK16PATH%/jre/lib/sparc/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib/sparc -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/sparc/native_threads -L%OJDK16PATH%/jre/plugin/sparc -L%OJDK16PATH%/jre/lib/sparc/xawt
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LM_LICENSE_FILE
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+            LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            OS SOLARIS
+            OUTPATH unxsols4
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxsols4%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxsols4%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /var/tmp
+            TMP /var/tmp
+        }
+        common:3 IF %UPDATER% == YES
+        {
+            TEMP /tmp
+            TMP /tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 if X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
+            JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
+            JDKLIB %JDK14PATH%/jre/lib/sparc:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/sparc/native_threads:%JDK14PATH%/jre/plugin/sparc:%JDK14PATH%/jre/lib/sparc/motif21
+            JDKLIBS -L%JDK14PATH%/jre/lib/sparc -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/sparc/native_threads -L%JDK14PATH%/jre/plugin/sparc -L%JDK14PATH%/jre/lib/sparc/motif21
+            JDKPATH %JDK14PATH%/bin
+            JDK_VERSION 142
+            XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
+            JDKLIB %JDK15PATH%/jre/lib/sparc:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparc/native_threads:%JDK15PATH%/jre/plugin/sparc:%JDK15PATH%/jre/lib/sparc/motif21
+            JDKLIBS -L%JDK15PATH%/jre/lib/sparc -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparc/native_threads -L%JDK15PATH%/jre/plugin/sparc -L%JDK15PATH%/jre/lib/sparc/motif21
+            JDKPATH %JDK15PATH%/bin
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        ojdk16
+        {
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
+            JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
+            JDKLIB %OJDK16PATH%/jre/lib/sparc:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/sparc/native_threads:%OJDK16PATH%/jre/plugin/sparc:%OJDK16PATH%/jre/lib/sparc/xawt
+            JDKLIBS -L%OJDK16PATH%/jre/lib/sparc -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/sparc/native_threads -L%OJDK16PATH%/jre/plugin/sparc -L%OJDK16PATH%/jre/lib/sparc/xawt
+            JDKPATH %OJDK16PATH%/bin
+            JDK_VERSION 160
+            XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+        }
+        ojdk16path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LM_LICENSE_FILE
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
+    reset
+    {
+        CLASSPATH
+    }
+    script
+    {
+        csh 
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 unxsolu4
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-			FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
-			LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
-			LIBXML_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxml2 -lpthread -lz -lm -lsocket -lnsl
-			LIBXSLT_CFLAGS -I%SYSBASE%/usr/include/libxml2
-			LIBXSLT_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxslt -lxml2 -lpthread -lz -lm -lsocket -lnsl
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			SYSTEM_FREETYPE YES
-			SYSTEM_LIBXML YES
-			SYSTEM_LIBXSLT YES
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOLARROOT%/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COPYALL FALSE
+            DEVROOT %SOL_TMP%$/r
+            PCLEAN_PATH %SOL_TMP%$/r/etools
+            PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+            *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%/bin/deliver.pl
+            *mkout %PERL% %SOLARENV%/bin/mkout.pl
+            *r: cd %SOLARROOT%
+            *s: cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+            DMAKEROOT %SOLARENV%/inc/startup
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
+            FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
+            LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
+            LIBXML_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxml2 -lpthread -lz -lm -lsocket -lnsl
+            LIBXSLT_CFLAGS -I%SYSBASE%/usr/include/libxml2
+            LIBXSLT_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxslt -lxml2 -lpthread -lz -lm -lsocket -lnsl
+            MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+            PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+            SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
+            SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+            SOLAR_JAVA TRUE
+            SYSTEM_FREETYPE YES
+            SYSTEM_LIBXML YES
+            SYSTEM_LIBXSLT YES
+            ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
             ENABLE_GCONF TRUE
 #           ENABLE_GNOMEVFS TRUE
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
-		}
-		common1
-		{
-			COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
-			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
-			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_15.sparc
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			USE_SYSTEM_STL YES
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
-			COM C52
-			COMEX 4
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU U
-			CPUNAME SPARC
-			CVER C52
-			ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxsolu4%PROEXT%
-			JDK15PATH %SOLAR_JDK15PATH%
-			OS SOLARIS
-			OUTPATH unxsolu4
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /var/tmp
-			TMP /var/tmp
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 if X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-			JDKLIB %JDK15PATH%/jre/lib/sparcv9:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparcv9/native_threads:%JDK15PATH%/jre/lib/sparcv9/server:%JDK15PATH%/jre/plugin/sparcv9:%JDK15PATH%/jre/lib/sparcv9/motif21
-			JDKLIBS -L%JDK15PATH%/jre/lib/sparcv9 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparcv9/native_threads -L%JDK15PATH%/jre/lib/sparcv9/server -L%JDK15PATH%/jre/plugin/sparcv9 -L%JDK15PATH%/jre/lib/sparcv9/motif21
-			JDKPATH %JDK15PATH%/bin/sparcv9
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LM_LICENSE_FILE
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
-	reset
-	{
-		CLASSPATH
-	}
-	script
-	{
-		csh
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT /so/env
+            SOLAR_SOURCE_ROOT %DRIVE_O%
+            SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+        }
+        common1
+        {
+            COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
+            DEVROOT %SOLAR_ENV_ROOT%
+            PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
+            PKGFORMAT pkg
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+            SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_15.sparc
+            SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            USE_SYSTEM_STL YES
+        }
+        common2
+        {
+            BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
+            COM C52
+            COMEX 4
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            CPU U
+            CPUNAME SPARC
+            CVER C52
+            ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
+            GUI UNX
+            GUIBASE unx
+            GVER VCL
+            INPATH unxsolu4%PROEXT%
+            JDK15PATH %SOLAR_JDK15PATH%
+            OS SOLARIS
+            OUTPATH unxsolu4
+            SOLAR_STLLIBPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/lib%UPDMINOREXT%
+            SOLAR_STLPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SYSBASE %SOLAR_SYSBASE_ROOT%
+            TEMP /var/tmp
+            TMP /var/tmp
+        }
+        common:3 IF %UPDATER% == YES
+        {
+            TEMP /tmp
+            TMP /tmp
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+        }
+        envroot:0 if X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk15
+        {
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
+            JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
+            JDKLIB %JDK15PATH%/jre/lib/sparcv9:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparcv9/native_threads:%JDK15PATH%/jre/lib/sparcv9/server:%JDK15PATH%/jre/plugin/sparcv9:%JDK15PATH%/jre/lib/sparcv9/motif21
+            JDKLIBS -L%JDK15PATH%/jre/lib/sparcv9 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparcv9/native_threads -L%JDK15PATH%/jre/lib/sparcv9/server -L%JDK15PATH%/jre/plugin/sparcv9 -L%JDK15PATH%/jre/lib/sparcv9/motif21
+            JDKPATH %JDK15PATH%/bin/sparcv9
+            JDK_VERSION 150
+            XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        pro
+        {
+            PROSWITCH -DPRODUCT
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+        sysbaseroot
+        {
+            SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+        }
+    }
+    extern
+    {
+        DIST_ROOT
+        ENV_ROOT
+        HOME
+        JDK_PATH
+        LM_LICENSE_FILE
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+        SYSBASE_ROOT
+        USER
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
+    reset
+    {
+        CLASSPATH
+    }
+    script
+    {
+        csh
+        {
+            400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            600: umask 002
+            800: rehash
             820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
             820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		sourceroot
-		sysbaseroot
-	}
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881: echo $SO_GEN_ERROR2
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        sourceroot
+        sysbaseroot
+    }
 }
 wntgcci1
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COMPATH %SOL_TMP%$/r$/MinGW
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COMPATH %SOL_TMP%$/r$/MinGW
-			COPYALL FALSE
-			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*dmake *dmake %PROFULLSWITCH%
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ILIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%FSDK%$/lib$:%COMPATH%$/lib$:
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%PSDK%$/lib$/x86$:%FSDK%$/lib$:%COMPATH%$/lib$:%SOLAR_STLLIBPATH%
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			PATH %PATH%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/bin$:%FSDK%$/bin
-			PSDKINC -I%PSDK%$/include
-			SOLAREXTRAINC -I%COMPATH%$/lib$/gcc-lib$/mingw32$/3.2$/include -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/MinGW
-			#			FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
-			DEVROOT %SOLAR_ENV_ROOT%
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
-			PKGFORMAT some_dummy
-			PSDK %SOLAR_ENV_ROOT%$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc7net$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COMPATH %SOL_TMP%$/r$/MinGW
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOLARROOT%$/etw
+            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+            PSDK %SOL_TMP%$/r$/MinGW$/w32api
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COMPATH %SOL_TMP%$/r$/MinGW
+            COPYALL FALSE
+            FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOL_TMP%$/r$/etw
+            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+            PSDK %SOL_TMP%$/r$/MinGW$/w32api
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+            *dmake *dmake %PROFULLSWITCH%
+            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+            *o cd %SOLARENV%$/..
+            *r cd %SOLARROOT%
+            *s cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+            BIG_SVX
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+            DMAKEROOT %SOLARENV%$/inc$/startup
+            ILIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%FSDK%$/lib$:%COMPATH%$/lib$:
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            LIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%PSDK%$/lib$/x86$:%FSDK%$/lib$:%COMPATH%$/lib$:%SOLAR_STLLIBPATH%
+            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+            PATH %PATH%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/bin$:%FSDK%$/bin
+            PSDKINC -I%PSDK%$/include
+            SOLAREXTRAINC -I%COMPATH%$/lib$/gcc-lib$/mingw32$/3.2$/include -I%DSDK%$/include
+            SOLAR_JAVA TRUE
+            XCLASSPATH .
+            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+        }
+        common0
+        {
+            SOLAR_ENV_ROOT r:
+            SOLAR_SOURCE_ROOT o:
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/MinGW
+            #           FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
+            DEVROOT %SOLAR_ENV_ROOT%
+            NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+            PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
+            PKGFORMAT some_dummy
+            PSDK %SOLAR_ENV_ROOT%$/MinGW$/w32api
+            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc7net$/Common7$/ide
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntgcci1
-			CPU I
-			CPUNAME INTEL
-			CVER M1300
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntgcci1%PROEXT%
-			OS WNT
-			OUTPATH wntgcci1
-			SET_EXEPTIONS TRUE
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_STLPATH %SOLARVERSION%$/wntgcci1%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-			use_shl_versions TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB -L%JDK14PATH%$/lib
-			JDKLIBS -L%JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB -L%JDK15PATH%$/lib
-			JDKLIBS -L%JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		psdk
-		{
-			PSDK %STAR_PSDK%
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
-	reset
-	{
-		COPYALL
-		NSIS_PATH
-		SOLAR_ENV_ROOT
-		WST
-	}
-	script
-	{
-		csh
-		{
-			150: setenv MYENV_PATH $PATH
-			160: setenv PATH $SSX_PATH
-			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			260: setenv PATH $MYENV_PATH
-			270: unsetenv MYENV_PATH
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			150: export MYENV_PATH=$PATH
-			160: export PATH=$SSX_PATH
-			260: export PATH=$MYENV_PATH
-			270: unset MYENV_PATH
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			881: echo $SO_GEN_ERROR
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		psdk STAR_PSDK
-		sourceroot
-	}
+            CALL_CDECL TRUE
+            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            COM GCC
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            COMP_ENV wntgcci1
+            CPU I
+            CPUNAME INTEL
+            CVER M1300
+            DYNAMIC_CRT TRUE
+            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+            GUI WNT
+            GUIBASE WIN
+            GVER NT351
+            INPATH wntgcci1%PROEXT%
+            OS WNT
+            OUTPATH wntgcci1
+            SET_EXEPTIONS TRUE
+            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+            SOLAR_STLPATH %SOLARVERSION%$/wntgcci1%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SORT sort -T %TMP%
+            use_shl_versions TRUE
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            HOMEDRIVE %DEVROOT%
+            HOMEPATH $/jdk141
+            JAVAHOME %JDK14PATH%
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
+            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+            JDKLIB -L%JDK14PATH%$/lib
+            JDKLIBS -L%JDK14PATH%$/lib
+            JDKPATH %JDK14PATH%$/bin
+            JDK_VERSION 142
+            JREPATH %JDK14PATH%$/jre$/bin$/client
+            XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            HOMEDRIVE %DEVROOT%
+            HOMEPATH $/jdk151
+            JAVAHOME %JDK15PATH%
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
+            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+            JDKLIB -L%JDK15PATH%$/lib
+            JDKLIBS -L%JDK15PATH%$/lib
+            JDKPATH %JDK15PATH%$/bin
+            JDK_VERSION 150
+            JREPATH %JDK15PATH%$/jre$/bin$/client
+            XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        psdk
+        {
+            PSDK %STAR_PSDK%
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+    }
+    extern
+    {
+        COMSPEC
+        DIST_ROOT
+        ENV_ROOT
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+    reset
+    {
+        COPYALL
+        NSIS_PATH
+        SOLAR_ENV_ROOT
+        WST
+    }
+    script
+    {
+        csh
+        {
+            150: setenv MYENV_PATH $PATH
+            160: setenv PATH $SSX_PATH
+            200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            260: setenv PATH $MYENV_PATH
+            270: unsetenv MYENV_PATH
+            850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+            851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+            900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+            901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+        }
+        sh
+        {
+            150: export MYENV_PATH=$PATH
+            160: export PATH=$SSX_PATH
+            260: export PATH=$MYENV_PATH
+            270: unset MYENV_PATH
+            400: if [ $COPYALL ]; then
+            410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851: export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861: export SO_GEN_ERROR
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            871: echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            881: echo $SO_GEN_ERROR
+            882: fi
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        psdk STAR_PSDK
+        sourceroot
+    }
 }
 wntmsci11
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COMPATH %SOL_TMP%$/r$/msvc8p
-			COMPROOT %SOL_TMP%$/r$/msvc8p
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
-			FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COMPATH %SOL_TMP%$/r$/msvc8p
-			COMPROOT %SOL_TMP%$/r$/msvc8p
-			COPYALL FALSE
-			DSDK %COMPATH%$/DirectXSDK
-			FSDK %COMPATH%$/Sdk$/v2.0
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %COMPATH%$/PlatformSDK
-			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*mwscommit %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
-			*o cdd %SOLARENV%$/..
-			*r cdd %SOLARROOT%
-			*s cdd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ILIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86$:%SOLAR_STLLIBPATH%
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
-			PATH %PATH%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/vc$/bin$:%PSDK%$/bin$:%FSDK%$/bin$:%DSDK%$/bin$/Utilities$/bin$/x86$:%PACKMS%
-			PROF_EDITION TRUE
-			PSDKINC -I%PSDK%$/vc$/include -I%PSDK%$/include -I%COMPATH%$/PlatformSDK_VC8$/include
-			SOLAREXTRAINC -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-			VISTA_MANIFEST TRUE
-			WINDOWS_VISTA_PSDK TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-		}
-		common0
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/msvc8p
-			COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
-			DEVROOT %SOLAR_ENV_ROOT%
-			DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK
-			FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0
-			PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT %SOURCE_ROOT_TMP%
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            COMPATH %SOL_TMP%$/r$/msvc8p
+            COMPROOT %SOL_TMP%$/r$/msvc8p
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
+            FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
+            PCLEAN_PATH %SOLARROOT%$/etw
+            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+            PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        cax
+        {
+            COMPATH %SOL_TMP%$/r$/msvc8p
+            COMPROOT %SOL_TMP%$/r$/msvc8p
+            COPYALL FALSE
+            DSDK %COMPATH%$/DirectXSDK
+            FSDK %COMPATH%$/Sdk$/v2.0
+            PCLEAN_PATH %SOL_TMP%$/r$/etw
+            PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+            PSDK %COMPATH%$/PlatformSDK
+            SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+        }
+        common
+        {
+            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+            *mwscommit %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
+            *o cdd %SOLARENV%$/..
+            *r cdd %SOLARROOT%
+            *s cdd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+            BIG_SVX
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+            DMAKEROOT %SOLARENV%$/inc$/startup
+            ILIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            LIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86$:%SOLAR_STLLIBPATH%
+            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+            MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
+            PATH %PATH%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/vc$/bin$:%PSDK%$/bin$:%FSDK%$/bin$:%DSDK%$/bin$/Utilities$/bin$/x86$:%PACKMS%
+            PROF_EDITION TRUE
+            PSDKINC -I%PSDK%$/vc$/include -I%PSDK%$/include -I%COMPATH%$/PlatformSDK_VC8$/include
+            SOLAREXTRAINC -I%DSDK%$/include
+            SOLAR_JAVA TRUE
+            TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+            VISTA_MANIFEST TRUE
+            WINDOWS_VISTA_PSDK TRUE
+            XCLASSPATH .
+            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+        }
+        common0
+        {
+            BS_ROOT n:
+            SOLAR_ENV_ROOT r:
+            SOLAR_SOURCE_ROOT o:
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/msvc8p
+            COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
+            DEVROOT %SOLAR_ENV_ROOT%
+            DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK
+            FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0
+            PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
             PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
+            PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
+            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			COM MSC
-			COMEX 11
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci11
-			CPU I
-			CPUNAME INTEL
-			CVER M1400
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntmsci11%PROEXT%
-			OS WNT
-			OUTPATH wntmsci11
-			PACKMS %SO_PACK%$/wntmsci11$/MS
-			SET_EXEPTIONS TRUE
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci11%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-			use_shl_versions TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB %JDK14PATH%$/lib
-			JDKLIBS %JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB %JDK15PATH%$/lib
-			JDKLIBS %JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		psdk
-		{
-			PSDK %STAR_PSDK%
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
-	reset
-	{
-		COPYALL
-		SOLAR_ENV_ROOT
-		WST
-	}
-	script
-	{
-		post
-		{
-			150: set MYENV_PATH=%PATH
-			160: set PATH=%SSX_PATH
-			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			260: set PATH=%MYENV_PATH
-			270: unset MYENV_PATH
-			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
-			401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		psdk STAR_PSDK
-		sourceroot
-	}
+            CALL_CDECL TRUE
+            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+            COM MSC
+            COMEX 11
+            COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            COMP_ENV wntmsci11
+            CPU I
+            CPUNAME INTEL
+            CVER M1400
+            DYNAMIC_CRT TRUE
+            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+            GUI WNT
+            GUIBASE WIN
+            GVER NT351
+            INPATH wntmsci11%PROEXT%
+            OS WNT
+            OUTPATH wntmsci11
+            PACKMS %SO_PACK%$/wntmsci11$/MS
+            SET_EXEPTIONS TRUE
+            SHIPDRIVE %BS_ROOT%$/ship$/install
+            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+            SOLAR_STLPATH %SOLARVERSION%$/wntmsci11%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SORT sort -T %TMP%
+            use_shl_versions TRUE
+        }
+        compath
+        {
+            COMPATH %STAR_COMPATH%
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+            SOLARVER %DIST_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT %ENV_ROOT%
+        }
+        jdk14
+        {
+            HOMEDRIVE %DEVROOT%
+            HOMEPATH $/jdk141
+            JAVAHOME %JDK14PATH%
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
+            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+            JDKLIB %JDK14PATH%$/lib
+            JDKLIBS %JDK14PATH%$/lib
+            JDKPATH %JDK14PATH%$/bin
+            JDK_VERSION 142
+            JREPATH %JDK14PATH%$/jre$/bin$/client
+            XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH %JDK_PATH%
+        }
+        jdk15
+        {
+            HOMEDRIVE %DEVROOT%
+            HOMEPATH $/jdk151
+            JAVAHOME %JDK15PATH%
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
+            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+            JDKLIB %JDK15PATH%$/lib
+            JDKLIBS %JDK15PATH%$/lib
+            JDKPATH %JDK15PATH%$/bin
+            JDK_VERSION 150
+            JREPATH %JDK15PATH%$/jre$/bin$/client
+            XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH %JDK_PATH%
+        }
+        psdk
+        {
+            PSDK %STAR_PSDK%
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+            SOURCE_ROOT_USED TRUE
+        }
+    }
+    extern
+    {
+        COMSPEC
+        DIST_ROOT
+        ENV_ROOT
+        JDK_PATH
+        LOCALINI
+        SOL_TMP
+        SOURCE_ROOT
+    }
+    order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+    reset
+    {
+        COPYALL
+        SOLAR_ENV_ROOT
+        WST
+    }
+    script
+    {
+        post
+        {
+            150: set MYENV_PATH=%PATH
+            160: set PATH=%SSX_PATH
+            200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            260: set PATH=%MYENV_PATH
+            270: unset MYENV_PATH
+            400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
+            401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
+        }
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        pro
+        psdk STAR_PSDK
+        sourceroot
+    }
 }
 wntmsci12
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+            SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+            COMPATH %SOL_TMP%$/r$/msvc9p
+            COMPROOT %SOL_TMP%$/r$/msvc9p
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
+            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
+            FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
+            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOLARROOT%$/etw
+            PERL %SOL_TMP%$/r$/%PERLDIR%
+            PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
-		}
-		cax
-		{
-			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL FALSE
-			DSDK %COMPATH%$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-			FSDK %COMPATH%$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ENABLE_PCH TRUE
-			ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
-			LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
-			LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
-			PROF_EDITION TRUE
-			PSDKINC -I%PSDK%$/include
-			SOLAREXTRAINC -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-			USE_DIRECTX5 TRUE
-			WINDOWS_VISTA_PSDK TRUE
-			SYSBASE TRUE
+        }
+        cax
+        {
+            BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
+            COMPATH %SOL_TMP%$/r$/msvc9p
+            COMPROOT %SOL_TMP%$/r$/msvc9p
+            COPYALL FALSE
+            DSDK %COMPATH%$/DirectXSDK
+            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
+            FSDK %COMPATH%$/Sdk$/v3.5
+            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOL_TMP%$/r$/etw
+            PERL %SOL_TMP%$/r$/%PERLDIR%
+            PSDK %COMPATH%$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+        }
+        common
+        {
+            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+            *mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+            *o cd %SOLARENV%$/..
+            *r cd %SOLARROOT%
+            *s cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+            *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
+            BIG_SVX
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+            CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
+            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+            DMAKEROOT %SOLARENV%$/inc$/startup
+            ENABLE_PCH TRUE
+            ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
+            LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
+            LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
+            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+            MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+            PROF_EDITION TRUE
+            PSDKINC -I%PSDK%$/include
+            SOLAREXTRAINC -I%DSDK%$/include
+            SOLAR_JAVA TRUE
+            TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+            USE_DIRECTX5 TRUE
+            WINDOWS_VISTA_PSDK TRUE
+            SYSBASE TRUE
             WITH_VC_REDIST TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BUILD_X64 TRUE
-			CHECK_LUCENCE_INDEXER_OUTPUT TRUE
-		}
-		common0
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-			BTOOLDIR %WORK_STAMP%$/cygtools
-			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
-		}
-		common02
-		{
-			PERL perl
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
-			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
-			DEVROOT %SOLAR_ENV_ROOT%
-			DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
-			FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+            XCLASSPATH .
+            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+            BUILD_X64 TRUE
+            CHECK_LUCENCE_INDEXER_OUTPUT TRUE
+            GNUCOPY cp
+        }
+        common0
+        {
+            BS_ROOT n:
+            SOLAR_ENV_ROOT r:
+            SOLAR_SOURCE_ROOT o:
+            BTOOLDIR %WORK_STAMP%$/cygtools
+            PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
+        }
+        common02
+        {
+            PERL perl
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/msvc9p
+            COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
+            DEVROOT %SOLAR_ENV_ROOT%
+            DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
+            FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
+            F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+            PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
             PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-#			TEMP $dp(%TEMP%)
-#			TMP $dp(%TMP%)
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
+            PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+#           TEMP $dp(%TEMP%)
+#           TMP $dp(%TMP%)
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
-			COM MSC
-			COMEX 12
-			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci12
-			CPU I
-			CPUNAME INTEL
-			CVER M1500
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntmsci12%PROEXT%
+            CALL_CDECL TRUE
+            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
+            COM MSC
+            COMEX 12
+            COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            COMP_ENV wntmsci12
+            CPU I
+            CPUNAME INTEL
+            CVER M1500
+            DYNAMIC_CRT TRUE
+            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+            GUI WNT
+            GUIBASE WIN
+            GVER NT351
+            INPATH wntmsci12%PROEXT%
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12
-			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
-			OS WNT
-			OUTPATH wntmsci12
-			PACKMS %SO_PACK%$/wntmsci12$/MS
-			SET_EXEPTIONS TRUE
-			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
-			use_shl_versions TRUE
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-		}
-		compath
-		{
-			COMPATH $dp(%STAR_COMPATH%)
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
-		}
-		jdk14
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB %JDK14PATH%$/lib
-			JDKLIBS %JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH $dp(%JDK_PATH%)
-		}
-		jdk15
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB %JDK15PATH%$/lib
-			JDKLIBS %JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH $dp(%JDK_PATH%)
-		}
-		ojdk16
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/openjdk-6-b08-windows-i586
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
-			JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
-			JDKLIB %OJDK16PATH%$/lib
-			JDKLIBS %OJDK16PATH%$/lib
-			JDKPATH %OJDK16PATH%$/bin
-			JDK_VERSION 160
-			JREPATH %OJDK16PATH%$/jre$/bin$/client
-			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
-		}
-		pro
-		{
-			RES_ENUS TRUE
-		}
-		psdk
-		{
-			PSDK $dp(%STAR_PSDK%)
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
-			SOURCE_ROOT_USED TRUE
-		}
-		tmp
-		{
-			SOL_TMP $dp(%SOL_TMP_DIR%)
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		OSTYPE
-		$dp(SOL_TMP)
-		$dp(SOURCE_ROOT)
-		$dp(TMP)
-		$dp(TEMP)
-	}
-	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
-	reset
-	{
-		COPYALL
-		CXX_X64_BINARY
-		DB2IMP
-		GCRINC
-		GCRLIB
-		GCRPATH
-		LIBMGR_X64_BINARY
-		LINK_X64_BINARY
-		NSIS_PATH
-		OLD_CHAOS
-		PERLDIR
-		SOLAR_ENV_ROOT
-		TFDEF
-		TFDIR
-		WST
-	}
-	script
-	{
+            MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
+            OS WNT
+            OUTPATH wntmsci12
+            PACKMS %SO_PACK%$/wntmsci12$/MS
+            SET_EXEPTIONS TRUE
+            SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
+            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+            SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
+            SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SORT sort -T %TMP%
+#           TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
+            use_shl_versions TRUE
+        }
+        common:3 IF %UPDATER% == YES
+        {
+            SHIPDRIVE %BS_ROOT%$/ship$/install
+        }
+        compath
+        {
+            COMPATH $dp(%STAR_COMPATH%)
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+            SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
+            SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
+        }
+        jdk14
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/jdk141
+            JAVAHOME %JDK14PATH%
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
+            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+            JDKLIB %JDK14PATH%$/lib
+            JDKLIBS %JDK14PATH%$/lib
+            JDKPATH %JDK14PATH%$/bin
+            JDK_VERSION 142
+            JREPATH %JDK14PATH%$/jre$/bin$/client
+            XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH $dp(%JDK_PATH%)
+        }
+        jdk15
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/jdk151
+            JAVAHOME %JDK15PATH%
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
+            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+            JDKLIB %JDK15PATH%$/lib
+            JDKLIBS %JDK15PATH%$/lib
+            JDKPATH %JDK15PATH%$/bin
+            JDK_VERSION 150
+            JREPATH %JDK15PATH%$/jre$/bin$/client
+            XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH $dp(%JDK_PATH%)
+        }
+        ojdk16
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/openjdk-6-b08-windows-i586
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
+            JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
+            JDKLIB %OJDK16PATH%$/lib
+            JDKLIBS %OJDK16PATH%$/lib
+            JDKPATH %OJDK16PATH%$/bin
+            JDK_VERSION 160
+            JREPATH %OJDK16PATH%$/jre$/bin$/client
+            XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
+        }
+        ojdk16path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH $dp(%JDK_PATH%)
+        }
+        pro
+        {
+            RES_ENUS TRUE
+        }
+        psdk
+        {
+            PSDK $dp(%STAR_PSDK%)
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
+            SOURCE_ROOT_USED TRUE
+        }
+        tmp
+        {
+            SOL_TMP $dp(%SOL_TMP_DIR%)
+        }
+    }
+    extern
+    {
+        COMSPEC
+        DIST_ROOT
+        ENV_ROOT
+        JDK_PATH
+        LOCALINI
+        OSTYPE
+        $dp(SOL_TMP)
+        $dp(SOURCE_ROOT)
+        $dp(TMP)
+        $dp(TEMP)
+    }
+    order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+    reset
+    {
+        COPYALL
+        CXX_X64_BINARY
+        DB2IMP
+        GCRINC
+        GCRLIB
+        GCRPATH
+        LIBMGR_X64_BINARY
+        LINK_X64_BINARY
+        NSIS_PATH
+        OLD_CHAOS
+        PERLDIR
+        SOLAR_ENV_ROOT
+        TFDEF
+        TFDIR
+        WST
+    }
+    script
+    {
          sh
             {
             400: if [ $COPYALL ]; then
@@ -2971,326 +2978,327 @@ wntmsci12
             881:       echo $SO_GEN_ERROR2
             882: fi
         }
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		psdk STAR_PSDK
-		sourceroot
-		tmp SOL_TMP_DIR
-	}
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        psdk STAR_PSDK
+        sourceroot
+        tmp SOL_TMP_DIR
+    }
 }
 wntmsci13
 {
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+    environment
+    {
+        bs_sourceroot
+        {
+            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+            SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+            SOURCE_ROOT_USED TRUE
+        }
+        cap
+        {
+            BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
+            COMPATH %SOL_TMP%$/r$/msvc9p
+            COMPROOT %SOL_TMP%$/r$/msvc9p
+            COPYALL TRUE
+            COPY_PACKED TRUE
+            DEVROOT %SOL_TMP%$/r
+            DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
+            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
+            FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
+            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOLARROOT%$/etw
+            PERL %SOL_TMP%$/r$/%PERLDIR%
+            PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
-		}
-		cax
-		{
-			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL FALSE
-			DSDK %COMPATH%$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
-			FSDK %COMPATH%$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ENABLE_PCH TRUE
-			ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
-			LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
-			LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
-			PROF_EDITION TRUE
-			PSDKINC -I%PSDK%$/include
-			SOLAREXTRAINC -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-			USE_DIRECTX5 TRUE
-			WINDOWS_VISTA_PSDK TRUE
-			SYSBASE TRUE
+        }
+        cax
+        {
+            BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
+            COMPATH %SOL_TMP%$/r$/msvc9p
+            COMPROOT %SOL_TMP%$/r$/msvc9p
+            COPYALL FALSE
+            DSDK %COMPATH%$/DirectXSDK
+            ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
+            FSDK %COMPATH%$/Sdk$/v3.5
+            F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+            PCLEAN_PATH %SOL_TMP%$/r$/etw
+            PERL %SOL_TMP%$/r$/%PERLDIR%
+            PSDK %COMPATH%$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
+            SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOL_TMP%$/r
+            SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+            SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#           TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+        }
+        common
+        {
+            *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+            *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+            *copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+            *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+            *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+            *mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+            *o cd %SOLARENV%$/..
+            *r cd %SOLARROOT%
+            *s cd %SOLARVERSION%
+            *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+            *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
+            BIG_SVX
+            COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+            CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
+            DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+            DMAKEROOT %SOLARENV%$/inc$/startup
+            ENABLE_PCH TRUE
+            ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
+            JDK13PATH %SOLAR_JDK13PATH%
+            JDK14PATH %SOLAR_JDK14PATH%
+            JDK15PATH %SOLAR_JDK15PATH%
+            LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
+            LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
+            LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
+            MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+            MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+            OJDK16PATH %SOLAR_OJDK16PATH%
+            PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+            PROF_EDITION TRUE
+            PSDKINC -I%PSDK%$/include
+            SOLAREXTRAINC -I%DSDK%$/include
+            SOLAR_JAVA TRUE
+            TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+            USE_DIRECTX5 TRUE
+            WINDOWS_VISTA_PSDK TRUE
+            SYSBASE TRUE
             WITH_VC_REDIST TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BUILD_X64 TRUE
-		}
-		common0
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-			BTOOLDIR %WORK_STAMP%$/cygtools
-			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
-		}
-		common02
-		{
-			PERL perl
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
-			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
-			DEVROOT %SOLAR_ENV_ROOT%
-			DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
-			FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+            XCLASSPATH .
+            ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+            BUILD_X64 TRUE
+            GNUCOPY cp
+        }
+        common0
+        {
+            BS_ROOT n:
+            SOLAR_ENV_ROOT r:
+            SOLAR_SOURCE_ROOT o:
+            BTOOLDIR %WORK_STAMP%$/cygtools
+            PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
+        }
+        common02
+        {
+            PERL perl
+        }
+        common1
+        {
+            COMPATH %SOLAR_ENV_ROOT%$/msvc9p
+            COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
+            DEVROOT %SOLAR_ENV_ROOT%
+            DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
+            FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
+            F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
+            NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+            PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
             PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-#			TEMP $dp(%TEMP%)
-#			TMP $dp(%TMP%)
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
+            PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
+            SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
+            SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+            SOLARROOT %SOLAR_ENV_ROOT%
+            SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+            SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+            SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+#           TEMP $dp(%TEMP%)
+#           TMP $dp(%TMP%)
+        }
+        common2
+        {
+            ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
-			COM MSC
-			COMEX 12
-			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci13
-			CPU I
-			CPUNAME INTEL
-			CVER M1500
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntmsci13%PROEXT%
-			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
-			OS WNT
-			OUTPATH wntmsci13
-			PACKMS %SO_PACK%$/wntmsci13$/MS
-			SET_EXEPTIONS TRUE
-			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
-			use_shl_versions TRUE
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-		}
-		compath
-		{
-			COMPATH $dp(%STAR_COMPATH%)
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
-		}
-		jdk14
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB %JDK14PATH%$/lib
-			JDKLIBS %JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH $dp(%JDK_PATH%)
-		}
-		jdk15
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB %JDK15PATH%$/lib
-			JDKLIBS %JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH $dp(%JDK_PATH%)
-		}
-		ojdk16
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/openjdk-6-b08-windows-i586
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
-			JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
-			JDKLIB %OJDK16PATH%$/lib
-			JDKLIBS %OJDK16PATH%$/lib
-			JDKPATH %OJDK16PATH%$/bin
-			JDK_VERSION 160
-			JREPATH %OJDK16PATH%$/jre$/bin$/client
-			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
-		}
-		pro
-		{
-			RES_ENUS TRUE
-		}
-		psdk
-		{
-			PSDK $dp(%STAR_PSDK%)
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
-			SOURCE_ROOT_USED TRUE
-		}
-		tmp
-		{
-			SOL_TMP $dp(%SOL_TMP_DIR%)
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		OSTYPE
-		$dp(SOL_TMP)
-		$dp(SOURCE_ROOT)
-		$dp(TMP)
-		$dp(TEMP)
-	}
-	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
-	reset
-	{
-		COPYALL
-		CXX_X64_BINARY
-		DB2IMP
-		GCRINC
-		GCRLIB
-		GCRPATH
-		LIBMGR_X64_BINARY
-		LINK_X64_BINARY
-		NSIS_PATH
-		OLD_CHAOS
-		PERLDIR
-		SOLAR_ENV_ROOT
-		TFDEF
-		TFDIR
-		WST
-	}
-	script
-	{
+            CALL_CDECL TRUE
+            CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
+            COM MSC
+            COMEX 12
+            COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
+            COMMON_ENV_TOOLS %SOLARROOT%$/etools
+            COMP_ENV wntmsci13
+            CPU I
+            CPUNAME INTEL
+            CVER M1500
+            DYNAMIC_CRT TRUE
+            ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+            GUI WNT
+            GUIBASE WIN
+            GVER NT351
+            INPATH wntmsci13%PROEXT%
+            MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
+            OS WNT
+            OUTPATH wntmsci13
+            PACKMS %SO_PACK%$/wntmsci13$/MS
+            SET_EXEPTIONS TRUE
+            SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
+            SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+            SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+            SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+            SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
+            SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl
+            SORT sort -T %TMP%
+#           TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
+            use_shl_versions TRUE
+        }
+        common:3 IF %UPDATER% == YES
+        {
+            SHIPDRIVE %BS_ROOT%$/ship$/install
+        }
+        compath
+        {
+            COMPATH $dp(%STAR_COMPATH%)
+        }
+        distroot:0 if X%DIST_ROOT%X != XX
+        {
+            SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+            SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
+            SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+        }
+        envroot:0 IF X%ENV_ROOT%X != XX
+        {
+            SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
+        }
+        jdk14
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/jdk141
+            JAVAHOME %JDK14PATH%
+            JAVA_HOME %JDK14PATH%
+            JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
+            JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+            JDKLIB %JDK14PATH%$/lib
+            JDKLIBS %JDK14PATH%$/lib
+            JDKPATH %JDK14PATH%$/bin
+            JDK_VERSION 142
+            JREPATH %JDK14PATH%$/jre$/bin$/client
+            XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
+        }
+        jdk14path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK14PATH $dp(%JDK_PATH%)
+        }
+        jdk15
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/jdk151
+            JAVAHOME %JDK15PATH%
+            JAVA_HOME %JDK15PATH%
+            JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
+            JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+            JDKLIB %JDK15PATH%$/lib
+            JDKLIBS %JDK15PATH%$/lib
+            JDKPATH %JDK15PATH%$/bin
+            JDK_VERSION 150
+            JREPATH %JDK15PATH%$/jre$/bin$/client
+            XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
+        }
+        jdk15path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_JDK15PATH $dp(%JDK_PATH%)
+        }
+        ojdk16
+        {
+#           HOMEDRIVE %DEVROOT%
+#           HOMEPATH $/openjdk-6-b08-windows-i586
+            JAVA_HOME %OJDK16PATH%
+            JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
+            JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
+            JDKLIB %OJDK16PATH%$/lib
+            JDKLIBS %OJDK16PATH%$/lib
+            JDKPATH %OJDK16PATH%$/bin
+            JDK_VERSION 160
+            JREPATH %OJDK16PATH%$/jre$/bin$/client
+            XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
+        }
+        ojdk16path:0 if X%JDK_PATH%X != XX
+        {
+            SOLAR_OJDK16PATH $dp(%JDK_PATH%)
+        }
+        pro
+        {
+            RES_ENUS TRUE
+        }
+        psdk
+        {
+            PSDK $dp(%STAR_PSDK%)
+        }
+        sourceroot:0 if X%SOURCE_ROOT%X != XX
+        {
+            SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
+            SOURCE_ROOT_USED TRUE
+        }
+        tmp
+        {
+            SOL_TMP $dp(%SOL_TMP_DIR%)
+        }
+    }
+    extern
+    {
+        COMSPEC
+        DIST_ROOT
+        ENV_ROOT
+        JDK_PATH
+        LOCALINI
+        OSTYPE
+        $dp(SOL_TMP)
+        $dp(SOURCE_ROOT)
+        $dp(TMP)
+        $dp(TEMP)
+    }
+    order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+    reset
+    {
+        COPYALL
+        CXX_X64_BINARY
+        DB2IMP
+        GCRINC
+        GCRLIB
+        GCRPATH
+        LIBMGR_X64_BINARY
+        LINK_X64_BINARY
+        NSIS_PATH
+        OLD_CHAOS
+        PERLDIR
+        SOLAR_ENV_ROOT
+        TFDEF
+        TFDIR
+        WST
+    }
+    script
+    {
          sh
             {
             400: if [ $COPYALL ]; then
@@ -3312,27 +3320,27 @@ wntmsci13
             881:       echo $SO_GEN_ERROR2
             882: fi
         }
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		psdk STAR_PSDK
-		sourceroot
-		tmp SOL_TMP_DIR
-	}
+    }
+    switches
+    {
+        bs_sourceroot SOURCE_ROOT_TMP
+        bsclient
+        cap
+        cax
+        compath STAR_COMPATH
+        distroot
+        envroot
+        jdk14
+        jdk14path
+        jdk15
+        jdk15path
+        l10n L10N_framework
+        ojdk16
+        ojdk16path
+        pro
+        psdk STAR_PSDK
+        sourceroot
+        tmp SOL_TMP_DIR
+    }
 }
 
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index 77b2f592a..ac84aee99 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -21,6 +21,7 @@ common
         *dmake
         *copyprj
 		__mgrdir
+        gb_LOCALBUILDDIR
 		product
         rsc_once
         wrapper_override_cc_wrapper
diff --git a/solenv/doc/gbuild/doxygen.cfg b/solenv/doc/gbuild/doxygen.cfg
new file mode 100644
index 000000000..2345b58d5
--- /dev/null
+++ b/solenv/doc/gbuild/doxygen.cfg
@@ -0,0 +1,1510 @@
+# Doxyfile 1.5.8
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = gbuild
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ./output
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
+# Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses. 
+# With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
+# The format is ext=language, where ext is a file extension, and language is one of 
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
+# use: inc=Fortran f=C
+
+EXTENSION_MAPPING      = mk=IDL 
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk. 
+# When the cache is full, less often used symbols will be written to disk. 
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penality. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will rougly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES 
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page. 
+# This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
+# doxygen. The layout file controls the global structure of the generated output files 
+# in an output format independent way. The create the layout file that represents 
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+# of the layout file.
+
+LAYOUT_FILE            = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = solenv/gbuild
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          = *.mk
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output. 
+# If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis. 
+# Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match. 
+# The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code. 
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.openoffice.gbuild
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING     = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
+# are set, an additional index file will be generated that can be used as input for 
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+# HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = 
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
+# For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION           = 
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to FRAME, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list; 
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
+# disables this behavior completely. For backwards compatibility with previous 
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
+# respectively.
+
+GENERATE_TREEVIEW      = NONE
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader. 
+# This is useful 
+# if you want to understand what is going on. 
+# On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#  
+# TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#  
+# TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links. 
+# Note that each tag file must have a unique name 
+# (where the name does NOT include the path) 
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include 
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif 
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Options related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk
new file mode 100644
index 000000000..8d5034e88
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk
@@ -0,0 +1,90 @@
+#include <types.h>
+
+namespace gb
+{
+    class SrsTarget;
+    class ResTarget;
+    class AllLangResTarget;
+
+    class SrsPartTarget : public Target, public HasDependencies, public UsesRsc
+    {
+        private:
+            /// SrsPartTarget s do not need to be explicitly constructed.
+
+            /// They are a helper class for the SrsTarget class.
+            /// They are named after the path of their source file (without
+            /// file extension) from the root of their source repository.
+            SrsPartTarget(String name);
+            friend class SrsTarget;
+
+            /// Platformdependant command to generate the dependencies for the srs target.
+            static const Command command_dep(
+                String srsname,
+                Path sourcefile,
+                List<Path> include,
+                List<String> defs);
+    };
+
+    class SrsTarget : public Target, public HasDependencies, public IsCleanable
+    {
+        public:
+            /// Sets defines for srs processing.
+            /// \$\$(DEFS) contains the current flags and can be used, if
+            /// just a few need to be modified.
+            void set_defs(List<String> defs);
+            /// Sets the include paths for srs processing.
+            /// \$\$(INCLUDE) contains the current paths and can be used, if
+            /// just a few need to be modified.
+            void set_include(List<String> include);
+            /// Adds a SrsPartTarget to be processed.
+            void add_file(SrsPartTarget part);
+            /// Adds multiple SrsPartTarget s to be processed.
+            void add_files(List<SrsPartTarget> parts);
+        private:
+            /// SrsTarget s do not need to be explicitly constructed.
+
+            /// They are a helper class for the ResTarget class.
+            SrsTarget(String name);
+            friend class ResTarget;
+
+            List<String> DEFS;
+            List<String> INCLUDE
+            List<SrsPartTarget> PARTS;
+            static const List<String> DEFAULTDEFS;
+    };
+
+    class ResTarget : public Target, public IsCleanable, public HasSrs
+    {
+        public:
+            void add_file(Path file);
+            void add_files(List<Path> files);
+        private:
+            /// ResTarget do not need to be explicitly constructed.
+
+            /// They are a helper class for the AllLangResTarget class.
+            ResTarget(String name, String library, Language lang, Path reslocation);
+            friend class AllLangResTarget;
+
+            String LIBRARY;
+            Language LANGUAGE;
+            Path RESLOCATION;
+    };
+
+    class AllLangResTarget : public Target, public IsCleanable, public HasSrs
+    {
+        public:
+            AllLangResTarget(String name);
+            /// Sets the location where resources are to be found. reslocation is a path relative to the default_images directory.
+            /// Resources will be found in reslocation itself and in the subdirectories res/ and imglst/ of it and again in subdirectories
+            /// of those named as the language of the processed resource. In addition, resources are found in the res/ directory directly
+            /// below default_images and the subdirectory of it named as the language of the processed resource.
+            void set_reslocation(Path reslocation);
+        private:
+            /// Sets the languages for which to create resources.
+            static void set_langs(List<Language> langs);
+
+            /// The list of languages that need to be build.
+            static List<Language> LANGS;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/executable.mk b/solenv/doc/gbuild/solenv/gbuild/executable.mk
new file mode 100644
index 000000000..8f7fcc9b0
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/executable.mk
@@ -0,0 +1,25 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class LinkTarget;
+
+    class Executable : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
+    {
+        public:
+            Executable(String name);
+
+        private:
+            /// private helper function for the constructor
+            void Executable_impl(LinkTarget library_linktarget);
+            /// platformdependant additional setup for constructor (used on Windows only)
+            void Executable_platform(LinkTarget library_linktarget);
+            /// helper function to wrap LinkTargets functions (this is more or less pimpl ...)
+            void forward_to_linktarget(Function f);
+
+            static const List<String> TARGETTYPEFLAGS;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
new file mode 100644
index 000000000..97ca9b252
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -0,0 +1,82 @@
+
+#include <types.mk>
+using namespace gb::types;
+
+// GNU make specific setup
+static const Command SHELL;
+
+
+// gbuild root directorys
+static Path SRCDIR;
+static Path OUTDIR;
+static Path WORKDIR;
+
+// Expected from configure/environment
+static const Integer OSL_DEBUG_LEVEL;
+static const List<Path> JDKINCS;
+static const List<Path> SOLARINC;
+static const List<Path> SOLARLIB;
+static const Path GBUILDDIR;
+static const Path INPATH;
+static const Path JAVA_HOME;
+static const Path UPD;
+static const String CVER;
+static const String LIBXML_CFLAGS;
+static const String OS;
+static const String STLPORT_VER;
+static const Bool DEBUG;
+static const Bool PRODUCT;
+
+// gbuild global variables derived from the configure/environment
+// some of these are defined per platform
+namespace gb
+{
+    /// building with generated dependencies
+    static const Bool FULLDEPS;
+    /// product build or non-product build with additional assertions and tests
+    static const Bool PRODUCT;
+    /// command to run awk scripts
+    static const Command AWK;
+    /// command to compile c source files
+    static const Command CC;
+    /// command to compile c++ source files
+    static const Command CXX;
+    /// command to process input with a gcc compatible preprocessor
+    static const Command GCCP;
+    /// command to link objects on the microsoft toolchain
+    static const Command LINK;
+    /// command to create a unique temporary file
+    static const Command MKTEMP;
+    /// debuglevel:
+    /// 0=no debugging,
+    /// 1=non-product build,
+    /// 2=debugging build (either product or nonproduct)
+    static const Integer DEBUGLEVEL;
+    /// compiler specific optimization flags
+    static const List<String> COMPILEROPTFLAGS;
+    /// default c compilation compiler flags
+    static const List<String> CFLAGS;
+    /// compiler specific defines
+    static const List<String> COMPILERDEFS;
+    /// cpu-specific default defines
+    static const List<String> CPUDEFS;
+    /// default c++ compilation compiler flags
+    static const List<String> CXXFLAGS;
+    /// platform- and compilerindependent default defines
+    static const List<String> GLOBALDEFS;
+    /// default objective c++ compilation compiler flags
+    static const List<String> OBJCXXFLAGS;
+    /// platfomspecific default defines
+    static const List<String> OSDEFS;
+    /// ?
+    static const Path SDKDIR;
+};
+
+// GXX_INCLUDE_PATH (Linux)
+// PTHREAD_CFLAGS (Linux)
+// SYSTEM_ICU (Linux)
+// SYSTEM_JPEG (Linux)
+// SYSTEM_LIBXML (Linux)
+// USE_SYSTEM_STL (Linux)
+
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/helper.mk b/solenv/doc/gbuild/solenv/gbuild/helper.mk
new file mode 100644
index 000000000..3fa666b85
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/helper.mk
@@ -0,0 +1,42 @@
+#include <types.h>
+
+String NEWLINE;
+String COMMA;
+
+namespace gb
+{
+    using namespace types;
+
+    class Helper
+    {
+        public:
+            /// Abbreviates the common directory roots in a command
+            static Command abbreviate_dirs(Command c);
+            /// Announces the start/end of an task.
+            static void announce(String announcement);
+            /// Creates the default get_clean_target() function for the type.
+            static void make_clean_target(TargetType t);
+            /// Creates the default get_clean_target() function for the types.
+            static void make_clean_targets(List<TargetType> ts);
+            /// Creates the default get_dep_target() function for the type.
+            static void make_dep_target(TargetType t);
+            /// Creates the default get_dep_target() function for the types.
+            static void make_dep_targets(List<TargetType> ts);
+            /// Creates the default get_dep_target() function for the type modifying the \$(OUTDIR).
+            static void make_outdir_clean_target(TargetType t);
+            /// Creates the default get_dep_target() function for types modifying the \$(OUTDIR).
+            static void make_outdir_clean_targets(List<TargetType> ts);
+            /// Returns the clean target of a target modifying the \$(OUTDIR).
+            static Path get_outdir_clean_target(Path target);
+
+            /// The path to a zero length file.
+            static const Path NULLFILE;
+            /// The path to the misc directory for temporary files etc.
+            static const Path MISC;
+            /// The path to a phony target, that is always outdated.
+            static const Path PHONY;
+            /// Internally used dummy file. 
+            static const Path MISCDUMMY;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/library.mk b/solenv/doc/gbuild/solenv/gbuild/library.mk
new file mode 100644
index 000000000..eba19a861
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/library.mk
@@ -0,0 +1,41 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class LinkTarget;
+
+    class Library : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
+    {
+        public:
+            Library(String name);
+            /// Returns how the library is named in the filesystem on the current platform.
+            /// Library filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependant hacks in solenv/gbuild/platform/*.mk.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_filename();
+
+        private:
+            /// private helper function for the constructor
+            void Library_impl(LinkTarget library_linktarget);
+            /// platformdependant additional setup for constructor (used on Windows only)
+            void Library_platform(
+                LinkTarget library_linktarget,
+                Path dllfile);
+            /// helper function to wrap LinkTargets functions (this is more or less pimpl ...)
+            void forward_to_linktarget(Function f);
+
+            /// List of buildable libraries (i.e. libraries that are not expected to exist outside of \$(OUTDIR) on the system).
+            static const List<Library> TARGETS;
+            /// List of additional defines for compiling objects for libraries
+            static const List<String> DEFS;
+            /// List of additional flags for linking a library
+            static const List<String> TARGETTYPEFLAGS;
+            /// Mapping from symbolic library names to dll filenames
+            static const Map<Library,Path> DLLFILENAMES;
+            /// Mapping from symbolic library names to filenames
+            static const Map<Library,Path> FILENAMES;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/linktarget.mk b/solenv/doc/gbuild/solenv/gbuild/linktarget.mk
new file mode 100644
index 000000000..5fb7ead86
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/linktarget.mk
@@ -0,0 +1,128 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class LinkTarget;
+    class Library;
+    class StaticLibrary;
+    class SdiTarget;
+    class Package;
+
+    /// CObjects are never used standalone. They only exist as part of a 
+    /// LinkTarget.
+    class CObject : public HasSource, public HasDependencies, public Target
+    {
+        public:
+            Path get_source();
+        private:
+            /// CObjects do not need to be explicitly constructed.
+            /// They are named after the path of their source file (without
+            /// file extension) from the root of their source repository.
+            CObject(String name);
+            friend class LinkTarget;
+
+            /// Platformdependent command to compile a plain C object.
+            static const Command command(
+                Path objectfile,
+                String name,
+                Path sourcefile,
+                List<String> defs,
+                List<String> cxxflags,
+                List<Path> include);
+            /// Platformdependent command to generate plain C object dependencies.
+            static const Command command_dep(
+                Path depfile,
+                String name,
+                Path sourcefile,
+                List<String> defs,
+                List<String> cxxflags,
+                List<Path> include);
+    };
+
+    /// CxxObjects are never used standalone. They only exist as part of a 
+    /// LinkTarget.
+    class CxxObject : public HasSource, public HasDependencies, public Target
+    {
+        public:
+            Path get_source();
+        private:
+            /// CxxObjects do not need to be explicitly constructed.
+            /// They are named after the path of their source file (without
+            /// file extension) from the root of their source repository.
+            CxxObject(String name);
+            friend class LinkTarget;
+
+            /// Platformdependent command to compile a C++ object.
+            static const Command command(
+                Path objectfile,
+                String name,
+                Path sourcefile,
+                List<String> defs,
+                List<String> cxxflags,
+                List<Path> include);
+            /// Platformdependent command to generate C++ object dependencies.
+            static const Command command_dep(
+                Path objectfile,
+                String name,
+                Path sourcefile,
+                List<String> defs,
+                List<String> cxxflags,
+                List<Path> include);
+    };
+
+    class LinkTarget : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
+    {
+        public:
+            LinkTarget(String name);
+
+        private:
+            void get_external_headers_check();
+            void add_internal_headers(const List<Target>& internal_headers);
+
+            /// @warning Evil Hack: SELF is set to the name of the LinkTarget
+            /// in the constructor. If SELF is not set to the LinkTarget name in
+            /// the execution of the header rule, the LinkTarget is used (linked
+            /// against) but was never defined. This might work out, if the
+            /// LinkTarget has been provided by other means (for example:
+            /// build.pl/dmake), but it should never happen in a project where
+            /// all LinkTarget s are controlled by gbuild.
+            LinkTarget& SELF;
+            List<CObject> COBJECTS;
+            List<CxxObject> CXXOBJECTS;
+            List<Library> LINKED_LIBS;
+            List<Path> AUXTARGETS;
+            List<Path> INCLUDE;
+            List<Path> INCLUDE_STL;
+            List<StaticLibrary> LINKED_STATIC_LIBS;
+            List<String> CFLAGS;
+            List<String> CXXFLAGS;
+            List<String> DEFS;
+            List<String> LDFLAGS;
+            List<String> TARGETTYPE_FLAGS;
+            Path DLLTARGET;
+
+            /// Platformdependent command for linking.
+            static const Command command (
+                Path linktargetfile,
+                String linktargetname,
+                List<String> linkflags,
+                List<Library> linked_libs,
+                List<StaticLibrary> linked_static_libs,
+                List<CObject> cobjects,
+                List<CxxObject> cxxobjects);
+            /// Command to collect all dependencies of this LinkTarget.
+            static const Command command_dep(
+                Path depfile,
+                String linktargetname,
+                List<CObject> cobjects,
+                List<CxxObject> cxxobjects);
+            static const List<String> DEFAULTDEFS;
+            static const List<String> CXXFLAGS;
+            static const List<String> LDFLAGS;
+            static const List<Path> INCLUDE;
+            static const List<Path> INCLUDE_STL;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/package.mk b/solenv/doc/gbuild/solenv/gbuild/package.mk
new file mode 100644
index 000000000..53daeb5c8
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/package.mk
@@ -0,0 +1,30 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+    class PackagePart
+    {
+        private:
+            /// PackagePart s do not need to be explicitly constructed.
+            /// They are named after the path of their source file (without
+            /// file extension) from the root of their source repository.
+            PackagePart(String name, Path Source);
+            friend Package;
+            /// Returns a list of aboslute paths where files are copied to with the PackagePart class.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            static const List<Path> get_destinations();
+    };
+
+    class Package : public Target, public IsCleanable
+    {
+        public:
+            /// Creates a new package that copies files from source_dir to the \$(OUTDIR).
+            Package(String name, Path source_dir);
+            /// Adds a file to the package. destination is the relative path in
+            /// the \$(OUTDIR) and source is the relative path in the source_dir.
+            add_file(Path destination, Path source);
+    }
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/sdi.mk b/solenv/doc/gbuild/solenv/gbuild/sdi.mk
new file mode 100644
index 000000000..f9f913fb1
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/sdi.mk
@@ -0,0 +1,23 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class SdiTarget : public Target, public IsCleanable
+    {
+        public:
+            /// Creates a new SdiTarget. 
+            SdiTarget(String name, String exports);
+            /// Sets the include paths for this SdiTarget.
+            set_include(List<Path> includes);
+        private:
+            /// The command to execute svidl.
+            static const Command SVIDLCOMMAND;
+            /// The target on with to depend to make sure the svidl executable is available.
+            static const Path SVIDLTARGET;
+            /// The target on with to depend to make sure the auxiliary files (libraries etc.) for the svidl executable are available.
+            static const Path SVIDLAUXDEPS;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/static_library.mk b/solenv/doc/gbuild/solenv/gbuild/static_library.mk
new file mode 100644
index 000000000..787c6e732
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/static_library.mk
@@ -0,0 +1,39 @@
+#include <types.h>
+
+namespace gb
+{
+    using namespace types;
+
+    class LinkTarget;
+
+    class StaticLibrary : public IsCleanable, public HasDependencies, public IsLinking, public DeliversHeaders, public HasCompileSettings, public Target
+    {
+        public:
+            StaticLibrary(String name);
+            /// Returns how the library is named in the filesystem on the current platform.
+            /// StaticLibrary filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependant hacks in solenv/gbuild/platform/*.mk.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_filename();
+
+        private:
+            /// private helper function for the constructor
+            void StaticLibrary_impl(LinkTarget library_linktarget);
+            /// helper function to wrap LinkTargets functions (this is more or less pimpl ...).
+            void forward_to_linktarget(Function f);
+
+            /// List of buildable static libraries (i.e. static libraries that are not expected to exist outside of \$(OUTDIR) on the system).
+            static const List<StaticLibrary> TARGETS;
+            /// List of additional defines for compiling objects for static libraries
+            static const List<String> DEFS;
+            /// List of additional flags for linking a static library
+            static const List<String> TARGETTYPEFLAGS;
+            /// Mapping from symbolic static library names to filenames
+            static const Map<StaticLibrary,Path> FILENAMES;
+            /// location to place static libraries in the \$(OUTDIR)
+            static const Path OUTDIRLOCATION;
+            /// platformdependant file extension for static libraries
+            static const String PLAINEXT;
+    };
+}
+/* vim: set filetype=cpp : */
diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk b/solenv/doc/gbuild/solenv/gbuild/types.mk
new file mode 100644
index 000000000..ecb736834
--- /dev/null
+++ b/solenv/doc/gbuild/solenv/gbuild/types.mk
@@ -0,0 +1,169 @@
+namespace gb {
+    class CObject;
+    class CxxObject;
+    class Library;
+    class StaticLibrary;
+    class Package;
+    class SdiTarget;
+};
+
+namespace gb { namespace types
+{
+    /// A type of target, with its set of rules etc., as used in the build system.
+    class TargetType {};
+    /// A plain old string.
+    class String {};
+    /// A partial, relative or absolute filesystem path.
+    class Path {};
+    /// A target to be build.
+    class Target
+    {
+        public:
+            /// The absolute filesystem path representing the target.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_target();
+    };
+    /// A partial or complete shell-command.
+    class Command {};
+    /// A integer number.
+    class Integer {};
+    /// A boolean value.
+
+    /// There are const boolean values true and false for
+    /// comparisons (written as $(true) and $(false) in makefiles.
+    class Bool {};
+    /// A language (for localisation)
+
+    /// A language represented by its ISO 639-1:2002 code.
+    class Language {};
+    /// A List of objects.
+
+    /// A List of objects represented by a whitespace separated list
+    /// in makefiles.
+    template <typename T>
+        class List<T> {};
+
+    /// A Mapping from with a key of type K and a value of type V
+
+    /// A Mapping is represented by a whitespace separated list
+    /// of key-value pairs. Key and value are separated by a colon (:).
+    template <typename K, typename V>
+        class Map<K,V> {};
+    /// A target that can be cleaned.
+    class IsCleanable
+    {
+        public:
+            /// The (phony) absolute filesystem path to clean the target.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_clean_target();
+    };
+    /// A target that has generated dependencies.
+    class HasDependencies
+    {
+        public:
+            /// The absolute filesystem path to the file containing the dependencies.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_dep_target();
+    };
+    /// A target that has a source file from which it is generated.
+    class HasSource
+    {
+        public:
+            /// The absolute filesystem path to the source file.
+            Path get_source();
+    };
+    /// A target that links objects and libraries.
+    class IsLinking
+    {
+        public:
+            /// Add a CObject to be compiled and linked.
+            void add_cobject(CObject cobject);
+            /// Add multiple CObject s to be compiled and linked.
+            void add_cobjects(List<CObject> cobjects);
+            /// Add a CxxObject to be compiled and linked.
+            void add_cxxobject(CxxObject cobject);
+            /// Add multiple CxxObject s to be compiled and linked.
+            void add_cxxobjects(List<CxxObject> cobjects);
+            /// Add multiple CxxObject s to be compiled and linked (with exceptions enabled).
+            void add_exception_objects(List<CxxObject> cobject);
+            /// Add libraries to link against dynamically.
+            void add_linked_libs(List<Library> linked_libs);
+            /// Add libraries to link against statically.
+            void add_linked_static_libs(List<StaticLibrary> linked_static_libs);
+            /// Add multiple CxxObject s to be compiled and linked (without exceptions enabled).
+            /// @deprecated We should not care about disabling exception.
+            void add_noexception_objects(List<CxxObject> cobject);
+            /// Set auxiliary files that are produced by linking (for cleanup and copying).
+            void set_auxtargets(List<Path> auxtargets);
+            /// Set the location for the produced DLL (used on Windows only).
+            void set_dll_target(Path dlltarget);
+            /// Set additional flags for the link command.
+            void set_ldflags(List<Path> ldflags);
+    };
+    /// A target that delivers headers of some kind.
+    class DeliversHeaders
+    {
+        public:
+            /// The absolute filesystem path which is touched when all headers for this target are prepared.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_headers_target();
+            /// The absolute filesystem path which is touched when all external headers for this target are prepared.
+
+            /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere.
+            Path get_external_headers_target();
+            /// Add multiple Packages that need to be delivered/generated
+            /// before compilation or dependency generation can start.
+            void add_package_headers(List<Package> packages);
+            /// Add multiple SdiTargets that need to be delivered/generated
+            /// before compilation or dependency generation can start.
+            void add_sdi_headers(List<SdiTarget> sdis);
+    };
+    /// A target where settings for the compilation can be set.
+    class HasCompileSettings
+    {
+        public:
+            /// Sets flags for plain C compilation.
+            /// \$\$(CFLAGS) contains the current flags and can be used if
+            /// just a few need to be modified.
+            void set_cflags(List<String> cflags);
+            /// Sets flags for C++ compilation.
+            /// \$\$(CXXFLAGS) contains the current flags and can be used if
+            /// just a few need to be modified.
+            void set_cxxflags(List<String> cxxflags);
+            /// Sets defines for C/C++ compilation.
+            /// \$\$(DEFS) contains the current flags and can be used if
+            /// just a few need to be modified.
+            void set_defs(List<String> defs);
+            /// Sets the include paths for C/C++ compilation.
+            /// \$\$(INCLUDE) contains the current paths and can be used if
+            /// just a few need to be modified.
+            void set_include(List<Path> include);
+            /// Sets the stl include paths for C++ compilation.
+            /// \$\$(INCLUDE_STL) contains the current paths and can be used if
+            /// just a few need to be modified.
+            void set_include_stl(List<Path> include_stl);
+    };
+    /// A target using the resource compiler
+    class UsesRsc
+    {
+        public:
+            /// The command to execute rsc.
+            static const Command RSCCOMMAND;
+            /// The target on with to depend to make sure the rsc executable is available.
+            static const Path RSCTARGET;
+    };
+    /// A target processing a set of srs files
+    class HasSrs
+    {
+        public:
+            /// Add a SrsTarget to be processed.
+            void add_one_srs(SrsTarget srs);
+            /// Add multiple SrsTarget s to be processed.
+            void add_srs(List<SrsTarget> srs);
+    };
+}};
+/* vim: set filetype=cpp : */
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
new file mode 100644
index 000000000..2d7495026
--- /dev/null
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -0,0 +1,323 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+# SrsPartMergeTarget class
+
+gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3)
+gb_SrsPartMergeTarget_TRANSEXAUXDEPS := $(call gb_Library_get_target,tl) $(call gb_Library_get_target,sal)
+# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
+
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
+
+define gb_SrsPartMergeTarget__command
+$(call gb_Output_announce,$(3),$(true),srs,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+        -p $(firstword $(subst /, ,$(2))) \
+        -i $(3) \
+        -o $(1) \
+        -m $(4) \
+        -l all)
+
+endef
+
+define gb_SrsPartMergeTarget__rules
+$$(call gb_SrsPartMergeTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartMergeTarget_TRANSEXTARGET) $$(gb_SrsPartMergeTarget_TRANSEXAUXDEPS)
+    $$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<,$$(SDF))
+
+endef
+
+$(foreach repo,$(gb_SrsPartMergeTarget_REPOS),$(eval $(call gb_SrsPartMergeTarget__rules,$(repo))))
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_REPOS := $(gb_REPOS)
+# defined by platform
+#  gb_SrsPartTarget_RSCTARGET
+#  gb_SrsPartTarget_RSCCOMMAND
+#  gb_SrsPartTarget__command_dep
+
+define gb_SrsPartTarget__command
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    RESPONSEFILE=`$(gb_MKTEMP) $(gb_Helper_MISC)` && \
+    echo "-s \
+        $(4) \
+        -I$(dir $(3)) \
+        $(5) \
+        -fp=$(1) \
+        $(6)" > $${RESPONSEFILE} && \
+    $(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
+    rm -rf $${RESPONSEFILE})
+
+endef
+
+define gb_SrsPartTarget__rules
+$$(call gb_SrsPartTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartTarget_RSCTARGET)
+    $$(call gb_SrsPartTarget__command_dep,$$*,$$<,$$(INCLUDE),$$(DEFS))
+    $$(call gb_SrsPartTarget__command,$$@,$$*,$$<,$$(INCLUDE),$$(DEFS),$$(lastword $$< $$(MERGEDFILE)))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_SrsPartTarget_get_dep_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY)
+    $$(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $$(dir $$@) && \
+        echo '$$(call gb_SrsPartTarget_get_target,$$*) : $$(gb_Helper_PHONY)' > $$@)
+endif
+
+endef
+
+$(foreach repo,$(gb_SrsPartTarget_REPOS),$(eval $(call gb_SrsPartTarget__rules,$(repo))))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsPartTarget_get_dep_target,%) :
+    $(eval $(call gb_Output_error,Unable to find resource definition file $* in repositories: $(gb_SrsPartTarget_REPOS)))
+endif
+
+
+define gb_SrsPartTarget_SrsPartTarget
+ifeq ($(strip $(WITH_LANG)),)
+$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := 
+else
+$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1))
+$(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf
+endif
+
+endef
+
+
+# SrsTarget class
+
+gb_SrsTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
+
+.PHONY : $(call gb_SrsTarget_get_clean_target,%)
+$(call gb_SrsTarget_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),SRS,1)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_SrsTarget_get_target,$*) \
+            $(call gb_SrsTarget_get_dep_target,$*) \
+            $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_target,$(part))) \
+            $(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))) \
+            $(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_SrsTarget__command_dep
+$(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    cat $(3) > $(1))
+endef
+endif
+
+$(call gb_SrsTarget_get_target,%) :
+    $(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*,$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))))
+    $(call gb_Output_announce,$*,$(true),SRS,1)
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && \
+        cat $^ > $@)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,%) :
+    $(call gb_SrsTarget__command_dep,$@,$*,$^)
+endif
+
+define gb_SrsTarget_SrsTarget
+$(call gb_SrsTarget_get_target,$(1)) : DEFS := $(gb_SrsTarget_DEFAULTDEFS)
+$(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
+$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS :=
+$(call gb_SrsTarget_get_target,$(1)) : PARTS :=
+ifeq ($(gb_FULLDEPS),$(true))
+ifneq ($(wildcard $(call gb_SrsTarget_get_dep_target,$(1))),)
+include $(call gb_SrsTarget_get_dep_target,$(1))
+else
+$(firstword $(MAKEFILE_LIST)) : $(call gb_SrsTarget_get_dep_target,$(1))
+endif
+endif
+
+endef
+
+define gb_SrsTarget_set_defs
+$(call gb_SrsTarget_get_target,$(1)) : DEFS := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,$(1)) : DEFS := $(2)
+endif
+
+endef
+
+define gb_SrsTarget_set_include
+$(call gb_SrsTarget_get_target,$(1)) : INCLUDE := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,$(1)) : INCLUDE := $(2)
+endif
+
+endef
+
+define gb_SrsTarget_add_file
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_SrsTarget_get_dep_target,$(1)) : $(call gb_SrsPartTarget_get_dep_target,$(2))
+endif
+$(call gb_SrsPartTarget_SrsPartTarget,$(2))
+$(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2))
+$(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2)
+$(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2)
+
+endef
+
+define gb_SrsTarget_add_files
+$(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file)))
+
+endef
+
+
+# ResTarget
+
+gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET)
+gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
+gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/default_images/
+
+$(call gb_ResTarget_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),RES,2)
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
+
+$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCTARGET)
+    $(call gb_Output_announce,$*,$(true),RES,2)
+    $(call gb_Helper_abbreviate_dirs_native,\
+        mkdir -p $(dir $@) $(OUTDIR)/bin \
+            $(dir $(call gb_ResTarget_get_imagelist_target,$(1))) && \
+        RESPONSEFILE=`$(gb_MKTEMP) $(gb_Helper_MISC)` && \
+        echo "-r -p \
+            -lg$(LANGUAGE) \
+            -fs=$@ \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE) \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE) \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
+            -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
+            -subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
+            -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
+            -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$(1))) \
+            $(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \
+        $(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
+        rm -f $${RESPONSEFILE})
+
+$(call gb_ResTarget_get_outdir_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        $(call gb_Deliver_deliver,$<,$@) && \
+        $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(ILSTTARGET)),$(ILSTTARGET)))
+
+define gb_ResTarget_ResTarget
+$(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
+$(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
+$(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
+$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1))
+$(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1))
+$(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
+
+$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) 
+$(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)))
+
+endef
+
+define gb_ResTarget_add_file
+$(call gb_ResTarget_get_target,$(1)) : $(2)
+
+endef
+
+define gb_ResTarget_add_one_srs
+$(call gb_ResTarget_add_file,$(1),$(call gb_SrsTarget_get_target,$(2)))
+$(call gb_ResTarget_get_clean_target,$(1)) : $(call gb_SrsTarget_get_clean_target,$(2))
+
+endef
+
+define gb_ResTarget_add_files
+$(foreach file,$(2),\
+    $(call gb_ResTarget_add_file,$(1),$(file)))
+
+endef
+
+define gb_ResTarget_add_srs
+$(foreach srs,$(2),\
+    $(call gb_ResTarget_add_one_srs,$(1),$(srs)))
+
+endef
+
+define gb_ResTarget_set_reslocation
+$(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
+
+endef
+
+
+# AllLangResTarget
+
+gb_AllLangResTarget_LANGS := en-US $(WITH_LANG)
+
+define gb_AllLangResTarget_set_langs
+gb_AllLangResTarget_LANGS := $(1)
+endef
+
+$(call gb_AllLangResTarget_get_clean_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_AllLangResTarget_get_target,$*))
+
+$(call gb_AllLangResTarget_get_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && touch $@)
+
+define gb_AllLangResTarget_AllLangResTarget
+$(foreach lang,$(gb_AllLangResTarget_LANGS),\
+    $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
+$$(eval $$(call gb_Module_register_target,$(call gb_AllLangResTarget_get_target,$(1)),$(call gb_AllLangResTarget_get_clean_target,$(1))))
+
+endef
+
+define gb_AllLangResTarget_add_one_srs
+$(foreach lang,$(gb_AllLangResTarget_LANGS),\
+    $(call gb_ResTarget_add_one_srs,$(1)$(lang),$(2)))
+
+endef
+
+define gb_AllLangResTarget_add_srs
+$(foreach srs,$(2),\
+    $(call gb_AllLangResTarget_add_one_srs,$(1),$(srs)))
+
+endef
+
+define gb_AllLangResTarget_set_reslocation
+$(foreach lang,$(gb_AllLangResTarget_LANGS),\
+    $(call gb_ResTarget_set_reslocation,$(1)$(lang),$(2)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
new file mode 100644
index 000000000..e31712016
--- /dev/null
+++ b/solenv/gbuild/BuildDirs.mk
@@ -0,0 +1,59 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# extend for JDK include (seems only needed in setsolar env?)
+SOLARINC += $(JDKINCS)
+
+OUTDIR := $(SOLARVERSION)/$(INPATH)
+WORKDIR := $(SOLARVERSION)/$(INPATH)/workdir
+
+# Override for SetupLocal
+ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk)),)
+include $(gb_LOCALBUILDDIR)/SetupLocal.mk
+endif
+
+ifeq ($(strip $(gb_REPOS)),)
+gb_REPOS := $(SOLARSRC)
+endif
+
+# HACK
+# unixify windoze paths
+ifeq ($(OS),WNT)
+override WORKDIR := $(shell cygpath -u $(WORKDIR))
+override OUTDIR := $(shell cygpath -u $(OUTDIR))
+override gb_REPOS := $(shell cygpath -u $(gb_REPOS))
+endif
+
+REPODIR := $(patsubst %/,%,$(dir $(firstword $(gb_REPOS))))
+
+ifeq ($(filter setuplocal removelocal,$(MAKECMDGOALS)),)
+ifneq ($(filter-out $(foreach repo,$(gb_REPOS),$(realpath $(repo))/%),$(realpath $(firstword $(MAKEFILE_LIST)))),)
+$(eval $(call gb_Output_error,The initial makefile $(realpath $(firstword $(MAKEFILE_LIST))) is not in the repositories $(foreach repo,$(gb_REPOS),$(realpath $(repo))).,ALL))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
new file mode 100644
index 000000000..15d162ee2
--- /dev/null
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -0,0 +1,77 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+gb_ComponentTarget_REPOS := $(gb_REPOS)
+
+ifeq ($(SYSTEM_LIBXSLT),YES)
+gb_ComponentTarget_XSLTPROCTARGET :=
+gb_ComponentTarget_XSLTPROCCOMMAND := xsltproc
+else
+gb_ComponentTarget_XSLTPROCTARGET := $(call gb_Executable_get_target,xsltproc)
+gb_ComponentTarget_XSLTPROCCOMMAND := $(gb_ComponentTarget_XSLTPROCPRECOMMAND) $(gb_ComponentTarget_XSLTPROCTARGET)
+endif
+gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt
+gb_ComponentTarget_get_source = $(1)/$(2).component
+
+# gb_ComponentTarget_PREFIXBASISNATIVE is set by the platform
+
+define gb_ComponentTarget__command
+$(call gb_Output_announce,$(3),$(true),CMP,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    $(gb_ComponentTarget_XSLTPROCCOMMAND) --nonet --stringparam uri \
+        '$(gb_ComponentTarget_PREFIXBASISNATIVE)$(LIBFILENAME)' -o $(1) \
+        $(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
+
+endef
+
+define gb_ComponentTarget__rules
+$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_ComponentTarget_XSLTPROCTARGET)
+    $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
+
+$$(call gb_ComponentTarget_get_clean_target,%) :
+    $$(call gb_Output_announce,$$*,$(false),CMP,1)
+    rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
+
+endef
+
+$(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
+
+$(call gb_ComponentTarget_get_target,%) :
+    $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xlstproc is missing.))
+
+$(call gb_ComponentTarget_get_external_target,%) :
+    $(call gb_Deliver_deliver,$<,$@)
+
+define gb_ComponentTarget_ComponentTarget
+$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(or $(3),$(2))
+$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
new file mode 100644
index 000000000..315c9df62
--- /dev/null
+++ b/solenv/gbuild/Deliver.mk
@@ -0,0 +1,82 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+gb_Deliver_GNUCOPY := $(GNUCOPY)
+
+# if ($true) then old files will get removed from the target location before
+# they are copied there. In multi-user environments, this is needed you need to
+# be the owner of the target file to be able to modify timestamps
+gb_Deliver_CLEARONDELIVER := $(true)
+
+define gb_Deliver_init
+gb_Deliver_DELIVERABLES :=
+
+endef
+
+define gb_Deliver_add_deliverable
+gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
+$(if $(gb_HIRESTIME),,.LOW_RESOLUTION_TIME : $(1))
+
+endef
+
+ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
+define gb_Deliver_deliver
+mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $(1) $(2) && touch -r $(1) $(2)
+endef
+else
+define gb_Deliver_deliver
+mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=timestamps $(1) $(2)
+endef
+endif
+
+
+# We are currently only creating a deliver.log, if only one module gets build.
+# As it is possible to add gbuild modules into other (which is done for example for
+# the toplevel ooo module already) it does not make sense to create a deliver.log once
+# fully migrated. The whole process should be rethought then.
+# We need the trailing whitespace so that the newline of echo does not become part of the last record.
+define gb_Deliver_setdeliverlogcommand
+ifeq ($$(words $(gb_Module_ALLMODULES)),1)
+$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1))
+deliverlog : COMMAND := mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) &&
+deliverlog : COMMAND += echo "$$(sort $$(gb_Deliver_DELIVERABLES)) " | $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log
+else
+$$(eval $$(call gb_Output_announce,more than one module - creating no deliver.log,$$(true),LOG,1))
+deliverlog : COMMAND := true
+endif
+endef
+
+# FIXME: this does not really work for real multi repository builds, but the
+# deliver.log format is broken in that case anyway
+.PHONY : deliverlog
+deliverlog:
+    $(eval $(call gb_Deliver_setdeliverlogcommand))
+    $(call gb_Helper_abbreviate_dirs, $(COMMAND))
+
+all : deliverlog
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
new file mode 100644
index 000000000..341f7c7b6
--- /dev/null
+++ b/solenv/gbuild/Executable.mk
@@ -0,0 +1,92 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+
+# Executable class
+
+# defined by platform
+#  gb_Executable_TARGETTYPEFLAGS
+#  gb_Executable_Executable_platform
+
+.PHONY : $(call gb_Executable_get_clean_target,%)
+$(call gb_Executable_get_clean_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_Executable_get_target,$*) \
+            $(AUXTARGETS))
+
+$(call gb_Executable_get_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        $(call gb_Deliver_deliver,$<,$@) \
+            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+
+define gb_Executable_Executable
+$(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))
+
+endef
+
+define gb_Executable__Executable_impl
+$(call gb_LinkTarget_LinkTarget,$(2))
+$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_Executable_TARGETTYPEFLAGS) $(call gb_Executable_get_rpath,$(1)))
+$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
+$(call gb_Executable_Executable_platform,$(1),$(2))
+$$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+
+endef
+
+define gb_Executable_forward_to_Linktarget
+gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3))
+
+endef
+
+$(eval $(foreach method,\
+    add_cobject \
+    add_cobjects \
+    add_cxxobject \
+    add_cxxobjects \
+    add_objcxxobject \
+    add_objcxxobjects \
+    add_exception_objects \
+    add_noexception_objects \
+    set_cflags \
+    set_cxxflags \
+    set_objcxxflags \
+    set_defs \
+    set_include \
+    set_ldflags \
+    set_library_path_flags \
+    add_linked_libs \
+    add_linked_static_libs \
+    add_package_headers \
+    add_sdi_headers \
+    add_precompiled_header \
+,\
+    $(call gb_Executable_forward_to_Linktarget,$(method))\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
new file mode 100644
index 000000000..c5fe87bbc
--- /dev/null
+++ b/solenv/gbuild/Helper.mk
@@ -0,0 +1,156 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+gb_Helper_NULLFILE := /dev/null
+
+gb_Helper_MISC := $(WORKDIR)/Misc
+
+# general propose phony target
+gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY
+
+# general propose empty dummy target
+gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY
+
+.PHONY : $(WORKDIR)/Misc/PHONY
+$(gb_Helper_MISCDUMMY) :
+    @mkdir -p $(dir $@) && touch $@
+
+define gb_Helper_abbreviate_dirs
+R=$(REPODIR) && \
+$(subst $(REPODIR)/,$$R/,S=$(SRCDIR) && \
+$(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \
+$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) && $(subst $(WORKDIR)/,$$W/,$(1)))))
+endef
+
+define gb_Helper_make_clean_target
+gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
+
+endef
+
+define gb_Helper_make_outdir_clean_target
+gb_$(1)_get_clean_target = $$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$$(call gb_$(1)_get_target,$$(1)))
+
+endef
+
+define gb_Helper_make_dep_target
+gb_$(1)_get_dep_target = $(WORKDIR)/Dep/$(1)/$$(1).d
+
+endef
+
+define gb_Helper_make_clean_targets
+$(foreach targettype,$(1),\
+    $(call gb_Helper_make_clean_target,$(targettype)))
+
+endef
+
+define gb_Helper_make_outdir_clean_targets
+$(foreach targettype,$(1),\
+    $(call gb_Helper_make_outdir_clean_target,$(targettype)))
+
+endef
+
+define gb_Helper_make_dep_targets
+$(foreach targettype,$(1),\
+    $(call gb_Helper_make_dep_target,$(targettype)))
+
+endef
+
+define gb_Helper_get_outdir_clean_target
+$$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1))
+endef
+
+define gb_Helper_register_repository
+gb_Helper_CURRENTREPOSITORY := $(1)
+
+endef
+
+define gb_Helper_add_repository
+gb_Helper_CURRENTREPOSITORY :=
+include $(1)/Repository.mk
+ifeq ($$(gb_Helper_CURRENTREPOSITORY),)
+$$(eval $$(call gb_Output_error,No call to gb_Helper_register_repository in Repository.mk for repository $(1)))
+endif
+$$(gb_Helper_CURRENTREPOSITORY) := $(1)
+
+endef
+
+define gb_Helper_add_repositories
+$(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo)))
+
+endef
+
+define gb_Helper_init_registries
+gb_Executable_VALIDGROUPS := UREBIN SDK OOO BRAND NONE
+gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS STLLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
+gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
+
+$$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
+$$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=))
+$$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(eval gb_StaticLibrary_$$(group) :=))
+
+endef
+
+define gb_Helper_collect_libtargets
+gb_Library_TARGETS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
+gb_StaticLibrary_TARGETS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
+
+endef
+
+define gb_Helper_collect_knownlibs
+gb_Library_KNOWNLIBS := $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(gb_Library_$$(group)))
+gb_StaticLibrary_KNOWNLIBS := $$(foreach group,$$(gb_StaticLibrary_VALIDGROUPS),$$(gb_StaticLibrary_$$(group)))
+
+endef
+
+define gb_Helper_register_executables
+ifeq ($$(filter $(1),$$(gb_Executable_VALIDGROUPS)),)
+$$(eval $$(call gb_Output_error,$(1) is not a valid group for executables. Valid groups are: $$(gb_Executable_VALIDGROUPS)))
+endif
+
+gb_Executable_$(1) += $(2)
+
+endef
+
+define gb_Helper_register_libraries
+ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),)
+$$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid groups are: $$(gb_Library_VALIDGROUPS)))
+endif
+
+gb_Library_$(1) += $(2)
+
+endef
+
+define gb_Helper_register_static_libraries
+ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDGROUPS)),)
+$$(eval $$(call gb_Output_error,$(1) is not a valid group for static libraries. Valid groups are: $$(gb_StaticLibrary_VALIDGROUPS)))
+endif
+
+gb_StaticLibrary_$(1) += $(2)
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
new file mode 100644
index 000000000..9a0c0aadf
--- /dev/null
+++ b/solenv/gbuild/Library.mk
@@ -0,0 +1,117 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+
+# Library class
+
+# defined globally in gbuild.mk
+#  gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib
+#  gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library
+# defined by platform
+#  gb_Library_DEFS
+#  gb_Library_DLLFILENAMES
+#  gb_Library_FILENAMES
+#  gb_Library_TARGETS
+#  gb_Library_TARGETTYPEFLAGS
+#  gb_Library_Library_platform
+
+
+# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
+.PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT)
+$(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%$(gb_Library_PLAINEXT)))
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(OUTDIR)/lib/$*$(gb_Library_PLAINEXT) \
+            $(AUXTARGETS))
+
+# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
+$(gb_Library_OUTDIRLOCATION)/%$(gb_Library_PLAINEXT) : 
+    $(call gb_Helper_abbreviate_dirs,\
+        $(call gb_Deliver_deliver,$<,$@) \
+            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+
+define gb_Library_Library
+ifeq (,$$(findstring $(1),$$(gb_Library_KNOWNLIBS)))
+$$(eval $$(call gb_Output_info,Currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
+$$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk))
+endif
+$(call gb_Library_get_target,$(1)) : AUXTARGETS :=
+$(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(call gb_Library_get_filename,$(1))))
+
+endef
+
+define gb_Library__Library_impl
+$(call gb_LinkTarget_LinkTarget,$(2))
+$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_Library_TARGETTYPEFLAGS) $(call gb_Library_get_rpath,$(1)))
+$(call gb_LinkTarget_set_defs,$(2),\
+    $$(DEFS) \
+    $(gb_Library_DEFS) \
+)
+$(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
+$$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
+$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+
+endef
+
+define gb_Library_set_componentfile
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library_get_filename,$(1)),$(call gb_Library_get_dllname,$(1)))
+$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
+
+endef
+
+define gb_Library__forward_to_Linktarget
+gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_Library_get_linktargetname,$$(call gb_Library_get_filename,$$(1))),$$(2),$$(3))
+
+endef
+
+$(eval $(foreach method,\
+    add_cobject \
+    add_cobjects \
+    add_cxxobject \
+    add_cxxobjects \
+    add_objcxxobject \
+    add_objcxxobjects \
+    add_exception_objects \
+    add_noexception_objects \
+    set_cflags \
+    set_cxxflags \
+    set_objcxxflags \
+    set_defs \
+    set_include \
+    set_ldflags \
+    set_library_path_flags \
+    add_linked_libs \
+    add_linked_static_libs \
+    add_package_headers \
+    add_sdi_headers \
+    add_precompiled_header \
+,\
+    $(call gb_Library__forward_to_Linktarget,$(method))\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
new file mode 100644
index 000000000..da16f6763
--- /dev/null
+++ b/solenv/gbuild/LinkTarget.mk
@@ -0,0 +1,569 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+
+# CObject class
+
+gb_CObject_REPOS := $(gb_REPOS)
+
+gb_CObject_get_source = $(1)/$(2).c
+# defined by platform
+#  gb_CObject__command
+
+# this rule generates an "always rebuild" dep file, to have something to include.
+# the dep file will be overridden on the fly, when the object is compiled
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_CObject__command_dep
+mkdir -p $(dir $(1)) && \
+    echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_CObject__command_dep =
+endif
+
+define gb_CObject__rules
+$$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
+    $$(call gb_CObject__command,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_source,$(1),%)
+    $$(call gb_CObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE))
+endif
+
+endef
+
+$(foreach repo,$(gb_CObject_REPOS),$(eval $(call gb_CObject__rules,$(repo))))
+
+$(call gb_CObject_get_dep_target,%) :
+    $(eval $(call gb_Output_error,Unable to find plain C file $(call gb_CObject_get_source,,$*) in the repositories: $(gb_CObject_REPOS)))
+
+gb_CObject_CObject =
+
+
+# CxxObject class
+
+gb_CxxObject_REPOS := $(gb_REPOS)
+
+gb_CxxObject_get_source = $(1)/$(2).cxx
+# defined by platform
+#  gb_CxxObject__command
+
+# This rule generates an "always rebuild" dep file, to have something to
+# include. The dep file will be overridden on the fly, when the object is
+# compiled.
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_CxxObject__command_dep
+mkdir -p $(dir $(1)) && \
+    echo '$(call gb_CxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_CxxObject__command_dep =
+endif
+
+# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget)
+# are the same as the CXXFLAGS and DEFS we want to use for this object. This
+# should usually be the case.  The DEFS/CXXFLAGS would have too be manually
+# overridden for one object file for them to differ.  PCH_CXXFLAGS/PCH_DEFS
+# should never be overridden on an object -- they should be the same as for the
+# whole linktarget. In general it should be cleaner to use a static library
+# compiled with different flags and link that in rather than mixing different
+# flags in one linktarget.
+define gb_CxxObject__set_pchflags
+ifeq ($(gb_ENABLE_PCH),$(true))
+ifneq ($(strip $$(PCH_NAME)),)
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+$$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
+else
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+$$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
+else
+$$(info No precompiled header available for $$*.)
+$$(info precompiled header flags (  ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
+$$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)))
+$$(info .           object flags        : $$(sort $$(CXXFLAGS) $$(DEFS)))
+$$@ : PCHFLAGS := 
+endif
+endif
+endif
+endif
+endef
+
+define gb_CxxObject__rules
+$$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
+    $$(eval $$(gb_CxxObject__set_pchflags))
+    $$(call gb_CxxObject__command,$$@,$$*,$$<,$$(DEFS),$$(CXXFLAGS) $$(PCHFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
+    $$(eval $$(gb_CxxObject__set_pchflags))
+    $$(call gb_CxxObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(CXXFLAGS) $$(PCHFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+endif
+
+endef
+
+$(foreach repo,$(gb_CxxObject_REPOS),$(eval $(call gb_CxxObject__rules,$(repo))))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_CxxObject_get_dep_target,%) :
+    $(eval $(call gb_Output_error,Unable to find C++ file $(call gb_CxxObject_get_source,,$*) in repositories: $(gb_CxxObject_REPOS)))
+
+endif
+
+gb_CxxObject_CxxObject =
+
+
+# ObjCxxObject class
+#
+gb_ObjCxxObject_REPOS := $(gb_REPOS)
+
+gb_ObjCxxObject_get_source = $(1)/$(2).mm
+# defined by platform
+#  gb_ObjCxxObject__command
+
+# this rule generates an "always rebuild" dep file, to have something to include.
+# the dep file will be overridden on the fly, when the object is compiled
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_ObjCxxObject__command_dep
+mkdir -p $(dir $(1)) && \
+    echo '$(call gb_ObjCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_ObjCxxObject__command_dep =
+endif
+
+define gb_ObjCxxObject__rules
+$$(call gb_ObjCxxObject_get_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
+    $$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
+    $$(call gb_ObjCxxObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+endif
+
+endef
+
+$(foreach repo,$(gb_ObjCxxObject_REPOS),$(eval $(call gb_ObjCxxObject__rules,$(repo))))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_ObjCxxObject_get_dep_target,%) :
+    $(eval $(call gb_Output_error,Unable to find Objective C++ file $(call gb_ObjCxxObject_get_source,,$*) in repositories: $(gb_ObjCxxObject_REPOS)))
+endif
+
+gb_ObjCxxObject_ObjCxxObject =
+
+
+
+# LinkTarget class
+
+gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
+# defined by platform
+#  gb_LinkTarget_CXXFLAGS
+#  gb_LinkTarget_LDFLAGS
+#  gb_LinkTarget_INCLUDE 
+#  gb_LinkTarget_INCLUDE_STL
+
+.PHONY : $(call gb_LinkTarget_get_clean_target,%)
+$(call gb_LinkTarget_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),LNK,4)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f \
+            $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+            $(foreach object,$(COBJECTS),$(call gb_CObject_get_dep_target,$(object))) \
+            $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+            $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_dep_target,$(object))) \
+            $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
+            $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_dep_target,$(object))) \
+            $(call gb_LinkTarget_get_target,$*) \
+            $(call gb_LinkTarget_get_dep_target,$*) \
+            $(call gb_LinkTarget_get_headers_target,$*) \
+            $(call gb_LinkTarget_get_external_headers_target,$*) \
+            $(DLLTARGET) \
+            $(AUXTARGETS))
+
+# cat the deps of all objects in one file, then we need only open that one file
+define gb_LinkTarget__command_dep
+$(call gb_Output_announce,LNK:$(2),$(true),DEP,1)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    cat $(gb_Helper_NULLFILE)\
+        $(foreach object,$(3),$(call gb_CObject_get_dep_target,$(object))) \
+        $(foreach object,$(4),$(call gb_CxxObject_get_dep_target,$(object))) \
+        $(foreach object,$(5),$(call gb_ObjCxxObject_get_dep_target,$(object))) > $(1))
+endef
+
+$(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
+    $(call gb_LinkTarget__command,$@,$*,$(TARGETTYPE_FLAGS) $(LDFLAGS),$(LINKED_LIBS),$(LINKED_STATIC_LIBS),$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_dep_target,%)
+$(call gb_LinkTarget_get_dep_target,%) : | $(call gb_LinkTarget_get_headers_target,%)
+    $(call gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS))
+endif
+
+# Ok, this is some dark voodoo: When declaring a linktarget with
+# gb_LinkTarget_LinkTarget we set SELF in the headertarget to name of the
+# target. When the rule for the headertarget is executed and SELF does not
+# match the target name, we are depending on a linktarget that was never
+# declared. In a full build exclusively in gbuild that should never happen.
+# However, partial gbuild build will not know about how to build lower level
+# linktargets, just as gbuild can not know about linktargets generated in the
+# old build.pl/dmake system. Once all is migrated, gbuild should error out
+# when is is told to depend on a linktarget it does not know about and not
+# only warn.
+define gb_LinkTarget__get_external_headers_check
+ifneq ($$(SELF),$$*)
+$$(eval $$(call gb_Output_info,LinkTarget $$* not defined: Assuming headers to be there!,ALL))
+endif
+$$@ : COMMAND := $$(call gb_Helper_abbreviate_dirs, mkdir -p $$(dir $$@) && touch $$@)
+
+endef
+
+$(call gb_LinkTarget_get_external_headers_target,%) :
+    $(eval $(gb_LinkTarget__get_external_headers_check))
+    $(COMMAND)
+
+$(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_headers_target,%)
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && touch $@)
+
+# Explanation of some of the targets:
+# - gb_LinkTarget_get_external_headers_target is the targets that guarantees all
+#   headers from linked against libraries are in OUTDIR.
+# - gb_LinkTarget_get_headers_target is the target that guarantees all headers
+#   from the linked against the libraries and the linktargets own headers
+#   (including generated headers) are in the OUTDIR.
+# - gb_LinkTarget_get_target links the objects into a file in WORKDIR.
+# gb_LinkTarget_get_target depends on gb_LinkTarget_get_headers_target which in
+# turn depends gb_LinkTarget_get_external_headers_target.
+# gb_LinkTarget_get_target depends additionally on the objects, which in turn
+# depend build-order only on the gb_LinkTarget_get_headers_target. The build
+# order-only dependency ensures all headers to be there for compiling and
+# dependency generation without causing all objects to be rebuild when one
+# header changes. Only the ones with an explicit dependency in their generated
+# dependency file will be rebuild.
+#
+# gb_LinkTarget_get_target is the target that links the objects into a file in
+# WORKDIR
+# Explanation of some of the variables:
+# - AUXTARGETS are the additionally generated files that need to be cleaned out
+#   on clean.
+# - PCH_CXXFLAGS and PCH_DEFS are the flags that the precompiled headers will
+#   be compiled with.  They should never be overridden in a single object
+#   files.
+# - TARGETTYPEFLAGS are the flags that are needed for a specific kind of target
+#   (shl,exe...) They are mostly used by the platforms.
+#
+# Since most variables are set on the linktarget and not on the object, the
+# object learns about these setting via GNU makes scoping of target variables.
+# Therefore it is important that objects are only directly depended on by the
+# linktarget. This for example means that you cannot build a single object
+# alone, because then you would directly depend on the object.
+define gb_LinkTarget_LinkTarget
+$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS :=
+$(call gb_LinkTarget_get_external_headers_target,$(1)) : SELF := $(1)
+$(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := 
+$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : COBJECTS := 
+$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS := 
+$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS :=
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
+$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $$(gb_LinkTarget_LDFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := 
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := 
+$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE_FLAGS := 
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
+
+ifeq ($(gb_FULLDEPS),$(true))
+ifneq ($(wildcard $(call gb_LinkTarget_get_dep_target,$(1))),)
+include $(call gb_LinkTarget_get_dep_target,$(1))
+else
+$(firstword $(MAKEFILE_LIST)) : $(call gb_LinkTarget_get_dep_target,$(1))
+endif
+$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS := 
+$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS := 
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
+$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE_FLAGS := 
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME :=
+endif
+
+endef
+
+define gb_LinkTarget_set_defs
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $(2)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_cflags
+$(call gb_LinkTarget_get_target,$(1)) : CFLAGS := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : CFLAGS := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_cxxflags
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_objcxxflags
+$(call gb_LinkTarget_get_target,$(1)) : OBJCXXFLAGS := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXFLAGS := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_include
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_include_stl
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $(2)
+endif
+
+endef
+
+define gb_LinkTarget_set_ldflags
+$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2)
+endef
+
+define gb_LinkTarget_add_linked_libs
+ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
+$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
+$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
+endif
+
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call gb_Library_get_target,$$(lib)))
+$(call gb_LinkTarget_get_external_headers_target,$(1)) : \
+$$(foreach lib,$(2),$$(call gb_Library_get_headers_target,$$(lib)))
+
+endef
+
+define gb_LinkTarget_add_linked_static_libs
+ifneq (,$$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)))
+$$(eval $$(call gb_Output_info, currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL))
+$$(eval $$(call gb_Output_error,Cannot link against static library/libraries $$(filter-out $(gb_StaticLibrary_KNOWNLIBS),$(2)). Static libraries must be registered in Repository.mk))
+endif
+
+$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_target,$$(lib)))
+$(call gb_LinkTarget_get_external_headers_target,$(1)) : \
+$$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib)))
+
+endef
+
+define gb_LinkTarget_add_cobject
+$(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : COBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CObject_get_target,$(2))
+$(call gb_CObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_CObject_get_target,$(2)) : CFLAGS += $(3)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CObject_get_dep_target,$(2))
+endif
+
+endef
+
+define gb_LinkTarget_add_cxxobject
+$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : CXXOBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2))
+$(call gb_CxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_CxxObject_get_target,$(2)) : CXXFLAGS += $(3)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CxxObject_get_dep_target,$(2))
+endif
+
+endef
+
+define gb_LinkTarget_add_objcxxobject
+$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : OBJCXXOBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCxxObject_get_target,$(2))
+$(call gb_ObjCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_ObjCxxObject_get_target,$(2)) : OBJCXXFLAGS += $(3)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCxxObject_get_dep_target,$(2))
+endif
+
+endef
+
+define gb_LinkTarget_add_noexception_object
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS))
+endef
+
+define gb_LinkTarget_add_exception_object
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS))
+endef
+
+define gb_LinkTarget_add_cobjects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_cobject,$(1),$(obj),$(3)))
+endef
+
+define gb_LinkTarget_add_cxxobjects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_cxxobject,$(1),$(obj),$(3)))
+endef
+
+define gb_LinkTarget_add_objcxxobjects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_objcxxobject,$(1),$(obj),$(3)))
+endef
+
+define gb_LinkTarget_add_noexception_objects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_noexception_object,$(1),$(obj)))
+endef
+
+define gb_LinkTarget_add_exception_objects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj)))
+endef
+
+define gb_LinkTarget_set_targettype_flags
+$(call gb_LinkTarget_get_target,$(1)) \
+$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE_FLAGS := $(2)
+endef
+
+define gb_LinkTarget_set_dlltarget
+$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(2)
+endef
+
+define gb_LinkTarget_set_auxtargets
+$(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS := $(2)
+endef
+
+define gb_LinkTarget__add_internal_headers
+$(call gb_LinkTarget_get_headers_target,$(1)) : $(2)
+$(2) :|	$(call gb_LinkTarget_get_external_headers_target,$(1))
+
+endef
+
+define gb_LinkTarget_add_package_headers
+$(call gb_LinkTarget__add_internal_headers,$(1),$(foreach package,$(2),$(call gb_Package_get_target,$(package))))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package)))
+
+endef
+
+define gb_LinkTarget_add_sdi_headers
+$(call gb_LinkTarget__add_internal_headers,$(1),$(foreach sdi,$(2),$(call gb_SdiTarget_get_target,$(sdi))))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTarget_get_clean_target,$(sdi)))
+endef
+
+define gb_LinkTarget__add_precompiled_header_impl
+$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_PrecompiledHeader_get_target,$(3)))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_PrecompiledHeader_get_clean_target,$(3))
+$(call gb_PrecompiledHeader_get_target,$(3)) : $(2).cxx
+
+$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_NoexPrecompiledHeader_get_target,$(3)))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_NoexPrecompiledHeader_get_clean_target,$(3))
+$(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(2).cxx
+
+$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS = $$(DEFS)
+ifeq ($(gb_FULLDEPS),$(true))
+-include \
+    $(call gb_PrecompiledHeader_get_dep_target,$(3)) \
+    $(call gb_NoexPrecompiledHeader_get_dep_target,$(3))
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS)
+endif
+
+endef
+
+define gb_LinkTarget_add_precompiled_header
+ifeq ($(gb_ENABLE_PCH),$(true))
+$(call gb_LinkTarget__add_precompiled_header_impl,$(1),$(2),$(notdir $(2)))
+endif
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
new file mode 100644
index 000000000..afc40a835
--- /dev/null
+++ b/solenv/gbuild/Module.mk
@@ -0,0 +1,128 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+
+# Module class
+
+gb_Module_ALLMODULES :=
+gb_Module_MODULELOCATIONS :=
+gb_Module_TARGETSTACK :=
+gb_Module_CLEANTARGETSTACK :=
+
+.PHONY : $(call gb_Module_get_clean_target,%)
+$(call gb_Module_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),MOD,5)
+    $(call gb_Output_announce_title,module $* cleared.)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_Module_get_target,$*))
+
+$(call gb_Module_get_target,%) :
+    $(call gb_Output_announce,$*,$(true),MOD,5)
+    $(call gb_Output_announce_title,module $* done.)
+    -$(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && \
+        touch $@)
+
+.PHONY : all clean
+.DEFAULT_GOAL := all
+
+all : 
+    $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
+    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)
+    $(call gb_Output_announce_title,all done.)
+    $(call gb_Output_announce_bell)
+
+clean : 
+    $(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6)
+    $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6)
+    $(call gb_Output_announce_title,all cleared.)
+    $(call gb_Output_announce_bell)
+
+define gb_Module_Module
+gb_Module_ALLMODULES += $(1)
+gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Module_get_target,$(1)),$(call gb_Module_get_clean_target,$(1))))
+
+endef
+
+# This is called inside the included file and pushes one target on each stack.
+# This has to be called with full late evaluation ($$(eval $$(call ))) and
+# should never be inlined ($(call )) as the calls defining it might be sourced
+# before gb_Module.
+define gb_Module_register_target
+gb_Module_TARGETSTACK := $(1) $(gb_Module_TARGETSTACK)
+gb_Module_CLEANTARGETSTACK := $(2) $(gb_Module_CLEANTARGETSTACK)
+
+endef
+
+# Here we include the file (in it there will be a call to
+# gb_Module_register_target) and pop one target from each stack afterwards.
+define gb_Module_add_target
+include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2).mk
+$(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
+$(call gb_Module_get_clean_target,$(1)) : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
+gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
+gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
+
+endef
+
+define gb_Module_add_moduledir
+$(call gb_Module_add_target,$(1),$(2)/Module_$(2))
+endef
+
+define gb_Module_add_targets
+$(foreach target,$(2),$(call gb_Module_add_target,$(1),$(target)))
+endef
+
+define gb_Module_add_moduledirs
+$(foreach target,$(2),$(call gb_Module_add_moduledir,$(1),$(target)))
+endef
+
+define gb_Module_make_global_targets
+ifneq ($$(gb_Module_TARGETSTACK),)
+$$(eval $$(call gb_Output_error,Corrupted module target stack!))
+endif
+
+include $(1)
+
+all : $$(firstword $$(gb_Module_TARGETSTACK))
+clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
+
+ifneq ($$(words $$(gb_Module_TARGETSTACK)),1)
+$$(eval $$(call gb_Output_error,Corrupted module target stack!))
+endif
+
+gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
+gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
+
+ifneq ($$(gb_Module_TARGETSTACK),)
+$$(eval $$(call gb_Output_error,Corrupted module target stack!))
+endif
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
new file mode 100644
index 000000000..dabb9b080
--- /dev/null
+++ b/solenv/gbuild/Output.mk
@@ -0,0 +1,147 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# user notifications and formatting
+
+define gb_Output__format_type
+[ $(word 2,$(1) build clean) $(2) ]
+endef
+
+define gb_Output__format_target
+$(1)
+endef
+
+define gb_Output_error
+$(error $(1))
+endef
+
+define gb_Output_announce_title
+endef
+
+define gb_Output_announce_bell
+endef
+
+define gb_Output_info
+$(info [ info  $(2) ] $(1))
+endef
+
+define gb_Output_warn
+$(warning $(NEWLINE)[ WARN  $(2) ] !!!$(NEWLINE)[ WARN  $(2) ] !!! $(1)$(NEWLINE)[ WARN  $(2) ] !!!)
+endef
+
+gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
+
+# only enable colorized output if
+# - gb_COLOR is set
+# - we have a known term
+ifneq ($(strip $(gb_COLOR)),)
+ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen xterm xterm-color),)
+
+gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m
+gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE)
+
+gb_Output_COLOR_OUTBUILD_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTBUILD_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTBUILD_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTBUILD_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTBUILD_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;46m
+gb_Output_COLOR_OUTBUILD_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;44m
+
+gb_Output_COLOR_INBUILD_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[36;40m
+gb_Output_COLOR_INBUILD_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[36;1;40m
+gb_Output_COLOR_INBUILD_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[32;40m
+gb_Output_COLOR_INBUILD_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[32;1;40m
+gb_Output_COLOR_INBUILD_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;46m
+gb_Output_COLOR_INBUILD_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;44m
+
+gb_Output_COLOR_OUTCLEAN_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTCLEAN_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTCLEAN_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTCLEAN_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[37;40m
+gb_Output_COLOR_OUTCLEAN_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[33;1;41m
+gb_Output_COLOR_OUTCLEAN_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
+
+gb_Output_COLOR_INCLEAN_LEVEL1 := $(gb_Output_COLOR_RESETANDESCAPE)[33;40m
+gb_Output_COLOR_INCLEAN_LEVEL2 := $(gb_Output_COLOR_RESETANDESCAPE)[33;1;40m
+gb_Output_COLOR_INCLEAN_LEVEL3 := $(gb_Output_COLOR_RESETANDESCAPE)[31;40m
+gb_Output_COLOR_INCLEAN_LEVEL4 := $(gb_Output_COLOR_RESETANDESCAPE)[31;1;40m
+gb_Output_COLOR_INCLEAN_LEVEL5 := $(gb_Output_COLOR_RESETANDESCAPE)[33;1;41m
+gb_Output_COLOR_INCLEAN_LEVEL6 := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
+
+gb_Output_COLOR_ERROR := $(gb_Output_COLOR_RESETANDESCAPE)[37;1;41m
+
+define gb_Output__format_type
+$(subst :, ,$(word 2,$(1) \
+    $(gb_Output_COLOR_OUTBUILD_LEVEL$(3))[:$(gb_Output_COLOR_INBUILD_LEVEL$(3))__.oO:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTBUILD_LEVEL$(3)):] \
+    $(gb_Output_COLOR_OUTCLEAN_LEVEL$(3))[:$(gb_Output_COLOR_INCLEAN_LEVEL$(3))Xx.__:$(subst $(WHITESPACE),:,$(2))$(gb_Output_COLOR_OUTCLEAN_LEVEL$(3)):]))$(gb_Output_COLOR_RESET)
+endef
+
+define gb_Output_info
+$(info $(gb_Output_COLOR_OUTBUILD_LEVEL6)[ $(gb_Output_COLOR_INBUILD_LEVEL6)info  $(2)$(gb_Output_COLOR_OUTBUILD_LEVEL6) ]$(gb_Output_COLOR_RESET) $(1))
+endef
+
+define gb_Output_warn
+$(warning $(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN  $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!!$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN  $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!! $(1)$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN  $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!!)
+endef
+
+define gb_Output_error
+$(error $(gb_Output_COLOR_ERROR)$(1)$(gb_Output_COLOR_RESET))
+endef
+
+endif
+endif
+
+# only enable title output if
+# - gb_TITLES is set
+# - we have a known term
+ifneq ($(strip $(gb_TITLES)),)
+ifneq ($(filter $(TERM),Eterm aterm gnome kterm rxvt rxvt-unicode screen xterm xterm-color),)
+define gb_Output_announce_title
+$(info $(gb_Output_ESCAPE)]2;gbuild: $(1)$(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
+endef
+
+$(call gb_Output_announce_title,...)
+
+endif
+endif
+
+# only enable bell output if
+# - gb_BELL is set
+# - gb_TTY is true (not piping to a file)
+ifneq ($(strip $(gb_BELL)),)
+define gb_Output_announce_bell
+$(info $(gb_Output_BELL)$(gb_Output_ESCAPE)[A)
+endef
+endif
+
+define gb_Output_announce
+$(info $(call gb_Output__format_type,$(2),$(3),$(4)) $(call gb_Output__format_target,$(1)))
+endef
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
new file mode 100644
index 000000000..7ed91db48
--- /dev/null
+++ b/solenv/gbuild/Package.mk
@@ -0,0 +1,67 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+
+# PackagePart class
+
+$(foreach destination,$(call gb_PackagePart_get_destinations), $(destination)/%) :
+    $(call gb_Deliver_deliver,$<,$@)
+
+define gb_PackagePart_PackagePart
+$(OUTDIR)/$(1) : $(2) 
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2))
+
+endef
+
+
+# Package class
+
+.PHONY : $(call gb_Package_get_clean_target,%)
+$(call gb_Package_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),PKG,2)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(FILES))
+
+$(call gb_Package_get_target,%) :
+    $(call gb_Output_announce,$*,$(true),PKG,2)
+    mkdir -p $(dir $@) && touch $@
+
+define gb_Package_Package
+gb_Package_SOURCEDIR_$(1) := $(2)
+$(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1))
+$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1))))
+
+endef
+
+define gb_Package_add_file
+$(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2)
+$(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2)
+$(call gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3))
+$(OUTDIR)/$(2) : $$(gb_Package_SOURCEDIR_$(1))/$(3)
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
new file mode 100644
index 000000000..23e075f2a
--- /dev/null
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -0,0 +1,75 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+
+# PrecompiledHeader class
+
+ifeq ($(gb_ENABLE_PCH),$(true))
+
+# gb_PrecompiledHeader_get_enableflags defined by platform
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_PrecompiledHeader_DEBUGDIR := debug
+gb_NoexPrecompiledHeader_DEBUGDIR := debug
+else
+gb_PrecompiledHeader_DEBUGDIR := nodebug
+gb_NoexPrecompiledHeader_DEBUGDIR := nodebug
+endif
+
+$(call gb_PrecompiledHeader_get_dep_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && \
+        echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+
+$(call gb_NoexPrecompiledHeader_get_dep_target,%) :
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $@) && \
+        echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+
+$(call gb_PrecompiledHeader_get_target,%) :
+    $(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+
+$(call gb_NoexPrecompiledHeader_get_target,%) :
+    $(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
+
+.PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%)
+$(call gb_PrecompiledHeader_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),PCH,1)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_PrecompiledHeader_get_target,$*) \
+            $(call gb_PrecompiledHeader_get_target,$*).pdb \
+            $(call gb_PrecompiledHeader_get_dep_target,$*))
+
+
+$(call gb_NoexPrecompiledHeader_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),PCH,1)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \
+            $(call gb_NoexPrecompiledHeader_get_target,$*).pdb \
+            $(call gb_NoexPrecompiledHeader_get_dep_target,$*))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
new file mode 100644
index 000000000..0281337fc
--- /dev/null
+++ b/solenv/gbuild/SdiTarget.mk
@@ -0,0 +1,72 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# SdiTarget is evil, in that it does not support multiple repositories for now (hardcoded to SRCDIR)
+# Also there is no way to cleanly deliver the generated header to OUTDIR.
+# (This can be workarounded by using gb_Package, but really should not.)
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target,svidl)
+gb_SdiTarget_SVIDLAUXDEPS := $(call gb_Library_get_target,tl) $(call gb_Library_get_target,sal)
+gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
+
+$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET) $(gb_SdiTarget_SVIDLAUXDEPS)
+    $(call gb_Output_announce,$*,$(true),SDI,1)
+    $(call gb_Helper_abbreviate_dirs,\
+        mkdir -p $(dir $(WORKDIR)/inc/$*) $(dir $@))
+    $(call gb_Helper_abbreviate_dirs_native,\
+        cd $(dir $<) && \
+        $(gb_SdiTarget_SVIDLCOMMAND) -quiet \
+            $(INCLUDE) \
+            -fs$@.hxx \
+            -fd$@.ilb \
+            -fl$@.lst \
+            -fz$@.sid \
+            -fx$(EXPORTS) \
+            -fm$@ \
+            $<)
+
+.PHONY : $(call gb_SdiTarget_get_clean_target,%)
+$(call gb_SdiTarget_get_clean_target,%) :
+    $(call gb_Output_announce,$*,$(false),SDI,1)
+    -$(call gb_Helper_abbreviate_dirs,\
+        rm -f $(foreach ext,.hxx .ilb .lst .sid,\
+            $(call gb_SdiTarget_get_target,$*)$(ext)) \
+            $(call gb_SdiTarget_get_target,$*))
+
+define gb_SdiTarget_SdiTarget
+$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := -I$(WORKDIR)/inc/ $$(subst -I. ,-I$$(dir $(SRCDIR)/$(1)) ,$$(SOLARINC))
+$(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi
+endef
+
+define gb_SdiTarget_set_include
+$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(2)
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
new file mode 100644
index 000000000..6d1f07b06
--- /dev/null
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -0,0 +1,107 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+
+# Static Library class
+
+# defined globally in gbuild.mk
+#  gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib
+# defined by platform
+#  gb_StaticLibrary_DEFS
+#  gb_StaticLibrary_FILENAMES
+#  gb_StaticLibrary_TARGETS
+#  gb_StaticLibrary_TARGETTYPEFLAGS
+
+
+# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
+.PHONY : $(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT)
+$(WORKDIR)/Clean/OutDir/lib/%$(gb_StaticLibrary_PLAINEXT) : $(call gb_LinkTarget_get_clean_target,$(call gb_StaticLibrary_get_linktargetname,%$(gb_StaticLibrary_PLAINEXT)))
+    $(call gb_Helper_abbreviate_dirs,\
+        rm -f $(OUTDIR)/lib/$*$(gb_StaticLibrary_PLAINEXT) \
+            $(AUXTARGETS))
+
+# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
+$(gb_StaticLibrary_OUTDIRLOCATION)/%$(gb_StaticLibrary_PLAINEXT) : 
+    $(call gb_Helper_abbreviate_dirs,\
+        $(call gb_Deliver_deliver,$<,$@) \
+            $(foreach target,$(AUXTARGETS), && $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(target)),$(target))))
+
+define gb_StaticLibrary_StaticLibrary
+ifeq (,$$(findstring $(1),$$(gb_StaticLibrary_KNOWNLIBS)))
+$$(eval $$(call gb_Output_info,Currently known static libraries are: $(sort $(gb_StaticLibrary_KNOWNLIBS)),ALL))
+$$(eval $$(call gb_Output_error,Static library $(1) must be registered in Repository.mk))
+endif
+$(call gb_StaticLibrary_get_target,$(1)) : AUXTARGETS :=
+$(call gb_StaticLibrary__StaticLibrary_impl,$(1),$(call gb_StaticLibrary_get_linktargetname,$(call gb_StaticLibrary_get_filename,$(1))))
+
+endef
+
+define gb_StaticLibrary__StaticLibrary_impl
+$(call gb_LinkTarget_LinkTarget,$(2))
+$(call gb_LinkTarget_set_targettype_flags,$(2),$(gb_StaticLibrary_TARGETTYPEFLAGS))
+$(call gb_LinkTarget_set_defs,$(2),\
+    $$(DEFS) \
+    $(gb_StaticLibrary_DEFS) \
+)
+$(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
+$(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
+$$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
+$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+
+endef
+
+define gb_StaticLibrary_forward_to_Linktarget
+gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$(call gb_StaticLibrary_get_linktargetname,$$(call gb_StaticLibrary_get_filename,$$(1))),$$(2),$$(3))
+
+endef
+
+$(eval $(foreach method,\
+    add_cobject \
+    add_cobjects \
+    add_cxxobject \
+    add_cxxobjects \
+    add_objcxxobject \
+    add_objcxxobjects \
+    add_exception_objects \
+    add_noexception_objects \
+    set_cflags \
+    set_cxxflags \
+    set_objcxxflags \
+    set_defs \
+    set_include \
+    set_ldflags \
+    set_library_path_flags \
+    add_linked_libs \
+    add_linked_static_libs \
+    add_package_headers \
+    add_sdi_headers \
+    add_precompiled_header \
+,\
+    $(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
new file mode 100644
index 000000000..03ff66523
--- /dev/null
+++ b/solenv/gbuild/TargetLocations.mk
@@ -0,0 +1,145 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+# outdir target pattern
+
+gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
+gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
+gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin
+gb_PackagePart_get_target = $(OUTDIR)/$(1)
+gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
+gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
+
+define gb_Library_get_target
+$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
+endef
+
+define gb_StaticLibrary_get_target
+$(patsubst $(1):%,$(gb_StaticLibrary_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_StaticLibrary_TARGETS)):%,$(gb_StaticLibrary_FILENAMES)))
+endef
+
+
+# workdir target patterns
+
+gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
+gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
+gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
+gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
+gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
+gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
+gb_LinkTarget_get_external_headers_target = $(WORKDIR)/ExternalHeaders/$(1)
+gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1)
+gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1)
+gb_Module_get_target = $(WORKDIR)/Module/$(1)
+gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
+gb_Package_get_target = $(WORKDIR)/Package/$(1)
+gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
+gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
+gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
+gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
+gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
+gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
+
+define gb_Library_get_external_headers_target
+$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
+endef
+
+define gb_Library_get_headers_target
+$(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
+endef
+
+define gb_StaticLibrary_get_external_headers_target
+$(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
+endef
+
+define gb_StaticLibrary_get_headers_target
+$(patsubst $(1):%,$(WORKDIR)/Headers/StaticLibrary/%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
+endef
+
+$(eval $(call gb_Helper_make_clean_targets,\
+    AllLangResTarget \
+    ComponentTarget \
+    LinkTarget \
+    Module \
+    NoexPrecompiledHeader \
+    PackagePart \
+    PrecompiledHeader \
+    ResTarget \
+    SdiTarget \
+    SrsTarget \
+))
+
+$(eval $(call gb_Helper_make_outdir_clean_targets,\
+    Executable \
+    Library \
+    Package \
+    StaticLibrary \
+))
+
+$(eval $(call gb_Helper_make_dep_targets,\
+    CObject \
+    CxxObject \
+    ObjCxxObject \
+    LinkTarget \
+    SrsPartTarget \
+    SrsTarget \
+    PrecompiledHeader \
+    NoexPrecompiledHeader \
+))
+
+
+# other getters
+
+gb_Library_get_linktargetname = Library/$(1)
+gb_StaticLibrary_get_linktargetname = StaticLibrary/$(1)
+
+define gb_Library_get_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER)))
+endef
+
+define gb_Executable_get_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Executable_LAYER)))
+endef
+
+define gb_Library_get_filename
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_FILENAMES)))
+endef
+
+define gb_StaticLibrary_get_filename
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
+endef
+
+
+# static members declared here because they are used globally
+
+gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib
+gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
+gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/PackModule.mk b/solenv/gbuild/extensions/PackModule.mk
new file mode 100644
index 000000000..237ffcf72
--- /dev/null
+++ b/solenv/gbuild/extensions/PackModule.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+# this is an optional extension to gbuild
+# it depends on scripts outside the gbuild directory
+# nothing in the gbuild core should ever depend on it
+
+.PHONY : packmodule cleanpackmodule
+
+define gb_PackModule_setpackmodulecommand
+ifeq ($$(words $(gb_Module_ALLMODULES)),1)
+$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),ZIP,5))
+packmodule : COMMAND := $$(SOLARENV)/bin/packmodule $$(OUTDIR) $$(strip $$(gb_Module_ALLMODULES))
+else
+$$(eval $$(call gb_Output_announce,more than one module - creating no zipped package,$$(true),ZIP,5))
+packmodule : COMMAND := true
+endif
+endef
+
+packmodule : all
+    $(eval $(call gb_PackModule_setpackmodulecommand))
+    $(COMMAND)
+
+define gb_PackModule_setcleanpackmodulecommand
+ifeq ($$(words $(gb_Module_ALLMODULES)),1)
+$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(false),ZIP,5))
+cleanpackmodule : COMMAND := rm -f $$(OUTDIR)/zip/$$(strip $$(gb_Module_ALLMODULES)).zip
+else
+$$(eval $$(call gb_Output_announce,more than one module - deleting no zipped package,$$(false),ZIP,5))
+cleanpackmodule : COMMAND := true
+endif
+endef
+
+cleanpackmodule : clean
+    $(eval $(call gb_PackModule_setcleanpackmodulecommand))
+    $(COMMAND)
+    
+# vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/extensions/SetupLocal.mk b/solenv/gbuild/extensions/SetupLocal.mk
new file mode 100644
index 000000000..483b8a163
--- /dev/null
+++ b/solenv/gbuild/extensions/SetupLocal.mk
@@ -0,0 +1,68 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+.PHONY : setuplocal removelocal
+ifneq ($(gb_LOCALBUILDDIR),)
+ifneq ($(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk),)
+setuplocal :
+    $(eval $(call gb_Output_error,$(gb_LOCALBUILDDIR) exists already.))
+
+else
+
+setuplocal :
+    $(eval MODULE := $(firstword $(MODULE) $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))))
+    $(eval modulerepo := $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))))
+    $(eval $(call gb_Output_announce,setting up local build directory (module: $(MODULE)).,$(true),SYC,5))
+    mkdir -p $(gb_LOCALBUILDDIR)/srcdir $(gb_LOCALBUILDDIR)/workdir $(gb_LOCALBUILDDIR)/outdir
+    rsync --archive --exclude 'workdir/**' $(SOLARVERSION)/$(INPATH)/ $(gb_LOCALBUILDDIR)/outdir
+    cp $(modulerepo)/Repository.mk $(gb_LOCALBUILDDIR)/srcdir/Repository.mk
+    cp $(modulerepo)/RepositoryFixes.mk $(gb_LOCALBUILDDIR)/srcdir/RepositoryFixes.mk
+    rsync --archive $(modulerepo)/$(MODULE)/ $(gb_LOCALBUILDDIR)/srcdir/$(MODULE)
+    echo "gb_REPOS := $(gb_LOCALBUILDDIR)/srcdir $(filter-out $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))),$(gb_REPOS))" > $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "#original gb_REPOS was $(gb_REPOS)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "OUTDIR := $(gb_LOCALBUILDDIR)/outdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "#original OUTDIR was $(OUTDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "WORKDIR := $(gb_LOCALBUILDDIR)/workdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+    echo "#original WORKDIR was $(WORKDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
+
+endif
+
+removelocal :
+    $(eval $(call gb_Output_warn,removing directory $(gb_LOCALBUILDDIR).,SYC))
+    sleep 10
+    rm -rf $(gb_LOCALBUILDDIR)
+
+else
+setuplocal:
+    $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
+
+removelocal:
+    $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
new file mode 100644
index 000000000..193ca6d3b
--- /dev/null
+++ b/solenv/gbuild/gbuild.mk
@@ -0,0 +1,212 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+# vars needed from the env/calling makefile
+
+# CVER
+# DEBUG
+# GBUILDDIR
+# INPATH
+# JAVA_HOME
+# JDKINCS
+# LIBXML_CFLAGS
+# OS
+# PRODUCT
+# SOLARINC
+# SOLARLIB
+# STLPORT_VER
+# UPD
+
+# GXX_INCLUDE_PATH (Linux)
+# PTHREAD_CFLAGS (Linux)
+# SYSTEM_ICU (Linux)
+# SYSTEM_JPEG (Linux)
+# SYSTEM_LIBXML (Linux)
+# USE_SYSTEM_STL (Linux)
+
+SHELL := /bin/sh
+true := T
+false :=
+define NEWLINE
+
+
+endef
+
+define WHITESPACE
+ 
+endef
+
+COMMA :=,
+
+include $(GBUILDDIR)/Output.mk
+
+# BuildDirs uses the Output functions already
+include $(GBUILDDIR)/BuildDirs.mk
+
+
+ifneq ($(strip $(PRODUCT)$(product)),)
+gb_PRODUCT := $(true)
+else
+ifneq ($(strip $(product)),)
+gb_PRODUCT := $(true)
+else
+gb_PRODUCT := $(false)
+endif
+endif
+
+ifneq ($(strip $(DEBUG)$(debug)),)
+gb_DEBUGLEVEL := 2
+else
+ifeq ($(gb_PRODUCT),$(true))
+gb_DEBUGLEVEL := 0
+else
+gb_DEBUGLEVEL := 1
+endif
+endif
+
+ifneq ($(strip $(ENABLE_PCH)),)
+gb_ENABLE_PCH := $(true)
+else
+gb_ENABLE_PCH := $(false)
+endif
+
+# for clean, setuplocal and removelocal goals we switch off dependencies
+ifneq ($(filter clean setuplocal removelocal,$(MAKECMDGOALS)),)
+gb_FULLDEPS := $(false)
+else
+gb_FULLDEPS := $(true)
+endif
+
+include $(GBUILDDIR)/Helper.mk
+include $(GBUILDDIR)/TargetLocations.mk
+
+$(eval $(call gb_Helper_init_registries))
+$(eval $(call gb_Helper_add_repositories,$(gb_REPOS)))
+$(eval $(call gb_Helper_collect_libtargets))
+
+ifeq ($(OS),LINUX)
+include $(GBUILDDIR)/platform/linux.mk
+else
+ifeq ($(OS),WNT)
+include $(GBUILDDIR)/platform/windows.mk
+else
+ifeq ($(OS),SOLARIS)
+include $(GBUILDDIR)/platform/solaris.mk
+else
+ifeq ($(OS),MACOSX)
+include $(GBUILDDIR)/platform/macosx.mk
+else
+$(eval $(call gb_Output_error,Unsupported OS: $(OS)))
+endif
+endif
+endif
+endif
+
+include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk)
+
+$(eval $(call gb_Helper_collect_knownlibs))
+
+gb_GLOBALDEFS := \
+    -D_REENTRANT \
+    -DCUI \
+    -DENABLE_LAYOUT_EXPERIMENTAL=0 \
+    -DENABLE_LAYOUT=0 \
+    -DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
+    -DSOLAR_JAVA \
+    -DSTLPORT_VERSION=$(STLPORT_VER) \
+    -DSUPD=$(UPD) \
+    -DVCL \
+    $(gb_OSDEFS) \
+    $(gb_COMPILERDEFS) \
+    $(gb_CPUDEFS) \
+
+ifeq ($(gb_PRODUCT),$(true))
+gb_GLOBALDEFS += \
+    -DPRODUCT \
+    -DPRODUCT_FULL \
+
+else
+gb_GLOBALDEFS += \
+    -DDBG_UTIL \
+    -D_STLP_DEBUG \
+    -D_DEBUG \
+
+endif
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_GLOBALDEFS += \
+    -DDEBUG \
+
+else
+gb_GLOBALDEFS += \
+    -DOPTIMIZE \
+    -DNDEBUG \
+
+endif
+
+gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
+
+include $(GBUILDDIR)/Deliver.mk
+
+$(eval $(call gb_Deliver_init))
+
+# We are using a set of scopes that we might as well call classes.
+
+# It is important to include them in the right order as that is
+# -- at least in part -- defining precedence. This is not an issue in the
+# WORKDIR as there are no nameing collisions there, but OUTDIR is a mess
+# and precedence is important there. This is also platform dependant.
+# For example:
+# $(OUTDIR)/bin/% for executables collides
+#	with $(OUTDIR)/bin/%.res for resources on unix
+# $(OUTDIR)/lib/%.lib collides
+#	on windows (static and dynamic libs)
+# $(OUTDIR)/xml/% for packageparts collides
+#	with $(OUTDIR)/xml/component/%.component for components
+# This is less of an issue with GNU Make versions > 3.82 which matches for
+# shortest stem instead of first match. However, upon intoduction this version
+# is not available everywhere by default.
+
+include $(foreach class, \
+    ComponentTarget \
+    AllLangResTarget \
+    LinkTarget \
+    Library \
+    StaticLibrary \
+    Executable \
+    SdiTarget \
+    Package \
+    PrecompiledHeaders \
+    Module \
+,$(GBUILDDIR)/$(class).mk)
+
+# optional extensions that should never be essential
+ifneq ($(wildcard $(GBUILDDIR)/extensions/*.mk),)
+include $(wildcard $(GBUILDDIR)/extensions/*.mk)
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
new file mode 100755
index 000000000..f8505ccd3
--- /dev/null
+++ b/solenv/gbuild/platform/linux.mk
@@ -0,0 +1,346 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+GUI := UNX
+COM := GCC
+
+gb_MKTEMP := mktemp -p
+
+gb_CC := gcc
+gb_CXX := g++
+gb_GCCP := gcc
+gb_AWK := awk
+
+# normalize setsolar and configure env.
+ifeq ($(CPU),X)
+CPUNAME := X86_64
+endif
+
+# use CC/CXX if they are nondefaults
+ifneq ($(origin CC),default)
+gb_CC := $(CC)
+gb_GCCP := $(CC)
+endif
+ifneq ($(origin CXX),default)
+gb_CXX := $(CXX)
+endif
+
+gb_OSDEFS := \
+    -DLINUX \
+    -D_PTHREADS \
+    -DUNIX \
+    -DUNX \
+    $(PTHREAD_CFLAGS) \
+
+ifeq ($(GXX_INCLUDE_PATH),)
+GXX_INCLUDE_PATH=$(COMPATH)/include/c++/$(shell gcc -dumpversion)
+endif
+
+gb_COMPILERDEFS := \
+    -DGCC \
+    -D$(CVER) \
+    -DCVER=$(CVER) \
+    -DGLIBC=2 \
+    -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
+    -DHAVE_GCC_VISIBILITY_FEATURE \
+    -DCPPU_ENV=gcc3 \
+
+ifeq ($(CPUNAME),X86_64)
+gb_CPUDEFS := -D$(CPUNAME)
+else
+gb_CPUDEFS := -DX86
+endif
+
+gb_CFLAGS := \
+    -Wall \
+    -Wendif-labels \
+    -Wextra \
+    -fmessage-length=0 \
+    -fno-strict-aliasing \
+    -fpic \
+    -fvisibility=hidden \
+    -pipe \
+
+gb_CXXFLAGS := \
+    -Wall \
+    -Wendif-labels \
+    -Wextra \
+    -Wno-ctor-dtor-privacy \
+    -Wno-non-virtual-dtor \
+    -Wreturn-type \
+    -Wshadow \
+    -Wuninitialized \
+    -fmessage-length=0 \
+    -fno-strict-aliasing \
+    -fno-use-cxa-atexit \
+    -fpic \
+    -fvisibility=hidden \
+    -fvisibility-inlines-hidden \
+    -pipe \
+
+ifneq ($(SYSBASE),)
+gb_CXXFLAGS += --sysroot=$(SYSBASE)
+gb_CFLAGS += --sysroot=$(SYSBASE)
+endif
+gb_LinkTarget_EXCEPTIONFLAGS := \
+    -DEXCEPTIONS_ON \
+    -fexceptions \
+    -fno-enforce-eh-specs \
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+    -DEXCEPTIONS_OFF \
+    -fno-exceptions \
+    
+gb_LinkTarget_LDFLAGS := \
+    -Wl,--sysroot=$(SYSBASE) \
+    -Wl,-rpath-link=$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
+    -Wl,--hash-style=both \
+    -Wl,-z,combreloc \
+    -Wl,-z,defs \
+    $(subst -L../lib , ,$(SOLARLIB)) \
+
+ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
+gb_LinkTarget_LDFLAGS += \
+    -Wl,--dynamic-list-cpp-new \
+    -Wl,--dynamic-list-cpp-typeinfo \
+    -Wl,-Bsymbolic-functions \
+
+endif
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_COMPILEROPTFLAGS := -O0
+else
+gb_COMPILEROPTFLAGS := -Os
+endif
+
+
+# Helper class
+
+gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+
+# CObject class
+
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+    $(gb_CC) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_CObject_get_target,$(2)) \
+        -MF $(call gb_CObject_get_dep_target,$(2)) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# CxxObject class
+
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+    $(gb_CXX) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
+        -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# LinkTarget class
+
+define gb_LinkTarget__get_rpath_for_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
+endef
+
+gb_LinkTarget__RPATHS := \
+    URELIB:'$$$$ORIGIN' \
+    UREBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \
+    OOOLIB:'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' \
+    BRAND:'$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib' \
+    SDKBIN:'$$$$ORIGIN/../../ure-link/lib' \
+    NONEBIN:'$$$$ORIGIN/../lib:$$$$ORIGIN' \
+
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+gb_LinkTarget_CFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+
+endif
+
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    $(gb_CXX) \
+        $(3) \
+        $(patsubst lib%.so,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) \
+        $(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \
+        $(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
+        -Wl$(COMMA)--start-group $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+        -o $(1))
+endef
+
+
+# Library class
+
+gb_Library_DEFS := -D_DLL_
+gb_Library_TARGETTYPEFLAGS := -shared -Wl,-z,noexecstack
+gb_Library_SYSPRE := lib
+gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
+gb_Library_PLAINEXT := .so
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
+else
+gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
+endif
+
+ifeq ($(CPUNAME),X86_64)
+gb_Library_OOOEXT := lx$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+else
+gb_Library_OOOEXT := li$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+endif
+
+gb_Library_PLAINLIBS_NONE += \
+    dl \
+    jpeg \
+    m \
+    pthread \
+    X11 \
+    z
+
+gb_Library_FILENAMES := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+
+gb_Library_Library_platform =
+
+define gb_Library_get_rpath
+-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))) \
+-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
+endef
+
+gb_Library_LAYER := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_TARGETTYPEFLAGS := -Wl,-z,noexecstack -static -nostdlib
+gb_StaticLibrary_SYSPRE := lib
+gb_StaticLibrary_PLAINEXT := .a
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+gb_StaticLibrary_StaticLibrary_platform =
+
+# Executable class
+
+gb_Executable_EXT :=
+gb_Executable_TARGETTYPEFLAGS :=
+gb_Executable_Executable_platform =
+
+gb_Executable_LAYER := \
+    $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+    $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
+    $(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \
+    $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
+    $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+
+
+define gb_Executable_get_rpath
+-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))) \
+-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
+endef
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs,\
+    $(gb_GCCP) \
+        -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
+        $(3) \
+        $(4) \
+        -c -x c++-header $(2) \
+        -o $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+
+
+# ComponentTarget
+
+gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
new file mode 100755
index 000000000..230371907
--- /dev/null
+++ b/solenv/gbuild/platform/macosx.mk
@@ -0,0 +1,391 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+GUI := UNX
+COM := GCC
+
+gb_MKTEMP := TMPDIR= mktemp -t
+
+gb_CC := $(CC)
+gb_CXX := $(CXX)
+gb_GCCP := $(CC)
+gb_AWK := awk
+
+
+gb_OSDEFS := \
+    -D$(OS) \
+    -D$(GUI) \
+    -DUNIX \
+    -D_PTHREADS \
+    -D_REENTRANT \
+    -DNO_PTHREAD_PRIORITY \
+    -DQUARTZ \
+    $(EXTRA_CDEFS) \
+#	$(PTHREAD_CFLAGS) \
+
+gb_COMPILERDEFS := \
+    -D$(COM) \
+    -DGLIBC=2 \
+    -D_USE_NAMESPACE=1 \
+    -DHAVE_GCC_VISIBILITY_FEATURE \
+    -DCPPU_ENV=gcc3 \
+    -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
+#	-D$(CVER) \
+#	-DCVER=$(CVER) \
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else # ifeq ($(CPUNAME),POWERPC)
+gb_CPUDEFS := -DPOWERPC -DPPC
+endif
+
+ifeq ($(SYSBASE), "")
+gb_SDKDIR := /Developer/SDKs/MacOSX10.4u.sdk
+else
+gb_SDKDIR := $(SYSBASE)/MacOSX10.4u.sdk
+endif
+
+
+gb_CFLAGS := \
+    -isysroot $(gb_SDKDIR) \
+    -fsigned-char \
+    -fmessage-length=0 \
+    -malign-natural \
+    -Wall \
+    -Wendif-labels \
+    -fno-strict-aliasing \
+    -fPIC \
+    -fno-common \
+    -pipe \
+#	-fvisibility=hidden \
+
+gb_CXXFLAGS := \
+    -isysroot $(gb_SDKDIR) \
+    -fsigned-char \
+    -fmessage-length=0 \
+    -malign-natural \
+    -Wall \
+    -Wendif-labels \
+    -Wno-long-double \
+    -Wno-ctor-dtor-privacy \
+    -Wno-non-virtual-dtor \
+    -fno-strict-aliasing \
+    -fPIC \
+    -fno-common \
+    -pipe \
+#	-fvisibility=hidden \
+#	-fvisibility-inlines-hidden \
+
+# these are to get g++ to switch to Objective-C++ mode
+# (see toolkit module for a case where it is necessary to do it this way)
+gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
+
+gb_CFLAGS_WERROR := \
+    -Werror \
+
+gb_CXXFLAGS_WERROR := \
+    -Werror \
+
+gb_LinkTarget_EXCEPTIONFLAGS := \
+    -DEXCEPTIONS_ON \
+    -fexceptions \
+    -fno-enforce-eh-specs \
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+    -DEXCEPTIONS_OFF \
+    -fno-exceptions \
+
+gb_LinkTarget_LDFLAGS := \
+    -Wl,-syslibroot,$(gb_SDKDIR) \
+    $(subst -L../lib , ,$(SOLARLIB)) \
+#man ld says: obsolete	-Wl,-multiply_defined,suppress \
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_COMPILEROPTFLAGS := -O0
+else
+gb_COMPILEROPTFLAGS := -O2
+endif
+
+
+# Helper class
+
+gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+
+
+# CObject class
+
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+    $(gb_CC) \
+        $(4) $(5) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_CObject_get_target,$(2)) \
+        -MF $(call gb_CObject_get_dep_target,$(2)) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# CxxObject class
+
+# N.B: $(4) or $(5) may contain -x objective-c++, which must come before -c
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_CxxObject_get_target,$(2)) \
+        -MF $(call gb_CxxObject_get_dep_target,$(2)) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# ObjCxxObject class
+
+define gb_ObjCxxObject__command
+$(call gb_Output_announce,$(2),$(true),OCX,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -c $(3) \
+        -o $(1) \
+        -MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \
+        -MF $(call gb_ObjCxxObject_get_dep_target,$(2)) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# LinkTarget class
+
+define gb_LinkTarget__get_rpath_for_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget_RPATHS)))
+endef
+
+gb_LinkTarget_RPATHS := \
+    URELIB:@__________________________________________________URELIB/ \
+    UREBIN: \
+    OOOLIB:@__________________________________________________OOO/ \
+    BRAND: \
+    SDKBIN: \
+    NONEBIN: \
+
+define gb_LinkTarget__get_installname
+$(if $(2),-install_name '$(2)$(1)',)
+endef
+
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_LinkTarget_CFLAGS += -g
+gb_LinkTarget_CXXFLAGS += -g
+gb_LinkTarget_OBJCXXFLAGS += -g
+endif
+
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+# FIXME the DYLIB_FILE mess is only necessary because
+# solver layout is different from installation layout
+# FIXME framework handling very hackish
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    DYLIB_FILE=`$(gb_MKTEMP) $(dir $(1))` && \
+    $(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl $(3) $(patsubst lib%.dylib,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \
+    $(gb_CXX) \
+        $(3) \
+        $(patsubst lib%.dylib,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(4)),$(call gb_Library_get_filename,$(lib)))) \
+        $(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(4))) \
+        $(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \
+        $(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
+        $(foreach object,$(8),$(call gb_ObjCxxObject_get_target,$(object))) \
+        $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) \
+        -o $(1) \
+        `cat $${DYLIB_FILE}` && \
+    $(if $(filter shl exe,$(TARGETTYPE)),$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl $(TARGETTYPE) $(LAYER) $(1) &&,) \
+    $(if $(filter shl,$(TARGETTYPE)),macosx-create-bundle $(1) &&,) \
+    rm -f $${DYLIB_FILE})
+endef
+
+
+# Library class
+
+gb_Library_DEFS :=
+gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
+gb_Library_SYSPRE := lib
+gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
+gb_Library_PLAINEXT := .dylib
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT)
+else
+gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT)
+endif
+
+ifeq ($(CPUNAME),INTEL)
+gb_Library_OOOEXT := mxi$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+else # ifeq ($(CPUNAME),POWERPC)
+gb_Library_OOOEXT := mxp$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+endif
+
+gb_Library__FRAMEWORKS += \
+    Cocoa \
+
+gb_Library_PLAINLIBS_NONE += \
+    Cocoa \
+     objc \
+    jpeg \
+    m \
+    pthread \
+    z \
+
+gb_Library_FILENAMES := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+
+# HACK
+# SUBSTITING OOOLIB with OOO to make the perl script happy
+define gb_Library_Library_platform
+$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := shl
+$(call gb_LinkTarget_get_target,$(2)) : LAYER :=$(subst OOOLIB,OOO,$(call gb_Library_get_layer,$(1)))
+
+endef
+
+define gb_Library_get_rpath
+$(call gb_LinkTarget__get_installname,$(call gb_Library_get_filename,$(1)),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))))
+endef
+
+gb_Library_LAYER := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_TARGETTYPEFLAGS := -static -nostdlib
+gb_StaticLibrary_SYSPRE := lib
+gb_StaticLibrary_PLAINEXT := .a
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+define gb_StaticLibrary_StaticLibrary_platform
+$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := staticlib
+$(call gb_LinkTarget_get_target,$(2)) : LAYER :=
+
+endef
+
+# Executable class
+
+gb_Executable_EXT :=
+gb_Executable_TARGETTYPEFLAGS := -bind_at_load
+
+# HACK
+# SUBSTITING OOOLIB with OOO to make the perl script happy
+define gb_Executable_Library_platform
+$(call gb_LinkTarget_get_target,$(2)) : TARGETTYPE := exe
+$(call gb_LinkTarget_get_target,$(2)) : LAYER :=$(subst OOOLIB,OOO,$(call gb_Executable_get_layer,$(1)))
+
+endef
+
+define gb_Executable_get_rpath
+$(call gb_LinkTarget__get_installname,$(1),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1))))
+endef
+
+gb_Executable_LAYER := \
+    $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+    $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
+    $(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \
+    $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
+    $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs,\
+    $(gb_GCCP) \
+        -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
+        $(3) \
+        $(4) \
+        -c -x c++-header $(2) \
+        -o $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+
+# ComponentTarget
+
+gb_ComponentTarget_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
new file mode 100755
index 000000000..457f86e79
--- /dev/null
+++ b/solenv/gbuild/platform/solaris.mk
@@ -0,0 +1,329 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+GUI := UNX
+COM := C52
+
+gb_MKTEMP := mktemp -p
+gb_AWK := nawk
+
+gb_CC := cc
+gb_CXX := CC
+gb_GCCP := cc
+
+gb_OSDEFS := \
+    -D$(OS) \
+    -D$(GUI) \
+    -DSYSV \
+    -DSUN \
+    -DSUN4 \
+    -D_REENTRANT \
+    -D_POSIX_PTHREAD_SEMANTICS \
+    -D_PTHREADS \
+    -DUNIX \
+#	$(PTHREAD_CFLAGS) \
+
+gb_COMPILERDEFS := \
+    -D$(COM) \
+    -DCPPU_ENV=sunpro5 \
+#	-D$(CVER) \
+#	-DCVER=$(CVER) \
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS :=
+else # ifeq ($(CPUNAME),SPARC)
+gb_CPUDEFS := -D__sparcv8plus
+endif
+
+gb_CFLAGS := \
+    -temp=/tmp \
+    -KPIC \
+    -mt \
+    -xCC \
+    -xc99=none \
+
+gb_CXXFLAGS := \
+    -temp=/tmp \
+    -KPIC \
+    -mt \
+    -features=no%altspell \
+    -library=no%Cstd \
+    +w2 \
+    -erroff=doubunder,identexpected,inllargeuse,inllargeint,notemsource,reftotemp,truncwarn,wnoretvalue,anonnotype \
+
+gb_CFLAGS_WERROR := \
+    -errwarn=%all \
+
+gb_CXXFLAGS_WERROR := \
+    -xwe \
+
+gb_LinkTarget_EXCEPTIONFLAGS := \
+    -DEXCEPTIONS_ON \
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+    -DEXCEPTIONS_OFF \
+    -noex \
+
+gb_LinkTarget_LDFLAGS := \
+    $(subst -L../lib , ,$(SOLARLIB)) \
+    -temp=/tmp \
+    -w \
+    -mt \
+    -z combreloc \
+    -norunpath \
+    -PIC \
+    -library=no%Cstd \
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_COMPILEROPTFLAGS :=
+else
+ifeq ($(CPUNAME),INTEL)
+gb_COMPILEROPTFLAGS := -xarch=generic -xO3
+else # ifeq ($(CPUNAME),SPARC)
+#  -m32 -xarch=sparc        restrict target to 32 bit sparc
+#  -xO3                     optimization level 3
+#  -xspace                  don't do optimizations which do increase binary size
+#  -xprefetch=yes           do prefetching (helps on UltraSparc III)
+gb_COMPILEROPTFLAGS := -m32 -xarch=sparc -xO3 -xspace -xprefetch=yes
+endif
+endif
+
+
+# Helper class
+
+gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+
+# CObject class
+
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    rm -f $(call gb_CObject_get_dep_target,$(2)) && \
+    mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+    $(gb_CC) \
+        -c $(3) \
+        -o $(1) \
+        -xMMD \
+        -xMF $(call gb_CObject_get_dep_target,$(2)) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# CxxObject class
+
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+    $(gb_CXX) \
+        -c $(3) \
+        -o $(1) \
+        -xMMD \
+        -xMF $(call gb_CxxObject_get_dep_target,$(2)) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6))
+endef
+
+
+# LinkTarget class
+
+define gb_LinkTarget__get_rpath_for_layer
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS)))
+endef
+
+gb_LinkTarget__RPATHS := \
+    URELIB:$$$$ORIGIN \
+    UREBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \
+    OOOLIB:$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib \
+    BRAND:$$$$ORIGIN:$$$$ORIGIN/../basis-link/program:$$$$ORIGIN/../basis-link/ure-link/lib \
+    SDKBIN:$$$$ORIGIN/../../ure-link/lib \
+    NONEBIN:$$$$ORIGIN/../lib:$$$$ORIGIN \
+
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_LinkTarget_CXXFLAGS += -g
+gb_LinkTarget_CFLAGS += -g
+endif
+
+gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(call gb_Helper_abbreviate_dirs,\
+    mkdir -p $(dir $(1)) && \
+    $(gb_CXX) \
+        $(3) \
+        $(patsubst lib%.so,-l%,$(foreach lib,$(4),$(call gb_Library_get_filename,$(lib)))) \
+        $(foreach object,$(6),$(call gb_CObject_get_target,$(object))) \
+        $(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
+        $(foreach lib,$(5),$(call gb_StaticLibrary_get_target,$(lib))) \
+        -o $(1))
+endef
+
+
+# Library class
+
+gb_Library_DEFS :=
+gb_Library_TARGETTYPEFLAGS := -Bdynamic -z text -G
+gb_Library_SYSPRE := lib
+gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
+gb_Library_PLAINEXT := .so
+gb_Library_RTEXT := C52$(gb_Library_PLAINEXT)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_STLEXT := port_sunpro$(gb_Library_PLAINEXT)
+else
+gb_Library_STLEXT := port_sunpro_debug$(gb_Library_PLAINEXT)
+endif
+
+ifeq ($(CPUNAME),INTEL)
+gb_Library_OOOEXT := si$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+else # ifeq ($(CPUNAME),SPARC)
+gb_Library_OOOEXT := ss$(gb_Library_PLAINEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
+endif
+
+gb_Library_PLAINLIBS_NONE += \
+    dl \
+    jpeg \
+    m \
+    pthread \
+    X11 \
+    z
+
+gb_Library_FILENAMES := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_STLEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+
+gb_Library__Library_platform =
+
+define gb_Library_get_rpath
+'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1)))'
+endef
+
+gb_Library_LAYER := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_TARGETTYPEFLAGS := \
+    -Bstatic \
+    -xar \
+
+gb_StaticLibrary_SYSPRE := lib
+gb_StaticLibrary_PLAINEXT := .a
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+gb_StaticLibrary_StaticLibrary_platform =
+
+# Executable class
+
+gb_Executable_EXT :=
+gb_Executable_TARGETTYPEFLAGS :=
+gb_Executable__Executable_platform =
+
+define gb_Executable_get_rpath
+'-R$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))'
+endef
+
+gb_Executable_LAYER := \
+    $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
+    $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
+    $(foreach exe,$(gb_Executable_OOO),$(exe):OOOLIB) \
+    $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
+    $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \
+
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
+gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+
+# Sun cc/CC support -xM1/-xMF flags, but unfortunately refuse input files that
+# do not have the right suffix, so use makedepend here...
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(3) $(4) \
+        $(2) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+
+
+# ComponentTarget
+
+gb_ComponentTarget_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$OOO_BASE_DIR/program/
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
new file mode 100755
index 000000000..a25d21ff5
--- /dev/null
+++ b/solenv/gbuild/platform/windows.mk
@@ -0,0 +1,566 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+GUI := WNT
+COM := MSC
+
+gb_MKTEMP := mktemp -p
+
+gb_CC := cl
+gb_CXX := cl
+gb_LINK := link
+gb_AWK := awk
+
+gb_OSDEFS := \
+    -DWINVER=0x0500 \
+    -D_WIN32_IE=0x0500 \
+    -DNT351 \
+    -DWIN32 \
+    -DWNT \
+
+gb_COMPILERDEFS := \
+    -DMSC \
+    -D_CRT_NON_CONFORMING_SWPRINTFS \
+    -D_CRT_NONSTDC_NO_DEPRECATE \
+    -D_CRT_SECURE_NO_DEPRECATE \
+    -D_MT \
+    -DBOOST_MEM_FN_ENABLE_CDECL \
+    -DCPPU_ENV=msci \
+    -DFULL_DESK \
+    -DM1500 \
+
+gb_CPUDEFS := -DINTEL -D_X86_=1
+
+gb_CFLAGS := \
+    -Gd \
+    -GR \
+    -Gs \
+    -GS \
+    -Gy \
+    -nologo \
+    -Wall \
+    -wd4005 \
+    -wd4061 \
+    -wd4127 \
+    -wd4180 \
+    -wd4189 \
+    -wd4191 \
+    -wd4217 \
+    -wd4250 \
+    -wd4251 \
+    -wd4255 \
+    -wd4275 \
+    -wd4290 \
+    -wd4294 \
+    -wd4350 \
+    -wd4355 \
+    -wd4365 \
+    -wd4503 \
+    -wd4505 \
+    -wd4511 \
+    -wd4512 \
+    -wd4514 \
+    -wd4611 \
+    -wd4619 \
+    -wd4625 \
+    -wd4626 \
+    -wd4640 \
+    -wd4668 \
+    -wd4675 \
+    -wd4692 \
+    -wd4710 \
+    -wd4711 \
+    -wd4738 \
+    -wd4786 \
+    -wd4800 \
+    -wd4820 \
+    -wd4826 \
+    -WX \
+    -Zc:forScope,wchar_t- \
+    -Zm500 \
+
+gb_CXXFLAGS := \
+    -Gd \
+    -GR \
+    -Gs \
+    -GS \
+    -Gy \
+    -nologo \
+    -Wall \
+    -wd4005 \
+    -wd4061 \
+    -wd4127 \
+    -wd4180 \
+    -wd4189 \
+    -wd4191 \
+    -wd4217 \
+    -wd4250 \
+    -wd4251 \
+    -wd4275 \
+    -wd4290 \
+    -wd4294 \
+    -wd4350 \
+    -wd4355 \
+    -wd4365 \
+    -wd4503 \
+    -wd4505 \
+    -wd4511 \
+    -wd4512 \
+    -wd4514 \
+    -wd4611 \
+    -wd4619 \
+    -wd4625 \
+    -wd4626 \
+    -wd4640 \
+    -wd4668 \
+    -wd4675 \
+    -wd4692 \
+    -wd4710 \
+    -wd4711 \
+    -wd4738 \
+    -wd4786 \
+    -wd4800 \
+    -wd4820 \
+    -wd4826 \
+    -WX \
+    -Zc:forScope,wchar_t- \
+    -Zm500 \
+
+gb_LinkTarget_EXCEPTIONFLAGS := \
+    -DEXCEPTIONS_ON \
+    -EHa \
+
+gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
+
+
+gb_LinkTarget_NOEXCEPTIONFLAGS := \
+    -DEXCEPTIONS_OFF \
+    
+gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
+
+gb_LinkTarget_LDFLAGS := \
+    -MACHINE:IX86 \
+    -NODEFAULTLIB \
+    -OPT:NOREF \
+    -SUBSYSTEM:CONSOLE \
+    -safeseh \
+    -nxcompat \
+    -dynamicbase \
+    $(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
+
+ifneq ($(ENABLE_CRASHDUMP),)
+gb_LinkTarget_LDFLAGS += -DEBUG
+gb_CFLAGS+=-Zi
+gb_CXXFLAGS+=-Zi
+endif
+
+ifeq ($(gb_DEBUGLEVEL),2)
+gb_CXXFLAGS +=-Zi
+gb_CFLAGS +=-Zi
+gb_COMPILEROPTFLAGS :=
+gb_LinkTarget_LDFLAGS += -DEBUG
+else
+gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
+endif
+
+
+# Helper class
+
+gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
+gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR))
+gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR))
+gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR))
+
+define gb_Helper_abbreviate_dirs_native
+R=$(gb_Helper_REPODIR_NATIVE) && \
+$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,S=$(gb_Helper_SRCDIR_NATIVE) && \
+$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,O=$(gb_Helper_OUTDIR_NATIVE)) && \
+$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(OUTDIR)/,$$O/,W=$(gb_Helper_WORKDIR_NATIVE) && $(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(subst $(WORKDIR)/,$$W/,$(1)))))))))
+endef
+
+# CObject class
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_CObject__command_deponcompile
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
+        -I$(dir $(3)) \
+        $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
+        $(3) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(1) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_CObject_get_dep_target,$(2)))
+endef
+else
+CObject__command_deponcompile =
+endif
+
+define gb_CObject__command
+$(call gb_Output_announce,$(2),$(true),C  ,3)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    unset INCLUDE && \
+    $(gb_CC) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6) \
+        -c $(3) \
+        -Fo$(1))
+$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+endef
+
+
+
+# CxxObject class
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_CxxObject__command_deponcompile
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
+        -I$(dir $(3)) \
+        $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
+        $(3) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(1) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_CxxObject_get_dep_target,$(2)))
+endef
+else
+gb_CxxObject__command_deponcompile =
+endif
+
+define gb_CxxObject__command
+$(call gb_Output_announce,$(2),$(true),CXX,3)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    unset INCLUDE && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6) \
+        -c $(3) \
+        -Fo$(1))
+$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+
+endef
+
+
+# PrecompiledHeader class
+
+gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \
+                                       -Fp$(call gb_PrecompiledHeader_get_target,$(1)) \
+                                       -Fd$(call gb_PrecompiledHeader_get_target,$(1)).pdb
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_PrecompiledHeader__command_deponcompile
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
+        $(3) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(1) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_PrecompiledHeader_get_dep_target,$(2)))
+endef
+else
+gb_PrecompiledHeader__command_deponcompile =
+endif
+
+define gb_PrecompiledHeader__command
+$(call gb_Output_announce,$(2),$(true),PCH,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
+    unset INCLUDE && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6) \
+        -c $(3) \
+        -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fd$(1).pdb -Fo$(1).obj)
+rm $(1).obj
+$(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+
+endef
+
+# NoexPrecompiledHeader class
+
+gb_NoexPrecompiledHeader_get_enableflags = -Yu$(1).hxx \
+                                           -Fp$(call gb_NoexPrecompiledHeader_get_target,$(1)) \
+                                           -Fd$(call gb_NoexPrecompiledHeader_get_target,$(1)).pdb
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_NoexPrecompiledHeader__command_deponcompile
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \
+        $(3) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(1) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_NoexPrecompiledHeader_get_dep_target,$(2)))
+endef
+else
+gb_NoexPrecompiledHeader__command_deponcompile =
+endif
+
+define gb_NoexPrecompiledHeader__command
+$(call gb_Output_announce,$(2),$(true),PCH,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
+    unset INCLUDE && \
+    $(gb_CXX) \
+        $(4) $(5) \
+        -I$(dir $(3)) \
+        $(6) \
+        -c $(3) \
+        -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fd$(1).pdb -Fo$(1).obj)
+rm $(1).obj
+$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
+
+endef
+
+
+# LinkTarget class
+
+gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_COMPILEROPTFLAGS)
+
+gb_LinkTarget_INCLUDE :=\
+    $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
+    $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
+
+gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+define gb_LinkTarget__command
+$(call gb_Output_announce,$(2),$(true),LNK,4)
+$(call gb_Helper_abbreviate_dirs_native,\
+    mkdir -p $(dir $(1)) && \
+    RESPONSEFILE=$$(mktemp --tmpdir=$(gb_Helper_MISC)) && \
+    echo "$(foreach object,$(7),$(call gb_CxxObject_get_target,$(object))) \
+        $(foreach object,$(6),$(call gb_CObject_get_target,$(object)))" > $${RESPONSEFILE} && \
+    $(gb_LINK) \
+        $(3) \
+        @$${RESPONSEFILE} \
+        $(foreach lib,$(4),$(call gb_Library_get_filename,$(lib))) \
+        $(foreach lib,$(5),$(call gb_StaticLibrary_get_filename,$(lib))) \
+        $(subst -out: -implib:$(1),-out:$(1),-out:$(DLLTARGET) -implib:$(1)) && rm $${RESPONSEFILE})
+endef
+
+
+# Library class
+
+gb_Library_DEFS := -D_DLL_ -D_DLL
+gb_Library_TARGETTYPEFLAGS := -DLL
+gb_Library_get_rpath :=
+
+gb_Library_SYSPRE := i
+gb_Library_PLAINEXT := .lib
+
+gb_Library_PLAINLIBS_NONE += \
+    advapi32 \
+    gdi32 \
+    gnu_getopt \
+    kernel32 \
+    msvcrt \
+    mpr \
+    oldnames \
+    ole32 \
+    oleaut32 \
+    shell32 \
+    unicows \
+    user32 \
+    uuid \
+    uwinapi \
+    z \
+
+gb_LinkTarget_LAYER := \
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOOLIB) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOOLIB) \
+
+gb_Library_FILENAMES :=\
+    $(foreach lib,$(gb_Library_TARGETS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
+
+gb_Library_DLLEXT := .dll
+gb_Library_MAJORVER := 3
+gb_Library_RTEXT := MSC$(gb_Library_DLLEXT)
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_STLEXT := port_vc7145$(gb_Library_DLLEXT)
+else
+gb_Library_STLEXT := port_vc7145_stldebug$(gb_Library_DLLEXT)
+endif
+gb_Library_OOOEXT := mi$(gb_Library_DLLEXT)
+gb_Library_UNOEXT := .uno$(gb_Library_DLLEXT)
+gb_Library_UNOVEREXT := $(gb_Library_MAJORVER)$(gb_Library_DLLEXT)
+gb_Library_RTVEREXT := $(gb_Library_MAJORVER)$(gb_Library_RTEXT)
+
+gb_Library_DLLFILENAMES :=\
+    $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(lib)$(gb_Library_OOOEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+    $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
+    $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
+    $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
+    $(foreach lib,$(gb_Library_STLLIBS),$(lib):$(lib)$(gb_Library_STLEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
+    $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
+
+
+define gb_Library_Library_platform
+$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
+
+$(call gb_LinkTarget_set_auxtargets,$(2),\
+    $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
+    $(3).manifest \
+    $(patsubst %.dll,%.pdb,$(3)) \
+    $(patsubst %.dll,%.ilk,$(3)) \
+)
+
+$(call gb_Library_get_target,$(1)) \
+$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
+
+ifneq ($(ENABLE_CRASHDUMP),)
+$(call gb_Library_get_target,$(1)) \
+$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
+        $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
+        $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
+
+endif
+
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+
+endef
+
+define gb_Library_get_dllname
+$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES)))
+endef
+
+
+# StaticLibrary class
+
+gb_StaticLibrary_DEFS :=
+gb_StaticLibrary_TARGETTYPEFLAGS := -LIB
+gb_StaticLibrary_SYSPRE :=
+gb_StaticLibrary_PLAINEXT := .lib
+gb_StaticLibrary_JPEGEXT := lib$(gb_StaticLibrary_PLAINEXT)
+
+gb_StaticLibrary_FILENAMES := \
+    $(foreach lib,$(gb_StaticLibrary_JPEGLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_JPEGEXT)) \
+    $(foreach lib,$(gb_StaticLibrary_PLAINLIBS),$(lib):$(gb_StaticLibrary_SYSPRE)$(lib)$(gb_StaticLibrary_PLAINEXT)) \
+
+gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
+
+gb_StaticLibrary_StaticLibrary_platform =
+
+# Executable class
+
+gb_Executable_EXT := .exe
+gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG
+gb_Executable_get_rpath :=
+
+define gb_Executable_Executable_platform
+$(call gb_LinkTarget_set_auxtargets,$(2),\
+    $(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \
+    $(call gb_LinkTarget_get_target,$(2)).manifest \
+)
+
+$(call gb_Executable_get_target,$(1)) \
+$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest)
+
+endef
+
+# SdiTarget class
+
+gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+
+# SrsPartMergeTarget
+
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+
+# SrsPartTarget class
+
+gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc.exe
+gb_SrsPartTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_SrsPartTarget__command_dep
+$(call gb_Helper_abbreviate_dirs_native,\
+    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
+        $(3) $(4) \
+        $(2) \
+        -f - \
+    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
+        -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
+        -v OUTDIR=$(OUTDIR)/ \
+        -v WORKDIR=$(WORKDIR)/ \
+        -v SRCDIR=$(SRCDIR)/ \
+        -v REPODIR=$(REPODIR)/ \
+    > $(call gb_SrsPartTarget_get_dep_target,$(1)))
+endef
+else
+gb_SrsPartTarget__command_dep =
+endif
+
+
+# ComponentTarget
+
+gb_ComponentTarget_XSLTPROCPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+gb_ComponentTarget_PREFIXBASISNATIVE := vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/processdelivered.awk b/solenv/gbuild/processdelivered.awk
new file mode 100644
index 000000000..7bf574c45
--- /dev/null
+++ b/solenv/gbuild/processdelivered.awk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+BEGIN {
+    RS=" "
+    FS=":"
+}
+
+length($1) > 0 && length($2) > 0 {
+    print "COPY " $1 " " $2;
+}
diff --git a/solenv/gbuild/processdeps.awk b/solenv/gbuild/processdeps.awk
new file mode 100644
index 000000000..c5efb1e0a
--- /dev/null
+++ b/solenv/gbuild/processdeps.awk
@@ -0,0 +1,74 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# this awk script mangles makedepend output for a single object file
+# usage:
+# awk -f .../processdeps.awk \
+#     -v OUTDIR=outdir \
+#     -v SRCDIR=srcdir \
+#     -v WORKDIR=workdir \
+#     -v REPODIR=repodir \
+#     -v OBJECTFILE=objectfile
+# called like this the script will read from stdin
+# and write to stdout. It will:
+#  - replace the objectfile with the one given on the commandline
+#  - normalize paths to mixed paths (replacing all \ with /)
+#  - replace the string given as WORKDIR with $(WORKDIR)/
+#  - replace the string given as OUTDIR with $(OUTDIR)/
+#  - replace the string given as SRCDIR with $(SRCDIR)/
+#  - replace the string given as REPODIR with $(REPODIR)/
+#  - translates absolute mixed windows paths to cygwin paths by
+#    substituting a path starting with X:... to /cygdrive/X/...
+
+function mangle_path(path) {
+    gsub("\\\\", "/", path);
+    if( path ~ /^[a-zA-Z]:/ )
+        path = toupper(substr(path,0,1)) substr(path,2);
+    gsub(WORKDIR, "$(WORKDIR)/", path);
+    gsub(OUTDIR, "$(OUTDIR)/", path);
+    gsub(SRCDIR, "$(SRCDIR)/", path);
+    gsub(REPODIR, "$(REPODIR)/", path);
+    if( path ~ /^[a-zA-Z]:/ )
+        path = "/cygdrive/" tolower(substr(path,0,1)) substr(path,3);
+    return path;
+}
+
+BEGIN {
+#   print "# WORKDIR=" WORKDIR;
+#   print "# OUTDIR=" OUTDIR;
+#   print "# SRCDIR=" SRCDIR;
+#   print "# REPODIR=" REPODIR;
+    print mangle_path(OBJECTFILE) ": \\";
+}
+
+/^[^#]/ {
+    print "\t" mangle_path($2) " \\";
+}
+
+END {
+    print "\n";
+}
diff --git a/solenv/inc/_tg_scp.mk b/solenv/inc/_tg_scp.mk
index 33ff97e21..d13e57990 100644
--- a/solenv/inc/_tg_scp.mk
+++ b/solenv/inc/_tg_scp.mk
@@ -7,7 +7,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP1FILES+=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP1TARGETN): $(LOCALSCP1FILES)
     @echo "Making:   " $(@:f)
@@ -25,7 +25,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP2FILES+=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP2TARGETN): $(LOCALSCP2FILES)
     @echo "Making:   " $(@:f)
@@ -43,7 +43,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP3FILES+=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP3TARGETN): $(LOCALSCP3FILES)
     @echo "Making:   " $(@:f)
@@ -61,7 +61,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP4FILES+=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP4TARGETN): $(LOCALSCP4FILES)
     @echo "Making:   " $(@:f)
@@ -79,7 +79,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP5FILES+=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP5TARGETN): $(LOCALSCP5FILES)
     @echo "Making:   " $(@:f)
@@ -97,7 +97,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP6FILES+=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP6TARGETN): $(LOCALSCP6FILES)
     @echo "Making:   " $(@:f)
@@ -115,7 +115,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP7FILES+=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP7TARGETN): $(LOCALSCP7FILES)
     @echo "Making:   " $(@:f)
@@ -133,7 +133,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP8FILES+=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP8TARGETN): $(LOCALSCP8FILES)
     @echo "Making:   " $(@:f)
@@ -151,7 +151,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP9FILES+=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP9TARGETN): $(LOCALSCP9FILES)
     @echo "Making:   " $(@:f)
@@ -169,7 +169,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP10FILES+=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP10TARGETN): $(LOCALSCP10FILES)
     @echo "Making:   " $(@:f)
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 3d9178398..41d48c839 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -440,8 +440,10 @@ $(SHL1TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL1RPATH) $@
+.IF "$(SHL1CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL1CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL1NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN)
@@ -538,16 +540,6 @@ $(SHL1TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL1TARGET)
-
-runtest_$(SHL1TARGET) : $(SHL1TARGETN)
-    testshl $(SHL1TARGETN) sce/$(SHL1TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL1TARGETN)"!=""
 
 # unroll begin
@@ -992,8 +984,10 @@ $(SHL2TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL2RPATH) $@
+.IF "$(SHL2CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL2CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL2NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN)
@@ -1090,16 +1084,6 @@ $(SHL2TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL2TARGET)
-
-runtest_$(SHL2TARGET) : $(SHL2TARGETN)
-    testshl $(SHL2TARGETN) sce/$(SHL2TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL2TARGETN)"!=""
 
 # unroll begin
@@ -1544,8 +1528,10 @@ $(SHL3TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL3RPATH) $@
+.IF "$(SHL3CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL3CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL3NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN)
@@ -1642,16 +1628,6 @@ $(SHL3TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL3TARGET)
-
-runtest_$(SHL3TARGET) : $(SHL3TARGETN)
-    testshl $(SHL3TARGETN) sce/$(SHL3TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL3TARGETN)"!=""
 
 # unroll begin
@@ -2096,8 +2072,10 @@ $(SHL4TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL4RPATH) $@
+.IF "$(SHL4CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL4CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL4NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN)
@@ -2194,16 +2172,6 @@ $(SHL4TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL4TARGET)
-
-runtest_$(SHL4TARGET) : $(SHL4TARGETN)
-    testshl $(SHL4TARGETN) sce/$(SHL4TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL4TARGETN)"!=""
 
 # unroll begin
@@ -2648,8 +2616,10 @@ $(SHL5TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL5RPATH) $@
+.IF "$(SHL5CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL5CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL5NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN)
@@ -2746,16 +2716,6 @@ $(SHL5TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL5TARGET)
-
-runtest_$(SHL5TARGET) : $(SHL5TARGETN)
-    testshl $(SHL5TARGETN) sce/$(SHL5TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL5TARGETN)"!=""
 
 # unroll begin
@@ -3200,8 +3160,10 @@ $(SHL6TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL6RPATH) $@
+.IF "$(SHL6CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL6CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL6NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN)
@@ -3298,16 +3260,6 @@ $(SHL6TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL6TARGET)
-
-runtest_$(SHL6TARGET) : $(SHL6TARGETN)
-    testshl $(SHL6TARGETN) sce/$(SHL6TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL6TARGETN)"!=""
 
 # unroll begin
@@ -3752,8 +3704,10 @@ $(SHL7TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL7RPATH) $@
+.IF "$(SHL7CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL7CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL7NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN)
@@ -3850,16 +3804,6 @@ $(SHL7TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL7TARGET)
-
-runtest_$(SHL7TARGET) : $(SHL7TARGETN)
-    testshl $(SHL7TARGETN) sce/$(SHL7TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL7TARGETN)"!=""
 
 # unroll begin
@@ -4304,8 +4248,10 @@ $(SHL8TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL8RPATH) $@
+.IF "$(SHL8CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL8CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL8NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN)
@@ -4402,16 +4348,6 @@ $(SHL8TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL8TARGET)
-
-runtest_$(SHL8TARGET) : $(SHL8TARGETN)
-    testshl $(SHL8TARGETN) sce/$(SHL8TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL8TARGETN)"!=""
 
 # unroll begin
@@ -4856,8 +4792,10 @@ $(SHL9TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL9RPATH) $@
+.IF "$(SHL9CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL9CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL9NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN)
@@ -4954,16 +4892,6 @@ $(SHL9TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL9TARGET)
-
-runtest_$(SHL9TARGET) : $(SHL9TARGETN)
-    testshl $(SHL9TARGETN) sce/$(SHL9TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL9TARGETN)"!=""
 
 # unroll begin
@@ -5408,8 +5336,10 @@ $(SHL10TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL10RPATH) $@
+.IF "$(SHL10CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL10CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL10NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN)
@@ -5506,16 +5436,6 @@ $(SHL10TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL10TARGET)
-
-runtest_$(SHL10TARGET) : $(SHL10TARGETN)
-    testshl $(SHL10TARGETN) sce/$(SHL10TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL10TARGETN)"!=""
 
 # unroll begin
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 884208e18..678878c86 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m92(Build:9541)
-BUILD=9541
-LAST_MINOR=m92
+RSCREVISION=300m96(Build:9560)
+BUILD=9560
+LAST_MINOR=m96
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index f16ccb554..888098fde 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -32,7 +32,9 @@ defaultlangiso=en-US
 # Complete list of all supported ISO codes
 completelangiso=af \
 ar \
+as \
 as-IN \
+ast \
 be-BY \
 bo \
 bg \
@@ -44,6 +46,7 @@ bn-IN \
 bs \
 by \
 ca \
+ca-XV \
 cs \
 cy \
 da \
@@ -67,6 +70,7 @@ gl \
 gu \
 gu-IN \
 he \
+hi \
 hi-IN \
 hr \
 hu \
@@ -76,6 +80,7 @@ ja \
 kid \
 ky \
 ka \
+kab \
 kk \
 km \
 kn \
@@ -91,7 +96,9 @@ mk \
 mn \
 mni \
 ms \
+ml \
 ml-IN \
+mr \
 mr-IN \
 my \
 ne \
@@ -100,19 +107,26 @@ nl \
 nn \
 nr \
 ns \
+nso \
 om \
+oms \
 oc \
+or \
 or-IN \
 pap \
+pa \
 pa-IN \
 pl \
 ps \
 pt \
 pt-BR \
+gug \
+pyg \
 ro \
 ru \
 rw \
 sat \
+sa \
 sa-IN \
 si \
 sc \
@@ -121,22 +135,27 @@ sq \
 sk \
 sl \
 sh \
+son \
 sr \
 ss \
 st \
 sv \
 sw \
 sw-TZ \
+te \
 te-IN \
+ti \
 ti-ER \
 ta \
 ta-IN \
+tlh \
 th \
 tn \
 tr \
 ts \
 tg \
 ug \
+ur \
 ur-IN \
 uk \
 uz \
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 74c50ae96..a845b9ae8 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -153,24 +153,3 @@ $(PAR)/%.par :
 #    $(COMMAND_ECHO)$(SCPCOMP) -l $(@:b).$(LANGFILEEXT) -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@
 
 .ENDIF			# "$(PARFILES)"!=""
-
-.IF "$(TESTDIR)"!=""
-
-# workaround for strange dmake bug:
-# if the previous block was a rule or a target, "\#" isn't recognized
-# as an escaped "#". if it was an assignment, escaping works...
-some_unique_variable_name:=1
-
-.IF "$(OS)" == "WNT"
-REGEXP:="s/^[\#].*//"
-.ELSE
-REGEXP:='s/^[\#].*//'
-.ENDIF
-
-$(MISC)/%.exp : sce/%.sce
-    @@-$(RM) $@
-    @@-$(RM) $(@:d)$(@:b).tst
-    $(COMMAND_ECHO)$(TYPE) $< | sed $(REGEXP) | sed "s/^/test_/" > $(@:d)$(@:b).tst
-    $(COMMAND_ECHO)$(TYPE) $(@:d)$(@:b).tst | sed "/test_./ w $@"
-
-.ENDIF			# "$(TESTDIR)"!=""
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index c6374cf39..a4b02a9ed 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -299,6 +299,12 @@ dbgutil=
 # ---------------------------------------------------------------------------
 
 DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD))
+.IF "$(GUI)"=="WNT"
+posix_PWD:=/cygdrive/$(PWD:s/://)
+.ELSE			#GUI)"=="WNT"
+posix_PWD:=$(PWD)
+.ENDIF			#GUI)"=="WNT"
+
 
 .IF "$(TMP)"!=""
 tmp*=$(TMP)
@@ -387,9 +393,11 @@ COMPILER_WARN_ERRORS=TRUE
 rsc_once*=$(RSC_ONCE)
 .ENDIF
 
-.IF "$(COMMON_BUILD)"!=""
-common_build*=$(COMMON_BUILD)
-.ENDIF
+#.IF "$(COMMON_BUILD)"!=""
+#common_build*=$(COMMON_BUILD)
+#.ENDIF
+common_build:=
+COMMON_BUILD:=
 
 .IF "$(USE_SHL_VERSIONS)"!=""
 use_shl_versions*=$(USE_SHL_VERSIONS)
@@ -574,24 +582,24 @@ PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))/, $(PWD))
 PATH_IN_MODULE:=
 .ENDIF			# "$(PRJ)"!="."
 
-# common output tree
-.IF "$(common_build)"!=""
-COMMON_OUTDIR*=common
-.IF "$(no_common_build_reslib)"==""
-common_build_reslib=true
-.ENDIF			# "$(no_common_build_reslib)"==""
-.IF "$(no_common_build_zip)"==""
-common_build_zip=true
-.ENDIF			# "$(no_common_build_zip)"==""
-.IF "$(no_common_build_sign_jar)"==""
-common_build_sign_jar=true
-.ENDIF			# "$(no_common_build_sign_jar)"==""
-.IF "$(no_common_build_srs)"==""
-common_build_srs=true
-.ENDIF			# "$(no_common_build_srs)"==""
-.ELSE			# "$(common_build)"!=""
+## common output tree
+#.IF "$(common_build)"!=""
+#COMMON_OUTDIR*=common
+#.IF "$(no_common_build_reslib)"==""
+#common_build_reslib=true
+#.ENDIF			# "$(no_common_build_reslib)"==""
+#.IF "$(no_common_build_zip)"==""
+#common_build_zip=true
+#.ENDIF			# "$(no_common_build_zip)"==""
+#.IF "$(no_common_build_sign_jar)"==""
+#common_build_sign_jar=true
+#.ENDIF			# "$(no_common_build_sign_jar)"==""
+#.IF "$(no_common_build_srs)"==""
+#common_build_srs=true
+#.ENDIF			# "$(no_common_build_srs)"==""
+#.ELSE			# "$(common_build)"!=""
 COMMON_OUTDIR:=$(OUTPATH)
-.ENDIF			# "$(common_build)"!=""
+#.ENDIF			# "$(common_build)"!=""
 
 LOCAL_OUT:=$(OUT)
 LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
@@ -602,23 +610,18 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
 # As this is not part of the initial startup makefile we define an infered
 # target instead of using $(OUT)/inc/myworld.mk as target name.
 # (See iz62795)
-$(OUT)/inc/%world.mk :
+$(posix_PWD)/$(OUT)/inc/%world.mk :
     @$(MKOUT) $(ROUT)
     @echo $(EMQ)# > $@
 
-# don't need/want output trees in solenv!!!
-.IF "$(PRJNAME)"!="solenv"
-.INCLUDE : $(OUT)/inc/myworld.mk
-.ENDIF			# "$(PRJNAME)"!="solenv"
+.INCLUDE :  $(posix_PWD)/$(OUT)/inc/myworld.mk
 
 .IF "$(common_build)"!=""
-$(LOCAL_COMMON_OUT)/inc/%world.mk :
+$(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk :
     @$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
     @echo $(EMQ)# > $@
 
-.IF "$(PRJNAME)"!="solenv"
-.INCLUDE : $(LOCAL_COMMON_OUT)/inc/myworld.mk
-.ENDIF			# "$(PRJNAME)"!="solenv"
+.INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk
 .ENDIF			# "$(common_build)"!=""
 
 .INCLUDE .IGNORE : office.mk
@@ -1020,9 +1023,9 @@ LNTFLAGSOUTOBJ=-os
 .IF "$(OOO_LIBRARY_PATH_VAR)" != ""
 # Add SOLARLIBDIR at the begin of a (potentially previously undefined) library
 # path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from
-# an existing office/URE installation ; the ": &&" in the bash case enables this to
-# work at the start of a recipe line that is not prefixed by "+" as well as in
-# the middle of an existing && chain:
+# an existing office/URE installation; the ": &&" enables this to work at the
+# start of a recipe line that is not prefixed by "+" as well as in the middle of
+# an existing && chain:
 AUGMENT_LIBRARY_PATH = : && \
     $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
 AUGMENT_LIBRARY_PATH_LOCAL = : && \
@@ -1366,6 +1369,7 @@ COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule:
 COMPONENTPREFIX_INBUILD_NATIVE = \
     vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/
 COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$OOO_INBUILD_JAR_DIR/
+COMPONENTPREFIX_EXTENSION = ./
 
 # workaround for strange dmake bug:
 # if the previous block was a rule or a target, "\#" isn't recognized
diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk
index fd970deaa..0033dd9a7 100644
--- a/solenv/inc/tg_scp.mk
+++ b/solenv/inc/tg_scp.mk
@@ -36,7 +36,7 @@ $(PAR)/%.par : $(SOLARPARDIR)/%.par
     @@-$(MKDIRHIER) $(@:d:d)
     $(COMMAND_ECHO)$(COPY) $< $@
 
-LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
+LOCALSCP$(TNR)FILES+=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
 
 $(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES)
     @echo "Making:   " $(@:f)
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 170947c21..ab95b1a75 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -469,8 +469,10 @@ $(SHL$(TNR)TARGETN) : \
     @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
         shl $(SHL$(TNR)RPATH) $@
+.IF "$(SHL$(TNR)CREATEJNILIB)"!=""
     @echo "Making:   " $(@:f).jnilib
     @macosx-create-bundle $@
+.ENDIF          # "$(SHL$(TNR)CREATEJNILIB)"!=""
 .IF "$(UPDATER)"=="YES"
 .IF "$(SHL$(TNR)NOCHECK)"==""
     $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)
@@ -567,16 +569,6 @@ $(SHL$(TNR)TARGETN) : \
 
 .ENDIF			# "$(GUI)" == "OS2"
 
-
-.IF "$(TESTDIR)"!=""
-.IF "$(NO_TESTS)"==""
-
-ALLTAR : runtest_$(SHL$(TNR)TARGET)
-
-runtest_$(SHL$(TNR)TARGET) : $(SHL$(TNR)TARGETN)
-    testshl $(SHL$(TNR)TARGETN) sce/$(SHL$(TNR)TARGET).sce -msg -skip
-.ENDIF			# "$(NO_TESTS)"==""
-.ENDIF			# "$(TESTDIR)"!=""
 .ENDIF			# "$(SHL$(TNR)TARGETN)"!=""
 
 # unroll end
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 7e12a9e2b..cea303c2a 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -120,6 +120,12 @@ GNUTAR*=/usr/sfw/bin/gtar
 DEREFERENCE=
 .ELSE			# "$(OS)"=="SOLARIS"
 AWK*=awk
+# this is not true, as BSD does not default to a GNU cp, but BSD cp
+# so in dmake makefiles one should be restricted to use the subset
+# of features that both BSD and GNU make support.
+# as the GNU make build system requires GNUCOPY to really be a GNU copy
+# we work around that for now by not setting GNUCOPY in sdev300.ini
+# for fbsd for now, but for all other platforms it is set.
 GNUCOPY*=cp
 GNUPATCH*=patch
 DEREFERENCE=-L
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 1ca4faa34..fd9f78328 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -143,6 +143,9 @@ LINK*=$(CXX)
 LINKC*=$(CC)
 
 # default linker flags
+.IF "$(SYSBASE)"!=""
+LINKFLAGS_SYSBASE:=-Wl,--sysroot=$(SYSBASE)
+.ENDIF          # "$(SYSBASE)"!=""
 LINKFLAGSDEFS*=-Wl,-z,defs
 LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
@@ -153,16 +156,16 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$O
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
 LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
 .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
 LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
 .ENDIF
 
 # linker flags for linking applications
 LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
 LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
-    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR):$(SYSBASE)/lib:$(SYSBASE)/usr/lib
 
 # linker flags for linking shared libraries
 LINKFLAGSSHLGUI= -shared
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 426e55437..0a0d0d103 100755
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -25,21 +25,11 @@
  *
  *************************************************************************/
 
-#define VERSION         3
-#define SUBVERSION      4
+#include "versionlist.hrc"
+
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT   0
-//#define VER_BETA      6
-#define VER_FINAL       0
 
-#define VER_DAY         1
-#define VER_MONTH       8
-#define VER_YEAR        2010
+#define VER_FINAL       0
 
 #ifndef VER_FIRSTYEAR
 #define VER_FIRSTYEAR   VER_YEAR
diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
index 5dd3a2a37..200cdf53e 100644..100755
--- a/solenv/inc/version.lst
+++ b/solenv/inc/version.lst
@@ -28,3 +28,7 @@
 OOOBASEVERSIONMAJOR=3
 OOOBASEVERSIONMINOR=4
 OOOBASEVERSIONMICRO=0
+
+OOOBASEVERSIONDAY=1
+OOOBASEVERSIONMONTH=10
+OOOBASEVERSIONYEAR=2010
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 5493a1587..383f3530c 100755
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -25,21 +25,11 @@
  *
  *************************************************************************/
 
-#define VERSION         3
-#define SUBVERSION      4
+#include "versionlist.hrc"
+
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
-// .0 + VER_CONCEPT
-// .100 + VER_ALPHA
-// .200 + VER_BETA
-// .300 + VER_GAMMA
-// .500 + VER_FINAL
-//#define VER_CONCEPT   0
-//#define VER_BETA      6
-#define VER_FINAL       0
 
-#define VER_DAY         1
-#define VER_MONTH       8
-#define VER_YEAR        2010
+#define VER_FINAL       0
 
 #ifndef VER_FIRSTYEAR
 #define VER_FIRSTYEAR   VER_YEAR
diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk
index 31a255e48..672df7bd7 100644..100755
--- a/solenv/inc/versionlist.mk
+++ b/solenv/inc/versionlist.mk
@@ -27,4 +27,4 @@
 
 .INCLUDE: version.lst
 
-.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO
+.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO OOOBASEVERSIONDAY OOOBASEVERSIONMONTH OOOBASEVERSIONYEAR
diff --git a/solenv/makefile.mk b/solenv/makefile.mk
index 31bed765a..c4a2d0893 100644..100755
--- a/solenv/makefile.mk
+++ b/solenv/makefile.mk
@@ -32,9 +32,14 @@ TARGET=init
 # --- Settings ----------------------------------
 .INCLUDE : settings.mk
 .INCLUDE : target.mk
+.INCLUDE : versionlist.mk
 
-ALLTAR : comment
-
-comment:
-    @echo just for sideeffects...
+ALLTAR : $(INCCOM)/versionlist.hrc
 
+$(INCCOM)/versionlist.hrc : ./inc/version.lst
+    $(COMMAND_ECHO)echo "#define VERSION $(OOOBASEVERSIONMAJOR)" > $@
+    $(COMMAND_ECHO)echo "#define SUBVERSION $(OOOBASEVERSIONMINOR)" >> $@
+    $(COMMAND_ECHO)echo "#define MICROVERSION $(OOOBASEVERSIONMICRO)" >> $@
+    $(COMMAND_ECHO)echo "#define VER_DAY $(OOOBASEVERSIONDAY)" >> $@
+    $(COMMAND_ECHO)echo "#define VER_MONTH $(OOOBASEVERSIONMONTH)" >> $@
+    $(COMMAND_ECHO)echo "#define VER_YEAR $(OOOBASEVERSIONYEAR)" >> $@
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index edbfc190c..05ceea226 100644..100755
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -1,2 +1,4 @@
-mkdir: %_DEST%\bin%_EXT%
-..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
+mkdir: %_DEST%\bin%_EXT%
+mkdir: %_DEST%\inc%_EXT%
+..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
+..\%__SRC%\inc\versionlist.hrc %_DEST%\inc%_EXT%\versionlist.hrc
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 437484958..de7e48628 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -60,8 +60,9 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 
 #define MAXDEFINES	512
-#define MAXFILES	2048  /* Increased from 512. -mcafee */
-                          /* Increased from 1024. -mh */
+#define MAXFILES	( 1<<16 ) /* Increased from 512. -mcafee */
+                              /* Increased from 1024. -mh */
+                              /* Increased from 2048. -b_michaelsen */
 #define MAXDIRS		64
 #define SYMHASHSEED     131  /* 131 1313 13131 ... */
 #define SYMHASHMEMBERS	64	/* must be 2^x to work right */
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index e6d4bddec..a349607e3 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -71,15 +71,18 @@ struct inclist *inc_path(file, include, dot, incCollection)
      * If the path was surrounded by "" or is an absolute path,
      * then check the exact path provided.
      */
-    if (!found && (dot || *include == '/')) {
-        
-        if ((exists_path(incCollection, include)) && stat(include, &st) == 0 && !( st.st_mode & S_IFDIR)) {
-            ip = newinclude(include, include);
-            found = TRUE;
-        }
-        else if (show_where_not)
-            warning1("\tnot in %s\n", include);
-    }
+// FIXME: creates duplicates in the dependency files if absolute paths are
+// given, which certainly is not the intended behavior. Also it slows down
+// makedepend performance considerably.
+//	if (!found && (dot || *include == '/')) {
+//        
+//		if ((exists_path(incCollection, include)) && stat(include, &st) == 0 && !( st.st_mode & S_IFDIR)) {
+//			ip = newinclude(include, include);
+//			found = TRUE;
+//		}
+//		else if (show_where_not)
+//			warning1("\tnot in %s\n", include);
+//	}
 
     /*
      * See if this include file is in the directory of the
author	Mikhail Voytenko <mav@openoffice.org>	2011-01-06 14:57:12 +0100
committer	Mikhail Voytenko <mav@openoffice.org>	2011-01-06 14:57:12 +0100
commit	125087d3a4ac8ffd111391fe27b71027c90acadc (patch)
tree	6afc6264ea33686546be829e768b5522e978d88f
parent	97f62a9636225cf2b9dd15b25752e570842f3c13 (diff)
parent	2ad19fc838f554a2f9883fc7a8cda849dc414a94 (diff)