summaryrefslogtreecommitdiff
path: root/solenv/config
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/config')
-rw-r--r--solenv/config/sdev300.ini53
-rw-r--r--solenv/config/ssolar.cmn2
2 files changed, 36 insertions, 19 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 54e8e0605670..f91d003dc25e 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -202,8 +202,8 @@ finish
}
common_1
{
- BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
- BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
+ BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
+ BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
DPKG %BUILD_TOOLS%$/dpkg
PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
PATH_SEPERATOR $;
@@ -221,6 +221,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% ==
{
@@ -501,6 +502,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
@@ -513,6 +515,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
@@ -772,6 +775,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
@@ -784,6 +788,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
@@ -1046,6 +1051,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
@@ -1058,6 +1064,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
@@ -1316,6 +1323,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
@@ -1328,6 +1336,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
@@ -1570,6 +1579,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
@@ -1582,6 +1592,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
@@ -1833,6 +1844,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
@@ -1845,6 +1857,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
@@ -2066,6 +2079,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
@@ -2078,6 +2092,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
@@ -2321,6 +2336,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
{
@@ -2329,7 +2345,7 @@ unxubti8
415: fi
600: umask 002
800: hash -r
- 882: fi
+ 820: wrapfetch.sh
}
}
switches
@@ -2366,7 +2382,7 @@ wntgcci1
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
- NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+ NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOLARROOT%$/etw
PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2382,7 +2398,7 @@ wntgcci1
COMPATH %SOL_TMP%$/r$/MinGW
COPYALL FALSE
FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
- NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+ NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOL_TMP%$/r$/etw
PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2676,7 +2692,6 @@ wntmsci11
*s cdd %SOLARVERSION%
*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
BIG_SVX
- BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
DMAKEROOT %SOLARENV%$/inc$/startup
@@ -2891,10 +2906,10 @@ wntmsci12
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
- ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+ ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
- NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+ NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOLARROOT%$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -2909,15 +2924,15 @@ wntmsci12
}
cax
{
- BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+ BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
COMPROOT %SOL_TMP%$/r$/msvc9p
COPYALL FALSE
DSDK %COMPATH%$/DirectXSDK
- ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+ ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
FSDK %COMPATH%$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
- NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+ NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOL_TMP%$/r$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -2943,7 +2958,6 @@ wntmsci12
*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
BIG_SVX
- BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
@@ -3179,6 +3193,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
@@ -3228,17 +3243,17 @@ wntmsci13
}
cap
{
- BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+ BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
COMPROOT %SOL_TMP%$/r$/msvc9p
COPYALL TRUE
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
- ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+ ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
- NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+ NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOLARROOT%$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -3253,15 +3268,15 @@ wntmsci13
}
cax
{
- BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+ BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
COMPROOT %SOL_TMP%$/r$/msvc9p
COPYALL FALSE
DSDK %COMPATH%$/DirectXSDK
- ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+ ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
FSDK %COMPATH%$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
- NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+ NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
PCLEAN_PATH %SOL_TMP%$/r$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -3287,7 +3302,6 @@ wntmsci13
*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
BIG_SVX
- BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
@@ -3522,6 +3536,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 d4b7ee01ee19..e8c0a71feaa6 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
@@ -220,6 +221,7 @@ common
STLPORT4
STLPORT_VER
SYSPATH
+ TARFILE_LOCATION
TF_CAPELLA
TF_CFG
TF_CFGDATA
generated by cgit (git 2.34.1) at 2024-07-17 08:16:37 +0000