diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-11-25 17:27:33 +0100 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-11-25 17:27:33 +0100 |
commit | 47a4bbe01c8543ecdff68176196840860e1f4880 (patch) | |
tree | 8993940c6b8e8a05c12db04226773cf1f8ac2ec8 /solenv | |
parent | ause106: #161178# remove -nojava switch and usage (diff) | |
download | core-47a4bbe01c8543ecdff68176196840860e1f4880.tar.gz core-47a4bbe01c8543ecdff68176196840860e1f4880.zip |
ause106: #161178# remove -btarget and -zipsource switches
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/config/sdev300.ini | 52 |
1 files changed, 21 insertions, 31 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 42f3e5f0c654..f7ffdadc2f40 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -2,10 +2,6 @@ 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 @@ -121,10 +117,6 @@ common { VERBOSE VERBOSE } - zipsource - { - ZIPSOURCE zipsource=%ZIP_SOURCE_URL% - } } extern { @@ -134,7 +126,7 @@ common STL_ROOT UPDATER } - order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 shell tmp crashdump maxproc hg r_only nosource + order 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 @@ -169,7 +161,6 @@ common } switches { - btarget BUILD_TARGET crashdump cwsname CWS_WORK_STAMP envroot @@ -181,7 +172,6 @@ common shell STAR_USE_SHELL tmp SOL_TMP_DIR verbose VERBOSE - zipsource ZIP_SOURCE_URL } } finish @@ -517,7 +507,7 @@ unxfbsdi { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -528,7 +518,7 @@ unxfbsdi sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -803,7 +793,7 @@ unxlngi6 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -814,7 +804,7 @@ unxlngi6 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1093,7 +1083,7 @@ unxlngx6 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1104,7 +1094,7 @@ unxlngx6 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1378,7 +1368,7 @@ unxmacxi { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1389,7 +1379,7 @@ unxmacxi sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1647,7 +1637,7 @@ unxsoli4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1658,7 +1648,7 @@ unxsoli4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1925,7 +1915,7 @@ unxsols4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1936,7 +1926,7 @@ unxsols4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2174,7 +2164,7 @@ unxsolu4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2185,7 +2175,7 @@ unxsolu4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2446,14 +2436,14 @@ unxubti8 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pj all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash } sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/etools/lucopy.pj all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2705,7 +2695,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.pj 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.pj 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 @@ -2720,7 +2710,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.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR @@ -3334,7 +3324,7 @@ wntmsci12 sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -3687,7 +3677,7 @@ wntmsci13 sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pj all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r |