CWS-TOOLING: integrate CWS ause106

5 files changed, 136 insertions, 807 deletions

diff --git a/configure.in b/configure.in
index 3505be436..88d75a6ff 100644
--- a/configure.in
+++ b/configure.in
@@ -1451,7 +1451,8 @@ if test "$COMPATH" = "." ; then
     dnl double square bracket to get single because of M4 quote...
     COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
 fi
-
+COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
+echo $COMPATH
 dnl ===================================================================
 dnl  Test the gcc version,  3 is OK
 dnl ===================================================================
@@ -1595,7 +1596,7 @@ dnl ===================================================================
 if test "$_os" = "SunOS"; then
    if test "$CC" = "cc"; then
       AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
       dnl cc -V outputs to standard error!!!!
       _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
@@ -1639,7 +1640,7 @@ dnl ===================================================================
 if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
    if test "$CC" = "cc"; then
       AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_CHECKING([the SGI MIPSpro C compiler version])
       dnl cc -version outputs to standard error!!!!
       _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
@@ -1664,7 +1665,7 @@ dnl ===================================================================
 if test "$_os" = "OSF1"; then
    if test "$CC" = "cc"; then
       AC_PATH_PROGS(_cc, cc)
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       AC_MSG_WARN([******* $_cc , $COMPATH])
       AC_MSG_CHECKING([the Compaq C compiler version])
       dnl cc -V outputs to standard error!!!!
@@ -1790,8 +1791,8 @@ if test "$_os" = "WINNT"; then
 			CC=`cygpath -u "$CC"`
 			# Remove /cl.exe from CC case insensitive
 			AC_MSG_RESULT([found ($CC)])
-			COMPATH=`echo $CC | $SED 's@/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
-			export INCLUDE=`cygpath -d "$COMPATH/../Include"`
+			COMPATH=`echo $CC | $SED 's@\/[[Bb]][[Ii]][[Nn]]\/[[cC]][[lL]]\.[[eE]][[xX]][[eE]]@@'`
+			export INCLUDE=`cygpath -d "$COMPATH/Include"`
 			dnl  Check which Microsoft C/C++ compiler is found
 			AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
 dnl      The following find microsoft, matches nn.nn.nnnn then pulls numbers out.         
@@ -2220,7 +2221,7 @@ _ACEOF
   if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
     AC_MSG_CHECKING([dynamic libgcc name])
     MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null`
+    MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GCCDLL"; then
         MINGW_SHARED_GCCLIB=YES
         AC_MSG_RESULT([use $MINGW_GCCDLL])
