diff --git a/configure b/configure
index 7a99031fc470..8ba4664381db 100755
--- a/configure
+++ b/configure
@@ -910,6 +910,7 @@ PERL
 HAVE_LD_HASH_STYLE
 _cc
 GNUMAKE
+NO_HIDS
 ENABLE_PCH
 HAVE_LD_BSYMBOLIC_FUNCTIONS
 GCCVER
@@ -1020,6 +1021,7 @@ enable_lockdown
 enable_vba
 with_vba_package_format
 enable_pch
+enable_hids
 enable_mozilla
 with_fonts
 with_ppds
@@ -1824,6 +1826,8 @@ Optional Features:
 
   --enable-pch            EXPERIMENTAL: Enables precompiled header support for C++.
 
+  --enable-hids            Enables generation of HelpId lists.
+
   --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
                           binary for your platform, to build without this
                           version, use this option.
@@ -2882,6 +2886,11 @@ if test "${enable_pch+set}" = set; then
   enableval=$enable_pch;
 fi
 
+# Check whether --enable-hids was given.
+if test "${enable_hids+set}" = set; then
+  enableval=$enable_hids;
+fi
+
 # Check whether --enable-mozilla was given.
 if test "${enable_mozilla+set}" = set; then
   enableval=$enable_mozilla;
@@ -6131,6 +6140,19 @@ $as_echo "no" >&6; }
 fi
 
 
+{ $as_echo "$as_me:$LINENO: checking whether to enable hid list feature" >&5
+$as_echo_n "checking whether to enable hid list feature... " >&6; }
+if test -n "$enable_hids" && test "$enable_hids" != "no"; then
+   NO_HIDS=""
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   NO_HIDS="TRUE"
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 { $as_echo "$as_me:$LINENO: checking for GNU make" >&5
 $as_echo_n "checking for GNU make... " >&6; }
 for a in "$MAKE" $GNUMAKE make gmake gnumake; do
@@ -6743,14 +6765,17 @@ $as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
 $as_echo "found Compiler version $CCNUMVER." >&6; }
 			if test "$CCNUMVER" -ge "001500000000"; then
 				COMEX=12
+				MSVSVER=2008
 				{ $as_echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5
 $as_echo "found .NET 2008 / VS 9.0." >&6; }
 			elif test "$CCNUMVER" -ge "001400000000"; then
 				COMEX=11
+				MSVSVER=2005
 				{ $as_echo "$as_me:$LINENO: result: found .NET 2005." >&5
 $as_echo "found .NET 2005." >&6; }
 			elif test "$CCNUMVER" -ge "001300102240"; then
 				COMEX=10
+				MSVSVER=2003
 				{ $as_echo "$as_me:$LINENO: result: found .NET 2003." >&5
 $as_echo "found .NET 2003." >&6; }
 			else
@@ -18182,10 +18207,16 @@ fi
 { $as_echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5
 $as_echo_n "checking for toolkit mozilla should use... " >&6; }
 if test -z "$with_mozilla_toolkit"; then
-   if test "$_os" != "WINNT"; then
-      MOZILLA_TOOLKIT=gtk2
-      { $as_echo "$as_me:$LINENO: result: gtk2" >&5
+   if test "$_os" != "WINNT" ; then
+      if test "$_os" = "Darwin" ; then
+         MOZILLA_TOOLKIT=mac
+         { $as_echo "$as_me:$LINENO: result: mac" >&5
+$as_echo "mac" >&6; }
+      else
+         MOZILLA_TOOLKIT=gtk2
+         { $as_echo "$as_me:$LINENO: result: gtk2" >&5
 $as_echo "gtk2" >&6; }
+      fi
    fi
 else
    MOZILLA_TOOLKIT=$with_mozilla_toolkit
@@ -18208,8 +18239,8 @@ else
       enable_build_mozilla=
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla" >&5
-$as_echo_n "checking whether to build Mozilla... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5
+$as_echo_n "checking whether to build Mozilla/SeaMonkey... " >&6; }
 if test -n "$enable_build_mozilla"; then
    BUILD_MOZAB="TRUE"
    { $as_echo "$as_me:$LINENO: result: yes" >&5
@@ -18221,18 +18252,29 @@ $as_echo "no" >&6; }
 fi
 
 if test "$BUILD_MOZAB" = "TRUE"; then
+  if test "$_os" = "WINNT"; then
+    if test "$WITH_MINGWIN" != "yes"; then
+      # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
+      if test "$MSVSVER" != "2005"; then
+        { { $as_echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5
+$as_echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;}
+   { (exit 1); exit 1; }; }
+      fi
+    else
+      { $as_echo "$as_me:$LINENO: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5
+$as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;}
+      echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn
+    fi
+  fi
+
    if test -z "$MOZILLA_VERSION"; then
-      MOZILLA_VERSION=1.7.5
-   fi
-   if test "$MOZILLA_VERSION" = "1.7b" ; then
-      MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source"
-   else
-      MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}"
+      MOZILLA_VERSION=1.1.14
    fi
+   MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
    for e in gz bz2; do
       { $as_echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5
 $as_echo_n "checking for $MOZILLA_SOURCE_VERSION.tar.$e... " >&6; }
-      if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
+      if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
          { $as_echo "$as_me:$LINENO: result: not found" >&5
 $as_echo "not found" >&6; }
          HAVE_MOZILLA_TARBALL=n
@@ -18243,34 +18285,24 @@ $as_echo "found" >&6; }
       fi
    done
    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         { { $as_echo "$as_me:$LINENO: error: Mozilla source archive not found.
+         { { $as_echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found.
 Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
 The archives can be found here:
-http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/" >&5
-$as_echo "$as_me: error: Mozilla source archive not found.
+http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5
+$as_echo "$as_me: error: Mozilla/SeaMonkey source archive not found.
 Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
 The archives can be found here:
-http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/" >&2;}
+http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&2;}
    { (exit 1); exit 1; }; }
    fi
    if test "$_os" = "WINNT"; then
-      { $as_echo "$as_me:$LINENO: checking for glib and libIDL binaries" >&5
-$as_echo_n "checking for glib and libIDL binaries... " >&6; }
-      if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \
-           -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \
-           -o ! -e "./moz/download/wintools.zip" ; then
-{ { $as_echo "$as_me:$LINENO: error: One or more of the following archives is missing in moz/download/
-  vc71-glib-1.2.10-bin.zip
-  vc71-libIDL-0.6.8-bin.zip
-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/)
-  wintools.zip
-(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)" >&5
-$as_echo "$as_me: error: One or more of the following archives is missing in moz/download/
-  vc71-glib-1.2.10-bin.zip
-  vc71-libIDL-0.6.8-bin.zip
-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/)
-  wintools.zip
-(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)" >&2;}
+      { $as_echo "$as_me:$LINENO: checking for moztools binaries" >&5
+$as_echo_n "checking for moztools binaries... " >&6; }
+      if test ! -e "moz/download/vc8-moztools.zip" ; then
+        { { $as_echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip
+(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5
+$as_echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip
+(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&2;}
    { (exit 1); exit 1; }; }
       else
          { $as_echo "$as_me:$LINENO: result: ok" >&5
diff --git a/configure.in b/configure.in
index 94d57c0245df..cc9a533e5553 100644
--- a/configure.in
+++ b/configure.in
@@ -61,6 +61,9 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_ENABLE(pch,
 [  --enable-pch            EXPERIMENTAL: Enables precompiled header support for C++.
 ],,)
+AC_ARG_ENABLE(hids,
+[  --enable-hids            Enables generation of HelpId lists.
+],,)
 AC_ARG_ENABLE(mozilla,
 [  --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
                           binary for your platform, to build without this
@@ -1491,6 +1494,19 @@ else
 fi
 AC_SUBST(ENABLE_PCH)
 
+dnl ===================================================================
+dnl Set the NO_HIDS variable. (enable with --enable-hids)
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable hid list feature])
+if test -n "$enable_hids" && test "$enable_hids" != "no"; then
+   NO_HIDS=""
+   AC_MSG_RESULT([yes])
+else
+   NO_HIDS="TRUE"
+   AC_MSG_RESULT([no])
+fi
+AC_SUBST(NO_HIDS)
+
 dnl ===================================================================
 dnl Search all the common names for GNU make
 dnl ===================================================================
@@ -1760,12 +1776,15 @@ dnl      The following find microsoft, matches nn.nn.nnnn then pulls numbers out
 			AC_MSG_RESULT([found Compiler version $CCNUMVER.])
 			if test "$CCNUMVER" -ge "001500000000"; then
 				COMEX=12
+				MSVSVER=2008
 				AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
 			elif test "$CCNUMVER" -ge "001400000000"; then
 				COMEX=11
+				MSVSVER=2005
 				AC_MSG_RESULT([found .NET 2005.])
 			elif test "$CCNUMVER" -ge "001300102240"; then
 				COMEX=10
+				MSVSVER=2003
 				AC_MSG_RESULT([found .NET 2003.])
 			else
 				AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler.])
@@ -4126,9 +4145,14 @@ AC_SUBST(MOZILLA_VERSION)
 
 AC_MSG_CHECKING([for toolkit mozilla should use])
 if test -z "$with_mozilla_toolkit"; then
-   if test "$_os" != "WINNT"; then
-      MOZILLA_TOOLKIT=gtk2
-      AC_MSG_RESULT([gtk2])
+   if test "$_os" != "WINNT" ; then
+      if test "$_os" = "Darwin" ; then
+         MOZILLA_TOOLKIT=mac  
+         AC_MSG_RESULT([mac])
+      else
+         MOZILLA_TOOLKIT=gtk2
+         AC_MSG_RESULT([gtk2])
+      fi
    fi
 else
    MOZILLA_TOOLKIT=$with_mozilla_toolkit
@@ -4150,7 +4174,7 @@ else
       enable_build_mozilla=
 fi
 
-AC_MSG_CHECKING([whether to build Mozilla])
+AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey])
 if test -n "$enable_build_mozilla"; then
    BUILD_MOZAB="TRUE"
    AC_MSG_RESULT([yes])
@@ -4160,17 +4184,25 @@ else
 fi
 
 if test "$BUILD_MOZAB" = "TRUE"; then
+  if test "$_os" = "WINNT"; then
+    if test "$WITH_MINGWIN" != "yes"; then
+      # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
+      if test "$MSVSVER" != "2005"; then
+        AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only.])
+      fi
+    else
+      AC_MSG_WARN([Building SeaMonkey with mingwin is not tested, and likely to break.])
+      echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn
+    fi
+  fi
+
    if test -z "$MOZILLA_VERSION"; then
-      MOZILLA_VERSION=1.7.5
-   fi
-   if test "$MOZILLA_VERSION" = "1.7b" ; then
-      MOZILLA_SOURCE_VERSION="mozilla-source-1.7b-source"
-   else
-      MOZILLA_SOURCE_VERSION="mozilla-source-${MOZILLA_VERSION}"
+      MOZILLA_VERSION=1.1.14
    fi
