CWS-TOOLING: integrate CWS killnonpro

1 files changed, 628 insertions, 630 deletions

diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 7550f86aedc5..cc6c7369275e 100644..100755
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -1,12 +1,12 @@
-common 
+common
 {
-	environment 
+	environment
 	{
-		btarget 
+		btarget
 		{
 			BTARGET btarget=%BUILD_TARGET%
 		}
-		common 
+		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
@@ -71,9 +71,8 @@ common
 		}
 		common:3 IF %UPDATER% != YES
 		{
-			ENABLE_CRASHDUMP DUMMY
 		}
-		crashdump 
+		crashdump
 		{
 			ENABLE_CRASHDUMP STATIC
 		}
@@ -100,7 +99,6 @@ common
 		pro:0 IF %UPDATER% == YES
 		{
 			DELIVER_TO_ZIP TRUE
-			ENABLE_CRASHDUMP STATIC
 			product full
 			PROEXT .pro
 			PROFULLSWITCH product=full
@@ -121,26 +119,26 @@ common
 			SHELL %STAR_USE_SHELL%
 			USE_SHELL %STAR_USE_SHELL%
 		}
-		tmp 
+		tmp
 		{
 			SOL_TMP %SOL_TMP_DIR%
 		}
-		verbose 
+		verbose
 		{
 			VERBOSE VERBOSE
 		}
-		zipsource 
+		zipsource
 		{
 			ZIPSOURCE zipsource=%ZIP_SOURCE_URL%
 		}
 	}
-	extern 
+	extern
 	{
-		ENVROOT 
-		PATH 
-		SRC_ROOT 
-		STL_ROOT 
-		UPDATER 
+		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 
@@ -166,19 +164,19 @@ common
 		WITH_FONTOOO 
 		WITH_LANG 
 	}
-	restore 
+	restore
 	{
-		PATH 
+		PATH
 	}
-	standlst 
+	standlst
 	{
 		DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
 		DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
 	}
-	switches 
+	switches
 	{
 		btarget BUILD_TARGET
-		crashdump 
+		crashdump
 		cwsname CWS_WORK_STAMP
 		envroot 
 		hg
@@ -194,37 +192,37 @@ common
 		zipsource ZIP_SOURCE_URL
 	}
 }
-finish 
+finish
 {
-	environment 
+	environment
 	{
-		ca 
+		ca
 		{
 			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
 		}
-		cap 
+		cap
 		{
 			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
 		}
-		cax 
+		cax
 		{
 			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
 		}
 		common_0:0 IF %OS% == MACOSX
 		{
-			ENABLE_GCONF 
-			ENABLE_GNOMEVFS 
-			ENABLE_GTK 
+			ENABLE_GCONF
+			ENABLE_GNOMEVFS
+			ENABLE_GTK
 			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
 		}
 		common_0:3 IF %SOLARINCLUDES% ==
 		{
 			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
 		}
-		common_1 
+		common_1
 		{
 			BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
 			BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
@@ -255,8 +253,8 @@ finish
 		}
 		cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
 		{
-			*build 
-			*deliver 
+			*build
+			*deliver
 			DMAKEROOT SOURCE_ROOT_not_used
 			SOLARINC SOURCE_ROOT_not_used
 			SOLARINCLUDE SOURCE_ROOT_not_used
@@ -270,8 +268,8 @@ finish
 		}
 		cwsname:1 IF X%SOURCE_ROOT%X == XX
 		{
-			*build 
-			*deliver 
+			*build
+			*deliver
 			DMAKEROOT SOURCE_ROOT_not_set
 			SOLARINC SOURCE_ROOT_not_set
 			SOLARINCLUDE SOURCE_ROOT_not_set
@@ -285,8 +283,8 @@ finish
 		}
 		cwsname:2 IF X%UPDMINOR%X == XX
 		{
-			*build 
-			*deliver 
+			*build
+			*deliver
 			DMAKEROOT UPDMINOR_not_used
 			SOLARINC UPDMINOR_not_used
 			SOLARINCLUDE UPDMINOR_not_used
@@ -298,30 +296,30 @@ finish
 			SO_GEN_ERROR2 ...resetting path to source tree
 			SRC_ROOT UPDMINOR_not_used
 		}
-		jdk13 
+		jdk13
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
 		}
-		jdk14 
+		jdk14
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
 		}
