set_soenv.in (deb9523b) set_soenv.in (f9b8cf2a)
1#!@PERL@ -w
2#
3###############################################################
4#
5# Licensed to the Apache Software Foundation (ASF) under one
6# or more contributor license agreements. See the NOTICE file
7# distributed with this work for additional information
8# regarding copyright ownership. The ASF licenses this file

--- 1104 unchanged lines hidden (view full) ---

1113 }
1114
1115 $JAVAHOME = '$JAVA_HOME';
1116
1117}
1118
1119# The general environment path.
1120if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
1#!@PERL@ -w
2#
3###############################################################
4#
5# Licensed to the Apache Software Foundation (ASF) under one
6# or more contributor license agreements. See the NOTICE file
7# distributed with this work for additional information
8# regarding copyright ownership. The ASF licenses this file

--- 1104 unchanged lines hidden (view full) ---

1113 }
1114
1115 $JAVAHOME = '$JAVA_HOME';
1116
1117}
1118
1119# The general environment path.
1120if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
1121{ $PATH = $cur_dir.
1122 $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
1121{ $PATH = '$SOLARENV'.$ds.'$INPATH'.$BIN.
1123 $ps.'$SOLARENV'.$BIN;
1124
1125 if ($platform =~ m/solaris/) {
1126 $PATH .= $ps.$USR_CCS.$BIN;
1127 }
1128
1129 $PATH .= $ps.$oldPATH;
1130

--- 13 unchanged lines hidden (view full) ---

1144
1145elsif ($platform =~ m/cygwin/)
1146{ # The PATH variable is completely created from scratch. Elements
1147 # from oldPATH that are not yet included are appended to PATH at
1148 # the end.
1149
1150 my ( $tmppath );
1151
1122 $ps.'$SOLARENV'.$BIN;
1123
1124 if ($platform =~ m/solaris/) {
1125 $PATH .= $ps.$USR_CCS.$BIN;
1126 }
1127
1128 $PATH .= $ps.$oldPATH;
1129

--- 13 unchanged lines hidden (view full) ---

1143
1144elsif ($platform =~ m/cygwin/)
1145{ # The PATH variable is completely created from scratch. Elements
1146 # from oldPATH that are not yet included are appended to PATH at
1147 # the end.
1148
1149 my ( $tmppath );
1150
1152 $PATH = $cur_dir.
1153 $ps.CygFormat($SOLARENV).$ds."bin".
1151 $PATH = CygFormat($SOLARENV).$ds."bin".
1154 $ps.CygFormat($SOLARENV).$ds.$INPATH.$BIN;
1155
1156 if ( $JAVA_HOME ne "" )
1157 {
1158 # hack either "hotspot" or "client" should be used, depending on the jdk version:
1159 # 1.2.x - no such directory, unsupported
1160 # 1.3.x - hotspot, client missing
1161 # 1.4.x - client, hotspot missing

--- 116 unchanged lines hidden (view full) ---

1278 # The path now is in cygwin posix format
1279
1280}
1281
1282elsif ($platform =~ m/os2/)
1283{ # The PATH variable is completely created from scratch. Everything that is not
1284 # needed is appended to the end.
1285
1152 $ps.CygFormat($SOLARENV).$ds.$INPATH.$BIN;
1153
1154 if ( $JAVA_HOME ne "" )
1155 {
1156 # hack either "hotspot" or "client" should be used, depending on the jdk version:
1157 # 1.2.x - no such directory, unsupported
1158 # 1.3.x - hotspot, client missing
1159 # 1.4.x - client, hotspot missing

--- 116 unchanged lines hidden (view full) ---

1276 # The path now is in cygwin posix format
1277
1278}
1279
1280elsif ($platform =~ m/os2/)
1281{ # The PATH variable is completely created from scratch. Everything that is not
1282 # needed is appended to the end.
1283
1286 $PATH = $cur_dir.
1287 $ps.'$SOLARENV'.$ds."bin".
1284 $PATH = '$SOLARENV'.$ds."bin".
1288 $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN;
1289
1290 if ( $JAVA_HOME ne "" )
1291 {
1292 # hack either "hotspot" or "client" should be used, depending on the jdk version:
1293 # 1.2.x - no such directory, unsupported
1294 # 1.3.x - hotspot, client missing
1295 # 1.4.x - client, hotspot missing

--- 14 unchanged lines hidden (view full) ---

1310
1311 # Append old PATH
1312 my $temp = $oldPATH;
1313 $temp =~ s/\\/\//g ;
1314 $PATH .= $ps.$temp;
1315}
1316
1317elsif ($platform =~ m/darwin/)
1285 $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN;
1286
1287 if ( $JAVA_HOME ne "" )
1288 {
1289 # hack either "hotspot" or "client" should be used, depending on the jdk version:
1290 # 1.2.x - no such directory, unsupported
1291 # 1.3.x - hotspot, client missing
1292 # 1.4.x - client, hotspot missing

--- 14 unchanged lines hidden (view full) ---

1307
1308 # Append old PATH
1309 my $temp = $oldPATH;
1310 $temp =~ s/\\/\//g ;
1311 $PATH .= $ps.$temp;
1312}
1313
1314elsif ($platform =~ m/darwin/)
1318{ $PATH = $cur_dir.
1319 $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
1315{ $PATH = '$SOLARENV'.$ds.'$INPATH'.$BIN.
1320 $ps.'$SOLARENV'.$BIN;
1321
1322 # Append old PATH
1323 $PATH .= $ps.$oldPATH;
1324}
1325else
1326{ AddWarning( "set_soenv", "$platform not configured for general environment paths" );
1327}

--- 1362 unchanged lines hidden --- 		1316 $ps.'$SOLARENV'.$BIN;
1317
1318 # Append old PATH
1319 $PATH .= $ps.$oldPATH;
1320}
1321else
1322{ AddWarning( "set_soenv", "$platform not configured for general environment paths" );
1323}

--- 1362 unchanged lines hidden ---