+   MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
    for e in gz bz2; do
       AC_MSG_CHECKING([for $MOZILLA_SOURCE_VERSION.tar.$e])
-      if test ! -e "./moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
+      if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then
          AC_MSG_RESULT([not found])
          HAVE_MOZILLA_TARBALL=n
       else
@@ -4179,22 +4211,16 @@ if test "$BUILD_MOZAB" = "TRUE"; then
       fi
    done
    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-         AC_MSG_ERROR([Mozilla source archive not found.
+         AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
 Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/.
 The archives can be found here:
-http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$MOZILLA_VERSION/source/])
+http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/])
    fi
    if test "$_os" = "WINNT"; then
-      AC_MSG_CHECKING([for glib and libIDL binaries])
-      if test ! -e "./moz/download/vc71-glib-1.2.10-bin.zip" \
-           -o ! -e "./moz/download/vc71-libIDL-0.6.8-bin.zip" \
-           -o ! -e "./moz/download/wintools.zip" ; then
-AC_MSG_ERROR([One or more of the following archives is missing in moz/download/
-  vc71-glib-1.2.10-bin.zip
-  vc71-libIDL-0.6.8-bin.zip
-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71/)
-  wintools.zip
-(from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)])
+      AC_MSG_CHECKING([for moztools binaries])
+      if test ! -e "moz/download/vc8-moztools.zip" ; then
+        AC_MSG_ERROR([The following file is missing in moz/download: vc8-moztools.zip
+(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)])
       else
          AC_MSG_RESULT([ok])
       fi
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c
index 5979d04bc546..4be342bbb273 100644
--- a/dmake/unix/runargv.c
+++ b/dmake/unix/runargv.c
@@ -553,8 +553,11 @@ char  **cmd; /* Simulate a reference to *cmd. */
       /* Restore stdout/stderr if needed. */
       if( old_stdout != -1 ) {
      dup2(old_stdout, 1);
-     if( old_stderr != -1 )
+     close(old_stdout);
+     if( old_stderr != -1 ) {
         dup2(old_stderr, 2);
+        close(old_stderr);
+      }
       }
 
       internal = 1;
@@ -593,8 +596,11 @@ char  **cmd; /* Simulate a reference to *cmd. */
 
    if( old_stdout != -1 ) {
       dup2(old_stdout, 1);
-      if( old_stderr != -1 )
+      close(old_stdout);
+      if( old_stderr != -1 ) {
      dup2(old_stderr, 2);
+     close(old_stderr);
+      }
    }
    if(pid.pid == (DMHANDLE)-1) {
       /* spawn failed */
@@ -649,8 +655,11 @@ char  **cmd; /* Simulate a reference to *cmd. */
        * failed. */
       if( old_stdout != -1 ) {
      dup2(old_stdout, 1);
-     if( old_stderr != -1 )
+     close(old_stdout);
+     if( old_stderr != -1 ) {
         dup2(old_stderr, 2);
+        close(old_stderr);
+     }
       }
       fprintf(stderr, "%s:  Error executing '%s': %s",
           Pname, argv[0], strerror(errno) );
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
new file mode 100644
index 000000000000..cc1c3032930c
--- /dev/null
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
@@ -0,0 +1,3 @@
+# OpenOffice 2 UpgradeCodes
+
+{1552EC17-8CE9-4E58-A009-991468B8E806}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
new file mode 100644
index 000000000000..daf492715fd5
--- /dev/null
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
@@ -0,0 +1,3 @@
+# OpenOffice 2 UpgradeCodes
+
+{D8B206B8-6822-48C2-A799-E35BFD585035}	# OOo UpgradeCode
\ No newline at end of file
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 514de56e4888..7e65e07d3053 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -123,7 +123,7 @@ OpenOffice_wJRE
 			BASEPRODUCTVERSION 3.2
 			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
@@ -194,7 +194,7 @@ OpenOffice_Dev
 			SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93
 			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
@@ -284,7 +284,7 @@ OpenOffice_SDK
 {
     Settings
     {
-        downloadname OOo-SDK_{productversion}_{os}_install_{languages}
+        downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
         variables
         {
             PRODUCTNAME OpenOffice.org
@@ -370,7 +370,7 @@ BrOffice
 			USE_FILEVERSION 1
 			LIBRARYVERSION 9.2.0
 			CODEFILENAME codes_broo.txt
-			PATCHCODEFILE ooo_patchcodes.txt
+			PATCHCODEFILE bro_patchcodes.txt
 			DOWNLOADBANNER	brobanner.bmp
 			DOWNLOADBITMAP	brobitmap.bmp
 			DOWNLOADSETUPICO	ooosetup.ico
@@ -412,7 +412,7 @@ BrOffice_wJRE
 			PROGRESSFRAMECOLOR 
 			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
@@ -437,7 +437,7 @@ BrOffice_wJRE
 			USE_FILEVERSION 1
 			LIBRARYVERSION 9.2.0
 			CODEFILENAME codes_broo.txt
-			PATCHCODEFILE ooo_patchcodes.txt
+			PATCHCODEFILE bro_patchcodes.txt
 			JAVAPRODUCT 1
 			DOWNLOADBANNER	brobanner.bmp
 			DOWNLOADBITMAP	brobitmap.bmp
@@ -487,7 +487,7 @@ BrOffice_Dev
 			SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93
 			UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
@@ -510,7 +510,7 @@ BrOffice_Dev
 			USE_FILEVERSION 1
 			JAVAPRODUCT 1
 			LIBRARYVERSION 9.2.0
-			PATCHCODEFILE ooo_patchcodes.txt
+			PATCHCODEFILE brodev_patchcodes.txt
 			CODEFILENAME codes_broodev.txt
 			DOWNLOADBANNER	brobanner.bmp
 			DOWNLOADBITMAP	brobitmap.bmp
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index 1709883abde9..2e62a4938998 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -7,12 +7,12 @@
 
 # Product       List_of_platforms                                                   List_of_languages   Target
 
-OpenOffice      unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro    en-US|ar   openoffice
+OpenOffice      unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro    en-US   openoffice
 OpenOffice      unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12                                     en-US   openoffice
 #BrOffice                                                                                          pt-BR   broffice
 #OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12                    en-US   openofficewithjre
 #BrOffice_wJRE                                                                                     pt-BR   brofficewithjre
-OpenOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US|ar   openofficedev
+OpenOffice_Dev  unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro    en-US   openofficedev
 #BrOffice_Dev                                                                                      pt-BR   brofficedev
 OpenOffice_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12  en-US   sdkoo
 #URE             unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12  en-US   ure
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 904960fdbdb1..89096b80f87c 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -41,6 +41,12 @@ End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis)
 
+File gid_File_Oo_Office_Dataaccess_Calc_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/calc.xcu";
+End
 STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index eac234c7793a..939b2cd81ac1 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -45,7 +45,7 @@ Module gid_Module_Prg_Calc_Bin
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+    Files = (gid_File_Oo_Office_Dataaccess_Calc_Xcu,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
     gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
     gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
     gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index a7b58c83e72b..a6e2eba60361 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -207,6 +207,11 @@ Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Ui
     DosName = "UI";
 End
 
+Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Dataaccess
+    ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
+    HostName = "DataAccess";
+End
+
 Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_OOoImprovement
     ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office;
     DosName = "OOoImprovement";
@@ -747,6 +752,11 @@ Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui
     HostName = "UI";
 End
 
+Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess
+    ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
+    HostName = "DataAccess";
+End
+
 Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement
     ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office;
     HostName = "OOoImprovement";
@@ -792,6 +802,11 @@ Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui
     HostName = "UI";
 End
 
+Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Dataaccess
+    ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office;
+    HostName = "DataAccess";
+End
+
 Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb
     ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice;
     HostName = "ucb";
@@ -922,11 +937,6 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Office_Scripting
     HostName = "Scripting";
 End
 
-Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess
-    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
-    HostName = "DataAccess";
-End
-
 Directory gid_Dir_Share_Registry_Modules_Oo_Office_Addons
     ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
     HostName = "Addons";
@@ -957,6 +967,16 @@ Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc
     HostName = "Misc";
 End
 
+Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess
+    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office;
+	HostName = "DataAccess";
+End
+
+Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers
+    ParentID = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess;
+	HostName = "Drivers";
+End
+
 Directory gid_Dir_Autotext
     ParentID = gid_Dir_Share;
     DosName = "autotext";
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 524176ab836f..f9de70d434ac 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -39,10 +39,22 @@ End
 #endif
 #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
 STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas)
+File gid_File_Oo_Office_Dataaccess_Adabas_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/adabas.xcu";
+End
 #endif
 
 #if defined(WNT)
 STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado)
+File gid_File_Oo_Office_Dataaccess_Ado_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/ado.xcu";
+End
 #endif
 
 STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl)
@@ -243,10 +255,15 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase )
+File gid_File_Oo_Office_Dataaccess_Dbase_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/dbase.xcu";
+End
 
 STD_LIB_FILE( gid_File_Lib_Dbfile , file)
-
-STD_LIB_FILE(gid_File_Lib_Odbcbase,odbcbase)
+STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
 
 
 File gid_File_Lib_Dbpool
@@ -387,7 +404,7 @@ End
 
 #endif
 
-STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
+STD_LIB_FILE_PATCH(gid_File_Lib_Drawinglayer,drawinglayer)
 
 SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj)
 
@@ -411,7 +428,12 @@ End
 #ifdef UNX
 
 #ifdef ENABLE_KAB
-
+File gid_File_Oo_Office_Dataaccess_Kab_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/kab.xcu";
+End
 File gid_File_Lib_Kab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -430,7 +452,12 @@ End
 #endif
 
 #ifdef MACOSX
-
+File gid_File_Oo_Office_Dataaccess_Macab_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/macab.xcu";
+End
 File gid_File_Lib_Macab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -449,6 +476,12 @@ End
 #endif  // #ifdef ENABLE_KAB
 
 #ifdef ENABLE_EVOAB2
+File gid_File_Oo_Office_Dataaccess_Evoab2_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/evoab2.xcu";
+End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
@@ -478,6 +511,12 @@ File gid_File_Lib_Filterconfig1
     Name = SPECIAL_NAME(filterconfig1);
 End
 
+File gid_File_Oo_Office_Dataaccess_Flat_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/flat.xcu";
+End
 STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat)
 
 #ifdef WNT
@@ -533,7 +572,7 @@ End
 #ifdef QUARTZ
 File gid_File_Lib_Fps_Aqua
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = gid_Dir_Program;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
@@ -757,11 +796,22 @@ End
 #ifdef SOLAR_JAVA
 
 STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
+File gid_File_Oo_Office_Dataaccess_Jdbc_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/jdbc.xcu";
+End
 
 #endif
 
 #ifdef SOLAR_JAVA
-
+File gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/hsqldb.xcu";
+End
 File gid_File_Lib_Hsqldb_2
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
@@ -880,6 +930,17 @@ End
 
 #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
                                                                 // #i91209#
