diff options
author | sb <sb@openoffice.org> | 2010-04-21 22:01:20 +0200 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-04-21 22:01:20 +0200 |
commit | dfa0a43bdbf10edec4dc5307f97d6274b5c6b825 (patch) | |
tree | be687eaab60999ebda22374b3504e2b03f27fc99 /solenv/config | |
parent | 804a0f3d882f888c7b3b33d63118e735283617e9 (diff) | |
parent | a0de0def4a49a63c6675a622123b793da8b4c78d (diff) |
sb120: merged in DEV300_m77
Diffstat (limited to 'solenv/config')
-rw-r--r-- | solenv/config/sdev300.ini | 23 | ||||
-rw-r--r-- | solenv/config/ssolar.cmn | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index a503679d9a1d..325d9a075504 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -217,6 +217,7 @@ finish { *o: cd %SOLARSRC% ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so + TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources } common_jre:0 IF %JREPATH% == { @@ -276,12 +277,14 @@ finish CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% + JAVA_TARGET_FLAG -target 1.4 } jdk15 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% + JAVA_TARGET_FLAG -target 1.5 } l10n { @@ -293,6 +296,7 @@ finish CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% + JAVA_TARGET_FLAG -target 1.6 } } 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 @@ -494,6 +498,7 @@ unxfbsdi 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -506,6 +511,7 @@ unxfbsdi 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -765,6 +771,7 @@ unxlngi6 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -777,6 +784,7 @@ unxlngi6 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -1039,6 +1047,7 @@ unxlngx6 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -1051,6 +1060,7 @@ unxlngx6 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -1309,6 +1319,7 @@ unxmacxi 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -1321,6 +1332,7 @@ unxmacxi 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -1563,6 +1575,7 @@ unxsoli4 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -1575,6 +1588,7 @@ unxsoli4 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -1826,6 +1840,7 @@ unxsols4 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -1838,6 +1853,7 @@ unxsols4 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -2059,6 +2075,7 @@ unxsolu4 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -2071,6 +2088,7 @@ unxsolu4 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -2309,6 +2327,7 @@ unxubti8 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh } sh { @@ -2317,7 +2336,7 @@ unxubti8 415: fi 600: umask 002 800: hash -r - 882: fi + 820: wrapfetch.sh } } switches @@ -3153,6 +3172,7 @@ wntmsci12 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -3493,6 +3513,7 @@ wntmsci13 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index 0f9edf93b805..54eda38b47f9 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -30,6 +30,7 @@ common BIG_SVX BIG_TOOLS BISON_HAIRY + BISON_PKGDATADIR BISON_SIMPLE BMP_WRITES_FLAG bndchk @@ -223,6 +224,7 @@ common STLPORT4 STLPORT_VER SYSPATH + TARFILE_LOCATION TF_CAPELLA TF_CFG TF_CFGDATA |