-		jdk15 
+		jdk15
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
 			LIB %LIB%$;%JDKLIB%
 		}
-		l10n 
+		l10n
 		{
 			framework %L10N_framework%
 			L10N-framework %L10N_framework%
 		}
-		ojdk16 
+		ojdk16
 		{
 			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
 			ILIB %LIB%$;%JDKLIB%
@@ -329,22 +327,22 @@ finish
 		}
 	}
 	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
-	switches 
+	switches
 	{
 		cwsname CWS_WORK_STAMP
 	}
 }
-unxfbsdi 
+unxfbsdi
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
@@ -354,7 +352,7 @@ unxfbsdi
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -366,7 +364,7 @@ unxfbsdi
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -377,7 +375,7 @@ unxfbsdi
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice perl %SOLARENV%/bin/build_client.pl
@@ -398,12 +396,12 @@ unxfbsdi
 			SOLAR_JAVA TRUE
 			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -420,7 +418,7 @@ unxfbsdi
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
 			COM GCC
@@ -446,11 +444,11 @@ unxfbsdi
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
-		debug 
+		debug
 		{
 			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
 		}
@@ -464,7 +462,7 @@ unxfbsdi
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
+		jdk13
 		{
 			JAVA_HOME %JDK13PATH%
 			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
@@ -479,7 +477,7 @@ unxfbsdi
 		{
 			SOLAR_JDK13PATH %JDK_PATH%
 		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
@@ -494,7 +492,7 @@ unxfbsdi
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -509,11 +507,11 @@ unxfbsdi
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
+		nativecvs
 		{
 			*cvs %STAR_NATIVECVS%
 		}
-		pre 
+		pre
 		{
 			ILIB %PRE%/lib:%ILIB%
 			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
@@ -521,7 +519,7 @@ unxfbsdi
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
 		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -539,35 +537,35 @@ unxfbsdi
 		{
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		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
-	reset 
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
@@ -579,7 +577,7 @@ unxfbsdi
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
 			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
@@ -600,43 +598,43 @@ unxfbsdi
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk13
+		jdk13path
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
 		nativecvs STAR_NATIVECVS
 		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		stl
+		sysbaseroot
 	}
 }
-unxlngi6 
+unxlngi6
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
@@ -647,7 +645,7 @@ unxlngi6
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -660,7 +658,7 @@ unxlngi6
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -672,7 +670,7 @@ unxlngi6
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -696,15 +694,15 @@ unxlngi6
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2            
+			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2
 		}
-		common1 
+		common1
 		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32            
+			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32
 			DEVROOT %SOLAR_ENV_ROOT%
 			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
@@ -722,7 +720,7 @@ unxlngi6
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
@@ -759,7 +757,7 @@ unxlngi6
 		{
 			FORCE2ARCHIVE TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -773,7 +771,7 @@ unxlngi6
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
+		jdk13
 		{
 			JAVA_HOME %JDK13PATH%
 			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
@@ -788,7 +786,7 @@ unxlngi6
 		{
 			SOLAR_JDK13PATH %JDK_PATH%
 		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
@@ -803,7 +801,7 @@ unxlngi6
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -818,11 +816,11 @@ unxlngi6
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
+		nativecvs
 		{
 			*cvs %STAR_NATIVECVS%
 		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -837,14 +835,14 @@ unxlngi6
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
+		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 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -862,35 +860,35 @@ unxlngi6
 		{
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		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
-	reset 
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
@@ -902,7 +900,7 @@ unxlngi6
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
 			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
@@ -923,45 +921,45 @@ unxlngi6
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk13
+		jdk13path
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
 		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
+		ojdk16
+		ojdk16path
 		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		stl
+		sysbaseroot
 	}
 }
-unxlngx6 
+unxlngx6
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
@@ -972,7 +970,7 @@ unxlngx6
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -985,7 +983,7 @@ unxlngx6
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -997,7 +995,7 @@ unxlngx6
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1021,13 +1019,13 @@ unxlngx6
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -1048,7 +1046,7 @@ unxlngx6
 			USE_SYSTEM_STL YES
 			XAU_LIBS -lXau
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
@@ -1086,7 +1084,7 @@ unxlngx6
 		{
 			FORCE2ARCHIVE TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1100,7 +1098,7 @@ unxlngx6
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1115,7 +1113,7 @@ unxlngx6
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1130,11 +1128,11 @@ unxlngx6
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
+		nativecvs
 		{
 			*cvs %STAR_NATIVECVS%
 		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -1149,14 +1147,14 @@ unxlngx6
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
+		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 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -1174,35 +1172,35 @@ unxlngx6
 		{
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		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
-	reset 
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
@@ -1214,7 +1212,7 @@ unxlngx6
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
 			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
@@ -1235,43 +1233,43 @@ unxlngx6
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
 		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
+		ojdk16
+		ojdk16path
 		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		stl
+		sysbaseroot
 	}
 }
-unxmacxi 
+unxmacxi
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
@@ -1282,7 +1280,7 @@ unxmacxi
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -1295,7 +1293,7 @@ unxmacxi
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -1307,7 +1305,7 @@ unxmacxi
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1329,7 +1327,7 @@ unxmacxi
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
 			SOLAR_ENV_ROOT /so/env
@@ -1337,7 +1335,7 @@ unxmacxi
 			SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
             MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
 		}
-		common1 
+		common1
 		{
 			BUILD_OS_APPLEOSX TRUE
 			BUILD_OS_MAJOR 10
@@ -1380,7 +1378,7 @@ unxmacxi
 			BUILD_PIXMAN YES
 			WITH_MOZILLA YES
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
 			COM GCC
@@ -1407,7 +1405,7 @@ unxmacxi
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1421,7 +1419,7 @@ unxmacxi
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
+		jdk13
 		{
 			JAVA_HOME %JDK13PATH%
 			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
@@ -1436,7 +1434,7 @@ unxmacxi
 		{
 			SOLAR_JDK13PATH %JDK_PATH%
 		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1451,7 +1449,7 @@ unxmacxi
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1466,18 +1464,18 @@ unxmacxi
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
+		nativecvs
 		{
 			*cvs %STAR_NATIVECVS%
 		}
-		pre 
+		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 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -1495,35 +1493,35 @@ unxmacxi
 		{
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		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
-	reset 
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
+		CLASSPATH
+		COPYALL
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
@@ -1535,7 +1533,7 @@ unxmacxi
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
 			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
@@ -1556,43 +1554,43 @@ unxmacxi
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		debug 
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		debug
+		distroot
+		envroot
+		jdk13
+		jdk13path
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
 		nativecvs STAR_NATIVECVS
 		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		stl
+		sysbaseroot
 	}
 }
-unxsoli4 
+unxsoli4
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
@@ -1603,7 +1601,7 @@ unxsoli4
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -1616,7 +1614,7 @@ unxsoli4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -1628,7 +1626,7 @@ unxsoli4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1649,13 +1647,13 @@ unxsoli4
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
 		}
-		common1 
+		common1
 		{
 			COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -1675,7 +1673,7 @@ unxsoli4
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
 			COM C52
@@ -1703,7 +1701,7 @@ unxsoli4
 			TEMP /var/tmp
 			TMP /var/tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -1717,7 +1715,7 @@ unxsoli4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
+		jdk13
 		{
 			JAVA_HOME %JDK13PATH%
 			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
@@ -1732,7 +1730,7 @@ unxsoli4
 		{
 			SOLAR_JDK13PATH %JDK_PATH%
 		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
@@ -1747,7 +1745,7 @@ unxsoli4
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -1762,11 +1760,11 @@ unxsoli4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
+		nativecvs
 		{
 			*cvs %STAR_NATIVECVS%
 		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
@@ -1781,13 +1779,13 @@ unxsoli4
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
+		pre
 		{
 			ILIB %PRE%/lib:%ILIB%
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB%
 		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -1805,30 +1803,30 @@ unxsoli4
 		{
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		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
-	reset 
+	reset
 	{
-		CLASSPATH 
+		CLASSPATH
 	}
-	script 
+	script
 	{
 		csh 
 		{
@@ -1840,7 +1838,7 @@ unxsoli4
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
 			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
@@ -1861,44 +1859,44 @@ unxsoli4
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk13
+		jdk13path
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
 		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
+		ojdk16
+		ojdk16path
 		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		stl
+		sysbaseroot
 	}
 }
-unxsols4 
+unxsols4
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
@@ -1909,7 +1907,7 @@ unxsols4
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -1922,7 +1920,7 @@ unxsols4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -1934,7 +1932,7 @@ unxsols4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1955,14 +1953,14 @@ unxsols4
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
 		}
-		common1 
+		common1
 		{
 			COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -1982,7 +1980,7 @@ unxsols4
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
 			COM C52
@@ -2016,7 +2014,7 @@ unxsols4
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -2030,7 +2028,7 @@ unxsols4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
+		jdk13
 		{
 			JAVA_HOME %JDK13PATH%
 			JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
@@ -2045,7 +2043,7 @@ unxsols4
 		{
 			SOLAR_JDK13PATH %JDK_PATH%
 		}
-		jdk14 
+		jdk14
 		{
 			JAVA_HOME %JDK14PATH%
 			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
@@ -2060,7 +2058,7 @@ unxsols4
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -2075,11 +2073,11 @@ unxsols4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
+		nativecvs
 		{
 			*cvs %STAR_NATIVECVS%
 		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
@@ -2094,13 +2092,13 @@ unxsols4
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
+		pre
 		{
 			ILIB %PRE%/lib:%ILIB%
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB%
 		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -2118,31 +2116,31 @@ unxsols4
 		{
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LM_LICENSE_FILE 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LM_LICENSE_FILE
+		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
-	reset 
+	reset
 	{
-		CLASSPATH 
+		CLASSPATH
 	}
-	script 
+	script
 	{
 		csh 
 		{
@@ -2154,7 +2152,7 @@ unxsols4
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
 			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
@@ -2175,44 +2173,44 @@ unxsols4
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk13
+		jdk13path
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
 		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
+		ojdk16
+		ojdk16path
 		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		stl
+		sysbaseroot
 	}
 }
-unxsolu4 
+unxsolu4
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
@@ -2223,7 +2221,7 @@ unxsolu4
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -2236,7 +2234,7 @@ unxsolu4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -2248,7 +2246,7 @@ unxsolu4
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -2261,7 +2259,7 @@ unxsolu4
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
-			ENABLE_GNOMEVFS 
+			ENABLE_GNOMEVFS
 			FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
 			FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
 			LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
@@ -2279,13 +2277,13 @@ unxsolu4
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
 		}
-		common1 
+		common1
 		{
 			COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
 			DEVROOT %SOLAR_ENV_ROOT%
@@ -2302,7 +2300,7 @@ unxsolu4
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 			USE_SYSTEM_STL YES
 		}
-		common2 
+		common2
 		{
 			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
 			COM C52
@@ -2331,7 +2329,7 @@ unxsolu4
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -2345,7 +2343,7 @@ unxsolu4
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %JDK15PATH%
 			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -2360,17 +2358,17 @@ unxsolu4
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
+		nativecvs
 		{
 			*cvs %STAR_NATIVECVS%
 		}
-		pre 
+		pre
 		{
 			ILIB %PRE%/lib:%ILIB%
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB%
 		}
-		pro 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
@@ -2388,31 +2386,31 @@ unxsolu4
 		{
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
-		sysbaseroot 
+		sysbaseroot
 		{
 			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LM_LICENSE_FILE 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		SYSBASE_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LM_LICENSE_FILE
+		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
-	reset 
+	reset
 	{
-		CLASSPATH 
+		CLASSPATH
 	}
-	script 
+	script
 	{
 		csh 
 		{
@@ -2424,7 +2422,7 @@ unxsolu4
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
 			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
@@ -2445,38 +2443,38 @@ unxsolu4
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk15
+		jdk15path
 		l10n L10N_framework
 		nativecvs STAR_NATIVECVS
 		pre PRE
-		pro 
-		sourceroot 
-		stl 
-		sysbaseroot 
+		pro
+		sourceroot
+		stl
+		sysbaseroot
 	}
 }
-unxubti8 
+unxubti8
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COPYALL TRUE
 			DEVROOT %SOL_TMP%$/r
@@ -2487,7 +2485,7 @@ unxubti8
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COPYALL TRUE
 			COPY_PACKED TRUE
@@ -2500,7 +2498,7 @@ unxubti8
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
@@ -2512,7 +2510,7 @@ unxubti8
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
 			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -2533,12 +2531,12 @@ unxubti8
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
 		}
-		common1 
+		common1
 		{
 			AGG_VERSION 2300
 			ANT /usr/share/ant/bin/ant
@@ -2579,7 +2577,7 @@ unxubti8
 			XINERAMA_LINK dynamic
 			ZIPDEP zipdep.pl
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
@@ -2602,11 +2600,11 @@ unxubti8
 			TEMP /tmp
 			TMP /tmp
 		}
-		compath 
+		compath
 		{
 			COMPATH /usr/bin
 		}
-		debug 
+		debug
 		{
 			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
 		}
@@ -2619,7 +2617,7 @@ unxubti8
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk15 
+		jdk15
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -2633,11 +2631,11 @@ unxubti8
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		nativecvs 
+		nativecvs
 		{
 			*cvs %STAR_NATIVECVS%
 		}
-		ojdk16 
+		ojdk16
 		{
 			JAVA_HOME %OJDK16PATH%
 			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -2651,17 +2649,17 @@ unxubti8
 		{
 			SOLAR_OJDK16PATH %JDK_PATH%
 		}
-		pre 
+		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 
+		pro
 		{
 			PROSWITCH -DPRODUCT
 		}
-		shell 
+		shell
 		{
 			USE_SHELL STAR_USE_SHELL
 		}
@@ -2680,30 +2678,30 @@ unxubti8
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
 	}
-	extern 
+	extern
 	{
-		DIST_ROOT 
-		ENV_ROOT 
-		HOME 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
-		USER 
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		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
-	reset 
+	reset
 	{
-		CLASSPATH 
-		COPYALL 
-		ENABLE_CRASHDUMP 
+		CLASSPATH
+		COPYALL
+		ENABLE_CRASHDUMP
 	}
-	restore 
+	restore
 	{
-		INCLUDE 
+		INCLUDE
 	}
-	script 
+	script
 	{
 		csh 
 		{
@@ -2711,7 +2709,7 @@ unxubti8
 			600: umask 002
 			800: rehash
 		}
-		sh 
+		sh
 		{
 			400: if [ $COPYALL ]; then
 			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
@@ -2721,37 +2719,37 @@ unxubti8
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
-		debug 
-		distroot 
-		envroot 
-		jdk15 
+		bsclient
+		ca
+		cap
+		cax
+		debug
+		distroot
+		envroot
+		jdk15
 		l10n L10N_framework
 		nativecvs STAR_NATIVECVS
-		ojdk16 
-		ojdk16path 
+		ojdk16
+		ojdk16path
 		pre PRE
-		pro 
-		sourceroot 
+		pro
+		sourceroot
 	}
 }
-wntgcci1 
+wntgcci1
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL TRUE
@@ -2766,7 +2764,7 @@ wntgcci1
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL TRUE
@@ -2783,7 +2781,7 @@ wntgcci1
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL FALSE
@@ -2798,7 +2796,7 @@ wntgcci1
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -2810,7 +2808,7 @@ wntgcci1
 			*r cd %SOLARROOT%
 			*s cd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX 
+			BIG_SVX
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
 			DMAKEROOT %SOLARENV%$/inc$/startup
@@ -2827,13 +2825,13 @@ wntgcci1
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
 			USE_SHELL bash
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/MinGW
 			#			FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
@@ -2852,7 +2850,7 @@ wntgcci1
 			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
@@ -2881,7 +2879,7 @@ wntgcci1
 			SORT sort -T %TMP%
 			use_shl_versions TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -2895,7 +2893,7 @@ wntgcci1
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
+		jdk13
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk131
@@ -2914,7 +2912,7 @@ wntgcci1
 		{
 			SOLAR_JDK13PATH %JDK_PATH%
 		}
-		jdk14 
+		jdk14
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk141
@@ -2933,7 +2931,7 @@ wntgcci1
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk151
@@ -2952,16 +2950,16 @@ wntgcci1
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		pre 
+		pre
 		{
 			ILIB %PRE%$/lib$:%ILIB%
 			LIB %PRE%$/lib$:%LIB%
 		}
-		psdk 
+		psdk
 		{
 			PSDK %STAR_PSDK%
 		}
-		shell 
+		shell
 		{
 			USE_SHELL STAR_USE_SHELL
 		}
@@ -2980,28 +2978,28 @@ wntgcci1
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		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
-	reset 
+	reset
 	{
-		COPYALL 
-		NSIS_PATH 
-		SOLAR_ENV_ROOT 
-		WST 
+		COPYALL
+		NSIS_PATH
+		SOLAR_ENV_ROOT
+		WST
 	}
-	script 
+	script
 	{
-		csh 
+		csh
 		{
 			150: setenv MYENV_PATH $PATH
 			160: setenv PATH $SSX_PATH
@@ -3013,7 +3011,7 @@ wntgcci1
 			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
 			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
 		}
-		sh 
+		sh
 		{
 			150: export MYENV_PATH=$PATH
 			160: export PATH=$SSX_PATH
@@ -3036,42 +3034,42 @@ wntgcci1
 			882: fi
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk13
+		jdk13path
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
 		pre PRE
-		pro 
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
+		stl
 	}
 }
-wntmsci11 
+wntmsci11
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT %SOURCE_ROOT_TMP%
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			COMPATH %SOL_TMP%$/r$/msvc8p
 			COMPROOT %SOL_TMP%$/r$/msvc8p
@@ -3088,7 +3086,7 @@ wntmsci11
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 		}
-		cap 
+		cap
 		{
 			COMPATH %SOL_TMP%$/r$/msvc8p
 			COMPROOT %SOL_TMP%$/r$/msvc8p
@@ -3107,7 +3105,7 @@ wntmsci11
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		cax 
+		cax
 		{
 			COMPATH %SOL_TMP%$/r$/msvc8p
 			COMPROOT %SOL_TMP%$/r$/msvc8p
@@ -3124,7 +3122,7 @@ wntmsci11
 			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
 			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
 		}
-		common 
+		common
 		{
 			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
 			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3136,7 +3134,7 @@ wntmsci11
 			*r cdd %SOLARROOT%
 			*s cdd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX 
+			BIG_SVX
 			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
@@ -3159,14 +3157,14 @@ wntmsci11
 			XCLASSPATH .
 			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
 		}
-		common0 
+		common0
 		{
 			BS_ROOT n:
 			SOLAR_ENV_ROOT r:
 			SOLAR_SOURCE_ROOT o:
 			USE_SHELL 4nt
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/msvc8p
 			COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
@@ -3185,7 +3183,7 @@ wntmsci11
 			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
@@ -3217,7 +3215,7 @@ wntmsci11
 			SORT sort -T %TMP%
 			use_shl_versions TRUE
 		}
-		compath 
+		compath
 		{
 			COMPATH %STAR_COMPATH%
 		}
@@ -3231,7 +3229,7 @@ wntmsci11
 		{
 			SOLAR_ENV_ROOT %ENV_ROOT%
 		}
-		jdk13 
+		jdk13
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk131
@@ -3250,7 +3248,7 @@ wntmsci11
 		{
 			SOLAR_JDK13PATH %JDK_PATH%
 		}
-		jdk14 
+		jdk14
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk141
@@ -3269,7 +3267,7 @@ wntmsci11
 		{
 			SOLAR_JDK14PATH %JDK_PATH%
 		}
-		jdk15 
+		jdk15
 		{
 			HOMEDRIVE %DEVROOT%
 			HOMEPATH $/jdk151
@@ -3288,16 +3286,16 @@ wntmsci11
 		{
 			SOLAR_JDK15PATH %JDK_PATH%
 		}
-		pre 
+		pre
 		{
 			ILIB %PRE%$/lib$:%ILIB%
 			LIB %PRE%$/lib$:%LIB%
 		}
-		psdk 
+		psdk
 		{
 			PSDK %STAR_PSDK%
 		}
-		shell 
+		shell
 		{
 			use_shell STAR_USE_SHELL
 		}
@@ -3316,27 +3314,27 @@ wntmsci11
 			SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
 		}
 	}
-	extern 
+	extern
 	{
-		COMSPEC 
-		DIST_ROOT 
-		ENV_ROOT 
-		JDK_PATH 
-		LOCALINI 
-		SOL_TMP 
-		SOURCE_ROOT 
-		STL_ROOT 
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		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
-	reset 
+	reset
 	{
-		COPYALL 
-		SOLAR_ENV_ROOT 
-		WST 
+		COPYALL
+		SOLAR_ENV_ROOT
+		WST
 	}
-	script 
+	script
 	{
-		post 
+		post
 		{
 			150: set MYENV_PATH=%PATH
 			160: set PATH=%SSX_PATH
@@ -3347,42 +3345,42 @@ wntmsci11
 			401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
 		}
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk13
+		jdk13path
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
 		pre PRE
-		pro 
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
+		stl
 	}
 }
-wntmsci12 
+wntmsci12
 {
-	environment 
+	environment
 	{
-		bs_sourceroot 
+		bs_sourceroot
 		{
 			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
 			SOURCE_ROOT_USED TRUE
 		}
-		ca 
+		ca
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3404,7 +3402,7 @@ wntmsci12
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
 		}
-		cap 
+		cap
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3428,7 +3426,7 @@ wntmsci12
 #			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
 
 		}
-		cax 
+		cax
 		{
 			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3449,7 +3447,7 @@ wntmsci12
 			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
@@ -3462,7 +3460,7 @@ wntmsci12
 			*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
@@ -3507,7 +3505,7 @@ wntmsci12
 		{
 			PERL perl
 		}
-		common1 
+		common1
 		{
 			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
 			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
@@ -3530,7 +3528,7 @@ wntmsci12
 #			TEMP $dp(%TEMP%)
 #			TMP $dp(%TMP%)
 		}
-		common2 
+		common2
 		{
 			ENABLE_GRAPHITE TRUE
             BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
@@ -3569,7 +3567,7 @@ wntmsci12
 		{
 			SHIPDRIVE %BS_ROOT%$/ship$/install
 		}
-		compath 
+		compath
 		{
 			COMPATH $dp(%STAR_COMPATH%)
 		}
@@ -3583,7 +3581,7 @@ wntmsci12
 		{
 			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
 		}
-		jdk13 
+		jdk13
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk131
@@ -3602,7 +3600,7 @@ wntmsci12
 		{
 			SOLAR_JDK13PATH $dp(%JDK_PATH%)
 		}
-		jdk14 
+		jdk14
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk141
@@ -3621,7 +3619,7 @@ wntmsci12
 		{
 			SOLAR_JDK14PATH $dp(%JDK_PATH%)
 		}
-		jdk15 
+		jdk15
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/jdk151
@@ -3640,11 +3638,11 @@ wntmsci12
 		{
 			SOLAR_JDK15PATH $dp(%JDK_PATH%)
 		}
-		nojava 
+		nojava
 		{
 			DISABLE_JAVA TRUE
 		}
-		ojdk16 
+		ojdk16
 		{
 #			HOMEDRIVE %DEVROOT%
 #			HOMEPATH $/openjdk-6-b08-windows-i586
@@ -3662,16 +3660,16 @@ wntmsci12
 		{
 			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
 		}
-		pre 
+		pre
 		{
 			ILIB %PRE%$/lib;%ILIB%
 			LIB %PRE%$/lib;%LIB%
 		}
-		pro 
+		pro
 		{
 			RES_ENUS TRUE
 		}
-		psdk 
+		psdk
 		{
 			PSDK $dp(%STAR_PSDK%)
 		}
@@ -3689,45 +3687,45 @@ wntmsci12
 		{
 			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(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
-	reset 
+	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
             {
@@ -3750,32 +3748,32 @@ wntmsci12
             882: fi
         }
 	}
-	switches 
+	switches
 	{
        	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient 
-		ca 
-		cap 
-		cax 
+		bsclient
+		ca
+		cap
+		cax
 		compath STAR_COMPATH
-		distroot 
-		envroot 
-		jdk13 
-		jdk13path 
-		jdk14 
-		jdk14path 
-		jdk15 
-		jdk15path 
+		distroot
+		envroot
+		jdk13
+		jdk13path
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
 		l10n L10N_framework
-		nojava 
-		ojdk16 
-		ojdk16path 
+		nojava
+		ojdk16
+		ojdk16path
 		pre PRE
-		pro 
+		pro
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
-		sourceroot 
-		stl 
+		sourceroot
+		stl
 		tmp SOL_TMP_DIR
 	}
 }