+File gid_File_Oo_Office_Dataaccess_Mozab_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+#ifdef WNT
+    Name = "/registry/spool/DataAccess/mozab.xcu";
+#else
+    Name = "/registry/spool/DataAccess/mozab2.xcu";
+#endif
+End
+
 STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
@@ -987,7 +1048,25 @@ End
 #endif
 
 STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql)
+File gid_File_Oo_Office_Dataaccess_Mysql_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/mysql.xcu";
+End
 STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc)
+File gid_File_Oo_Office_Dataaccess_Odbc_Xcu
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers;
+    Name = "/registry/spool/DataAccess/odbc.xcu";
+End
+
+File gid_File_Registry_Drivers_Zip
+    Dir = gid_Dir_Share_Registry_Res_Lang;
+    ARCHIVE_TXT_FILE_BODY;
+    EXTRA_ALL_LANG(fcfg_drivers);
+End
 
 // STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
 
@@ -1064,7 +1143,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
 File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = gid_Dir_Program;
 End
 #endif
@@ -1074,7 +1153,7 @@ End
 File gid_File_Lib_Vclplug_Gtk
     Name = LIBNAME(vclplug_gtk);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = gid_Dir_Program;
 End
 #endif
@@ -1083,7 +1162,7 @@ End
 File gid_File_Lib_Vclplug_Kde
     Name = LIBNAME(vclplug_kde);
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = gid_Dir_Program;
 End
 #endif
@@ -1109,7 +1188,7 @@ End
 #endif
 
 #if defined UNX && ! defined QUARTZ
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif
 
@@ -1408,7 +1487,7 @@ File gid_File_Lib_Ucpchelp1
 End
 
 #ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
 #endif
 
 SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
@@ -1668,20 +1747,17 @@ End
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
-#if defined WNT && \
-    (defined M1310 || \
-     ((defined M1400 || defined M1500) && \
-      !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
-File gid_File_Moz_Msvcp71
+#if defined WNT && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA
+File gid_File_Moz_Msvcp80
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
-    Name = SCP2_URE_DL_NORMAL("msvcp71" SCP2_STDLP_DEBUG);
+    Name = SCP2_URE_DL_NORMAL("msvcp80");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
-File gid_File_Moz_Msvcr71
+File gid_File_Moz_Msvcr80
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
+    Name = SCP2_URE_DL_NORMAL("msvcr80");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 #endif
@@ -1718,7 +1794,7 @@ File gid_File_Lib_Rasqal
     #endif
   #else
    #ifdef _gcc3
-    Name = "librasqal-0.dll";
+       Name = STRING(CONCAT3(librasqal-,RASQAL_MAJOR,.dll));
    #else
     Name = "rasqal.dll";
    #endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 69afeed98f26..5ddbbe70b70f 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1513,6 +1513,13 @@ File gid_File_Oo_Office_Dataaccess_Xcu
     Name = "/registry/data/org/openoffice/Office/DataAccess.xcu";
 End
 
+File gid_File_Oo_Office_Dataaccess_Drivers_Xcs
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess;
+    Name = "/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs";
+End
+
 File gid_File_Oo_Office_Ui_Dbucommands_Xcs
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 46c8f9017cab..1e1037fa8c2e 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -174,10 +174,12 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Dba,
 	gid_File_Lib_Dbacfg,
 	gid_File_Lib_Dbase2,
+	gid_File_Oo_Office_Dataaccess_Dbase_Xcu,
 	gid_File_Lib_Dbaxml,
 	gid_File_Lib_Dbt,
 	gid_File_Lib_Dbfile,
 	gid_File_Lib_Drawinglayer,
+	gid_File_Oo_Office_Dataaccess_Flat_Xcu,
 	gid_File_Lib_Flat,
 	gid_File_Lib_For,
 	gid_File_Lib_Forui,
@@ -277,6 +279,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Ldapbe2,
 	gid_File_Lib_Comphelper2,
 	gid_File_Lib_Adabas,
+	gid_File_Oo_Office_Dataaccess_Adabas_Xcu,
 	gid_File_Lib_Cached1,
 	gid_File_Lib_Curl,
 	gid_File_Lib_Db,
@@ -284,8 +287,11 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Embobj,
 	gid_File_Lib_Emboleobj,
 	gid_File_Lib_Evoab_2,
+	gid_File_Oo_Office_Dataaccess_Evoab_Xcu,
 	gid_File_Lib_Kab_1,
+	gid_File_Oo_Office_Dataaccess_Kab_Xcu,
     gid_File_Lib_Kab_Drv_1,
+    gid_File_Oo_Office_Dataaccess_Macab_Xcu,
 	gid_File_Lib_Macab_1,
     gid_File_Lib_Macab_Drv_1,
 	gid_File_Lib_Evtatt,
@@ -307,14 +313,19 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Localedata_Es,
 	gid_File_Lib_Localedata_Euro,
 	gid_File_Lib_Localedata_Others,
+	gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu,
 	gid_File_Lib_Hsqldb_2,
 	gid_File_Lib_Jdbc,
+	gid_File_Oo_Office_Dataaccess_Jdbc_Xcu,
 	gid_File_Lib_Mcnttype,
+	gid_File_Oo_Office_Dataaccess_Mozab_Xcu,
 	gid_File_Lib_Mozab_2,
 	gid_File_Lib_Mozabdrv,
 	gid_File_Lib_Mozbootstrap,
 	gid_File_Lib_Mysql,
+	gid_File_Oo_Office_Dataaccess_Mysql_Xcu,
 	gid_File_Lib_Odbc,
+	gid_File_Oo_Office_Dataaccess_Odbc_Xcu,
 	gid_File_Lib_Officebean,
 	gid_File_Lib_Openssl,
 	gid_File_Lib_Package2,
@@ -374,6 +385,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Stdc_5,
 	gid_File_Lib_Accessbridge,
 	gid_File_Lib_Ado,
+	gid_File_Oo_Office_Dataaccess_Ado_Xcu,
 	gid_File_Lib_Dl,
 	gid_File_Lib_Dnd,
 	gid_File_Lib_Dtrans,
@@ -664,6 +676,7 @@ Module gid_Module_Root_Files_6
 	gid_File_Oo_Office_Ui_Controller_Xcu,
 	gid_File_Oo_Office_Dataaccess_Xcs,
 	gid_File_Oo_Office_Dataaccess_Xcu,
+	gid_File_Oo_Office_Dataaccess_Drivers_Xcs,
 	gid_File_Oo_Office_Ui_Dbucommands_Xcs,
 	gid_File_Oo_Office_Ui_Dbucommands_Xcu,
 	gid_File_Oo_Office_Ui_Basewindowstate_Xcs,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index b62635f11650..d28fa5bb54dd 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -47,6 +47,7 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Extra_Wordbook,
              gid_File_Extra_Wordbook_Lang,
              gid_File_Registry_Filter_Zip,
+             gid_File_Registry_Drivers_Zip,
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
              gid_File_Registry_Spool_Oo_Common_Ctl_Xcu,
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 547873850426..03b359068b26 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -46,38 +46,11 @@ COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
 
 ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
 
-.PHONY $(INCCOM)$/alllangmodules.inc:
+.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+.IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
+PHONYTEMPL=.PHONY
+.ENDIF			# "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
+$(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
     @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_root.inc:
-    @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_root.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_base.inc:
-    @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_base.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_calc.inc:
-    @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_calc.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_draw.inc:
-    @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_draw.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_impress.inc:
-    @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_impress.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_math.inc:
-    @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_math.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_writer.inc:
-    @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_writer.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/alllangmodules_binfilter.inc:
-    @@-$(RENAME) $@ $@.tmp
-    $(PERL) -w modules.pl -i $(PRJ)$/source$/templates$/module_langpack_binfilter.sct -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+    $(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+    @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
diff --git a/set_soenv.in b/set_soenv.in
index 1ee948f0a226..2c496efc1d73 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -186,7 +186,6 @@ $CALL_CDECL           = "TRUE";
 $COMMON_OUTDIR        = "";
 $common_build         = "";
 $NO_REC_RES           = "TRUE";
-$NO_HIDS              = "TRUE";
 $SO3                  = "TRUE";
 $SOLAR_JAVA           = "@SOLAR_JAVA@";
 $SOLAR_PLUGIN         = "TRUE";
@@ -1622,7 +1621,6 @@ ToFile( "common_build",      $common_build,      "e" );
 ToFile( "BMP_WRITES_FLAG",   $BMP_WRITES_FLAG,   "e" );
 ToFile( "BUILD_SOSL_RELEASE", $BUILD_SOSL_RELEASE, "e" );
 ToFile( "NO_REC_RES",        $NO_REC_RES,        "e" );
-ToFile( "NO_HIDS",           $NO_HIDS,           "e" );
 ToFile( "SO3",               $SO3,               "e" );
 ToFile( "SOLAR_PLUGIN",      $SOLAR_PLUGIN,      "e" );
 ToFile( "UPDATER",           $UPDATER,           "e" );
@@ -1816,6 +1814,7 @@ ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
 ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
 ToFile( "ENABLE_LAYOUT",     "@ENABLE_LAYOUT@",     "e" );
 ToFile( "ENABLE_PCH",        "@ENABLE_PCH@",       "e" );
+ToFile( "NO_HIDS",           "@NO_HIDS@",       "e" );
 ToFile( "VC_STANDARD",       "@VC_STANDARD@",      "e" );
 ToFile( "WITH_GPC",          "@WITH_GPC@",         "e" );
 ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi
index 4725045c9583..2a47bb8cf83e 100755
--- a/solenv/bin/checkapi
+++ b/solenv/bin/checkapi
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 PS=":"
 # cygwin:
 if [ "$GUI" = "WNT" ]; then
@@ -8,14 +9,22 @@ fi
 JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
 SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
 
+# it is possible to give an other OOoRunner.jar
 if [ -n "$RUNNERJAR" ]; then
     myCLASSPATH=$RUNNERJAR
 else 
     myCLASSPATH=$JARFOLDER/OOoRunner.jar
 fi
 
-myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar
-myCLASSPATH=$myCLASSPATH${PS}/net/unoapi/export/unoapi/bin/mysql.jar${PS}$SOLVER_LIB
+myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}\
+${JARFOLDER}/unoil.jar${PS}\
+${JARFOLDER}/jurt.jar${PS}\
+${JARFOLDER}/juh.jar${PS}\
+${JARFOLDER}/java_uno.jar
+
+myCLASSPATH=$myCLASSPATH${PS}\
+/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
+$SOLVER_LIB
 
 if [ -n "$JAVAI" ]; then
 	JAVABIN=$JAVAI
@@ -26,8 +35,12 @@ elif [ -n "$JAVA_HOME" ]; then
         JAVABIN=$JAVA_HOME/bin/java
     fi
 else
-	echo "please set environment variable JAVA_HOME"
-	exit 1
+    # there seems to be some machines without real java
+    JAVABIN=$(which java)
+    if [ -z "$JAVABIN" ]; then 
+        echo "please set environment variable JAVA_HOME"
+        exit 1
+    fi
 fi
 
 if [ x${USER}x = xx ]; then
@@ -46,12 +59,13 @@ if [ -n "$RUNNERPROPS" ]; then
     PARAM="$PARAM -runnerini $RUNNERPROPS"
 fi
 
-MYXDEBUG=""
-if [ -n "$XDEBUG" ]; then
-    # export XDEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001" 
-    MYXDEBUG=$XDEBUG
+DEBUG_THE_API=""
+if [ -n "$DEBUGAPI" ]; then
+    export DEBUGAPI="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9002,suspend=y" 
+    DEBUG_THE_API=$DEBUGAPI
 fi
 
-COMMAND="$JAVABIN -Xmx120m $MYXDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
+COMMAND="$JAVABIN -Xmx120m $DEBUG_THE_API -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
 echo $COMMAND
 $COMMAND
+# if COMMAND fails, it returns also the exitcode
diff --git a/solenv/bin/checkapi.btm b/solenv/bin/checkapi.btm
index fde6802f50dd..7af444eb601f 100644
--- a/solenv/bin/checkapi.btm
+++ b/solenv/bin/checkapi.btm
@@ -1,4 +1,4 @@
-rem @echo off
+@echo off
 
 setlocal
 
@@ -27,13 +27,13 @@ IFF "%RUNNERPROPS%" != "" THEN
     SET PARAM=%PARAM% -runnerini %RUNNERPROPS%
 ENDIFF
 
-SET MYXDEBUG
+rem SET MYXDEBUG=""
 IFF "%XDEBUG%" != "" THEN
     REM SET XDEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 
-    SET MYXDEBUG=%XDEBUG
+    SET MYXDEBUG=%XDEBUG%
 ENDIFF
 
-set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %&
+set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG% -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %&
 
 
 echo %COMMAND
diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl
index 91025ea8c2be..aa73d86991d2 100644
--- a/solenv/bin/clipatchconfig.pl
+++ b/solenv/bin/clipatchconfig.pl
@@ -31,7 +31,7 @@
 
 use warnings;
 use strict;
-use diagnostics;
+# use diagnostics;
 
 sub trim;
 sub readRedirectionValues($);
@@ -134,4 +134,4 @@ sub trim($)
     $string =~ s/^\s+//;
     $string =~ s/\s+$//;
     return $string;
-}
+}
\ No newline at end of file
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index bca7fe3cc271..288b908ea7fe 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -1117,7 +1117,7 @@ sub update_solver
     my $solver     = shift;
     my $milestone  = shift;
 
-    my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml');
+    my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml', 'sdf');
 
     use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 
diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi
index 357a40a20ee5..ddb56fd1d7c1 100755
--- a/solenv/bin/cwscheckapi
+++ b/solenv/bin/cwscheckapi
@@ -34,80 +34,136 @@ EXIT_FAILURE=1
 EXIT_ERROR=2
 EXIT_BUG=10
 
-usage() {
-        echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-i] [-t] [-s] [-a]" >&2
-        echo "" >&2
-        echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2
-        echo "" >&2
-        echo "[-k] keep Office installation, otherwise it will be removed after test" >&2
-        echo "" >&2
-        echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
-        echo "" >&2
-        echo "[-d] debug installation and UnoAPI-Tests" >&2
-        echo "" >&2
-        echo "[-i] debug installation" >&2
-        echo "" >&2
-        echo "[-t] debug UnoAPI-Tests" >&2
-        echo "" >&2
-        echo "[-s] skip installation of Office" >&2
-        echo "" >&2
-        echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2
-        echo "" >&2
-        echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2
-        echo "" >&2
-        exit $EXIT_FAILURE
+# report the given error parameter to cwstestresult if the is one.
+# 0: no error send ok or parameter $2
+# 1: failure
+# 2...: incomplete
+function reportError()
+{
+    ERRORCODE=$1
+    if [ -e $SOLARENV/bin/cwstestresult.pl ]; then
+        if [ $ERRORCODE -eq 0 ]; then
+            PT_STATUS=${2:-ok} # use default 'ok' or $2
+        elif [ $ERRORCODE -eq 1 ]; then
+            PT_STATUS=failed
+        else
+            PT_STATUS=incomplete
+        fi
+
+        if [ "$OSTYPE" == "cygwin" ]; then
+            CWSENV=Windows
+        elif [ "$OSTYPE" == "linux" ]; then
+            CWSENV=Linux
+        elif [ "$OSTYPE" == "solaris" ]; then
+            CWSENV=SolarisX86
+        else
+            CWSENV=Unknown
+        fi
+        perl $SOLARENV/bin/cwstestresult.pl -c $CWS_WORK_STAMP -n CWSCheckAPI -p $CWSENV $PT_STATUS
+    else
+        echo "No cwstestresult.pl found."
+    fi
 }
 
+usage() {
+    echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-u] [-t] [-s] [-a]" >&2
+    echo "" >&2
+    echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2
+    echo "" >&2
+    echo "[-k] keep Office installation, otherwise it will be removed after test" >&2
+    echo "" >&2
+    echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
+    echo "" >&2
+    echo "[-d] debug installation and UnoAPI-Tests" >&2
+    # echo "" >&2
+    # echo "[-i] debug installation" >&2
+    echo "" >&2
+    echo "[-t] debug UnoAPI-Tests" >&2
+    echo "" >&2
+    echo "[-s] skip installation of Office" >&2
+    echo "" >&2
+    echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2
+    echo "" >&2
+    echo "[-u] UseInstalledOffice: do not install an office" >&2
+    echo "" >&2
+    echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2
+    echo "" >&2
+    exit $EXIT_FAILURE
+}
+
+# we start cwscheckapi
+reportError 0 running
+
 if [ "$PROEXT" != ".pro" ]; then
     echo "ERROR: cwscheckapi works only on pro-versions" >&2
