[ooo-build-commit] Branch 'ooo/OOO310' - 2 commits - solenv/config
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Jul 7 17:05:58 PDT 2009
solenv/config/sooo310.ini | 40 +++++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 17 deletions(-)
New commits:
commit 6d4a3a3810d01956eff72d72b8ce9814a2fbe585
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jul 7 11:08:29 2009 +0000
#i10000# MAXPROC maxproc=15 initializer added
diff --git a/solenv/config/sooo310.ini b/solenv/config/sooo310.ini
index 55dff8e..cf4470a 100644
--- a/solenv/config/sooo310.ini
+++ b/solenv/config/sooo310.ini
@@ -48,6 +48,7 @@ common
wrapper_override_cc_wrapper TRUE
ZIPSOURCE 1
BUILD_QADEVOOO YES
+ MAXPROC maxproc=15
}
common:0 IF %UPDATER% == YES
{
commit 41913eb2aa53d3c9ce0122fdc5d0ff6ba5bc578c
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jul 7 10:38:44 2009 +0000
#i10000# support MAXPROC for lucopy.pl
diff --git a/solenv/config/sooo310.ini b/solenv/config/sooo310.ini
index a2dd400..55dff8e 100644
--- a/solenv/config/sooo310.ini
+++ b/solenv/config/sooo310.ini
@@ -71,6 +71,10 @@ common
{
ENABLE_CRASHDUMP STATIC
}
+ maxproc
+ {
+ MAXPROC maxproc=%MAXPROCESS%
+ }
nojava
{
DISABLE_JAVA TRUE
@@ -116,7 +120,7 @@ common
STL_ROOT
UPDATER
}
- order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump
+ order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc
reset
{
ENVCFLAGS
@@ -152,6 +156,7 @@ common
envroot
nojava
pro
+ maxproc MAXPROCESS
shell STAR_USE_SHELL
tmp SOL_TMP_DIR
verbose VERBOSE
@@ -569,7 +574,7 @@ unxlngi6
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -580,7 +585,7 @@ unxlngi6
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -885,7 +890,7 @@ unxlngx6
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -896,7 +901,7 @@ unxlngx6
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -1213,7 +1218,7 @@ unxmacxi
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1224,7 +1229,7 @@ unxmacxi
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -1519,7 +1524,7 @@ unxsoli4
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1530,7 +1535,7 @@ unxsoli4
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -1834,7 +1839,7 @@ unxsols4
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1845,7 +1850,7 @@ unxsols4
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -2106,7 +2111,7 @@ unxsolu4
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2117,7 +2122,7 @@ unxsolu4
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -2419,7 +2424,7 @@ wntgcci1
{
150: set MYENV_PATH=%PATH
160: set PATH=%SSX_PATH
- 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET%
+ 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC%
260: set PATH=%MYENV_PATH
270: unset MYENV_PATH
400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
@@ -2429,7 +2434,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.pl all $ZIPSOURCE $BTARGET
+ 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
260: setenv PATH $MYENV_PATH
270: unsetenv MYENV_PATH
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2444,7 +2449,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.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
851: export SO_GEN_ERROR
@@ -2831,7 +2836,7 @@ wntmsci12
{
150: set MYENV_PATH=%PATH
160: set PATH=%SSX_PATH
- 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET%
+ 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC%
260: set PATH=%MYENV_PATH
270: unset MYENV_PATH
300: call pcleaner.btm
More information about the ooo-build-commit
mailing list