@@ -2237,7 +2238,7 @@ _ACEOF
   if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
     AC_MSG_CHECKING([dynamic libstdc++ name])
     MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null`
+    MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GXXDLL"; then
         MINGW_SHARED_GXXLIB=YES
         AC_MSG_RESULT([use $MINGW_GXXDLL])
@@ -4689,7 +4690,8 @@ if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
          [#include <X11/Intrinsic.h>])
    else
        AC_MSG_RESULT([yes])
-       AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
+       AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])],
+         [#include <X11/Intrinsic.h>])
        AC_CHECK_LIB(Xaw, main, [],
            [AC_MSG_ERROR(Xaw library not found or functional)], [])
    fi
@@ -5418,8 +5420,8 @@ if test "$_os" = "WINNT"; then
    if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
       AC_MSG_RESULT([found])
    else
-      MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
-      MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
+      MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
+      MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
       if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
          cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
diff --git a/set_soenv.in b/set_soenv.in
index 16edc2933..e1655da4a 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -646,7 +646,6 @@ elsif ( $platform =~ m/cygwin/ )
       $PATH_SEPERATOR = ';';
       $outfile        = "winmingw.set"; 
       $COM            = "GCC";
-      $COMPATH        =~ s/\/bin$//i;
       $CVER           = "C341";
       $OUTPATH        = "wntgcci";
       $INPATH         = $OUTPATH.$PROEXT;
@@ -655,8 +654,6 @@ elsif ( $platform =~ m/cygwin/ )
   else # The MSVC section starts here
   {   $outfile        = "winenv.set";
       $COM            = "MSC";
-      # COMPATH for MSC is differently used
-      $COMPATH        =~ s/\/bin$//i;
       $OUTPATH        = "wntmsci@COMEX@";
       $INPATH         = $OUTPATH.$PROEXT;
       $COMEX          = '@COMEX@';
@@ -979,12 +976,10 @@ if ( $platform =~ m/darwin/ )
 $WORK_STAMP            = "@SOURCEVERSION@";
 # Location of the source.
 $SOLARSRC             = '$SRC_ROOT';
-
-# SOURCE_ROOT_DIR equals $SOLARSRC/..
-my @list1 = split( /\// , $SOLARSRC );
-pop @list1;
-$SOURCE_ROOT_DIR = join ( '/' , @list1 );
-
+# Location of the repository.
+my @splitlist = split( /\//, $SRC_ROOT );
+pop @splitlist;
+$SOURCE_ROOT_DIR      = join("/", @splitlist);
 #
 $DEVROOT              = '$SRC_ROOT';
 # Set solenv and solver to given or default values. 
@@ -1323,9 +1318,7 @@ if ($platform =~ m/solaris/)
                         $L.$LIB.
                         $L.$USR_LIB;
    if ( $CC =~ "gcc" ) {
-      my $temp = $COMPATH;
-      $temp =~ s:/bin$::;
-      $SOLARLIB      .= $L.$temp.$LIB;
+      $SOLARLIB      .= $L.$COMPATH.$LIB;
    }
    $SOLARLIB         .= $L.$USR_LOCAL.$LIB.
                         $L.$USR_DT.$LIB.
@@ -1394,9 +1387,8 @@ $SOLARINC            .= '/SC5 ';
 }
 # Platform dependent include path at the top of this list of include paths
 if ($platform =~ m/solaris/)
-{   my $temp;
-    $temp =~ s:$COMPATH:/bin\$:;
-    $SOLARINC         .= $I.$temp.$ds."include";
+{   
+    $SOLARINC         .= $I.$COMPATH.$ds."include";
 }
 if ($platform =~ m/linux/)
 {
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index cc6c73692..be1fc69fa 100755
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -2,16 +2,11 @@ common
 {
 	environment
 	{
-		btarget
-		{
-			BTARGET btarget=%BUILD_TARGET%
-		}
 		common
 		{
 			ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
-			BTARGET 1
 			BUILD_SPECIAL TRUE
 			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE
 			common_build TRUE
@@ -50,7 +45,6 @@ common
 			WITH_FONTOOO YES
 			WITH_LDAP YES
 			wrapper_override_cc_wrapper TRUE
-			ZIPSOURCE 1
             BUILD_QADEVOOO YES
 			MAXPROC maxproc=15
 		}
@@ -88,10 +82,6 @@ common
 		{
 			UPDMINOREXT .%UPDMINOR%
 		}
-		nojava 
-		{
-			DISABLE_JAVA TRUE
-		}
 		nosource
 		{
 			LU_NOSOURCE no_source
@@ -114,7 +104,7 @@ common
 		{
 			LU_RFLAG r_only
 		}
-		shell 
+		shell
 		{
 			SHELL %STAR_USE_SHELL%
 			USE_SHELL %STAR_USE_SHELL%
@@ -127,42 +117,37 @@ common
 		{
 			VERBOSE VERBOSE
 		}
-		zipsource
-		{
-			ZIPSOURCE zipsource=%ZIP_SOURCE_URL%
-		}
 	}
 	extern
 	{
 		ENVROOT
 		PATH
 		SRC_ROOT
-		STL_ROOT
 		UPDATER
 	}
-	order minorext common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc hg r_only nosource
-	reset 
+	order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource
+	reset
 	{
 		ALT_L10N_MODULE
-		ENVCFLAGS 
-		HOMEDRIVE 
-		HOMEPATH 
-		JAVAHOME 
-		JAVA_HOME 
+		ENVCFLAGS
+		HOMEDRIVE
+		HOMEPATH
+		JAVAHOME
+		JAVA_HOME
  		LU_HGFLAG
  		LU_NOSOURCE
  		LU_RFLAGS
         MKDIRHIER
-		PROEXT 
-		PROFULLSWITCH 
-		SHIPDRIVE 
-		SOLARSRC 
-		SOLAR_JAVA 
-		SPEW 
-		STLPORT4 
+		PROEXT
+		PROFULLSWITCH
+		SHIPDRIVE
+		SOLARSRC
+		SOLAR_JAVA
+		SPEW
+		STLPORT4
 		UPDMINOREXT
-		WITH_FONTOOO 
-		WITH_LANG 
+		WITH_FONTOOO
+		WITH_LANG
 	}
 	restore
 	{
@@ -175,13 +160,11 @@ common
 	}
 	switches
 	{
-		btarget BUILD_TARGET
 		crashdump
 		cwsname CWS_WORK_STAMP
-		envroot 
+		envroot
 		hg
 		minorext
-		nojava
 		nosource
 		pro
 		maxproc MAXPROCESS
@@ -189,18 +172,12 @@ common
 		shell STAR_USE_SHELL
 		tmp SOL_TMP_DIR
 		verbose VERBOSE
-		zipsource ZIP_SOURCE_URL
 	}
 }
 finish
 {
 	environment
 	{
-		ca
-		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-		}
 		cap
 		{
 			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
@@ -296,12 +273,6 @@ finish
 			SO_GEN_ERROR2 ...resetting path to source tree
 			SRC_ROOT UPDMINOR_not_used
 		}
-		jdk13
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
-		}
 		jdk14
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
@@ -326,7 +297,7 @@ finish
 			LIB %LIB%$;%JDKLIB%
 		}
 	}
-	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a
+	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
 	switches
 	{
 		cwsname CWS_WORK_STAMP
@@ -342,16 +313,6 @@ unxfbsdi
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
 		cap
 		{
 			COPYALL TRUE
@@ -462,21 +423,6 @@ unxfbsdi
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
-			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
-		}
-		jdk13path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
 		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
@@ -507,18 +453,6 @@ unxfbsdi
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		pre
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
 		pro
 		{
 			PROSWITCH -DPRODUCT
@@ -528,15 +462,6 @@ unxfbsdi
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
@@ -551,11 +476,10 @@ unxfbsdi
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
 	reset
 	{
 		CLASSPATH
@@ -569,7 +493,7 @@ unxfbsdi
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -580,7 +504,7 @@ unxfbsdi
 		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -602,25 +526,19 @@ unxfbsdi
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
 		debug
 		distroot
 		envroot
-		jdk13
-		jdk13path
 		jdk14
 		jdk14path
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		pre PRE
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -634,17 +552,6 @@ unxlngi6
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
 		cap
 		{
 			COPYALL TRUE
@@ -771,21 +678,6 @@ unxlngi6
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
-			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
-		}
-		jdk13path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
 		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
@@ -816,10 +708,6 @@ unxlngi6
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs
-		{
-			*cvs %STAR_NATIVECVS%
-		}
 		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
@@ -835,13 +723,6 @@ unxlngi6
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
 		pro
 		{
 			PROSWITCH -DPRODUCT
@@ -851,15 +732,6 @@ unxlngi6
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
@@ -874,11 +746,10 @@ unxlngi6
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
 	reset
 	{
 		CLASSPATH
@@ -892,7 +763,7 @@ unxlngi6
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -903,7 +774,7 @@ unxlngi6
 		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -925,27 +796,21 @@ unxlngi6
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
 		debug
 		distroot
 		envroot
-		jdk13
-		jdk13path
 		jdk14
 		jdk14path
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
 		ojdk16
 		ojdk16path
-		pre PRE
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -959,17 +824,6 @@ unxlngx6
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
 		cap
 		{
 			COPYALL TRUE
@@ -1128,10 +982,6 @@ unxlngx6
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs
-		{
-			*cvs %STAR_NATIVECVS%
-		}
 		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
@@ -1147,13 +997,6 @@ unxlngx6
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
 		pro
 		{
 			PROSWITCH -DPRODUCT
@@ -1163,15 +1006,6 @@ unxlngx6
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
@@ -1186,11 +1020,10 @@ unxlngx6
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2  common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
 	reset
 	{
 		CLASSPATH
@@ -1204,7 +1037,7 @@ unxlngx6
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1215,7 +1048,7 @@ unxlngx6
 		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1237,7 +1070,6 @@ unxlngx6
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
@@ -1249,13 +1081,10 @@ unxlngx6
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
 		ojdk16
 		ojdk16path
-		pre PRE
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -1269,17 +1098,6 @@ unxmacxi
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
 		cap
 		{
 			COPYALL TRUE
@@ -1363,7 +1181,6 @@ unxmacxi
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/mac_jdk13_unknown
 			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
 			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
@@ -1419,21 +1236,6 @@ unxmacxi
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
-			JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
-		}
-		jdk13path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
 		jdk14
 		{
 			JAVA_HOME %JDK15PATH%
@@ -1464,17 +1266,6 @@ unxmacxi
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		pre
-		{
-			ILIB %PRE%/lib:%ILIB%
-			LIB %PRE%/lib:%LIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
 		pro
 		{
 			PROSWITCH -DPRODUCT
@@ -1484,15 +1275,6 @@ unxmacxi
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
@@ -1507,11 +1289,10 @@ unxmacxi
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
 	reset
 	{
 		CLASSPATH
@@ -1525,7 +1306,7 @@ unxmacxi
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1536,7 +1317,7 @@ unxmacxi
 		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1558,25 +1339,19 @@ unxmacxi
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
 		debug
 		distroot
 		envroot
-		jdk13
-		jdk13path
 		jdk14
 		jdk14path
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		pre PRE
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -1590,17 +1365,6 @@ unxsoli4
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
 		cap
 		{
 			COPYALL TRUE
@@ -1715,21 +1479,6 @@ unxsoli4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris
-			JDKLIB %JDK13PATH%/jre/lib/i386:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/i386/native_threads:%JDK13PATH%/jre/plugin/i386:%JDK13PATH%/jre/lib/i386/motif21
-			JDKLIBS -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/i386/native_threads -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/lib/i386/motif21
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
 		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
@@ -1760,10 +1509,6 @@ unxsoli4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs
-		{
-			*cvs %STAR_NATIVECVS%
-		}
 		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
@@ -1779,12 +1524,6 @@ unxsoli4
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre
-		{
-			ILIB %PRE%/lib:%ILIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB%
-		}
 		pro
 		{
 			PROSWITCH -DPRODUCT
@@ -1794,15 +1533,6 @@ unxsoli4
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
@@ -1817,11 +1547,10 @@ unxsoli4
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
 	reset
 	{
 		CLASSPATH
@@ -1830,7 +1559,7 @@ unxsoli4
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1841,7 +1570,7 @@ unxsoli4
 		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -1863,26 +1592,20 @@ unxsoli4
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
 		distroot
 		envroot
-		jdk13
-		jdk13path
 		jdk14
 		jdk14path
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
 		ojdk16
 		ojdk16path
-		pre PRE
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -1896,17 +1619,6 @@ unxsols4
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
 		cap
 		{
 			COPYALL TRUE
@@ -2028,21 +1740,6 @@ unxsols4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13
-		{
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
-			JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris
-			JDKLIB %JDK13PATH%/jre/lib/sparc:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/sparc/native_threads:%JDK13PATH%/jre/plugin/sparc:%JDK13PATH%/jre/lib/sparc/motif21
-			JDKLIBS -L%JDK13PATH%/jre/lib/sparc -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/sparc/native_threads -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/lib/sparc/motif21
-			JDKPATH %JDK13PATH%/bin
-			JDK_VERSION 131
-			XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
 		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
@@ -2073,10 +1770,6 @@ unxsols4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs
-		{
-			*cvs %STAR_NATIVECVS%
-		}
 		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
@@ -2092,12 +1785,6 @@ unxsols4
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre
-		{
-			ILIB %PRE%/lib:%ILIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB%
-		}
 		pro
 		{
 			PROSWITCH -DPRODUCT
@@ -2107,15 +1794,6 @@ unxsols4
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
@@ -2131,11 +1809,10 @@ unxsols4
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
 	reset
 	{
 		CLASSPATH
@@ -2144,7 +1821,7 @@ unxsols4
 	{
 		csh 
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2155,7 +1832,7 @@ unxsols4
 		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -2177,26 +1854,20 @@ unxsols4
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
 		distroot
 		envroot
-		jdk13
-		jdk13path
 		jdk14
 		jdk14path
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
 		ojdk16
 		ojdk16path
-		pre PRE
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -2210,17 +1881,6 @@ unxsolu4
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
 		cap
 		{
 			COPYALL TRUE
@@ -2358,16 +2018,6 @@ unxsolu4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs
-		{
-			*cvs %STAR_NATIVECVS%
-		}
-		pre
-		{
-			ILIB %PRE%/lib:%ILIB%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L%PRE%/lib %SOLARLIB%
-		}
 		pro
 		{
 			PROSWITCH -DPRODUCT
@@ -2377,15 +2027,6 @@ unxsolu4
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
@@ -2401,20 +2042,19 @@ unxsolu4
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
 	reset
 	{
 		CLASSPATH
 	}
 	script
 	{
-		csh 
+		csh
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2425,7 +2065,7 @@ unxsolu4
 		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -2447,7 +2087,6 @@ unxsolu4
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
@@ -2456,11 +2095,8 @@ unxsolu4
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
-		pre PRE
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -2474,17 +2110,6 @@ unxubti8
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-		}
 		cap
 		{
 			COPYALL TRUE
@@ -2631,10 +2256,6 @@ unxubti8
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs
-		{
-			*cvs %STAR_NATIVECVS%
-		}
 		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
@@ -2649,12 +2270,6 @@ unxubti8
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre
-		{
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
-			SOLARINC -I. -I%PRE%/inc %SOLARINC%
-			SOLARLIB -L../lib -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
-		}
 		pro
 		{
 			PROSWITCH -DPRODUCT
@@ -2668,15 +2283,6 @@ unxubti8
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 	}
 	extern
 	{
@@ -2687,10 +2293,9 @@ unxubti8
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug
 	reset
 	{
 		CLASSPATH
@@ -2703,16 +2308,16 @@ unxubti8
 	}
 	script
 	{
-		csh 
+		csh
 		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			600: umask 002
 			800: rehash
 		}
 		sh
 		{
 			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			600: umask 002
 			800: hash -r
@@ -2723,7 +2328,6 @@ unxubti8
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		debug
@@ -2731,10 +2335,8 @@ unxubti8
 		envroot
 		jdk15
 		l10n L10N_framework
-		nativecvs STAR_NATIVECVS
 		ojdk16
 		ojdk16path
-		pre PRE
 		pro
 		sourceroot
 	}
@@ -2749,21 +2351,6 @@ wntgcci1
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COMPATH %SOL_TMP%$/r$/MinGW
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-		}
 		cap
 		{
 			COMPATH %SOL_TMP%$/r$/MinGW
@@ -2771,6 +2358,7 @@ wntgcci1
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2786,6 +2374,7 @@ wntgcci1
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL FALSE
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2893,25 +2482,6 @@ wntgcci1
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
 		jdk14
 		{
 			HOMEDRIVE %DEVROOT%
@@ -2950,11 +2520,6 @@ wntgcci1
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		pre
-		{
-			ILIB %PRE%$/lib$:%ILIB%
-			LIB %PRE%$/lib$:%LIB%
-		}
 		psdk
 		{
 			PSDK %STAR_PSDK%
@@ -2968,15 +2533,6 @@ wntgcci1
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 	}
 	extern
 	{
@@ -2987,9 +2543,8 @@ wntgcci1
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
 	reset
 	{
 		COPYALL
@@ -3003,7 +2558,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 $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			260: setenv PATH $MYENV_PATH
 			270: unsetenv MYENV_PATH
 			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -3018,7 +2573,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 $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			415: fi
 			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
 			851: export SO_GEN_ERROR
@@ -3038,25 +2593,20 @@ wntgcci1
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
 		distroot
 		envroot
-		jdk13
-		jdk13path
 		jdk14
 		jdk14path
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		pre PRE
 		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
 		sourceroot
-		stl
 	}
 }
 wntmsci11
@@ -3069,23 +2619,6 @@ wntmsci11
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			COMPATH %SOL_TMP%$/r$/msvc8p
-			COMPROOT %SOL_TMP%$/r$/msvc8p
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
-			FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-		}
 		cap
 		{
 			COMPATH %SOL_TMP%$/r$/msvc8p
@@ -3229,25 +2762,6 @@ wntmsci11
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH %JDK_PATH%
-		}
 		jdk14
 		{
 			HOMEDRIVE %DEVROOT%
@@ -3286,11 +2800,6 @@ wntmsci11
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		pre
-		{
-			ILIB %PRE%$/lib$:%ILIB%
-			LIB %PRE%$/lib$:%LIB%
-		}
 		psdk
 		{
 			PSDK %STAR_PSDK%
@@ -3304,15 +2813,6 @@ wntmsci11
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
-			SOLAR_STLPATH %STL_ROOT%
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 	}
 	extern
 	{
@@ -3323,9 +2823,8 @@ wntmsci11
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
 	reset
 	{
 		COPYALL
@@ -3338,7 +2837,7 @@ wntmsci11
 		{
 			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% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
 			260: set PATH=%MYENV_PATH
 			270: unset MYENV_PATH
 			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
@@ -3349,25 +2848,20 @@ wntmsci11
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
 		distroot
 		envroot
-		jdk13
-		jdk13path
 		jdk14
 		jdk14path
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		pre PRE
 		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
 		sourceroot
-		stl
 	}
 }
 wntmsci12
@@ -3380,28 +2874,6 @@ wntmsci12
 			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT_USED TRUE
 		}
-		ca
-		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
-		}
 		cap
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
@@ -3414,6 +2886,7 @@ wntmsci12
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -3436,6 +2909,7 @@ wntmsci12
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %COMPATH%$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -3581,25 +3055,6 @@ wntmsci12
 		{
 			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
 		}
-		jdk13
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH $dp(%JDK_PATH%)
-		}
 		jdk14
 		{
 #			HOMEDRIVE %DEVROOT%
@@ -3638,10 +3093,6 @@ wntmsci12
 		{
 			SOLAR_JDK15PATH $dp(%JDK_PATH%)
 		}
-		nojava
-		{
-			DISABLE_JAVA TRUE
-		}
 		ojdk16
 		{
 #			HOMEDRIVE %DEVROOT%
@@ -3660,11 +3111,6 @@ wntmsci12
 		{
 			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
 		}
-		pre
-		{
-			ILIB %PRE%$/lib;%ILIB%
-			LIB %PRE%$/lib;%LIB%
-		}
 		pro
 		{
 			RES_ENUS TRUE
@@ -3678,15 +3124,6 @@ wntmsci12
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib)
-			SOLAR_STLPATH $dp(%STL_ROOT%)
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
 		tmp
 		{
 			SOL_TMP $dp(%SOL_TMP_DIR%)
@@ -3702,11 +3139,10 @@ wntmsci12
 		OSTYPE
 		$dp(SOL_TMP)
 		$dp(SOURCE_ROOT)
-		$dp(STL_ROOT)
 		$dp(TMP)
 		$dp(TEMP)
 	}
-	order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16  pre
+	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
 	reset
 	{
 		COPYALL
@@ -3730,7 +3166,7 @@ wntmsci12
          sh
             {
             400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
             415: fi
             600: umask 002
             800: hash -r
@@ -3752,64 +3188,36 @@ wntmsci12
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
 		bsclient
-		ca
 		cap
 		cax
 		compath STAR_COMPATH
 		distroot
 		envroot
-		jdk13
-		jdk13path
 		jdk14
 		jdk14path
 		jdk15
 		jdk15path
 		l10n L10N_framework
-		nojava
 		ojdk16
 		ojdk16path
-		pre PRE
 		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
 		sourceroot
-		stl
 		tmp SOL_TMP_DIR
 	}
 }
-wntmsci13 
+wntmsci13
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
-		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
-			COMPATH %SOL_TMP%$/r$/msvc9p
-			COMPROOT %SOL_TMP%$/r$/msvc9p
-			COPYALL TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
-		}
-		cap 
+		cap
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3821,6 +3229,7 @@ wntmsci13
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -3833,7 +3242,7 @@ wntmsci13
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
 		}
-		cax 
+		cax
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3843,6 +3252,7 @@ wntmsci13
 			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
 			FSDK %COMPATH%$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -3854,7 +3264,7 @@ wntmsci13
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3867,7 +3277,7 @@ wntmsci13
 			*s cd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX 
+			BIG_SVX
 			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
 			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
@@ -3912,7 +3322,7 @@ wntmsci13
 		{
 			PERL perl
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
 			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
@@ -3935,7 +3345,7 @@ wntmsci13
 #			TEMP $dp(%TEMP%)
 #			TMP $dp(%TMP%)
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
@@ -3974,7 +3384,7 @@ wntmsci13
 		{
 			SHIPDRIVE %BS_ROOT%$/ship$/install
 		}
-		compath 
+		compath
 		{
 			COMPATH $dp(%STAR_COMPATH%)
 		}
@@ -3988,26 +3398,7 @@ wntmsci13
 		{
 			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
 		}
-		jdk13 
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk131
-			JAVAHOME %JDK13PATH%
-			JAVA_HOME %JDK13PATH%
-			JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
-			JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
-			JDKLIB %JDK13PATH%$/lib
-			JDKLIBS %JDK13PATH%$/lib
-			JDKPATH %JDK13PATH%$/bin
-			JDK_VERSION 131
-			JREPATH %JDK13PATH%$/jre$/bin$/hotspot
-			XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar
-		}
-		jdk13path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK13PATH $dp(%JDK_PATH%)
-		}
-		jdk14 
+		jdk14
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk141
@@ -4026,7 +3417,7 @@ wntmsci13
 		{
 			SOLAR_JDK14PATH $dp(%JDK_PATH%)
 		}
-		jdk15 
+		jdk15
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk151
@@ -4045,11 +3436,7 @@ wntmsci13
 		{
 			SOLAR_JDK15PATH $dp(%JDK_PATH%)
 		}
-		nojava 
-		{
-			DISABLE_JAVA TRUE
-		}
-		ojdk16 
+		ojdk16
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/openjdk-6-b08-windows-i586
@@ -4067,16 +3454,11 @@ wntmsci13
 		{
 			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
 		}
-		pre 
-		{
-			ILIB %PRE%$/lib;%ILIB%
-			LIB %PRE%$/lib;%LIB%
-		}
-		pro 
+		pro
 		{
 			RES_ENUS TRUE
 		}
-		psdk 
+		psdk
 		{
 			PSDK $dp(%STAR_PSDK%)
 		}
@@ -4085,59 +3467,49 @@ wntmsci13
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
 			SOURCE_ROOT_USED TRUE
 		}
-		stl:0 IF X%STL_ROOT%X != XX
-		{
-			SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib)
-			SOLAR_STLPATH $dp(%STL_ROOT%)
-		}
-		stl:1 IF X%STL_ROOT%X == XX
-		{
-			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
-		}
-		tmp 
+		tmp
 		{
 			SOL_TMP $dp(%SOL_TMP_DIR%)
 		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
 		OSTYPE
-		$dp(SOL_TMP) 
-		$dp(SOURCE_ROOT) 
-		$dp(STL_ROOT) 
+		$dp(SOL_TMP)
+		$dp(SOURCE_ROOT)
 		$dp(TMP)
 		$dp(TEMP)
 	}
-	order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16  pre
-	reset 
+	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+	reset
 	{
-		COPYALL 
-		CXX_X64_BINARY 
-		DB2IMP 
-		GCRINC 
-		GCRLIB 
-		GCRPATH 
-		LIBMGR_X64_BINARY 
-		LINK_X64_BINARY 
-		NSIS_PATH 
-		OLD_CHAOS 
+		COPYALL
+		CXX_X64_BINARY
+		DB2IMP
+		GCRINC
+		GCRLIB
+		GCRPATH
+		LIBMGR_X64_BINARY
+		LINK_X64_BINARY
+		NSIS_PATH
+		OLD_CHAOS
 		PERLDIR
-		SOLAR_ENV_ROOT 
-		TFDEF 
-		TFDIR 
-		WST 
+		SOLAR_ENV_ROOT
+		TFDEF
+		TFDIR
+		WST
 	}
-	script 
+	script
 	{
          sh
             {
             400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
             415: fi
             600: umask 002
             800: hash -r
@@ -4155,32 +3527,26 @@ wntmsci13
             882: fi
         }
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nojava 
-		ojdk16 
-		ojdk16path 
-		pre PRE
-		pro 
+		ojdk16
+		ojdk16path
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
 		tmp SOL_TMP_DIR
 	}
 }
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 2db775426..6110498ed 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -848,12 +848,7 @@ LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf
 .ENDIF			# "$(LOCALIZESDF)"==""
 .ENDIF			# "$(WITH_LANG)"!=""
 
-.IF "$(PRE)"==""
-#JARDIR=$(CLASSDIR)
 JARDIR=$(OUT)/class
-.ELSE
-JARDIR=$(PRE)/class
-.ENDIF
 
 # needs to be expanded!!!
 
@@ -896,9 +891,6 @@ UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD)
 
 UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
 
-.IF "$(PRE)"!=""
-UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC)
-.ENDIF
 UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
 
 CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
@@ -1226,26 +1218,9 @@ STDLIB+=$(FILLUPARC)
 STDSHL+=$(FILLUPARC)
 .ENDIF			# "$(FILUPARC)"!=""
 
-.IF "$(DISABLE_JAVA)"==""
 .IF "$(SOLAR_JAVA)"!=""
 CDEFS+=$(JAVADEF)
 .ENDIF          # "$(SOLAR_JAVA)"!=""
-.ELSE           # "$(DISABLE_JAVA)"==""
-SOLAR_JAVA!:=
-.EXPORT : SOLAR_JAVA
-.IF "$(JDKPATH)"!=""
-environment_confusion:
-    @echo ----------------------------------------------------------
-    @echo -
-    @echo - Error!
-    @echo -
-    @echo - $$JDKPATH and $$DISABLE_JAVA are set. this will lead
-    @echo - to impropper results.
-    @echo -
-    @echo ----------------------------------------------------------
-    force_dmake_to_error
-.ENDIF          # "$(JDKPATH)"!=""
-.ENDIF          # "$(DISABLE_JAVA)"==""
 
 .INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk
 
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index eb4b35008..2330aa64e 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -55,9 +55,6 @@ target_empty=warn_target_empty
 INCEXT*=.
 INCPRE*=.
 INCPOST*=.
-.IF "$(PRE)"!=""
-ENVINCPRE+=-I$(PRE)/inc
-.ENDIF			# "$(PRE)"!=""
 .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
 UNOINCLUDES=$(SOLARINCDIR)/offuh
 .ENDIF			# "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
@@ -66,9 +63,9 @@ SOLARINC+=$(JDKINCS)
 INCLUDE:=
 .EXPORT : INCLUDE
 .IF "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
 .ELSE		# "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
 .ENDIF		# "$(PRJINC)"!=""
 INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 .EXPORT : LIB
@@ -1259,9 +1256,6 @@ CPPUMAKERFLAGS*=-L
 .IF "$(UNOTYPES)" != ""
 # makeing all in one
 .DIRCACHE=no
-.IF "$(ENVINCPRE)"!=""
-MKDEPFLAGS+=-I:$(ENVINCPRE)
-.ENDIF			# "$(ENVINCPRE))"!=""
 .IF "$(OBJFILES)"!=""
 $(OBJFILES) : $(UNOUCRTARGET)
 .ENDIF			# "$(OBJFILES)"!=""