+    reportError 2
     exit $EXIT_FAILURE
 fi
 
 if [ x${USER}x = xx ]; then
     if [ x${LOGNAME}x = xx ]; then
         echo "ERROR: could not determine username. Please export variable USER" >&2
+        reportError 2
         exit $EXIT_FAILURE
     else 
         USER=$LOGNAME
         export USER
     fi
 fi
-     
 
 
-DEBUG_I=false
+
+#DEBUG_I=false
 DEBUG_T=false
 INSTALL=true
-ATTACH=ture
+ATTACH=true
 MODULES="auto"
 OOO=false
 KEEPOFFICE=false
+USE_INSTALLED_OFFICE=false
 
-while getopts ':m:dkitsaho' OPTION ; do
+while getopts ':m:dkutsaho' OPTION ; do
         case $OPTION in
-        d)        DEBUG_I=true
-                  DEBUG_T=true
+            d)
+#                DEBUG_I=true
+                DEBUG_T=true
                 ;;
-        m)        MODULES="$OPTARG"
+            m) 
+                MODULES="$OPTARG"
                 ;;
-        k)        KEEPOFFICE=true
+            k)
+                KEEPOFFICE=true
                 ;;
-        o)        OOO=true
+            o)
+                OOO=true
                 ;;
-        i)        DEBUG_I=true
+#            i)
+#                DEBUG_I=true
+#                ;;
+            t)
+                DEBUG_T=true
                 ;;
-        t)        DEBUG_T=true
+            s)
+                INSTALL=false
                 ;;
-        s)        INSTALL=false
+            a)
+                ATTACH=false
                 ;;
-        a)        ATTACH=false
+            u)
+                USE_INSTALLED_OFFICE=true
+                INSTALL=false
+                KEEPOFFICE=true
+                echo "make sure your office is started with parameter -accept=pipe,name=$USER;urp;"
                 ;;
-        h)        usage $EXIT_SUCCESS
+            h)
+                usage $EXIT_SUCCESS
                 ;;
-        \?)        echo "unkown option \"-$OPTARG\"." >&2
-                usage $EXIT_ERROR
-                ;;
-        *)        echo "this is not possible...">&2
+            \?)
+            echo "unkown option \"-$OPTARG\"." >&2
+            usage $EXIT_ERROR
+            ;;
+            *)
+                echo "this is not possible...">&2
                 usage $EXIT_BUG
                 ;;
         esac
@@ -140,24 +196,24 @@ export LOCALUNPACKDIR
 
 unset FORCE2ARCHIVE
 
-date 2>&1
-
 if [ $INSTALL = true ]; then
-	
     
-	if [ $DEBUG_I = true ]; then
-        echo "start installation: `date`"
-		echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I"
-    fi
+    date 2>&1
+    
+#    if [ $DEBUG_I = true ]; then
+#        echo "start installation: `date`"
+#        echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I"
+#    fi
     perl -w $SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -ooo $OOO -debug $DEBUG_I
-
+    
     EXITVAL=$?
     
     if [ $EXITVAL -ne 0 ]; then
         echo "ERROR: could not install office"
+        reportError 2
         exit $EXITVAL
     fi
-	echo "`date` installation successfull, start testing...." 
+    echo "`date` installation successfull, start testing...." 
 fi
 
 SOFFICE="soffice"
@@ -170,38 +226,57 @@ if [ "$GUI" = "WNT" ]; then
     SOFFICE="soffice.exe"
     PS=";"
     CYGWIN="-Cygwin true"
-    SHELL=`which bash`
-    SHELL=`cygpath -w $SHELL`
+    SHELL=$(which bash)
+    SHELL=$(cygpath -w $SHELL)
     if [ ! -f $SHELL ]; then
         echo "could not determine bash shell" 
+        reportError 2
         exit 1
     fi
 fi
 
-if [ $DEBUG_T = true ]; then
-    echo find $LOCALINSTALLDIR -name $SOFFICE
-fi
+# if [ $DEBUG_T = true ]; then
+#     echo find $LOCALINSTALLDIR -name $SOFFICE
+# fi
 
-OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE`
+if [ $USE_INSTALLED_OFFICE = false ]; then
 
-if [ ! -f "$OFFICEBIN" ]; then
-    echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR"
-    exit 1
-fi
+    OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE`
 
-if [ "$GUI" = "WNT" ]; then
+    if [ ! -f "$OFFICEBIN" ]; then
+        echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR"
+        reportError 2
+        exit 1
+    fi
+
+    if [ "$GUI" = "WNT" ]; then
     # transform /tmp/... -> c:\tmp\...
-    OFFICEBIN=`cygpath -w $OFFICEBIN`
+        OFFICEBIN=`cygpath -w $OFFICEBIN`
+    fi
+else
+    OFFICEBIN=$SOFFICE
+    echo "Use already installed and running office."
 fi
 
 JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
 SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
-myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}${JARFOLDER}/unoil.jar${PS}${JARFOLDER}/jurt.jar${PS}${JARFOLDER}/juh.jar${PS}${JARFOLDER}/java_uno.jar
-myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/OOoRunner.jar
-myCLASSPATH=$myCLASSPATH${PS}/net/unoapi/export/unoapi/bin/mysql.jar${PS}$SOLVER_LIB
+
+myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}\
+${JARFOLDER}/unoil.jar${PS}\
+${JARFOLDER}/jurt.jar${PS}\
+${JARFOLDER}/juh.jar${PS}\
+${JARFOLDER}/java_uno.jar
+
+myCLASSPATH=$myCLASSPATH${PS}\
+${JARFOLDER}/OOoRunner.jar
+
+myCLASSPATH=$myCLASSPATH${PS}\
+/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
+$SOLVER_LIB
+
 PARAM=""
 if [ -n "$JAVAI" ]; then
