ause106: #161178# remove -stlswitch

1 files changed, 12 insertions, 144 deletions

diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index f7ffdadc2f40..3fd245b0da87 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -123,7 +123,6 @@ common
 		ENVROOT
 		PATH
 		SRC_ROOT
-		STL_ROOT
 		UPDATER
 	}
 	order common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource
@@ -466,15 +465,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%
@@ -489,11 +479,10 @@ unxfbsdi
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15 debug
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro common jdk14 jdk15 debug
 	reset
 	{
 		CLASSPATH
@@ -554,7 +543,6 @@ unxfbsdi
 		nativecvs STAR_NATIVECVS
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -752,15 +740,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%
@@ -775,11 +754,10 @@ unxlngi6
 		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 cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk14 jdk15 ojdk16
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
 	reset
 	{
 		CLASSPATH
@@ -842,7 +820,6 @@ unxlngi6
 		ojdk16path
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -1042,15 +1019,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%
@@ -1065,11 +1033,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 cap cax compath common2  common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
 	reset
 	{
 		CLASSPATH
@@ -1132,7 +1099,6 @@ unxlngx6
 		ojdk16path
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -1327,15 +1293,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%
@@ -1350,11 +1307,10 @@ unxmacxi
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk14 jdk15
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 nativecvs cap cax compath common2 pro common jdk14 jdk15
 	reset
 	{
 		CLASSPATH
@@ -1415,7 +1371,6 @@ unxmacxi
 		nativecvs STAR_NATIVECVS
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -1601,15 +1556,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%
@@ -1624,11 +1570,10 @@ unxsoli4
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk14 jdk15 ojdk16
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath nativecvs common2 pro common jdk14 jdk15 ojdk16
 	reset
 	{
 		CLASSPATH
@@ -1685,7 +1630,6 @@ unxsoli4
 		ojdk16path
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -1878,15 +1822,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%
@@ -1902,11 +1837,10 @@ unxsols4
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		SYSBASE_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk14 jdk15 ojdk16
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath nativecvs common2 common:3 pro common jdk14 jdk15 ojdk16
 	reset
 	{
 		CLASSPATH
@@ -1963,7 +1897,6 @@ unxsols4
 		ojdk16path
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -2127,15 +2060,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%
@@ -2151,11 +2075,10 @@ 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 cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath nativecvs common2 common:3 pro common jdk15
 	reset
 	{
 		CLASSPATH
@@ -2208,7 +2131,6 @@ unxsolu4
 		nativecvs STAR_NATIVECVS
 		pro
 		sourceroot
-		stl
 		sysbaseroot
 	}
 }
@@ -2399,15 +2321,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
 	{
@@ -2418,10 +2331,9 @@ unxubti8
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 		USER
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs cap cax compath common2 pro common jdk15 ojdk16 debug
 	reset
 	{
 		CLASSPATH
@@ -2660,15 +2572,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
 	{
@@ -2679,9 +2582,8 @@ wntgcci1
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15
+	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
@@ -2744,7 +2646,6 @@ wntgcci1
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
 		sourceroot
-		stl
 	}
 }
 wntmsci11
@@ -2951,15 +2852,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
 	{
@@ -2970,9 +2862,8 @@ wntmsci11
 		LOCALINI
 		SOL_TMP
 		SOURCE_ROOT
-		STL_ROOT
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk14 jdk15
+	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
@@ -3010,7 +2901,6 @@ wntmsci11
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
 		sourceroot
-		stl
 	}
 }
 wntmsci12
@@ -3272,15 +3162,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%)
@@ -3296,11 +3177,10 @@ wntmsci12
 		OSTYPE
 		$dp(SOL_TMP)
 		$dp(SOURCE_ROOT)
-		$dp(STL_ROOT)
 		$dp(TMP)
 		$dp(TEMP)
 	}
-	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16
+	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
@@ -3362,7 +3242,6 @@ wntmsci12
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
 		sourceroot
-		stl
 		tmp SOL_TMP_DIR
 	}
 }
@@ -3625,15 +3504,6 @@ 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
 		{
 			SOL_TMP $dp(%SOL_TMP_DIR%)
@@ -3649,11 +3519,10 @@ wntmsci13
 		OSTYPE
 		$dp(SOL_TMP)
 		$dp(SOURCE_ROOT)
-		$dp(STL_ROOT)
 		$dp(TMP)
 		$dp(TEMP)
 	}
-	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk14 jdk15 ojdk16
+	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
@@ -3715,7 +3584,6 @@ wntmsci13
 		psdk STAR_PSDK
 		shell STAR_USE_SHELL
 		sourceroot
-		stl
 		tmp SOL_TMP_DIR
 	}
 }