summaryrefslogtreecommitdiff
path: root/solenv/config
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/config')
-rw-r--r--solenv/config/sdev300.ini95
-rw-r--r--solenv/config/ssolar.cmn8
2 files changed, 51 insertions, 52 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 96a947b005fe..d4a90f7d1d3c 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,7 +8,7 @@ common
BIG_SVX TRUE
BMP_WRITES_FLAG TRUE
BUILD_SPECIAL TRUE
- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC
+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
common_build TRUE
COMMON_OUTDIR common
CONFIG_PROJECT config_office
@@ -36,6 +36,7 @@ common
NEW_JAR_PACK TRUE
NO_REC_RES TRUE
OOODMAKEMODE YES
+ OOO_SHELL /bin/bash
PCLEAN_PATH xxx
RES_ENUS TRUE
RES_GER TRUE
@@ -105,11 +106,6 @@ common
{
LU_RFLAG r_only
}
- shell
- {
- SHELL %STAR_USE_SHELL%
- USE_SHELL %STAR_USE_SHELL%
- }
tmp
{
SOL_TMP %SOL_TMP_DIR%
@@ -126,7 +122,7 @@ common
SRC_ROOT
UPDATER
}
- order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 shell tmp crashdump maxproc hg r_only nosource
+ order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource
reset
{
ALT_L10N_MODULE
@@ -170,7 +166,6 @@ common
pro
maxproc MAXPROCESS
r_only
- shell STAR_USE_SHELL
tmp SOL_TMP_DIR
verbose VERBOSE
}
@@ -202,9 +197,10 @@ 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
+ OOO_JUNIT_JAR %SOLARROOT%$/btools$/junit-4.8.1.jar
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 $;
SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
@@ -212,6 +208,7 @@ finish
SOLARSRC %SRC_ROOT%
SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1
+ DBGSV_INIT %SOLARENV%/bin/dbgsv.ini
}
common_2:0 IF X%CWS_WORK_STAMP%X == XX
{
@@ -221,6 +218,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% ==
{
@@ -280,12 +278,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
{
@@ -297,6 +297,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
@@ -498,6 +499,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
@@ -510,6 +512,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
@@ -769,6 +772,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
@@ -781,6 +785,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
@@ -1043,6 +1048,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
@@ -1055,6 +1061,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
@@ -1313,6 +1320,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
@@ -1325,6 +1333,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
@@ -1567,6 +1576,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
@@ -1579,6 +1589,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
@@ -1830,6 +1841,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
@@ -1842,6 +1854,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
@@ -2063,6 +2076,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
@@ -2075,6 +2089,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
@@ -2199,7 +2214,6 @@ unxubti8
SOLAR_PLUGIN TRUE
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
- USE_SHELL tcsh
VBA_EXTENSION NO
WITH_LANG en-US de
XAU_LIBS -lXau
@@ -2279,10 +2293,6 @@ unxubti8
{
PROSWITCH -DPRODUCT
}
- shell
- {
- USE_SHELL STAR_USE_SHELL
- }
sourceroot:0 IF X%SOURCE_ROOT%X != XX
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
@@ -2318,6 +2328,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
{
@@ -2326,7 +2337,7 @@ unxubti8
415: fi
600: umask 002
800: hash -r
- 882: fi
+ 820: wrapfetch.sh
}
}
switches
@@ -2363,7 +2374,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
@@ -2379,7 +2390,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
@@ -2423,7 +2434,6 @@ wntgcci1
{
SOLAR_ENV_ROOT r:
SOLAR_SOURCE_ROOT o:
- USE_SHELL bash
}
common1
{
@@ -2529,10 +2539,6 @@ wntgcci1
{
PSDK %STAR_PSDK%
}
- shell
- {
- USE_SHELL STAR_USE_SHELL
- }
sourceroot:0 if X%SOURCE_ROOT%X != XX
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
@@ -2610,7 +2616,6 @@ wntgcci1
l10n L10N_framework
pro
psdk STAR_PSDK
- shell STAR_USE_SHELL
sourceroot
}
}
@@ -2673,7 +2678,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
@@ -2700,7 +2704,6 @@ wntmsci11
BS_ROOT n:
SOLAR_ENV_ROOT r:
SOLAR_SOURCE_ROOT o:
- USE_SHELL 4nt
}
common1
{
@@ -2710,6 +2713,7 @@ wntmsci11
DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK
FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0
PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
+ PKGFORMAT msi
PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
@@ -2809,10 +2813,6 @@ wntmsci11
{
PSDK %STAR_PSDK%
}
- shell
- {
- use_shell STAR_USE_SHELL
- }
sourceroot:0 if X%SOURCE_ROOT%X != XX
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
@@ -2865,7 +2865,6 @@ wntmsci11
l10n L10N_framework
pro
psdk STAR_PSDK
- shell STAR_USE_SHELL
sourceroot
}
}
@@ -2888,10 +2887,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
@@ -2906,15 +2905,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
@@ -2940,7 +2939,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
@@ -2975,8 +2973,6 @@ wntmsci12
BS_ROOT n:
SOLAR_ENV_ROOT r:
SOLAR_SOURCE_ROOT o:
- USE_SHELL bash
- STAR_USE_SHELL bash
BTOOLDIR %WORK_STAMP%$/cygtools
PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
}
@@ -2994,6 +2990,7 @@ wntmsci12
F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+ PKGFORMAT msi
PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
@@ -3176,6 +3173,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
@@ -3208,7 +3206,6 @@ wntmsci12
ojdk16path
pro
psdk STAR_PSDK
- shell STAR_USE_SHELL
sourceroot
tmp SOL_TMP_DIR
}
@@ -3225,17 +3222,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
@@ -3250,15 +3247,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
@@ -3284,7 +3281,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
@@ -3319,8 +3315,6 @@ wntmsci13
BS_ROOT n:
SOLAR_ENV_ROOT r:
SOLAR_SOURCE_ROOT o:
- USE_SHELL bash
- STAR_USE_SHELL bash
BTOOLDIR %WORK_STAMP%$/cygtools
PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
}
@@ -3338,6 +3332,7 @@ wntmsci13
F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+ PKGFORMAT msi
PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
@@ -3519,6 +3514,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
@@ -3551,7 +3547,6 @@ wntmsci13
ojdk16path
pro
psdk STAR_PSDK
- shell STAR_USE_SHELL
sourceroot
tmp SOL_TMP_DIR
}
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index d4b7ee01ee19..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
@@ -100,6 +101,7 @@ common
ENABLE_NAS
ENABLE_PCH
SYSTEM_CURL
+ SYSTEM_CPPUNIT
SYSTEM_FREETYPE
FREETYPE_CFLAGS
FREETYPE_LIBS
@@ -160,6 +162,8 @@ common
ODBCPATH
ODBCVER
OLD_CHAOS
+ OOO_JUNIT_JAR
+ OOO_SHELL
PACKMS
PCLEAN_PATH
PKGCONFIG_ROOT
@@ -220,6 +224,7 @@ common
STLPORT4
STLPORT_VER
SYSPATH
+ TARFILE_LOCATION
TF_CAPELLA
TF_CFG
TF_CFGDATA
@@ -241,7 +246,6 @@ common
USE_MAPFILES
USE_NEW_SDK
USE_PCH
- USE_SHELL
USE_SYSTEM_STL
use_cygcp
use_shl_versions
@@ -271,6 +275,7 @@ common
HAVE_LD_HASH_STYLE
JAVACOMPILER
JAVADOC
+ JAVAIFLAGS
JDK
NO_HIDS
PAM_LINK
@@ -281,7 +286,6 @@ common
SOLAR_PLUGIN
URE_BOOTSTRAP
USE_FT_EMBOLDEN
- USE_SHELL
USE_XINERAMA
VBA_EXTENSION
XINERAMA_LINK
generated by cgit (git 2.34.1) at 2024-07-17 12:07:32 +0000