-        JAVABIN=$JAVAI
+    JAVABIN=$JAVAI
 elif [ -n "$JAVA_HOME" ]; then
     if [ "$OS$CPUNAME$CPU" = SOLARISSPARCU ]; then
         JAVABIN=$JAVA_HOME/bin/sparcv9/java
@@ -209,19 +284,20 @@ elif [ -n "$JAVA_HOME" ]; then
         JAVABIN=$JAVA_HOME/bin/java
     fi
 else
-        echo "please set environment variable JAVA_HOME"
-        exit 1
+    echo "please set environment variable JAVA_HOME"
+    reportError 2
+    exit 1
 fi
 
 if [ -n "$WORK_STAMP" ]; then
-	if [ -n "$CWS_WORK_STAMP" ]; then
+    if [ -n "$CWS_WORK_STAMP" ]; then
         PARAM="$PARAM -Version cws_${CWS_WORK_STAMP}"
-	else
-	    echo "######"
-	    echo CAUTION! You are working on the MWS
-	    echo "######"
+    else
+        echo "######"
+        echo CAUTION! You are working on the MWS
+        echo "######"
         PARAM="$PARAM -Version ${WORK_STAMP}_${UPDMINOR}"
-	fi
+    fi
 fi
 
 PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
@@ -241,12 +317,33 @@ if [ $DEBUG_T = true ]; then
     PARAM="$PARAM -debug true -log true"
 fi
 
-#XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 " 
+# Sample command
+# /so/env/Linux_JDK_1.5.0_06/bin/java
+# -Xmx120m $XDEBUG
+# -cp :/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/ridl.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/unoil.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/jurt.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/juh.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/java_uno.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/OOoRunner.jar:/net/unoapi/export/unoapi/bin/mysql.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/lib.m50
+# org.openoffice.Runner
+# -Version cws_unoapi04
+# -cmd '/tmp/ll93751/cwscheckapi/office/staroffice9/program/soffice -nofirststartwizard -accept=pipe,name=ll93751;urp; -norestore -nocrashreport -nolockcheck -enableautomation'
+# -cs pipe,name=ll93751
+# -NoOffice true
+# -SRC_ROOT /net/so-cwsserv02/export/cws/unoapi04/DEV300/src.m50
+# -COMP_ENV unxlngi6
+# -Shell /bin/bash 
+# -tb java_complex
+# -TimeOut 90000 
+# -o 'complex.unoapi.CheckModuleAPI::module(auto)'
+
+# XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y "
+
+# set DEBUGAPI if you want to debug the checkapi
+# DEBUGAPI=t
+
 COMMAND="$JAVABIN -Xmx120m $XDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
 echo "$COMMAND"
 
 LOGFILE=$CWSCHECKAPIPATH/cwscheckapi.log
 $COMMAND | tee $LOGFILE
+EXITVAL=$?
 
 if [ $KEEPOFFICE = false ]; then
     echo "remove office instrallation in $LOCALINSTALLDIR..."
@@ -256,4 +353,11 @@ fi
 echo
 echo A logfile could be found here: $LOGFILE
 
-date 2>&1
\ No newline at end of file
+date 2>&1
+
+# send the results via cwstestresult.pl to EIS
+if [ $EXITVAL -eq 0 ]; then
+    reportError 0 ok
+else
+    reportError 1
+fi
diff --git a/solenv/bin/cwscheckapi.btm b/solenv/bin/cwscheckapi.btm
index 96e2dd7c2afc..64c624dd4bba 100755
--- a/solenv/bin/cwscheckapi.btm
+++ b/solenv/bin/cwscheckapi.btm
@@ -28,10 +28,13 @@ REM * <http://www.openoffice.org/license.html>
 REM * for a copy of the LGPLv3 License.
 REM ************************************************************************/
 
-echo off
+rem echo on
+
+call reportErrorCheckAPI.btm 0 running
 
 iff "%PROEXT" != ".pro" THEN
     echo ERROR: cwscheckapi works only on pro-versions >&2
+    call reportErrorCheckAPI.btm 2
     quit 1
 endiff
 
@@ -42,6 +45,7 @@ SET ATTACH=true
 SET MODULES=auto
 SET OOO=false
 SET KEEPOFFICE=false
+SET USE_INSTALLED_OFFICE=false
 
 for %opt in (%&%) DO (
     if "%opt%" == "-d" (SET DEBUG_I=true ^ SET DEBUG_T=true ^ shift)
@@ -51,6 +55,7 @@ for %opt in (%&%) DO (
     if "%opt%" == "-m" (SET MODULES=%2  ^ shift ^ shift)
     if "%opt%" == "-t" (SET DEBUG_T=true ^ shift)
     if "%opt%" == "-s" (SET INSTALL=false ^ shift)
+    if "%opt%" == "-u" (SET USE_INSTALLED_OFFICE=true ^ SET INSTALL=false ^ SET KEEPOFFICE=true ^ shift)
     if "%opt%" == "-a" (SET attach=false ^ shift)
     if "%opt%" == "-h" goto usage
     if "%opt%" == "/h" goto usage
@@ -81,25 +86,33 @@ iff "%INSTALL%" == "true" THEN
     
     IFF %? NE 0 THEN
         echo ERROR: coud not install office  >&2
+        call reportErrorCheckAPI.btm 2
         quit %?
     ENDIFF
 ENDIFF
 
 setlocal
 
-SET CWD=%_CWD%
-cdd %LOCALINSTALLDIR%
-SET ffindtxt="ffind.txt"
-ffind /s /f /m soffice.exe > %ffindtxt
-SET FindFile=%@FILEOPEN[%ffindtxt%, READ]
-SET OfficeBin=%@FILEREAD[%FindFile]
-set dummy=%@FILECLOSE[%FindFile]
-DEL /q %ffindtxt
-cdd %CWD
+IFF %USE_INSTALLED_OFFICE% == "false" then
 
-IFF NOT EXIST %OFFICEBIN% THEN
-    echo could not find 'soffice.exe' in subfolders of %OFFICEBIN%  >&2
-    quit 1
+    SET CWD=%_CWD%
+    cdd %LOCALINSTALLDIR%
+    SET ffindtxt="ffind.txt"
+    ffind /s /f /m soffice.exe > %ffindtxt
+    SET FindFile=%@FILEOPEN[%ffindtxt%, READ]
+    SET OfficeBin=%@FILEREAD[%FindFile]
+    set dummy=%@FILECLOSE[%FindFile]
+    DEL /q %ffindtxt
+    cdd %CWD
+
+    IFF NOT EXIST %OFFICEBIN% THEN
+        echo could not find 'soffice.exe' in subfolders of %OFFICEBIN%  >&2
+        call reportErrorCheckAPI.btm 2
+        quit 1
+    ENDIFF
+ELSE
+    SET OFFICEBIN=soffice.exe
+    echo "Use already installed office."
 ENDIFF
 
 SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%
@@ -111,6 +124,7 @@ ELSEIFF "%JAVA_HOME%" != "" THEN
     SET JAVABIN=%JAVA_HOME%\bin\java
 ELSE
    echo please set environment variable JAVA_HOME  >&2
+   call reportErrorCheckAPI.btm 2
    quit 1
 ENDIFF
 
@@ -125,6 +139,7 @@ ELSE
     echo ######  >&2
     echo ERROR: could not determine your CWS or MWS version  >&2
     echo ######  >&2
+    call reportErrorCheckAPI.btm 2
     quit 1
 ENDIFF
 
@@ -148,6 +163,7 @@ set COMMANDO=%JAVABIN% -Xmx120m -cp %MYCLASSPATH% org.openoffice.Runner %PARAM%
 echo %COMMANDO
 SET LOGFILE=%CWSCHECKAPIPATH%\cwscheckapi.log
 %COMMANDO |& tee %LOGFILE%
+set EXITVAL=%?
 
 IFF %KEEPOFFICE% == "false" THEN
     echo remove office instrallation in %LOCALINSTALLDIR%...
@@ -157,6 +173,12 @@ fi
 echo .
 echo A logfile could be found here: %LOGFILE%
 
+IFF %EXITVAL% NE 0 THEN
+    call reportErrorCheckAPI.btm 1
+ELSE
+    call reportErrorCheckAPI.btm 0 ok
+ENDIFF
+
 endlocal
 
 quit 0
diff --git a/solenv/bin/cwstouched b/solenv/bin/cwstouched
index 1847ce388d76..dac08c07f9a7 100755
--- a/solenv/bin/cwstouched
+++ b/solenv/bin/cwstouched
@@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then
     echo No environment found, please use 'configure' or 'setsolar'
     exit 1
 fi
-exec perl -w $SOLARENV/bin/cwstouched.pl
\ No newline at end of file
+exec perl -w $SOLARENV/bin/cwstouched.pl
diff --git a/solenv/bin/cwstouched.pl b/solenv/bin/cwstouched.pl
index 0171e39d9fd4..03e5095e78b4 100755
--- a/solenv/bin/cwstouched.pl
+++ b/solenv/bin/cwstouched.pl
@@ -42,6 +42,10 @@ use lib (@lib_dirs);
 
 use Cws;
 
+# Prototypes
+sub getMinor($);
+sub getCwsWorkStamp();
+
 my $workstamp = $ENV{'WORK_STAMP'};
 my $solenv= $ENV{'SOLARENV'};
 my $cwsWorkStamp = getCwsWorkStamp();
@@ -53,12 +57,16 @@ my $svndiff="svn diff --summarize --old=svn://svn.services.openoffice.org/ooo/ta
 my @diff = `$svndiff`;
 
 my @modules;
-foreach(@diff){
-    if (/.*svn:\/\/svn.services.openoffice.org.*/){
+foreach(@diff)
+{
+    if (/.*svn:\/\/svn.services.openoffice.org.*/)
+    {
         $_ =~ /.*$oldWorkStamp\/(\w*)/;
         my $newModule=$1;
-        if (defined($newModule)){
-            if ( ! grep(/$newModule/,@modules)){
+        if (defined($newModule))
+        {
+            if ( ! grep(/$newModule/,@modules))
+            {
                 push(@modules, $newModule);
             }
 
@@ -66,17 +74,20 @@ foreach(@diff){
     }
 }
 
-foreach(@modules){
+foreach(@modules)
+{
     print "$_\n";
 }
 
 exit(0);
 
-sub getMinor{
+sub getMinor($)
+{
     my $workst = shift;
     my $min="";
 
-    if ( ! defined($ENV{'UPDMINOR'})){
+    if ( ! defined($ENV{'UPDMINOR'}))
+    {
         my $cws = Cws->new();
         $cws->child($workst);
         $cws->master($ENV{'WORK_STAMP'});
@@ -85,18 +96,22 @@ sub getMinor{
 
         # check if we got a valid child workspace
         my $id = $cws->eis_id();
-        if ( !$id ) {
+        if ( !$id )
+        {
             print("Child workspace '$childws' for master workspace '$masterws' not found in EIS database.\n");
             exit(1);
         }
 
         my @milestones = $cws->milestone();
         foreach (@milestones) {
-            if ( defined($_) ) {
+            if ( defined($_) )
+            {
                 $min=$_;
             }
         }
-    } else {
+    }
+    else
+    {
         $min = $ENV{'UPDMINOR'};
     }
 
@@ -104,25 +119,31 @@ sub getMinor{
     return $min;
 }
 
-sub getCwsWorkStamp {
+sub getCwsWorkStamp()
+{
     my $cwsWorkSt="";
 
-    if ( ! defined($ENV{'CWS_WORK_STAMP'})){
+    if ( ! defined($ENV{'CWS_WORK_STAMP'}))
+    {
         my $currPath= cwd;
 
         chdir($ENV{'SOLARENV'});
 
         my @info = `svn info`;
 
-        foreach(@info) {
-            if ( /URL:.*/ ){
+        foreach(@info)
+        {
+            if ( /URL:.*/ )
+            {
                 # URL: svn+ssh://svn@svn.services.openoffice.org/ooo/cws/qadev37/solenv
                 $_ =
~ /.*svn.services.openoffice.org(.*\/(.*))\/\w*/;
                 $cwsWorkSt=$2; #qadev37
             }
         }
 
-    } else {
+    }
+    else
+    {
         $cwsWorkSt = $ENV{'CWS_WORK_STAMP'};
     }
     return $cwsWorkSt
diff --git a/solenv/bin/install-sh b/solenv/bin/install-sh
new file mode 100755
index 000000000000..fb942ef71665
--- /dev/null
+++ b/solenv/bin/install-sh
@@ -0,0 +1,3 @@
+;; This file is automatically created by diff_all_filter.pl
+;; Fri Mar 27 08:02:00 2009
+
diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice
index 602934958b53..29645688b56a 100755
--- a/solenv/bin/installoffice
+++ b/solenv/bin/installoffice
@@ -1,3 +1,4 @@
+#!/bin/bash
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
@@ -5,10 +6,6 @@
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: installoffice,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,7 +24,6 @@
 # for a copy of the LGPLv3 License.
 #***********************************************************************/
 
-#!/bin/bash
 EXIT_SUCCESS=0
 EXIT_FAILURE=1
 EXIT_ERROR=2
@@ -47,6 +43,8 @@ usage() {
         echo "[-d] installation with debug output" >&2
         echo "" >&2
         echo "[-a] the office will be patched to run without FirstStartWizard" >&2
+        echo "" >&2
+        echo "[-i] impress should open documents without autopilot" >&2
         exit $EXIT_FAILURE
 }
 
@@ -63,7 +61,7 @@ fi
 DESTPATH=/tmp/$USER
 PARAM=""
 
-while getopts ':mt:acdhot' OPTION ; do
+while getopts ':mt:aicdhot' OPTION ; do
         case $OPTION in
         d)        PARAM="$PARAM -debug true"
                 ;;
@@ -73,6 +71,8 @@ while getopts ':mt:acdhot' OPTION ; do
                 ;;
         a)        PARAM="$PARAM -autorun true"
                 ;;
+        i)        PARAM="$PARAM -autoimpress true"
+                ;;
         t)        DESTPATH="$OPTARG"
                 ;;
         h)        usage $EXIT_SUCCESS
@@ -93,7 +93,10 @@ LOCALUNPACKDIR=$DESTPATH/unpack
 
 export LOCALINSTALLDIR
 export LOCALUNPACKDIR
+echo "export LOCALINSTALLDIR"
+echo "export LOCALUNPACKDIR"
 
+unset LD_LIBRARY_PATH
 unset FORCE2ARCHIVE
 
 echo "### $SOLARENV/bin/installoffice.pl $PARAM -cleanup true $@"
diff --git a/solenv/bin/installoffice.btm b/solenv/bin/installoffice.btm
index 983ee9e3df02..ffd6633fafcd 100755
--- a/solenv/bin/installoffice.btm
+++ b/solenv/bin/installoffice.btm
@@ -28,6 +28,54 @@ REM * <http://www.openoffice.org/license.html>
 REM * for a copy of the LGPLv3 License.
 REM ************************************************************************/
 
+
+SET DESTPATH=%USERNAME%
+SET DEBUG=false
+SET OOO=false
+SET PARAM=
+
+for %opt in (%&%) DO (
+    iff "%opt%" == "-d" THEN 
+        SET PARAM=%PARAM% -debug true
+        shift
+
+    elseiff "%opt%" == "-o" THEN 
+        SET PARAM=%PARAM% -ooo true
+        shift
+
+    elseiff "%opt%" == "-c" THEN 
+        SET PARAM=%PARAM% -cwscheckapi true
+        shift
+
+    elseiff "%opt%" == "-a" THEN 
+        SET PARAM=%PARAM% -autorun true
+        shift
+
+    elseiff "%opt%" == "-i" THEN
+        SET PARAM=%PARAM% -autoimpress true
+        shift
+
+    elseiff "%opt%" == "-t" THEN 
+        SET DESTPATH=%2
+        shift
+        shift
+
+    elseiff "%opt%" == "-h" THEN 
+        goto usage
+
+    elseiff "%opt%" == "/h" THEN 
+        goto usage
+
+    elseiff "%opt%" == "%DESTPATH%" THEN
+        shift
+
+    else 
+        echo wrong param: %opt%
+        goto usage
+    endiff
+)
+
+iff "%DESTPATH%" == "%USERNAME%" THEN
 iff EXIST e:\  then
     iff EXIST e:\temp then
         set temppath=e:\temp
@@ -44,25 +92,15 @@ elseiff EXIST c:\temp then
 else
     set temppath=%TMP%
 endiff
-
-SET DESTPATH=%temppath%\%USERNAME%
-SET DEBUG=false
-SET OOO=false
-SET PARAM=
-
-for %opt in (%&%) DO (
-    if "%opt%" == "-d" (SET PARAM=%PARAM% -debug true ^ shift)
-    if "%opt%" == "-o" (SET PARAM=%PARAM% -ooo true ^ shift)
-    if "%opt%" == "-c" (SET PARAM=%PARAM% -cwscheckapi true ^ shift)
-    if "%opt%" == "-a" (SET PARAM=%PARAM% -autorun true ^ shift)
-    if "%opt%" == "-t" (SET DESTPATH=%2  ^ shift ^ shift)
-    if "%opt%" == "-h" goto usage
-    if "%opt%" == "/h" goto usage
-)
+    DESTPATH=%temppath%\%USERNAME%
+endiff
 
 SET LOCALINSTALLDIR=%DESTPATH%\office
 SET LOCALUNPACKDIR=%DESTPATH%\unpack
+echo LOCALINSTALLDIR=%LOCALINSTALLDIR%
+echo LOCALUNPACKDIR=%LOCALUNPACKDIR%
 
+echo call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
 call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
 
 quit %?
@@ -75,8 +113,10 @@ quit %?
     echo. 
     echo [-o] force OpenOffice.org installation instead of StarOffice>&2
     echo. 
-    echo [-t] target path: path wehre tho office should installed to. The default is '%DESTPATH%'>&2
+    echo [-t] target path: path where the office should installed to. The default is '%DESTPATH%'>&2
     echo.
     echo [-a] the office will be patched to run without FirstStartWizard >&2
    echo. 
+    echo [-i] impress should open documents without autopilot
+    echo.
     quit 1
diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl
index a8ef48e53df6..4a50eb891636 100755
--- a/solenv/bin/installoffice.pl
+++ b/solenv/bin/installoffice.pl
@@ -39,6 +39,9 @@ my $script = $0;
 ( our $script_name = $script ) =~ s/^.*\b(\w+)\.pl$/$1/;
 ( our $script_path = $script ) =~ s/$script_name.*//;
 
+# Prototypes
+sub installOffice();
+
 our $debug = 0;           # run without executing commands
 
 our $is_command_infos = 1;   # print command details before exec
@@ -54,6 +57,9 @@ our $cleanup = 0;
 # should the office be startable without user interaction
 our $autorun = 0;
 
+# should impress open documents without autopilot
+our $autoimpress = 0;
+
 # force openOffice.org installation if StarOffice is available
 our $is_ooo = 0;
 
@@ -292,18 +298,31 @@ sub installOffice(){
         makeAutoRun($destinationPath);
     }
 
+    if ($autoimpress) {
+        makeAutoImpress($destinationPath);
+    }
+
     return $success;
 }
 
+sub makeAutoImpress(){
+    my $destinationPath = shift;
+
+    if (patchXCU ($destinationPath, $script_path.$script_name."_impress.oxt") != 0) {
+        print_error("could not register ".$script_path.$script_name."_impress.oxt", "1");
+    }
+    return 0;
+}
+
+
 sub makeAutoRun(){
 
     my $destinationPath = shift;
 
     patchBootstraprc($destinationPath);
 
-
-    if (patchXCU ($destinationPath) != 0) {
-        print_error("could not patch XCU files", "1");
+    if (patchXCU ($destinationPath, $script_path.$script_name.".oxt") != 0) {
+        print_error("could not register ".$script_path.$script_name.".oxt", "1");
     }
     return 0;
 }
@@ -340,6 +359,7 @@ sub patchBootstraprc(){
 
 sub patchXCU(){
     my $destinationPath = shift;
+    my $oxt = shift;
     my $unopkg="";
 
     find sub { $unopkg=$File::Find::name if -e _ && /$UNOPKGBIN$/ }, $destinationPath;
@@ -351,8 +371,8 @@ sub patchXCU(){
         $unopkg = "\"$unopkg\"";
     }
 
-    my $unopkgCommand = "$unopkg add $script_path".$script_name.".oxt";
-    print "patch xcu files for automatic office start...\n" if $debug;
+    my $unopkgCommand = "$unopkg add $oxt";
+    print "register oxt file ...\n" if $debug;
     print "call $unopkgCommand\n" if $debug;
     my $success=0;
     $success = system($unopkgCommand);
@@ -471,12 +491,17 @@ sub getInstsetUtilFolder(){
     my $instsetFolder = $RootDir.$PS.$instset;
     my $utilFolder="";
 
-    if(-w $instsetFolder) {
+    if( open(DATEI, ">$instsetFolder".$PS."touch"))
+    {
+        close(DATEI);
+        unlink($instsetFolder.$PS."touch");
         print "$instsetFolder is writable \n" if $debug;
         $utilFolder = $RootDir.$PS.$instset.$PS."util";
-    } else {
+    }
+    else
+    {
         print "$instsetFolder is NOT writable \n" if $debug;
-        print "copy $instset to $destPath$PS..n" if $debug;
+        print "copy $instset to $destPath$PS..\n" if $debug;
         my $prjPath=$destPath.$PS."..";
 
         my $command = "$ENV{COPYPRJ} -x $instset $prjPath";
@@ -874,6 +899,11 @@ sub parseArgs
             if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autorun = 1 };
         }
 
+        if ( $ARGV[$i] =~ /^-autoimpress$/ ) {
+            my $value = $ARGV[++$i];
+            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autoimpress = 1 };
+        }
+
         if ( $ARGV[$i] =~ /^-debug$/ ) {
             my $value = $ARGV[++$i];
             if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $debug = 1 };
diff --git a/solenv/bin/installoffice_impress.oxt b/solenv/bin/installoffice_impress.oxt
new file mode 100755
index 000000000000..31c7bfa45c06
Binary files /dev/null and b/solenv/bin/installoffice_impress.oxt differ
diff --git a/solenv/bin/localize b/solenv/bin/localize
new file mode 100755
index 000000000000..74a75ecc3aee
--- /dev/null
+++ b/solenv/bin/localize
@@ -0,0 +1,20 @@
+#!/bin/sh
+if [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+# localize.pl calls localize_sl in solver bin directory which depends on dynamic
+# libraries in solver lib directory but has no correct RPATH (or equivalent):
+if [ "${OS?}" = MACOSX ]; then
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+else
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+fi
+
+if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx  ]; then
+    exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
+else
+    exec perl -w $SOLARVERSION/$INPATH/bin.$UPDMINOR/localize.pl "$@"
+fi
+
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index eefe7930afb3..13052fa1a116 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -949,11 +949,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist($scpactionsinproductlanguageresolvedarrayref, $includepatharrayref_lang, $dirsinproductlanguageresolvedarrayref, "ScpActions");
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions5.log", $scpactionsinproductlanguageresolvedarrayref); }
 
-    # Editing scpactions with flag SCPZIP_REPLACE.
+    # Editing scpactions with flag SCPZIP_REPLACE and PATCH_SO_NAME.
 
     installer::scpzipfiles::resolving_scpzip_replace_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6.log", $scpactionsinproductlanguageresolvedarrayref); }
 
+    installer::scppatchsoname::resolving_patchsoname_flag($scpactionsinproductlanguageresolvedarrayref, $allvariableshashref, "ScpAction", $languagestringref);
+    if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions6a.log", $scpactionsinproductlanguageresolvedarrayref); }
+
     #########################################################
     # language dependent links part
     #########################################################
@@ -1687,7 +1690,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
                             installer::epmfile::create_new_directory_structure($newepmdir);
                             $installer::globals::postprocess_specialepm = 1;
 
-                            if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::epmoutpath); }
+                            # solaris patch not needed anymore
+                            # if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::epmoutpath); }
                         }
                     }
                     else    # this is the standard epm (not relocatable) or ( nonlinux and nonsolaris )
@@ -2307,7 +2311,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # Temp path for administrative installations: $installer::globals::temppath
             # Path of new installation set: $finalinstalldir
             # Path of old installation set: $installer::globals::updatedatabasepath
-            my $mspdir = installer::windows::msp::create_msp_patch($finalinstalldir, $includepatharrayref, $allvariableshashref, $languagestringref, $filesinproductlanguageresolvedarrayref);
+            my $mspdir = installer::windows::msp::create_msp_patch($finalinstalldir, $includepatharrayref, $allvariableshashref, $languagestringref, $languagesarrayref, $filesinproductlanguageresolvedarrayref);
             ($is_success, $finalinstalldir) = installer::worker::analyze_and_save_logfile($loggingdir, $mspdir, $installlogdir, $allsettingsarrayref, $languagestringref, $current_install_number);
             installer::worker::clean_output_tree(); # removing directories created in the output tree
         }
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 6c6baef328ab..07062d306e11 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -576,6 +576,7 @@ sub set_download_filename
     my $type = get_installation_type();
     my $language = get_downloadname_language($languagestringref);
     my $addon = get_downloadname_addon();
+
     if ( $installer::globals::product =~ /_Dev\s*$/ )
     {
         my $localminor = "";
@@ -659,6 +660,10 @@ sub resolve_variables_in_downloadname
     if ( $allvariables->{'PRODUCTVERSION'} ) { $productversion = $allvariables->{'PRODUCTVERSION'}; }
     $downloadname =~ s/\{productversion\}/$productversion/;
 
+    my $ppackageversion = "";
+    if ( $allvariables->{'PACKAGEVERSION'} ) { $packageversion = $allvariables->{'PACKAGEVERSION'}; }
+    $downloadname =~ s/\{packageversion\}/$packageversion/;
+
     my $extension = "";
     if ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) { $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
     $extension = lc($extension);
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 08113d70deaf..b41de206b485 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1092,10 +1092,10 @@ sub set_revision_in_pkginfo
                 my $micro = $3;
 
                 my $finalmajor = $major;
-                my $finalminor = 0;
+                my $finalminor = $minor;
                 my $finalmicro = 0;
 
-                if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; }
+                # if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; }
 
                 $version = "$finalmajor.$finalminor.$finalmicro";
             }
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index 5d445d92dc13..bc358903093c 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -51,6 +51,20 @@ sub change_length_of_string
     }
 }
 
+########################################################################################
+# The length of the new string must be identical with the length of the old string
+########################################################################################
+
+sub change_length_of_string_with_letter
+{
+    my ($newstringref, $oldstring, $onestring) = @_;
+
+    while ( length($$newstringref) < length($oldstring) )
+    {
+        $$newstringref = $$newstringref . $onestring;
+    }
+}
+
 ########################################################################################
 # Converting a string to a unicode string
 ########################################################################################
@@ -78,24 +92,47 @@ sub convert_to_unicode
 
 sub replace_productname_in_file
 {
-    my ($sourcepath, $destpath, $variableshashref, $filedescription) = @_;
+    my ($sourcepath, $destpath, $variableshashref, $onefilehash, $styles) = @_;
 
     my $onefile = installer::files::read_binary_file($sourcepath);
 
+    # searching for "x"
+
     my $onestring = "x" . chr(0);
     my $replacestring = "";
     for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
 
     my $productname = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
-    if ( $filedescription ne "" ) { $productname = $filedescription; }
+    if ( exists($onefilehash->{'FileDescription'}) ) { $productname = $onefilehash->{'FileDescription'}; }
     my $unicode_productname = convert_to_unicode($productname);
 
     change_length_of_string(\$unicode_productname, $replacestring);
 
-    my $found = $onefile =~ s/$replacestring/$unicode_productname/s;
+    my $found1 = $onefile =~ s/$replacestring/$unicode_productname/sg;
+
+    my $found2 = 0;
+
+    if ( $styles =~ /\bPATCH_SO_NAME_Z\b/ )
+    {
+        # searching for "z"
+
+        $onestring = "z" . chr(0);
+        $replacestring = "";
+        for ( my $i = 1; $i <= 80; $i++ ) { $replacestring .= $onestring; }
+
+        my $productname2 = $variableshashref->{'PRODUCTNAME'} . " " . $variableshashref->{'PRODUCTVERSION'};
+        if ( exists($onefilehash->{'FileDescriptionZ'}) ) { $productname2 = $onefilehash->{'FileDescriptionZ'}; }
+        my $unicode_productname2 = convert_to_unicode($productname2);
+
+        change_length_of_string_with_letter(\$unicode_productname2, $replacestring, $onestring);
+
+        $found2 = $onefile =~ s/$replacestring/$unicode_productname2/sg;
+    }
 
     installer::files::save_binary_file($onefile, $destpath);
 
+    my $found = $found1 + $found2;
+
     return $found;
 }
 
@@ -142,8 +179,6 @@ sub resolving_patchsoname_flag
             my $destinationpath = $replacedir . $onefilename;
             my $movepath = $destinationpath . ".orig";
 
-            if ( exists($onefile-> {'FileDescription'}) ) { $filedescription = $onefile-> {'FileDescription'}; }
-
             # if (!(-f $destinationpath))   # do nothing if the file already exists
             # {
 
@@ -152,7 +187,7 @@ sub resolving_patchsoname_flag
             if ( $copysuccess )
             {
                 # Now the file can be patch (binary!)
-                my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $filedescription);
+                my $found = replace_productname_in_file($movepath, $destinationpath, $variableshashref, $onefile, $styles);
 
                 if ($found == 0)
                 {
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index e43a8325f775..771e0980c2f5 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -404,14 +404,18 @@ sub create_simple_package
         else
         {
             installer::systemactions::copy_one_file($source, $destination);
-            # see issue 102274
-            my $unixrights = "";
-            if ( $onefile->{'UnixRights'} )
-            {
-                $unixrights = $onefile->{'UnixRights'};
 
-                my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1";
-                system($localcall);
+            if ( ! $installer::globals::iswindowsbuild )
+            {
+                # see issue 102274
+                my $unixrights = "";
+                if ( $onefile->{'UnixRights'} )
+                {
+                    $unixrights = $onefile->{'UnixRights'};
+
+                    my $localcall = "$installer::globals::wrapcmd chmod $unixrights \'$destination\' \>\/dev\/null 2\>\&1";
+                    system($localcall);
+                }
             }
         }
     }
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 7e8a14a94123..8cd2b402561c 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -58,11 +58,17 @@ sub unpack_cabinet_file
     # But this wrong expand.exe is typically in the PATH before this expand.exe, to unpack
     # cabinet files.
 
+#   if ( $^O =~ /cygwin/i )
+#   {
+#       $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory
+#       $expandfile =~ s/\\/\//;
+#       if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); }
+#   }
+
     if ( $^O =~ /cygwin/i )
     {
-        $expandfile = $ENV{'SYSTEMROOT'} . "/system32/expand.exe"; # Has to be located in the systemdirectory
-        $expandfile =~ s/\\/\//;
-        if ( ! -f $expandfile ) { exit_program("ERROR: Did not find file $expandfile in the Windows system folder!"); }
+        $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
+        chomp $expandfile;
     }
 
     my $expandlogfile = $unpackdir . $installer::globals::separator . "expand.log";
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index e65b649885f0..0a5a35f05693 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -286,20 +286,36 @@ sub check_and_save_tables
     }
 }
 
+####################################################################
+# Setting the languages for the service packs
+####################################################################
+
+sub create_langstring
+{
+    my ( $languagesarrayref ) = @_;
+
+    my $langstring = "";
+    for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ ) { $langstring = $langstring . "_" . ${$languagesarrayref}[$i]; }
+
+    return $langstring;
+}
+
 ####################################################################
 # Setting the name of the msp database
 ####################################################################
 
 sub set_mspfilename
 {
-    my ($allvariables, $mspdir) = @_;
+    my ($allvariables, $mspdir, $languagesarrayref) = @_;
 
-    my $databasename = $allvariables->{'PRODUCTNAME'} . $allvariables->{'PRODUCTVERSION'};
+    my $databasename = $allvariables->{'PRODUCTNAME'};
     $databasename = lc($databasename);
     $databasename =~ s/\.//g;
     $databasename =~ s/\-//g;
     $databasename =~ s/\s//g;
 
+    if ( $allvariables->{'MSPPRODUCTVERSION'} ) { $databasename = $databasename . $allvariables->{'MSPPRODUCTVERSION'}; }
+
     # possibility to overwrite the name with variable DATABASENAME
     # if ( $allvariables->{'DATABASENAME'} ) { $databasename = $allvariables->{'DATABASENAME'}; }
 
@@ -312,8 +328,10 @@ sub set_mspfilename
     if (( $allvariables->{'SERVICEPACK'} ) && ( $allvariables->{'SERVICEPACK'} == 1 ))
     {
         my $windowspatchlevel = 0;
-        if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; }
+        if ( $allvariables->{'MSPPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'MSPPATCHLEVEL'}; }
         $databasename = $databasename . "_servicepack_" . $windowspatchlevel;
+        my $languagestring = create_langstring($languagesarrayref);
+        $databasename = $databasename . $languagestring;
     }
     else
     {
@@ -1139,7 +1157,7 @@ sub analyze_msimsp_logfile
 
 sub create_msp_patch
 {
-    my ($installationdir, $includepatharrayref, $allvariables, $languagestringref, $filesarray) = @_;
+    my ($installationdir, $includepatharrayref, $allvariables, $languagestringref, $languagesarrayref, $filesarray) = @_;
 
     my $force = 1; # print this message even in 'quiet' mode
     installer::logger::print_message( "\n******************************************\n" );
@@ -1221,7 +1239,7 @@ sub create_msp_patch
     check_and_save_tables($tablelist, $localmspdir);
 
     # Setting the name of the new msp file
-    my $mspfilename = set_mspfilename($allvariables, $mspdir);
+    my $mspfilename = set_mspfilename($allvariables, $mspdir, $languagesarrayref);
 
     # Editing tables
     edit_tables($tablelist, $localmspdir, $olddatabase, $newdatabase, $mspfilename, $allvariables, $languagestringref);
diff --git a/solenv/bin/reportErrorCheckAPI.btm b/solenv/bin/reportErrorCheckAPI.btm
new file mode 100755
index 000000000000..4340ad347259
--- /dev/null
+++ b/solenv/bin/reportErrorCheckAPI.btm
@@ -0,0 +1,17 @@
+set ERRORCODE=%1%
+iff exist %SOLARENV%/bin/cwstestresult.pl then
+    iff %ERRORCODE% EQ 0 then
+        set PT_STATUS=%2%
+    else
+        iff %ERRORCODE% EQ 1 then
+            set PT_STATUS=failed
+        else       
+            set PT_STATUS=incomplete
+        endiff
+    endiff
+
+    set CWSENV=Windows
+    call perl5 %SOLARENV%/bin/cwstestresult.pl -c %CWS_WORK_STAMP% -n CWSCheckAPI -p %CWSENV% %PT_STATUS%
+else
+    echo "No cwstestresult.pl found."
+endiff
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 041b2246e93a..b3ed56475e85 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -48,6 +48,7 @@ common
 			wrapper_override_cc_wrapper TRUE
 			ZIPSOURCE 1
             BUILD_QADEVOOO YES
+			MAXPROC maxproc=15
 		}
 		common:0 IF %UPDATER% == YES
 		{
@@ -72,6 +73,10 @@ common
 		{
 			ENABLE_CRASHDUMP STATIC
 		}
+		maxproc
+		{
+			MAXPROC maxproc=%MAXPROCESS%
+		}
 		nojava 
 		{
 			DISABLE_JAVA TRUE
@@ -117,7 +122,7 @@ common
 		STL_ROOT 
 		UPDATER 
 	}
-	order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump
+	order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc
 	reset 
 	{
 		ENVCFLAGS 
@@ -132,9 +137,9 @@ common
 		SOLARSRC 
 		SOLAR_JAVA 
 		SPEW 
-		STLPORT4 
-		WITH_FONTOOO 
-		WITH_LANG 
+		STLPORT4
+		WITH_FONTOOO
+		WITH_LANG
 	}
 	restore 
 	{
@@ -153,6 +158,7 @@ common
 		envroot 
 		nojava 
 		pro 
+		maxproc MAXPROCESS
 		shell STAR_USE_SHELL
 		tmp SOL_TMP_DIR
 		verbose VERBOSE
@@ -536,7 +542,7 @@ unxfbsdi
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -547,7 +553,7 @@ unxfbsdi
 		sh 
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -859,7 +865,7 @@ unxlngi6
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -870,7 +876,7 @@ unxlngi6
 		sh 
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -985,6 +991,7 @@ unxlngx6
 			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
+            WITH_MOZILLA NO
 		}
 		common0 
 		{
@@ -1171,7 +1178,7 @@ unxlngx6
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1182,7 +1189,7 @@ unxlngx6
 		sh 
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1288,7 +1295,6 @@ unxmacxi
 			HAVE_GCC_VISIBILITY_FEATURE TRUE
 			LIBRARY_PATH %SYSBASE%/usr/lib
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			NO_HIDS TRUE
 			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%
@@ -1301,6 +1307,7 @@ unxmacxi
 			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 
 		{
@@ -1492,7 +1499,7 @@ unxmacxi
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1503,7 +1510,7 @@ unxmacxi
 		sh 
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1797,7 +1804,7 @@ unxsoli4
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1808,7 +1815,7 @@ unxsoli4
 		sh 
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -2111,7 +2118,7 @@ unxsols4
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2122,7 +2129,7 @@ unxsols4
 		sh 
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -2971,7 +2978,7 @@ wntgcci1
 		{
 			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 %ZIPSOURCE% %BTARGET%
+			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC%
 			260: set PATH=%MYENV_PATH
 			270: unset MYENV_PATH
 			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
@@ -2981,7 +2988,7 @@ wntgcci1
 		{
 			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 $ZIPSOURCE $BTARGET
+			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			260: setenv PATH $MYENV_PATH
 			270: unsetenv MYENV_PATH
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2996,7 +3003,7 @@ wntgcci1
 			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 $ZIPSOURCE $BTARGET
+			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
 			415: fi
 			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
 			851: export SO_GEN_ERROR
@@ -3484,7 +3491,11 @@ wntmsci12
 			SOLAR_SOURCE_ROOT o:
 			USE_SHELL 4nt
 			BTOOLDIR %WORK_STAMP%
-			PERLDIR btw\perl\bin\perl
+			PERLDIR btw\%WORK_STAMP%\perl\bin\perl
+		}
+		common02:0 IF %OSTYPE% == cygwin
+		{
+			PERL perl
 		}
 		common1 
 		{
@@ -3562,8 +3573,8 @@ wntmsci12
 		}
 		jdk13 
 		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk131
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk131
 			JAVAHOME %JDK13PATH%
 			JAVA_HOME %JDK13PATH%
 			JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
@@ -3581,8 +3592,8 @@ wntmsci12
 		}
 		jdk14 
 		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk141
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk141
 			JAVAHOME %JDK14PATH%
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
@@ -3600,8 +3611,8 @@ wntmsci12
 		}
 		jdk15 
 		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk151
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk151
 			JAVAHOME %JDK15PATH%
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
@@ -3623,8 +3634,8 @@ wntmsci12
 		}
 		ojdk16 
 		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/openjdk-6-b08-windows-i586
+#			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
@@ -3685,7 +3696,7 @@ wntmsci12
 		$dp(TMP)
 		$dp(TEMP)
 	}
-	order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16  pre
+	order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02:0 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16  pre
 	reset 
 	{
 		COPYALL 
@@ -3710,7 +3721,7 @@ wntmsci12
 		{
 			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 %ZIPSOURCE% %BTARGET%
+			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC% 
 			260: set PATH=%MYENV_PATH
 			270: unset MYENV_PATH
 			300: call pcleaner.btm
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index bc23ed5ffbba..3d260248b3b0 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -15,7 +15,7 @@ ALLTAR : $(HIDSRS1PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
+$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr
@@ -31,7 +31,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -66,7 +66,7 @@ ALLTAR : $(HIDSRS2PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
+$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr
@@ -82,7 +82,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -117,7 +117,7 @@ ALLTAR : $(HIDSRS3PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
+$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr
@@ -133,7 +133,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -168,7 +168,7 @@ ALLTAR : $(HIDSRS4PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
+$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr
@@ -184,7 +184,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -219,7 +219,7 @@ ALLTAR : $(HIDSRS5PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
+$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr
@@ -235,7 +235,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -270,7 +270,7 @@ ALLTAR : $(HIDSRS6PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
+$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr
@@ -286,7 +286,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -321,7 +321,7 @@ ALLTAR : $(HIDSRS7PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
+$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr
@@ -337,7 +337,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -372,7 +372,7 @@ ALLTAR : $(HIDSRS8PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
+$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr
@@ -388,7 +388,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -423,7 +423,7 @@ ALLTAR : $(HIDSRS9PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
+$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr
@@ -439,7 +439,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -474,7 +474,7 @@ ALLTAR : $(HIDSRS10PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
+$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr
@@ -490,7 +490,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index d88e1fd863e1..333b90355ad2 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m51(Build:9408)
-BUILD=9408
-LAST_MINOR=m51
+RSCREVISION=300m53(Build:9412)
+BUILD=9412
+LAST_MINOR=m53
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 8c1ba38e17e7..0264ac9bb7c6 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1393,9 +1393,10 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
 .IF "$(LOCALIZESDF)"!=""
 "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
     @@-$(MKDIRHIER) $(@:d)
-    @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip 
-    @@-cp -r $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET)$/* $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)
-    @@-$(RM) -rf $(SOLARSRC)$/$(PRJNAME)$/$(COMMON_OUTDIR)$(PROEXT)$/misc$/$(PRJNAME)_$(TARGET)
+    @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET)
+    @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip 
+    @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)$/* $(COMMONMISC)$/$(PRJNAME)
+    @@-$(RM) -rf $(COMMONMISC)$/$(PRJNAME)_$(TARGET)
 .ENDIF			# "$(LOCALIZESDF)"!=""
 .ENDIF			# "$(LOCALIZATION_FOUND)"==""
 .ENDIF			# "$(WITH_LANG)"!=""
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 6a06591ab795..f000775b2279 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -47,7 +47,11 @@ LDFLAGS!:=$(EXTRA_LINKFLAGS) $(LDFLAGS)
 .EXPORT : LDFLAGS
 .ENDIF
 
-PATH!:=.:$(SOLARBINDIR):$(PATH)
+.IF "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt"
+PATH!:=.:$(SOLARBINDIR:^"/cygdrive/":s/://):$(PATH)
+.ELSE           # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt"
+PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH)
+.ENDIF          # "$(GUI)"=="WNT" && "$(USE_SHELL)"!="4nt"
 .EXPORT : PATH
 
 #override
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 1c34aaa16b57..d4a04f8e0e11 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -47,7 +47,7 @@ ALLTAR : $(HIDSRS$(TNR)PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
+$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) $(LOCALIZE_ME_DEST)
     @echo ------------------------------
     @echo Making: $@
     @@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr
@@ -63,7 +63,7 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZE
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i)
+$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
 .ENDIF			# "$(WITH_LANG)"!=""