summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-01-26 14:45:09 +0100
committerMichael Stahl <mst@openoffice.org>2010-01-26 14:45:09 +0100
commit9232fb1123644f85b5f8dc00c9623ec32c38b69b (patch)
tree436c9e5fde43a6a5b9a442b80ab2f4708f838c16 /solenv
parent5468c694b9f87b60ed961ccff472131d14881189 (diff)
parent3406b75aaec59100b015b9bcd2efe303f2a2f78b (diff)
merge DEV300_m70
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/checkdll.sh10
-rwxr-xr-xsolenv/bin/deliver.pl2
-rwxr-xr-xsolenv/bin/modules/osarch.pm9
-rw-r--r--solenv/config/sdev300.ini1940
-rw-r--r--solenv/inc/_tg_shl.mk80
-rw-r--r--solenv/inc/libs.mk12
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/postset.mk1
-rw-r--r--solenv/inc/rules.mk2
-rw-r--r--solenv/inc/settings.mk32
-rw-r--r--solenv/inc/shlinfo.rc2
-rw-r--r--solenv/inc/target.mk10
-rw-r--r--solenv/inc/tg_help.mk86
-rw-r--r--solenv/inc/tg_shl.mk8
-rw-r--r--solenv/inc/unx.mk12
-rw-r--r--solenv/inc/unxirgm.mk163
-rw-r--r--solenv/inc/unxirxm.mk162
-rw-r--r--solenv/inc/unxirxm3.mk162
-rw-r--r--solenv/inc/unxlng.mk8
-rw-r--r--solenv/inc/unxmacxi.mk1
-rw-r--r--solenv/inc/unxsoli4.mk2
-rw-r--r--solenv/inc/unxsols4.mk2
-rw-r--r--solenv/inc/version.hrc4
-rw-r--r--solenv/inc/version_so.hrc4
24 files changed, 768 insertions, 1952 deletions
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index 0400f461666e..e64b8fd2aa4c 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -60,16 +60,6 @@ if [ -x $checkdll ]; then
*) DYLD_LIBRARY_PATH=$libpath;;
esac
export DYLD_LIBRARY_PATH;;
- IRIX) case "${LD_LIBRARYN32_PATH+X}" in
- X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
- *) LD_LIBRARYN32_PATH=$libpath;;
- esac
- export LD_LIBRARYN32_PATH;;
- IRIX64) case "${LD_LIBRARYN32_PATH+X}" in
- X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
- *) LD_LIBRARYN32_PATH=$libpath;;
- esac
- export LD_LIBRARYN32_PATH;;
*) case "${LD_LIBRARY_PATH+X}" in
X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
*) LD_LIBRARY_PATH=$libpath;;
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index d4d6c9c0bf5a..0d6c8b27afa4 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -552,7 +552,7 @@ sub get_base
}
if ( $#field == -1 ) {
- print_error("can't determine module");
+ print_error("can't find d.lst");
exit(2);
}
else {
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 8c3a87e4ddc5..205e4c933193 100755
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -27,8 +27,7 @@ chop( $m_str, $s_str );
# "SCO_SV", "scouw21",
"Darwin", "macosxp",
"Mac OS", "macosxp",
- "SINIX-N", "sinix",
- "IRIX", "irix"
+ "SINIX-N", "sinix"
);
%osDefTable = ("SunOS", "-DSYSV -DSOLARIS",
@@ -42,8 +41,7 @@ chop( $m_str, $s_str );
# "SCO_SV", "-DSYSV -DSCO -DSCO_UW21",
"Darwin", "-DBSD -DMACOSX",
"Mac OS", "-DBSD -DMACOSX",
- "SINIX-N", "-DSYSV -DSINIX",
- "IRIX", "-DSYSV -DIRIX"
+ "SINIX-N", "-DSYSV -DSINIX"
);
%osDosTable = ("SunOS", "sol",
@@ -56,8 +54,7 @@ chop( $m_str, $s_str );
"SCO_SV", "sco",
"Darwin", "macx",
"Mac OS", "macx",
- "SINIX-N", "sni",
- "IRIX", "irx"
+ "SINIX-N", "sni"
);
%archTable = ("sun4c", "sparc",
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 7550f86aedc5..c3b6f91c9dd7 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -1,17 +1,12 @@
-common
+common
{
- environment
+ environment
{
- btarget
- {
- BTARGET btarget=%BUILD_TARGET%
- }
- common
+ common
{
ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
BIG_SVX TRUE
BMP_WRITES_FLAG TRUE
- BTARGET 1
BUILD_SPECIAL TRUE
BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL 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
common_build TRUE
@@ -50,7 +45,6 @@ common
WITH_FONTOOO YES
WITH_LDAP YES
wrapper_override_cc_wrapper TRUE
- ZIPSOURCE 1
BUILD_QADEVOOO YES
MAXPROC maxproc=15
}
@@ -71,9 +65,8 @@ common
}
common:3 IF %UPDATER% != YES
{
- ENABLE_CRASHDUMP DUMMY
}
- crashdump
+ crashdump
{
ENABLE_CRASHDUMP STATIC
}
@@ -89,10 +82,6 @@ common
{
UPDMINOREXT .%UPDMINOR%
}
- nojava
- {
- DISABLE_JAVA TRUE
- }
nosource
{
LU_NOSOURCE no_source
@@ -100,7 +89,6 @@ common
pro:0 IF %UPDATER% == YES
{
DELIVER_TO_ZIP TRUE
- ENABLE_CRASHDUMP STATIC
product full
PROEXT .pro
PROFULLSWITCH product=full
@@ -116,74 +104,67 @@ common
{
LU_RFLAG r_only
}
- shell
+ shell
{
SHELL %STAR_USE_SHELL%
USE_SHELL %STAR_USE_SHELL%
}
- tmp
+ tmp
{
SOL_TMP %SOL_TMP_DIR%
}
- verbose
+ verbose
{
VERBOSE VERBOSE
}
- zipsource
- {
- ZIPSOURCE zipsource=%ZIP_SOURCE_URL%
- }
}
- extern
+ extern
{
- ENVROOT
- PATH
- SRC_ROOT
- STL_ROOT
- UPDATER
+ ENVROOT
+ PATH
+ SRC_ROOT
+ UPDATER
}
- order minorext common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc hg r_only nosource
- reset
+ order minorext 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
- ENVCFLAGS
- HOMEDRIVE
- HOMEPATH
- JAVAHOME
- JAVA_HOME
+ ENVCFLAGS
+ HOMEDRIVE
+ HOMEPATH
+ JAVAHOME
+ JAVA_HOME
LU_HGFLAG
LU_NOSOURCE
LU_RFLAGS
MKDIRHIER
- PROEXT
- PROFULLSWITCH
- SHIPDRIVE
- SOLARSRC
- SOLAR_JAVA
- SPEW
- STLPORT4
+ PROEXT
+ PROFULLSWITCH
+ SHIPDRIVE
+ SOLARSRC
+ SOLAR_JAVA
+ SPEW
+ STLPORT4
UPDMINOREXT
- WITH_FONTOOO
- WITH_LANG
+ WITH_FONTOOO
+ WITH_LANG
}
- restore
+ restore
{
- PATH
+ PATH
}
- standlst
+ standlst
{
DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
}
- switches
+ switches
{
- btarget BUILD_TARGET
- crashdump
+ crashdump
cwsname CWS_WORK_STAMP
- envroot
+ envroot
hg
minorext
- nojava
nosource
pro
maxproc MAXPROCESS
@@ -191,40 +172,34 @@ common
shell STAR_USE_SHELL
tmp SOL_TMP_DIR
verbose VERBOSE
- zipsource ZIP_SOURCE_URL
}
}
-finish
+finish
{
- environment
+ environment
{
- ca
- {
- SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
- SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
- }
- cap
+ cap
{
SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
}
- cax
+ cax
{
SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
}
common_0:0 IF %OS% == MACOSX
{
- ENABLE_GCONF
- ENABLE_GNOMEVFS
- ENABLE_GTK
+ ENABLE_GCONF
+ ENABLE_GNOMEVFS
+ ENABLE_GTK
SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
}
common_0:3 IF %SOLARINCLUDES% ==
{
SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
}
- common_1
+ common_1
{
BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
@@ -255,8 +230,8 @@ finish
}
cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
{
- *build
- *deliver
+ *build
+ *deliver
DMAKEROOT SOURCE_ROOT_not_used
SOLARINC SOURCE_ROOT_not_used
SOLARINCLUDE SOURCE_ROOT_not_used
@@ -270,8 +245,8 @@ finish
}
cwsname:1 IF X%SOURCE_ROOT%X == XX
{
- *build
- *deliver
+ *build
+ *deliver
DMAKEROOT SOURCE_ROOT_not_set
SOLARINC SOURCE_ROOT_not_set
SOLARINCLUDE SOURCE_ROOT_not_set
@@ -285,8 +260,8 @@ finish
}
cwsname:2 IF X%UPDMINOR%X == XX
{
- *build
- *deliver
+ *build
+ *deliver
DMAKEROOT UPDMINOR_not_used
SOLARINC UPDMINOR_not_used
SOLARINCLUDE UPDMINOR_not_used
@@ -298,63 +273,47 @@ finish
SO_GEN_ERROR2 ...resetting path to source tree
SRC_ROOT UPDMINOR_not_used
}
- jdk13
+ jdk14
{
CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
ILIB %LIB%$;%JDKLIB%
LIB %LIB%$;%JDKLIB%
}
- jdk14
+ jdk15
{
CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
ILIB %LIB%$;%JDKLIB%
LIB %LIB%$;%JDKLIB%
}
- jdk15
- {
- CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
- ILIB %LIB%$;%JDKLIB%
- LIB %LIB%$;%JDKLIB%
- }
- l10n
+ l10n
{
framework %L10N_framework%
L10N-framework %L10N_framework%
}
- ojdk16
+ ojdk16
{
CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
ILIB %LIB%$;%JDKLIB%
LIB %LIB%$;%JDKLIB%
}
}
- order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a
- switches
+ 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
+ switches
{
cwsname CWS_WORK_STAMP
}
}
-unxfbsdi
+unxfbsdi
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOLARROOT%/etools
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- }
- cap
+ cap
{
COPYALL TRUE
COPY_PACKED TRUE
@@ -366,7 +325,7 @@ unxfbsdi
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
@@ -377,7 +336,7 @@ unxfbsdi
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
*build_client nice perl %SOLARENV%/bin/build_client.pl
@@ -398,12 +357,12 @@ unxfbsdi
SOLAR_JAVA TRUE
ZIPDEP perl %SOLARENV%/bin/zipdep.pl
}
- common0
+ common0
{
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
}
- common1
+ common1
{
COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
DEVROOT %SOLAR_ENV_ROOT%
@@ -420,7 +379,7 @@ unxfbsdi
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
- common2
+ common2
{
BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
COM GCC
@@ -446,11 +405,11 @@ unxfbsdi
TEMP /tmp
TMP /tmp
}
- compath
+ compath
{
COMPATH %STAR_COMPATH%
}
- debug
+ debug
{
LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
}
@@ -464,22 +423,7 @@ unxfbsdi
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk13
- {
- JAVA_HOME %JDK13PATH%
- JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
- JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
- JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
- JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
- JDKPATH %JDK13PATH%/bin
- JDK_VERSION 131
- XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
- }
- jdk13path:0 IF X%JDK_PATH%X != XX
- {
- SOLAR_JDK13PATH %JDK_PATH%
- }
- jdk14
+ jdk14
{
JAVA_HOME %JDK14PATH%
JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
@@ -494,7 +438,7 @@ unxfbsdi
{
SOLAR_JDK14PATH %JDK_PATH%
}
- jdk15
+ jdk15
{
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -509,19 +453,7 @@ unxfbsdi
{
SOLAR_JDK15PATH %JDK_PATH%
}
- nativecvs
- {
- *cvs %STAR_NATIVECVS%
- }
- pre
- {
- ILIB %PRE%/lib:%ILIB%
- LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
- LIB %PRE%/lib:%LIB%
- SOLARINC -I. -I%PRE%/inc %SOLARINC%
- SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
- }
- pro
+ pro
{
PROSWITCH -DPRODUCT
}
@@ -530,48 +462,38 @@ unxfbsdi
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
- sysbaseroot
+ sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
}
}
- extern
+ extern
{
- DIST_ROOT
- ENV_ROOT
- HOME
- JDK_PATH
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
- SYSBASE_ROOT
- USER
+ DIST_ROOT
+ ENV_ROOT
+ HOME
+ JDK_PATH
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
+ SYSBASE_ROOT
+ USER
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
+ reset
{
- CLASSPATH
- COPYALL
+ CLASSPATH
+ COPYALL
}
- restore
+ restore
{
- INCLUDE
+ INCLUDE
}
- script
+ script
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -579,10 +501,10 @@ unxfbsdi
900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
}
- sh
+ sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -600,54 +522,37 @@ unxfbsdi
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- debug
- distroot
- envroot
- jdk13
- jdk13path
- jdk14
- jdk14path
- jdk15
- jdk15path
+ debug
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- nativecvs STAR_NATIVECVS
- pre PRE
- pro
- sourceroot
- stl
- sysbaseroot
+ pro
+ sourceroot
+ sysbaseroot
}
}
-unxlngi6
+unxlngi6
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- }
- cap
+ cap
{
COPYALL TRUE
COPY_PACKED TRUE
@@ -660,7 +565,7 @@ unxlngi6
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
@@ -672,7 +577,7 @@ unxlngi6
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -696,15 +601,15 @@ unxlngi6
SOLAR_JAVA TRUE
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
}
- common0
+ common0
{
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
- SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2
+ SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.32/glibc2.3.2
}
- common1
+ common1
{
- COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32
+ COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.32
DEVROOT %SOLAR_ENV_ROOT%
LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
@@ -722,7 +627,7 @@ unxlngi6
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
- common2
+ common2
{
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
@@ -759,7 +664,7 @@ unxlngi6
{
FORCE2ARCHIVE TRUE
}
- compath
+ compath
{
COMPATH %STAR_COMPATH%
}
@@ -773,22 +678,7 @@ unxlngi6
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk13
- {
- JAVA_HOME %JDK13PATH%
- JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
- JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
- JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
- JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
- JDKPATH %JDK13PATH%/bin
- JDK_VERSION 131
- XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
- }
- jdk13path:0 IF X%JDK_PATH%X != XX
- {
- SOLAR_JDK13PATH %JDK_PATH%
- }
- jdk14
+ jdk14
{
JAVA_HOME %JDK14PATH%
JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
@@ -803,7 +693,7 @@ unxlngi6
{
SOLAR_JDK14PATH %JDK_PATH%
}
- jdk15
+ jdk15
{
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -818,11 +708,7 @@ unxlngi6
{
SOLAR_JDK15PATH %JDK_PATH%
}
- nativecvs
- {
- *cvs %STAR_NATIVECVS%
- }
- ojdk16
+ ojdk16
{
JAVA_HOME %OJDK16PATH%
JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -837,14 +723,7 @@ unxlngi6
{
SOLAR_OJDK16PATH %JDK_PATH%
}
- pre
- {
- ILIB %PRE%/lib:%ILIB%
- LIB %PRE%/lib:%LIB%
- SOLARINC -I. -I%PRE%/inc %SOLARINC%
- SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
- }
- pro
+ pro
{
PROSWITCH -DPRODUCT
}
@@ -853,48 +732,38 @@ unxlngi6
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
- sysbaseroot
+ sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
}
}
- extern
+ extern
{
- DIST_ROOT
- ENV_ROOT
- HOME
- JDK_PATH
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
- SYSBASE_ROOT
- USER
+ DIST_ROOT
+ ENV_ROOT
+ HOME
+ JDK_PATH
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
+ SYSBASE_ROOT
+ USER
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
+ reset
{
- CLASSPATH
- COPYALL
+ CLASSPATH
+ COPYALL
}
- restore
+ restore
{
- INCLUDE
+ INCLUDE
}
- script
+ script
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -902,10 +771,10 @@ unxlngi6
900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
}
- sh
+ sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -923,56 +792,39 @@ unxlngi6
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- debug
- distroot
- envroot
- jdk13
- jdk13path
- jdk14
- jdk14path
- jdk15
- jdk15path
+ debug
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- nativecvs STAR_NATIVECVS
- ojdk16
- ojdk16path
- pre PRE
- pro
- sourceroot
- stl
- sysbaseroot
+ ojdk16
+ ojdk16path
+ pro
+ sourceroot
+ sysbaseroot
}
}
-unxlngx6
+unxlngx6
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- }
- cap
+ cap
{
COPYALL TRUE
COPY_PACKED TRUE
@@ -985,7 +837,7 @@ unxlngx6
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
@@ -997,7 +849,7 @@ unxlngx6
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1021,19 +873,18 @@ unxlngx6
SOLAR_JAVA TRUE
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
}
- common0
+ common0
{
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6
}
- common1
+ common1
{
COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
DEVROOT %SOLAR_ENV_ROOT%
PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
PKGFORMAT rpm
- PTHREAD_CFLAGS -DNPTL
SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
@@ -1048,7 +899,7 @@ unxlngx6
USE_SYSTEM_STL YES
XAU_LIBS -lXau
}
- common2
+ common2
{
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
@@ -1086,7 +937,7 @@ unxlngx6
{
FORCE2ARCHIVE TRUE
}
- compath
+ compath
{
COMPATH %STAR_COMPATH%
}
@@ -1100,7 +951,7 @@ unxlngx6
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk14
+ jdk14
{
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1115,7 +966,7 @@ unxlngx6
{
SOLAR_JDK14PATH %JDK_PATH%
}
- jdk15
+ jdk15
{
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1130,11 +981,7 @@ unxlngx6
{
SOLAR_JDK15PATH %JDK_PATH%
}
- nativecvs
- {
- *cvs %STAR_NATIVECVS%
- }
- ojdk16
+ ojdk16
{
JAVA_HOME %OJDK16PATH%
JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -1149,14 +996,7 @@ unxlngx6
{
SOLAR_OJDK16PATH %JDK_PATH%
}
- pre
- {
- ILIB %PRE%/lib:%ILIB%
- LIB %PRE%/lib:%LIB%
- SOLARINC -I. -I%PRE%/inc %SOLARINC%
- SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
- }
- pro
+ pro
{
PROSWITCH -DPRODUCT
}
@@ -1165,48 +1005,38 @@ unxlngx6
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
- sysbaseroot
+ sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
}
}
- extern
+ extern
{
- DIST_ROOT
- ENV_ROOT
- HOME
- JDK_PATH
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
- SYSBASE_ROOT
- USER
+ DIST_ROOT
+ ENV_ROOT
+ HOME
+ JDK_PATH
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
+ SYSBASE_ROOT
+ USER
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 common3:0 pro common jdk14 jdk15 ojdk16
+ reset
{
- CLASSPATH
- COPYALL
+ CLASSPATH
+ COPYALL
}
- restore
+ restore
{
- INCLUDE
+ INCLUDE
}
- script
+ script
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1214,10 +1044,10 @@ unxlngx6
900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
}
- sh
+ sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -1235,54 +1065,39 @@ unxlngx6
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- debug
- distroot
- envroot
- jdk14
- jdk14path
- jdk15
- jdk15path
+ debug
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- nativecvs STAR_NATIVECVS
- ojdk16
- ojdk16path
- pre PRE
- pro
- sourceroot
- stl
- sysbaseroot
+ ojdk16
+ ojdk16path
+ pro
+ sourceroot
+ sysbaseroot
}
}
-unxmacxi
+unxmacxi
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- }
- cap
+ cap
{
COPYALL TRUE
COPY_PACKED TRUE
@@ -1295,7 +1110,7 @@ unxmacxi
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
@@ -1307,7 +1122,7 @@ unxmacxi
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1329,7 +1144,7 @@ unxmacxi
SOLAR_JAVA TRUE
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
}
- common0
+ common0
{
GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
SOLAR_ENV_ROOT /so/env
@@ -1337,7 +1152,7 @@ unxmacxi
SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
}
- common1
+ common1
{
BUILD_OS_APPLEOSX TRUE
BUILD_OS_MAJOR 10
@@ -1365,7 +1180,6 @@ unxmacxi
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/mac_jdk13_unknown
SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
@@ -1380,7 +1194,7 @@ unxmacxi
BUILD_PIXMAN YES
WITH_MOZILLA YES
}
- common2
+ common2
{
BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
COM GCC
@@ -1407,7 +1221,7 @@ unxmacxi
TEMP /tmp
TMP /tmp
}
- compath
+ compath
{
COMPATH %STAR_COMPATH%
}
@@ -1421,22 +1235,7 @@ unxmacxi
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk13
- {
- JAVA_HOME %JDK13PATH%
- JDKINC %JDK13PATH%/include:%JDK13PATH%/include/linux
- JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/linux
- JDKLIB %JDK13PATH%/jre/lib:%JDK13PATH%/jre/lib/i386:%JDK13PATH%/jre/lib/i386/client
- JDKLIBS -L%JDK13PATH%/jre/lib -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/jre/lib/i386/client
- JDKPATH %JDK13PATH%/bin
- JDK_VERSION 131
- XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/lib/tools.jar
- }
- jdk13path:0 IF X%JDK_PATH%X != XX
- {
- SOLAR_JDK13PATH %JDK_PATH%
- }
- jdk14
+ jdk14
{
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1451,7 +1250,7 @@ unxmacxi
{
SOLAR_JDK14PATH %JDK_PATH%
}
- jdk15
+ jdk15
{
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
@@ -1466,18 +1265,7 @@ unxmacxi
{
SOLAR_JDK15PATH %JDK_PATH%
}
- nativecvs
- {
- *cvs %STAR_NATIVECVS%
- }
- pre
- {
- ILIB %PRE%/lib:%ILIB%
- LIB %PRE%/lib:%LIB%
- SOLARINC -I. -I%PRE%/inc %SOLARINC%
- SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
- }
- pro
+ pro
{
PROSWITCH -DPRODUCT
}
@@ -1486,48 +1274,38 @@ unxmacxi
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
- sysbaseroot
+ sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
}
}
- extern
+ extern
{
- DIST_ROOT
- ENV_ROOT
- HOME
- JDK_PATH
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
- SYSBASE_ROOT
- USER
+ DIST_ROOT
+ ENV_ROOT
+ HOME
+ JDK_PATH
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
+ SYSBASE_ROOT
+ USER
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
+ reset
{
- CLASSPATH
- COPYALL
+ CLASSPATH
+ COPYALL
}
- restore
+ restore
{
- INCLUDE
+ INCLUDE
}
- script
+ script
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1535,10 +1313,10 @@ unxmacxi
900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
}
- sh
+ sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -1556,54 +1334,37 @@ unxmacxi
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- debug
- distroot
- envroot
- jdk13
- jdk13path
- jdk14
- jdk14path
- jdk15
- jdk15path
+ debug
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- nativecvs STAR_NATIVECVS
- pre PRE
- pro
- sourceroot
- stl
- sysbaseroot
+ pro
+ sourceroot
+ sysbaseroot
}
}
-unxsoli4
+unxsoli4
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- }
- cap
+ cap
{
COPYALL TRUE
COPY_PACKED TRUE
@@ -1616,7 +1377,7 @@ unxsoli4
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
@@ -1628,7 +1389,7 @@ unxsoli4
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1649,13 +1410,13 @@ unxsoli4
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
- common0
+ common0
{
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
}
- common1
+ common1
{
COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
DEVROOT %SOLAR_ENV_ROOT%
@@ -1675,7 +1436,7 @@ unxsoli4
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
- common2
+ common2
{
BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
COM C52
@@ -1703,7 +1464,7 @@ unxsoli4
TEMP /var/tmp
TMP /var/tmp
}
- compath
+ compath
{
COMPATH %STAR_COMPATH%
}
@@ -1717,22 +1478,7 @@ unxsoli4
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk13
- {
- JAVA_HOME %JDK13PATH%
- JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
- JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris
- JDKLIB %JDK13PATH%/jre/lib/i386:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/i386/native_threads:%JDK13PATH%/jre/plugin/i386:%JDK13PATH%/jre/lib/i386/motif21
- JDKLIBS -L%JDK13PATH%/jre/lib/i386 -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/i386/native_threads -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/plugin/i386 -L%JDK13PATH%/jre/lib/i386/motif21
- JDKPATH %JDK13PATH%/bin
- JDK_VERSION 131
- XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar
- }
- jdk13path:0 if X%JDK_PATH%X != XX
- {
- SOLAR_JDK13PATH %JDK_PATH%
- }
- jdk14
+ jdk14
{
JAVA_HOME %JDK14PATH%
JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
@@ -1747,7 +1493,7 @@ unxsoli4
{
SOLAR_JDK14PATH %JDK_PATH%
}
- jdk15
+ jdk15
{
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -1762,11 +1508,7 @@ unxsoli4
{
SOLAR_JDK15PATH %JDK_PATH%
}
- nativecvs
- {
- *cvs %STAR_NATIVECVS%
- }
- ojdk16
+ ojdk16
{
JAVA_HOME %OJDK16PATH%
JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
@@ -1781,13 +1523,7 @@ unxsoli4
{
SOLAR_OJDK16PATH %JDK_PATH%
}
- pre
- {
- ILIB %PRE%/lib:%ILIB%
- SOLARINC -I. -I%PRE%/inc %SOLARINC%
- SOLARLIB -L%PRE%/lib %SOLARLIB%
- }
- pro
+ pro
{
PROSWITCH -DPRODUCT
}
@@ -1796,43 +1532,33 @@ unxsoli4
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
- sysbaseroot
+ sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
}
}
- extern
+ extern
{
- DIST_ROOT
- ENV_ROOT
- HOME
- JDK_PATH
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
- SYSBASE_ROOT
- USER
+ DIST_ROOT
+ ENV_ROOT
+ HOME
+ JDK_PATH
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
+ SYSBASE_ROOT
+ USER
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
+ reset
{
- CLASSPATH
+ CLASSPATH
}
- script
+ script
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1840,10 +1566,10 @@ unxsoli4
900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
}
- sh
+ sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -1861,55 +1587,38 @@ unxsoli4
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- distroot
- envroot
- jdk13
- jdk13path
- jdk14
- jdk14path
- jdk15
- jdk15path
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- nativecvs STAR_NATIVECVS
- ojdk16
- ojdk16path
- pre PRE
- pro
- sourceroot
- stl
- sysbaseroot
+ ojdk16
+ ojdk16path
+ pro
+ sourceroot
+ sysbaseroot
}
}
-unxsols4
+unxsols4
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- }
- cap
+ cap
{
COPYALL TRUE
COPY_PACKED TRUE
@@ -1922,7 +1631,7 @@ unxsols4
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
@@ -1934,7 +1643,7 @@ unxsols4
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -1955,14 +1664,14 @@ unxsols4
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
- common0
+ common0
{
SOLAR_ENV_ROOT /so/env
SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
SOLAR_SOURCE_ROOT %DRIVE_O%
SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
}
- common1
+ common1
{
COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
DEVROOT %SOLAR_ENV_ROOT%
@@ -1982,7 +1691,7 @@ unxsols4
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
- common2
+ common2
{
BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
COM C52
@@ -2016,7 +1725,7 @@ unxsols4
TEMP /tmp
TMP /tmp
}
- compath
+ compath
{
COMPATH %STAR_COMPATH%
}
@@ -2030,22 +1739,7 @@ unxsols4
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk13
- {
- JAVA_HOME %JDK13PATH%
- JDKINC %JDK13PATH%/include:%JDK13PATH%/include/solaris
- JDKINCS -I%JDK13PATH%/include -I%JDK13PATH%/include/solaris
- JDKLIB %JDK13PATH%/jre/lib/sparc:%JDK13PATH%/lib:%JDK13PATH%/jre/lib/sparc/native_threads:%JDK13PATH%/jre/plugin/sparc:%JDK13PATH%/jre/lib/sparc/motif21
- JDKLIBS -L%JDK13PATH%/jre/lib/sparc -L%JDK13PATH%/lib -L%JDK13PATH%/jre/lib/sparc/native_threads -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/plugin/sparc -L%JDK13PATH%/jre/lib/sparc/motif21
- JDKPATH %JDK13PATH%/bin
- JDK_VERSION 131
- XCLASSPATH .:%JDK13PATH%/jre/lib/rt.jar:%JDK13PATH%/jre/lib/i18n.jar:%JDK13PATH%/lib/tools.jar:%JDK13PATH%/jre/lib/javaplugin.jar
- }
- jdk13path:0 if X%JDK_PATH%X != XX
- {
- SOLAR_JDK13PATH %JDK_PATH%
- }
- jdk14
+ jdk14
{
JAVA_HOME %JDK14PATH%
JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
@@ -2060,7 +1754,7 @@ unxsols4
{
SOLAR_JDK14PATH %JDK_PATH%
}
- jdk15
+ jdk15
{
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -2075,11 +1769,7 @@ unxsols4
{
SOLAR_JDK15PATH %JDK_PATH%
}
- nativecvs
- {
- *cvs %STAR_NATIVECVS%
- }
- ojdk16
+ ojdk16
{
JAVA_HOME %OJDK16PATH%
JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
@@ -2094,13 +1784,7 @@ unxsols4
{
SOLAR_OJDK16PATH %JDK_PATH%
}
- pre
- {
- ILIB %PRE%/lib:%ILIB%
- SOLARINC -I. -I%PRE%/inc %SOLARINC%
- SOLARLIB -L%PRE%/lib %SOLARLIB%
- }
- pro
+ pro
{
PROSWITCH -DPRODUCT
}
@@ -2109,44 +1793,34 @@ unxsols4
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
- sysbaseroot
+ sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
}
}
- extern
+ extern
{
- DIST_ROOT
- ENV_ROOT
- HOME
- JDK_PATH
- LM_LICENSE_FILE
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
- SYSBASE_ROOT
- USER
+ DIST_ROOT
+ ENV_ROOT
+ HOME
+ JDK_PATH
+ LM_LICENSE_FILE
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
+ SYSBASE_ROOT
+ USER
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
+ reset
{
- CLASSPATH
+ CLASSPATH
}
- script
+ script
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2154,10 +1828,10 @@ unxsols4
900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
}
- sh
+ sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -2175,55 +1849,38 @@ unxsols4
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- distroot
- envroot
- jdk13
- jdk13path
- jdk14
- jdk14path
- jdk15
- jdk15path
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- nativecvs STAR_NATIVECVS
- ojdk16
- ojdk16path
- pre PRE
- pro
- sourceroot
- stl
- sysbaseroot
+ ojdk16
+ ojdk16path
+ pro
+ sourceroot
+ sysbaseroot
}
}
-unxsolu4
+unxsolu4
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- }
- cap
+ cap
{
COPYALL TRUE
COPY_PACKED TRUE
@@ -2236,7 +1893,7 @@ unxsolu4
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
@@ -2248,7 +1905,7 @@ unxsolu4
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -2261,7 +1918,7 @@ unxsolu4
COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
DELIVER %PERL% %SOLARENV%/bin/deliver.pl
DMAKEROOT %SOLARENV%/inc/startup
- ENABLE_GNOMEVFS
+ ENABLE_GNOMEVFS
FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
@@ -2279,13 +1936,13 @@ unxsolu4
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
- common0
+ common0
{
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
}
- common1
+ common1
{
COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
DEVROOT %SOLAR_ENV_ROOT%
@@ -2302,7 +1959,7 @@ unxsolu4
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
USE_SYSTEM_STL YES
}
- common2
+ common2
{
BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
COM C52
@@ -2331,7 +1988,7 @@ unxsolu4
TEMP /tmp
TMP /tmp
}
- compath
+ compath
{
COMPATH %STAR_COMPATH%
}
@@ -2345,7 +2002,7 @@ unxsolu4
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk15
+ jdk15
{
JAVA_HOME %JDK15PATH%
JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
@@ -2360,17 +2017,7 @@ unxsolu4
{
SOLAR_JDK15PATH %JDK_PATH%
}
- nativecvs
- {
- *cvs %STAR_NATIVECVS%
- }
- pre
- {
- ILIB %PRE%/lib:%ILIB%
- SOLARINC -I. -I%PRE%/inc %SOLARINC%
- SOLARLIB -L%PRE%/lib %SOLARLIB%
- }
- pro
+ pro
{
PROSWITCH -DPRODUCT
}
@@ -2379,44 +2026,34 @@ unxsolu4
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
- sysbaseroot
+ sysbaseroot
{
SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
}
}
- extern
+ extern
{
- DIST_ROOT
- ENV_ROOT
- HOME
- JDK_PATH
- LM_LICENSE_FILE
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
- SYSBASE_ROOT
- USER
+ DIST_ROOT
+ ENV_ROOT
+ HOME
+ JDK_PATH
+ LM_LICENSE_FILE
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
+ SYSBASE_ROOT
+ USER
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot ca cap cax compath nativecvs common2 common:3 pro stl:1 stl:0 common jdk15 pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
+ reset
{
- CLASSPATH
+ CLASSPATH
}
- script
+ script
{
- csh
+ csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2424,10 +2061,10 @@ unxsolu4
900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
}
- sh
+ sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -2445,49 +2082,34 @@ unxsolu4
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- distroot
- envroot
- jdk15
- jdk15path
+ distroot
+ envroot
+ jdk15
+ jdk15path
l10n L10N_framework
- nativecvs STAR_NATIVECVS
- pre PRE
- pro
- sourceroot
- stl
- sysbaseroot
+ pro
+ sourceroot
+ sysbaseroot
}
}
-unxubti8
+unxubti8
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- }
- cap
+ cap
{
COPYALL TRUE
COPY_PACKED TRUE
@@ -2500,7 +2122,7 @@ unxubti8
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
@@ -2512,7 +2134,7 @@ unxubti8
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
@@ -2533,12 +2155,12 @@ unxubti8
SOLAR_JAVA TRUE
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
}
- common0
+ common0
{
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
}
- common1
+ common1
{
AGG_VERSION 2300
ANT /usr/share/ant/bin/ant
@@ -2562,7 +2184,6 @@ unxubti8
PAM_LINK NO
PERL /usr/bin/perl
PKGFORMAT deb
- PTHREAD_CFLAGS -DNPTL
SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -2579,7 +2200,7 @@ unxubti8
XINERAMA_LINK dynamic
ZIPDEP zipdep.pl
}
- common2
+ common2
{
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
@@ -2602,11 +2223,11 @@ unxubti8
TEMP /tmp
TMP /tmp
}
- compath
+ compath
{
COMPATH /usr/bin
}
- debug
+ debug
{
LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
}
@@ -2619,7 +2240,7 @@ unxubti8
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk15
+ jdk15
{
JAVA_HOME %OJDK16PATH%
JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -2633,11 +2254,7 @@ unxubti8
{
SOLAR_JDK15PATH %JDK_PATH%
}
- nativecvs
- {
- *cvs %STAR_NATIVECVS%
- }
- ojdk16
+ ojdk16
{
JAVA_HOME %OJDK16PATH%
JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
@@ -2651,17 +2268,11 @@ unxubti8
{
SOLAR_OJDK16PATH %JDK_PATH%
}
- pre
- {
- LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
- SOLARINC -I. -I%PRE%/inc %SOLARINC%
- SOLARLIB -L../lib -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
- }
- pro
+ pro
{
PROSWITCH -DPRODUCT
}
- shell
+ shell
{
USE_SHELL STAR_USE_SHELL
}
@@ -2670,109 +2281,82 @@ unxubti8
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
}
- extern
+ extern
{
- DIST_ROOT
- ENV_ROOT
- HOME
- JDK_PATH
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
- USER
+ DIST_ROOT
+ ENV_ROOT
+ HOME
+ JDK_PATH
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
+ USER
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk15 ojdk16 debug pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug
+ reset
{
- CLASSPATH
- COPYALL
- ENABLE_CRASHDUMP
+ CLASSPATH
+ COPYALL
+ ENABLE_CRASHDUMP
}
- restore
+ restore
{
- INCLUDE
+ INCLUDE
}
- script
+ script
{
- csh
+ csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
}
- sh
+ sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
- debug
- distroot
- envroot
- jdk15
+ bsclient
+ cap
+ cax
+ debug
+ distroot
+ envroot
+ jdk15
l10n L10N_framework
- nativecvs STAR_NATIVECVS
- ojdk16
- ojdk16path
- pre PRE
- pro
- sourceroot
+ ojdk16
+ ojdk16path
+ pro
+ sourceroot
}
}
-wntgcci1
+wntgcci1
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COMPATH %SOL_TMP%$/r$/MinGW
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
- PCLEAN_PATH %SOLARROOT%$/etw
- PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
- PSDK %SOL_TMP%$/r$/MinGW$/w32api
- SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
- }
- cap
+ cap
{
COMPATH %SOL_TMP%$/r$/MinGW
COPYALL TRUE
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+ NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
PCLEAN_PATH %SOLARROOT%$/etw
PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2783,11 +2367,12 @@ wntgcci1
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COMPATH %SOL_TMP%$/r$/MinGW
COPYALL FALSE
FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+ NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
PCLEAN_PATH %SOL_TMP%$/r$/etw
PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2798,7 +2383,7 @@ wntgcci1
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -2810,7 +2395,7 @@ wntgcci1
*r cd %SOLARROOT%
*s cd %SOLARVERSION%
*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
- BIG_SVX
+ BIG_SVX
COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
DMAKEROOT %SOLARENV%$/inc$/startup
@@ -2827,13 +2412,13 @@ wntgcci1
XCLASSPATH .
ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
}
- common0
+ common0
{
SOLAR_ENV_ROOT r:
SOLAR_SOURCE_ROOT o:
USE_SHELL bash
}
- common1
+ common1
{
COMPATH %SOLAR_ENV_ROOT%$/MinGW
# FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
@@ -2852,7 +2437,7 @@ wntgcci1
SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
}
- common2
+ common2
{
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
@@ -2881,7 +2466,7 @@ wntgcci1
SORT sort -T %TMP%
use_shl_versions TRUE
}
- compath
+ compath
{
COMPATH %STAR_COMPATH%
}
@@ -2895,26 +2480,7 @@ wntgcci1
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk13
- {
- HOMEDRIVE %DEVROOT%
- HOMEPATH $/jdk131
- JAVAHOME %JDK13PATH%
- JAVA_HOME %JDK13PATH%
- JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32
- JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
- JDKLIB %JDK13PATH%$/lib
- JDKLIBS %JDK13PATH%$/lib
- JDKPATH %JDK13PATH%$/bin
- JDK_VERSION 131
- JREPATH %JDK13PATH%$/jre$/bin$/hotspot
- XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar
- }
- jdk13path:0 if X%JDK_PATH%X != XX
- {
- SOLAR_JDK13PATH %JDK_PATH%
- }
- jdk14
+ jdk14
{
HOMEDRIVE %DEVROOT%
HOMEPATH $/jdk141
@@ -2933,7 +2499,7 @@ wntgcci1
{
SOLAR_JDK14PATH %JDK_PATH%
}
- jdk15
+ jdk15
{
HOMEDRIVE %DEVROOT%
HOMEPATH $/jdk151
@@ -2952,16 +2518,11 @@ wntgcci1
{
SOLAR_JDK15PATH %JDK_PATH%
}
- pre
- {
- ILIB %PRE%$/lib$:%ILIB%
- LIB %PRE%$/lib$:%LIB%
- }
- psdk
+ psdk
{
PSDK %STAR_PSDK%
}
- shell
+ shell
{
USE_SHELL STAR_USE_SHELL
}
@@ -2970,42 +2531,32 @@ wntgcci1
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
}
- extern
+ extern
{
- COMSPEC
- DIST_ROOT
- ENV_ROOT
- JDK_PATH
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
+ COMSPEC
+ DIST_ROOT
+ ENV_ROOT
+ JDK_PATH
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+ reset
{
- COPYALL
- NSIS_PATH
- SOLAR_ENV_ROOT
- WST
+ COPYALL
+ NSIS_PATH
+ SOLAR_ENV_ROOT
+ WST
}
- script
+ script
{
- csh
+ csh
{
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 $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl 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
@@ -3013,14 +2564,14 @@ wntgcci1
900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
}
- sh
+ sh
{
150: export MYENV_PATH=$PATH
160: export PATH=$SSX_PATH
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 $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
851: export SO_GEN_ERROR
@@ -3036,59 +2587,37 @@ wntgcci1
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- distroot
- envroot
- jdk13
- jdk13path
- jdk14
- jdk14path
- jdk15
- jdk15path
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- pre PRE
- pro
+ pro
psdk STAR_PSDK
shell STAR_USE_SHELL
- sourceroot
- stl
+ sourceroot
}
}
-wntmsci11
+wntmsci11
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT %SOURCE_ROOT_TMP%
SOURCE_ROOT_USED TRUE
}
- ca
- {
- COMPATH %SOL_TMP%$/r$/msvc8p
- COMPROOT %SOL_TMP%$/r$/msvc8p
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
- FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
- PCLEAN_PATH %SOLARROOT%$/etw
- PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
- PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
- SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
- }
- cap
+ cap
{
COMPATH %SOL_TMP%$/r$/msvc8p
COMPROOT %SOL_TMP%$/r$/msvc8p
@@ -3107,7 +2636,7 @@ wntmsci11
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- cax
+ cax
{
COMPATH %SOL_TMP%$/r$/msvc8p
COMPROOT %SOL_TMP%$/r$/msvc8p
@@ -3124,7 +2653,7 @@ wntmsci11
SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
}
- common
+ common
{
*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3136,7 +2665,7 @@ wntmsci11
*r cdd %SOLARROOT%
*s cdd %SOLARVERSION%
*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
- BIG_SVX
+ BIG_SVX
BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
@@ -3159,14 +2688,14 @@ wntmsci11
XCLASSPATH .
ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
}
- common0
+ common0
{
BS_ROOT n:
SOLAR_ENV_ROOT r:
SOLAR_SOURCE_ROOT o:
USE_SHELL 4nt
}
- common1
+ common1
{
COMPATH %SOLAR_ENV_ROOT%$/msvc8p
COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
@@ -3185,7 +2714,7 @@ wntmsci11
SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
}
- common2
+ common2
{
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
@@ -3217,7 +2746,7 @@ wntmsci11
SORT sort -T %TMP%
use_shl_versions TRUE
}
- compath
+ compath
{
COMPATH %STAR_COMPATH%
}
@@ -3231,26 +2760,7 @@ wntmsci11
{
SOLAR_ENV_ROOT %ENV_ROOT%
}
- jdk13
- {
- HOMEDRIVE %DEVROOT%
- HOMEPATH $/jdk131
- JAVAHOME %JDK13PATH%
- JAVA_HOME %JDK13PATH%
- JDKINC %JDK13PATH%$/include$:%JDK13PATH%$/include$/win32
- JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
- JDKLIB %JDK13PATH%$/lib
- JDKLIBS %JDK13PATH%$/lib
- JDKPATH %JDK13PATH%$/bin
- JDK_VERSION 131
- JREPATH %JDK13PATH%$/jre$/bin$/hotspot
- XCLASSPATH .$:%JDK13PATH%$/jre$/lib$/rt.jar$:%JDK13PATH%$/lib$/tools.jar
- }
- jdk13path:0 if X%JDK_PATH%X != XX
- {
- SOLAR_JDK13PATH %JDK_PATH%
- }
- jdk14
+ jdk14
{
HOMEDRIVE %DEVROOT%
HOMEPATH $/jdk141
@@ -3269,7 +2779,7 @@ wntmsci11
{
SOLAR_JDK14PATH %JDK_PATH%
}
- jdk15
+ jdk15
{
HOMEDRIVE %DEVROOT%
HOMEPATH $/jdk151
@@ -3288,16 +2798,11 @@ wntmsci11
{
SOLAR_JDK15PATH %JDK_PATH%
}
- pre
- {
- ILIB %PRE%$/lib$:%ILIB%
- LIB %PRE%$/lib$:%LIB%
- }
- psdk
+ psdk
{
PSDK %STAR_PSDK%
}
- shell
+ shell
{
use_shell STAR_USE_SHELL
}
@@ -3306,105 +2811,68 @@ wntmsci11
SOLAR_SOURCE_ROOT %SOURCE_ROOT%
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH %STL_ROOT%$/..$/lib
- SOLAR_STLPATH %STL_ROOT%
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
}
- extern
+ extern
{
- COMSPEC
- DIST_ROOT
- ENV_ROOT
- JDK_PATH
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- STL_ROOT
+ COMSPEC
+ DIST_ROOT
+ ENV_ROOT
+ JDK_PATH
+ LOCALINI
+ SOL_TMP
+ SOURCE_ROOT
}
- order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 ca cap cax psdk compath common2 jdk13path:0 jdk14path:0 jdk15path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 pre
- reset
+ order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+ reset
{
- COPYALL
- SOLAR_ENV_ROOT
- WST
+ COPYALL
+ SOLAR_ENV_ROOT
+ WST
}
- script
+ script
{
- post
+ post
{
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% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
260: set PATH=%MYENV_PATH
270: unset MYENV_PATH
400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- distroot
- envroot
- jdk13
- jdk13path
- jdk14
- jdk14path
- jdk15
- jdk15path
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- pre PRE
- pro
+ pro
psdk STAR_PSDK
shell STAR_USE_SHELL
- sourceroot
- stl
+ sourceroot
}
}
-wntmsci12
+wntmsci12
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
SOURCE_ROOT_USED TRUE
}
- ca
- {
- BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
- COMPATH %SOL_TMP%$/r$/msvc9p
- COMPROOT %SOL_TMP%$/r$/msvc9p
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
- ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
- FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
- F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
- PCLEAN_PATH %SOLARROOT%$/etw
- PERL %SOL_TMP%$/r$/%PERLDIR%
- PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
- SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
- }
- cap
+ cap
{
BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3416,6 +2884,7 @@ wntmsci12
ENV_TOOLS %SOL_TMP%$/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
PCLEAN_PATH %SOLARROOT%$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -3428,7 +2897,7 @@ wntmsci12
# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
}
- cax
+ cax
{
BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3438,6 +2907,7 @@ wntmsci12
ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
FSDK %COMPATH%$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+ NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
PCLEAN_PATH %SOL_TMP%$/r$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -3449,7 +2919,7 @@ wntmsci12
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
}
- common
+ common
{
*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3462,7 +2932,7 @@ wntmsci12
*s cd %SOLARVERSION%
*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
- BIG_SVX
+ BIG_SVX
BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
@@ -3507,7 +2977,7 @@ wntmsci12
{
PERL perl
}
- common1
+ common1
{
COMPATH %SOLAR_ENV_ROOT%$/msvc9p
COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
@@ -3530,7 +3000,7 @@ wntmsci12
# TEMP $dp(%TEMP%)
# TMP $dp(%TMP%)
}
- common2
+ common2
{
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
@@ -3569,7 +3039,7 @@ wntmsci12
{
SHIPDRIVE %BS_ROOT%$/ship$/install
}
- compath
+ compath
{
COMPATH $dp(%STAR_COMPATH%)
}
@@ -3583,26 +3053,7 @@ wntmsci12
{
SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
}
- jdk13
- {
-# HOMEDRIVE %DEVROOT%
-# HOMEPATH $/jdk131
- JAVAHOME %JDK13PATH%
- JAVA_HOME %JDK13PATH%
- JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
- JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
- JDKLIB %JDK13PATH%$/lib
- JDKLIBS %JDK13PATH%$/lib
- JDKPATH %JDK13PATH%$/bin
- JDK_VERSION 131
- JREPATH %JDK13PATH%$/jre$/bin$/hotspot
- XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar
- }
- jdk13path:0 if X%JDK_PATH%X != XX
- {
- SOLAR_JDK13PATH $dp(%JDK_PATH%)
- }
- jdk14
+ jdk14
{
# HOMEDRIVE %DEVROOT%
# HOMEPATH $/jdk141
@@ -3621,7 +3072,7 @@ wntmsci12
{
SOLAR_JDK14PATH $dp(%JDK_PATH%)
}
- jdk15
+ jdk15
{
# HOMEDRIVE %DEVROOT%
# HOMEPATH $/jdk151
@@ -3640,11 +3091,7 @@ wntmsci12
{
SOLAR_JDK15PATH $dp(%JDK_PATH%)
}
- nojava
- {
- DISABLE_JAVA TRUE
- }
- ojdk16
+ ojdk16
{
# HOMEDRIVE %DEVROOT%
# HOMEPATH $/openjdk-6-b08-windows-i586
@@ -3662,16 +3109,11 @@ wntmsci12
{
SOLAR_OJDK16PATH $dp(%JDK_PATH%)
}
- pre
- {
- ILIB %PRE%$/lib;%ILIB%
- LIB %PRE%$/lib;%LIB%
- }
- pro
+ pro
{
RES_ENUS TRUE
}
- psdk
+ psdk
{
PSDK $dp(%STAR_PSDK%)
}
@@ -3680,59 +3122,49 @@ wntmsci12
SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib)
- SOLAR_STLPATH $dp(%STL_ROOT%)
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
- tmp
+ tmp
{
SOL_TMP $dp(%SOL_TMP_DIR%)
}
}
- extern
+ extern
{
- COMSPEC
- DIST_ROOT
- ENV_ROOT
- JDK_PATH
- LOCALINI
+ COMSPEC
+ DIST_ROOT
+ ENV_ROOT
+ JDK_PATH
+ LOCALINI
OSTYPE
- $dp(SOL_TMP)
- $dp(SOURCE_ROOT)
- $dp(STL_ROOT)
+ $dp(SOL_TMP)
+ $dp(SOURCE_ROOT)
$dp(TMP)
$dp(TEMP)
}
- order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
- reset
- {
- COPYALL
- CXX_X64_BINARY
- DB2IMP
- GCRINC
- GCRLIB
- GCRPATH
- LIBMGR_X64_BINARY
- LINK_X64_BINARY
- NSIS_PATH
- OLD_CHAOS
+ order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+ reset
+ {
+ COPYALL
+ CXX_X64_BINARY
+ DB2IMP
+ GCRINC
+ GCRLIB
+ GCRPATH
+ LIBMGR_X64_BINARY
+ LINK_X64_BINARY
+ NSIS_PATH
+ OLD_CHAOS
PERLDIR
- SOLAR_ENV_ROOT
- TFDEF
- TFDIR
- WST
+ SOLAR_ENV_ROOT
+ TFDEF
+ TFDIR
+ WST
}
- script
+ script
{
sh
{
400: if [ $COPYALL ]; then
- 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -3750,68 +3182,40 @@ wntmsci12
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- distroot
- envroot
- jdk13
- jdk13path
- jdk14
- jdk14path
- jdk15
- jdk15path
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- nojava
- ojdk16
- ojdk16path
- pre PRE
- pro
+ ojdk16
+ ojdk16path
+ pro
psdk STAR_PSDK
shell STAR_USE_SHELL
- sourceroot
- stl
+ sourceroot
tmp SOL_TMP_DIR
}
}
-wntmsci13
+wntmsci13
{
- environment
+ environment
{
- bs_sourceroot
+ bs_sourceroot
{
SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
SOURCE_ROOT_USED TRUE
}
- ca
- {
- BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
- COMPATH %SOL_TMP%$/r$/msvc9p
- COMPROOT %SOL_TMP%$/r$/msvc9p
- COPYALL TRUE
- DEVROOT %SOL_TMP%$/r
- DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
- ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
- FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
- F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
- PCLEAN_PATH %SOLARROOT%$/etw
- PERL %SOL_TMP%$/r$/%PERLDIR%
- PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
- SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
- }
- cap
+ cap
{
BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3823,6 +3227,7 @@ wntmsci13
ENV_TOOLS %SOL_TMP%$/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
PCLEAN_PATH %SOLARROOT%$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -3835,7 +3240,7 @@ wntmsci13
# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
}
- cax
+ cax
{
BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
COMPATH %SOL_TMP%$/r$/msvc9p
@@ -3845,6 +3250,7 @@ wntmsci13
ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
FSDK %COMPATH%$/Sdk$/v3.5
F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+ NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
PCLEAN_PATH %SOL_TMP%$/r$/etw
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -3856,7 +3262,7 @@ wntmsci13
SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
}
- common
+ common
{
*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
@@ -3869,7 +3275,7 @@ wntmsci13
*s cd %SOLARVERSION%
*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
- BIG_SVX
+ BIG_SVX
BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
@@ -3914,7 +3320,7 @@ wntmsci13
{
PERL perl
}
- common1
+ common1
{
COMPATH %SOLAR_ENV_ROOT%$/msvc9p
COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
@@ -3937,7 +3343,7 @@ wntmsci13
# TEMP $dp(%TEMP%)
# TMP $dp(%TMP%)
}
- common2
+ common2
{
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
@@ -3976,7 +3382,7 @@ wntmsci13
{
SHIPDRIVE %BS_ROOT%$/ship$/install
}
- compath
+ compath
{
COMPATH $dp(%STAR_COMPATH%)
}
@@ -3990,26 +3396,7 @@ wntmsci13
{
SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
}
- jdk13
- {
-# HOMEDRIVE %DEVROOT%
-# HOMEPATH $/jdk131
- JAVAHOME %JDK13PATH%
- JAVA_HOME %JDK13PATH%
- JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32
- JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32
- JDKLIB %JDK13PATH%$/lib
- JDKLIBS %JDK13PATH%$/lib
- JDKPATH %JDK13PATH%$/bin
- JDK_VERSION 131
- JREPATH %JDK13PATH%$/jre$/bin$/hotspot
- XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar
- }
- jdk13path:0 if X%JDK_PATH%X != XX
- {
- SOLAR_JDK13PATH $dp(%JDK_PATH%)
- }
- jdk14
+ jdk14
{
# HOMEDRIVE %DEVROOT%
# HOMEPATH $/jdk141
@@ -4028,7 +3415,7 @@ wntmsci13
{
SOLAR_JDK14PATH $dp(%JDK_PATH%)
}
- jdk15
+ jdk15
{
# HOMEDRIVE %DEVROOT%
# HOMEPATH $/jdk151
@@ -4047,11 +3434,7 @@ wntmsci13
{
SOLAR_JDK15PATH $dp(%JDK_PATH%)
}
- nojava
- {
- DISABLE_JAVA TRUE
- }
- ojdk16
+ ojdk16
{
# HOMEDRIVE %DEVROOT%
# HOMEPATH $/openjdk-6-b08-windows-i586
@@ -4069,16 +3452,11 @@ wntmsci13
{
SOLAR_OJDK16PATH $dp(%JDK_PATH%)
}
- pre
- {
- ILIB %PRE%$/lib;%ILIB%
- LIB %PRE%$/lib;%LIB%
- }
- pro
+ pro
{
RES_ENUS TRUE
}
- psdk
+ psdk
{
PSDK $dp(%STAR_PSDK%)
}
@@ -4087,59 +3465,49 @@ wntmsci13
SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
SOURCE_ROOT_USED TRUE
}
- stl:0 IF X%STL_ROOT%X != XX
- {
- SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib)
- SOLAR_STLPATH $dp(%STL_ROOT%)
- }
- stl:1 IF X%STL_ROOT%X == XX
- {
- SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl
- }
- tmp
+ tmp
{
SOL_TMP $dp(%SOL_TMP_DIR%)
}
}
- extern
+ extern
{
- COMSPEC
- DIST_ROOT
- ENV_ROOT
- JDK_PATH
- LOCALINI
+ COMSPEC
+ DIST_ROOT
+ ENV_ROOT
+ JDK_PATH
+ LOCALINI
OSTYPE
- $dp(SOL_TMP)
- $dp(SOURCE_ROOT)
- $dp(STL_ROOT)
+ $dp(SOL_TMP)
+ $dp(SOURCE_ROOT)
$dp(TMP)
$dp(TEMP)
}
- order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre
- reset
- {
- COPYALL
- CXX_X64_BINARY
- DB2IMP
- GCRINC
- GCRLIB
- GCRPATH
- LIBMGR_X64_BINARY
- LINK_X64_BINARY
- NSIS_PATH
- OLD_CHAOS
+ order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+ reset
+ {
+ COPYALL
+ CXX_X64_BINARY
+ DB2IMP
+ GCRINC
+ GCRLIB
+ GCRPATH
+ LIBMGR_X64_BINARY
+ LINK_X64_BINARY
+ NSIS_PATH
+ OLD_CHAOS
PERLDIR
- SOLAR_ENV_ROOT
- TFDEF
- TFDIR
- WST
+ SOLAR_ENV_ROOT
+ TFDEF
+ TFDIR
+ WST
}
- script
+ script
{
sh
{
400: if [ $COPYALL ]; then
- 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -4157,32 +3525,26 @@ wntmsci13
882: fi
}
}
- switches
+ switches
{
bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- ca
- cap
- cax
+ bsclient
+ cap
+ cax
compath STAR_COMPATH
- distroot
- envroot
- jdk13
- jdk13path
- jdk14
- jdk14path
- jdk15
- jdk15path
+ distroot
+ envroot
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
l10n L10N_framework
- nojava
- ojdk16
- ojdk16path
- pre PRE
- pro
+ ojdk16
+ ojdk16path
+ pro
psdk STAR_PSDK
shell STAR_USE_SHELL
- sourceroot
- stl
+ sourceroot
tmp SOL_TMP_DIR
}
}
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index a862ec39897f..19f6e30ad175 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -100,9 +100,7 @@ $(USE_SHL1VERSIONMAP) .PHONY:
.ENDIF # "$(SHL1VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
$(USE_SHL1VERSIONMAP): \
$(SHL1OBJS)\
@@ -139,9 +137,7 @@ $(USE_SHL1VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL1VERSIONMAP)"!=""
USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS)
@@ -189,11 +185,7 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL1SONAME=$(SONAME_SWITCH)$(SHL1TARGETN:f)
-.ELSE
SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -654,9 +646,7 @@ $(USE_SHL2VERSIONMAP) .PHONY:
.ENDIF # "$(SHL2VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
$(USE_SHL2VERSIONMAP): \
$(SHL2OBJS)\
@@ -693,9 +683,7 @@ $(USE_SHL2VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL2VERSIONMAP)"!=""
USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS)
@@ -743,11 +731,7 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL2SONAME=$(SONAME_SWITCH)$(SHL2TARGETN:f)
-.ELSE
SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -1208,9 +1192,7 @@ $(USE_SHL3VERSIONMAP) .PHONY:
.ENDIF # "$(SHL3VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
$(USE_SHL3VERSIONMAP): \
$(SHL3OBJS)\
@@ -1247,9 +1229,7 @@ $(USE_SHL3VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL3VERSIONMAP)"!=""
USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS)
@@ -1297,11 +1277,7 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL3SONAME=$(SONAME_SWITCH)$(SHL3TARGETN:f)
-.ELSE
SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -1762,9 +1738,7 @@ $(USE_SHL4VERSIONMAP) .PHONY:
.ENDIF # "$(SHL4VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
$(USE_SHL4VERSIONMAP): \
$(SHL4OBJS)\
@@ -1801,9 +1775,7 @@ $(USE_SHL4VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL4VERSIONMAP)"!=""
USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS)
@@ -1851,11 +1823,7 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL4SONAME=$(SONAME_SWITCH)$(SHL4TARGETN:f)
-.ELSE
SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -2316,9 +2284,7 @@ $(USE_SHL5VERSIONMAP) .PHONY:
.ENDIF # "$(SHL5VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
$(USE_SHL5VERSIONMAP): \
$(SHL5OBJS)\
@@ -2355,9 +2321,7 @@ $(USE_SHL5VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL5VERSIONMAP)"!=""
USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS)
@@ -2405,11 +2369,7 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL5SONAME=$(SONAME_SWITCH)$(SHL5TARGETN:f)
-.ELSE
SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -2870,9 +2830,7 @@ $(USE_SHL6VERSIONMAP) .PHONY:
.ENDIF # "$(SHL6VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
$(USE_SHL6VERSIONMAP): \
$(SHL6OBJS)\
@@ -2909,9 +2867,7 @@ $(USE_SHL6VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL6VERSIONMAP)"!=""
USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS)
@@ -2959,11 +2915,7 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL6SONAME=$(SONAME_SWITCH)$(SHL6TARGETN:f)
-.ELSE
SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -3424,9 +3376,7 @@ $(USE_SHL7VERSIONMAP) .PHONY:
.ENDIF # "$(SHL7VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
$(USE_SHL7VERSIONMAP): \
$(SHL7OBJS)\
@@ -3463,9 +3413,7 @@ $(USE_SHL7VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL7VERSIONMAP)"!=""
USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS)
@@ -3513,11 +3461,7 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL7SONAME=$(SONAME_SWITCH)$(SHL7TARGETN:f)
-.ELSE
SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -3978,9 +3922,7 @@ $(USE_SHL8VERSIONMAP) .PHONY:
.ENDIF # "$(SHL8VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
$(USE_SHL8VERSIONMAP): \
$(SHL8OBJS)\
@@ -4017,9 +3959,7 @@ $(USE_SHL8VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL8VERSIONMAP)"!=""
USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS)
@@ -4067,11 +4007,7 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL8SONAME=$(SONAME_SWITCH)$(SHL8TARGETN:f)
-.ELSE
SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -4532,9 +4468,7 @@ $(USE_SHL9VERSIONMAP) .PHONY:
.ENDIF # "$(SHL9VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
$(USE_SHL9VERSIONMAP): \
$(SHL9OBJS)\
@@ -4571,9 +4505,7 @@ $(USE_SHL9VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL9VERSIONMAP)"!=""
USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS)
@@ -4621,11 +4553,7 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL9SONAME=$(SONAME_SWITCH)$(SHL9TARGETN:f)
-.ELSE
SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -5086,9 +5014,7 @@ $(USE_SHL10VERSIONMAP) .PHONY:
.ENDIF # "$(SHL10VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
$(USE_SHL10VERSIONMAP): \
$(SHL10OBJS)\
@@ -5125,9 +5051,7 @@ $(USE_SHL10VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL10VERSIONMAP)"!=""
USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS)
@@ -5175,11 +5099,7 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL10SONAME=$(SONAME_SWITCH)$(SHL10TARGETN:f)
-.ELSE
SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index e63b590a2e9e..4d40600ba368 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -243,7 +243,7 @@ SFXDEBUGLIB=
FWELIB=-lfwe$(DLLPOSTFIX)
FWILIB=-lfwi$(DLLPOSTFIX)
SVXCORELIB=-lsvxcore$(DLLPOSTFIX)
-SVXMSFILTERLIB=-lsvxmsfilter$(DLLPOSTFIX)
+MSFILTERLIB=-lmsfilter$(DLLPOSTFIX)
SVXLIB=-lsvx$(DLLPOSTFIX)
BASCTLLIB=-lbasctl$(DLLPOSTFIX)
BASICIDELIB=-lybctl
@@ -271,10 +271,11 @@ JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
JVMACCESSLIB = -ljvmaccess$(COMID)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
CPPUNITLIB = -lcppunit$(DLLPOSTFIX)
+TESTSHL2LIB = -ltestshl2$(DLLPOSTFIX)
.IF "$(SYSTEM_LIBXSLT)"=="YES"
XSLTLIB=$(LIBXSLT_LIBS)
.ELSE
-XSLTLIB=-lxslt $(ZLIB3RDLIB) $(LIBXML2LIB)
+XSLTLIB=-lxslt $(LIBXML2LIB)
.ENDIF
.IF "$(GUI)$(COM)"=="WNTGCC"
JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
@@ -429,7 +430,7 @@ VBAHELPERLIB=vbahelper.lib
TKTLIB=tkt.lib
SJLIB=sj.lib
SVXCORELIB=isvxcore.lib
-SVXMSFILTERLIB=isvxmsfilter.lib
+MSFILTERLIB=imsfilter.lib
SVXLIB=isvx.lib
BASCTLLIB=basctl.lib
BASICIDELIB=ybctl.lib
@@ -478,7 +479,8 @@ PKGCHKLIB=ipkgchk.lib
HELPLINKERLIB=ihelplinker.lib
JVMACCESSLIB = ijvmaccess.lib
CPPUNITLIB = cppunit.lib
-XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB)
+TESTSHL2LIB = testshl2.lib
+XSLTLIB = libxslt.lib $(LIBXML2LIB)
.IF "$(GUI)"=="OS2"
REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib
.ELSE
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a7c1a50e911b..c81283b50ebb 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m67(Build:9466)
-BUILD=9466
-LAST_MINOR=m67
+RSCREVISION=300m70(Build:9478)
+BUILD=9478
+LAST_MINOR=m70
SOURCEVERSION=DEV300
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 30bb91599903..4a7f6aeae28c 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -114,6 +114,7 @@ pl \
ps \
pt \
pt-BR \
+ro \
ru \
rw \
sat \
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 7b8e6f2aaadd..991309d6de6e 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -160,7 +160,7 @@ $(SLO)/precompiled_ex.% .PHONY:
$(SLO)/%.obj : %.cxx
@echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
-.IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
+.IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" )
# just a helper var
@noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
# cleanup first
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 8d068bd28c04..6110498edd29 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -191,7 +191,6 @@ CDEFSPROF=
CDEFSDEBUG=
CDEFSDBGUTIL=
CDEFSOPT=
-HDEFS=
CFLAGS=
CFLAGSCALL=
@@ -849,12 +848,7 @@ LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf
.ENDIF # "$(LOCALIZESDF)"==""
.ENDIF # "$(WITH_LANG)"!=""
-.IF "$(PRE)"==""
-#JARDIR=$(CLASSDIR)
JARDIR=$(OUT)/class
-.ELSE
-JARDIR=$(PRE)/class
-.ENDIF
# needs to be expanded!!!
@@ -897,9 +891,6 @@ UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD)
UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER)
-.IF "$(PRE)"!=""
-UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC)
-.ENDIF
UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR)
CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
@@ -928,7 +919,6 @@ CDEFSDEBUG=-DDEBUG
.ENDIF
CDEFSDBGUTIL=-DDBG_UTIL
CDEFSOPT=-DOPTIMIZE
-HDEFS=-D:$(GUI) -D:$(COM)
MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/)
MKDEPALLINC=$(SOLARINC:s/-I/ -I/)
@@ -1136,11 +1126,8 @@ RSCDEFS+=-DDBG_UTIL
.IF "$(product)"!=""
CDEFS+= -DPRODUCT -DNDEBUG
-HDEFS+= -D:PRODUCT
RSCDEFS+= -DPRODUCT
-CDEFS+=-DPRODUCT_FULL
-HDEFS+=-D:PRODUCT_FULL
-RSCDEFS+= -DPRODUCT_FULL -DNDEBUG
+RSCDEFS+= -DNDEBUG
.ENDIF
.IF "$(DBG_LEVEL)"!=""
@@ -1231,26 +1218,9 @@ STDLIB+=$(FILLUPARC)
STDSHL+=$(FILLUPARC)
.ENDIF # "$(FILUPARC)"!=""
-.IF "$(DISABLE_JAVA)"==""
.IF "$(SOLAR_JAVA)"!=""
CDEFS+=$(JAVADEF)
.ENDIF # "$(SOLAR_JAVA)"!=""
-.ELSE # "$(DISABLE_JAVA)"==""
-SOLAR_JAVA!:=
-.EXPORT : SOLAR_JAVA
-.IF "$(JDKPATH)"!=""
-environment_confusion:
- @echo ----------------------------------------------------------
- @echo -
- @echo - Error!
- @echo -
- @echo - $$JDKPATH and $$DISABLE_JAVA are set. this will lead
- @echo - to impropper results.
- @echo -
- @echo ----------------------------------------------------------
- force_dmake_to_error
-.ENDIF # "$(JDKPATH)"!=""
-.ENDIF # "$(DISABLE_JAVA)"==""
.INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 07853e84862e..c114458617de 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -29,7 +29,7 @@
#define LG_D // generate always german version
#endif
-#define VER_FIRSTYEAR 2008
+#define VER_FIRSTYEAR 2010
#if defined(OS2)
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index eb4b35008e8a..2330aa64e49b 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -55,9 +55,6 @@ target_empty=warn_target_empty
INCEXT*=.
INCPRE*=.
INCPOST*=.
-.IF "$(PRE)"!=""
-ENVINCPRE+=-I$(PRE)/inc
-.ENDIF # "$(PRE)"!=""
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
UNOINCLUDES=$(SOLARINCDIR)/offuh
.ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
@@ -66,9 +63,9 @@ SOLARINC+=$(JDKINCS)
INCLUDE:=
.EXPORT : INCLUDE
.IF "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
.ELSE # "$(PRJINC)"!=""
-INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
+INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST)
.ENDIF # "$(PRJINC)"!=""
INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
.EXPORT : LIB
@@ -1259,9 +1256,6 @@ CPPUMAKERFLAGS*=-L
.IF "$(UNOTYPES)" != ""
# makeing all in one
.DIRCACHE=no
-.IF "$(ENVINCPRE)"!=""
-MKDEPFLAGS+=-I:$(ENVINCPRE)
-.ENDIF # "$(ENVINCPRE))"!=""
.IF "$(OBJFILES)"!=""
$(OBJFILES) : $(UNOUCRTARGET)
.ENDIF # "$(OBJFILES)"!=""
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
new file mode 100644
index 000000000000..a8a33051f0fc
--- /dev/null
+++ b/solenv/inc/tg_help.mk
@@ -0,0 +1,86 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.pmk,v $
+#
+# $Revision: 1.25 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# to make it usable with special lang selection of
+# helpcontent2
+
+aux_alllangiso*:=$(alllangiso)
+
+SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
+HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
+
+ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
+
+$(HLANGXHPFILES) : $$(@:d)thisdir.created
+
+$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
+ @$(TOUCH) $@
+# internal dependencies not sufficient to trigger merge?
+# @$(NULL)
+
+
+$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
+.IF "$(WITH_LANG)"!=""
+ $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+.ELSE # "$(WITH_LANG)"!=""
+ cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
+.ENDIF # "$(WITH_LANG)"!=""
+.IF "$(OS)"=="SOLARIS"
+ @$(ECHONL) " "
+.ELSE # "$(OS)"=="SOLARIS"
+ @$(ECHONL)
+.ENDIF # "$(OS)"=="SOLARIS"
+
+$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES)
+ @$(TOUCH) $@
+
+# urks - dmake mixes up operators and strings :-(
+.IF "$(HLANGXHPFILES:s/defined/xxx/)"!=""
+
+.IF "$(HELPTRANSPHONY)"!=""
+$(COMMONMISC)$/$(TARGET).done .PHONY :
+.ELSE # "$(HELPTRANSPHONY)"!=""
+
+$(COMMONMISC)$/$(TARGET).done : makefile.mk
+.IF "$(WITH_LANG)"!=""
+$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF)
+.ENDIF # "$(WITH_LANG)"!=""
+.ENDIF # "$(HELPTRANSPHONY)"!=""
+.ENDIF # "$(HLANGXHPFILES)"!=""
+
+optix: $(COMMONMISC)$/$(TARGET).done
+ @echo done
+
+%.created :
+ @@-$(MKDIRHIER) $(@:d)
+ @$(TOUCH) $@
+
+
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 496e95926981..8cb6653f334e 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -133,9 +133,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY:
.ENDIF # "$(SHL$(TNR)VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
$(USE_SHL$(TNR)VERSIONMAP): \
$(SHL$(TNR)OBJS)\
@@ -172,9 +170,7 @@ $(USE_SHL$(TNR)VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
@@ -222,11 +218,7 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL$(TNR)SONAME=$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)
-.ELSE
SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index bb5a4864484d..36e5cd70447f 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -151,18 +151,6 @@
.INCLUDE : unxfbsd.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
-.INCLUDE : unxirxm3.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCIRIXM"
-.INCLUDE : unxirgm.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "C710IRIXM"
-.INCLUDE : unxirxm.mk
-.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
.INCLUDE : unxmacxp.mk
.ENDIF
diff --git a/solenv/inc/unxirgm.mk b/solenv/inc/unxirgm.mk
deleted file mode 100644
index b3abfb76d2c3..000000000000
--- a/solenv/inc/unxirgm.mk
+++ /dev/null
@@ -1,163 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unxirgm.mk,v $
-#
-# $Revision: 1.15 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# Makefile for IRIX/mips using GNU compilers 2.95.2 for n32 ABI
-ASM=
-AFLAGS=
-
-SOLAR_JAVA=TRUE
-JAVADEF=-DSOLAR_JAVA
-#JAVAFLAGSDEBUG=-g
-
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC= gcc
-CXX= g++
-CFLAGS=-c
-CDEFS+= -D_PTHREADS -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSCXX=$(ARCH_FLAGS)
-PICSWITCH:=-fpic
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-w
-CFLAGSWALLCC=-Wall
-CFLAGSWERRCC=-Werror
-
-# exception flags
-CFLAGSEXCEPTIONS=-fexceptions
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
-
-#
-# To use the map files, you need to have a gcc_specs file which contains:
-# *linker:
-# /path/to/bin/ld.sh
-# where ld.sh is a wrapper script that does some conversion of the
-# map files on the fly.
-#
-LINK= g++
-LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved
-LINKVERSIONMAPFLAG= -Wl,-exports_file
-
-LINKFLAGSAPPGUI= $(THREADLIB)
-LINKFLAGSAPPCUI= $(THREADLIB)
-LINKFLAGSSHLGUI= $(THREADLIB)
-LINKFLAGSSHLCUI= $(THREADLIB)
-
-LINKFLAGSAPPGUI+= -Wl,-multigot
-LINKFLAGSAPPCUI+= -Wl,-multigot
-LINKFLAGSSHLGUI+= -shared
-LINKFLAGSSHLCUI+= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG= -g
-LINKFLAGSOPT=
-
-LINKFLAGSSHLGUI += -Wl,-Bsymbolic
-LINKFLAGSSHLCUI += -Wl,-Bsymbolic
-
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-SONAME_SWITCH = -Wl,-soname -Wl,
-
-# Sequence of libraries DOES matter!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lgcc -lc -lm
-STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc
-THREADLIB= -lpthread
-
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST= -lstlport
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST= -lstlport_gcc
-.ENDIF
-
-LIBMGR= ar
-LIBFLAGS= -r
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC= irc
-RCFLAGS= -fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX= im
-DLLPRE= lib
-DLLPOST= .so
-
-
-LDUMP=c++filt
diff --git a/solenv/inc/unxirxm.mk b/solenv/inc/unxirxm.mk
deleted file mode 100644
index 80aae3d5b382..000000000000
--- a/solenv/inc/unxirxm.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unxirxm.mk,v $
-#
-# $Revision: 1.10 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mak-file for IRIX/mips
-ASM=
-AFLAGS=
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-#
-# Zu den Compilerflags:
-#
-# -ptused : instantisiert Templates, wenn sie benutzt werden.
-# Der Schalter wurde neu eingefuegt, weil sich eine
-# statische Memberfunktion nicht instantisieren liess.
-# (ts&sdo/10.06.98)
-#
-CC= cc -KPIC -c -n32
-CXX= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523
-CDEFS+=-D_PTHREADS
-CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-# 1009 ...nested comment is not allowed...
-# 1021 ...type qualifiers are meaningless in this declaration...
-# 1107 ...signed bit field of length 1...
-# 1110 ...statement not reached...
-# 1155 ...unrecognized #pragma...
-# 1171 ...expression has no effect...
-# 1183 ...comparison of unsigned integer with zero...
-# 1185 ...enumerated type mixed with another type...
-# 1188 ...type qualifier is meaningless on cast type...
-# 1233 ...explicit type is missing ("int" assumed)...
-# 1234 ...access control not specified...
-# 1257 ...NULL reference is not allowed...
-# 1440 ...initial value of reference to non-const must be an lvalue...
-# 1516 ...pointless comparison of unsigned integer with a negative constant
-# 1681 ...virtual function override intended...
-# 1682 ...is only partially overridden in class...
-CFLAGSCC= -Xcpluscomm -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
-CFLAGSCXX= -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=
-CFLAGSSLOCUIMT=
-CFLAGSPROF=
-CFLAGSDEBUG= -g
-CFLAGSDBGUTIL=
-CFLAGSOPT= -O
-CFLAGSNOOPT=
-CFLAGSOUTOBJ= -o
-
-STATIC= -B static
-DYNAMIC= -B dynamic
-
-#
-# Zu den Linkflags:
-#
-# -update_registry <file> : fuer das Linken mehrerer shared Libraries
-# erforderlich.
-# **FUER LOKALE STAENDE FEHLT Z.ZT. EIN GULTIGER
-# MECHANISMUS**
-#
-LINK= CC
-LINKFLAGS=
-LINKFLAGSAPPGUI=-n32 -multigot
-LINKFLAGSSHLGUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
-LINKFLAGSAPPCUI=-n32 -multigot
-LINKFLAGSSHLCUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-# Reihenfolge der Libraries NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-# STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm
-# STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
-THREADLIB= -lpthread
-
-LIBMGR= ar
-LIBFLAGS= -r
-# LIBEXT= .so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC= irc
-RCFLAGS= -fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX= im
-.IF "$(WORK_STAMP)"=="MIX364"
-DLLPOSTFIX=
-.ENDIF
-DLLPRE= lib
-DLLPOST= .so
-
-
-LDUMP=
-
-
-# --------------------------
-# AUS DEM ALTEN ENVIRONMENT:
-# --------------------------
-#
-# Linken einer statischen Library:
-# ar -r ...
-#
-# Linken einer shared Library:
-# CC -B symbolic -soname <...> -B dynamic -shared -n32 -multigot
-# -update_registry <...> ...
-#
-# Linken einer Applikation mit statischen Librarys:
-# CC -B static ...
-#
-# Linken einer Applikation mit stared Librarys:
-# CC -n32 -multigot ...
-#
-
diff --git a/solenv/inc/unxirxm3.mk b/solenv/inc/unxirxm3.mk
deleted file mode 100644
index 8d24d2c54032..000000000000
--- a/solenv/inc/unxirxm3.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unxirxm3.mk,v $
-#
-# $Revision: 1.12 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# Makefile for IRIX/mips
-ASM=
-AFLAGS=
-
-SOLAR_JAVA*=TRUE
-JAVADEF=-DSOLAR_JAVA
-#JAVAFLAGSDEBUG=-g
-
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC= cc
-CXX= CC
-CFLAGS= -c
-CDEFS+= -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSCXX= -LANG:ansi-for-init-scope=OFF -LANG:std=ON -LANG:libc_in_namespace_std=ON $(ARCH_FLAGS)
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=-KPIC
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=-KPIC
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-w
-CFLAGSWALLCC=-fullwarn
-CFLAGSWERRCC=
-
-# exception flags
-CFLAGSEXCEPTIONS=-LANG:exceptions=ON
-CFLAGS_NO_EXCEPTIONS=-LANG:exceptions=OFF
-#CFLAGS_NO_EXCEPTIONS=
-
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
-
-#
-# To use the map files, you need to have a gcc_specs file which contains:
-# *linker:
-# /path/to/bin/ld.sh
-# where ld.sh is a wrapper script that does some conversion of the
-# map files on the fly.
-#
-LINK= CC
-LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved
-LINKVERSIONMAPFLAG= -Wl,-exports_file
-
-LINKFLAGSAPPGUI= $(THREADLIB)
-LINKFLAGSAPPCUI= $(THREADLIB)
-LINKFLAGSSHLGUI= $(THREADLIB)
-LINKFLAGSSHLCUI= $(THREADLIB)
-
-LINKFLAGSAPPGUI+= -Wl,-multigot
-LINKFLAGSAPPCUI+= -Wl,-multigot
-LINKFLAGSSHLGUI+= -shared
-LINKFLAGSSHLCUI+= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG= -g
-LINKFLAGSOPT=
-
-LINKFLAGSSHLGUI += -Wl,-Bsymbolic
-LINKFLAGSSHLCUI += -Wl,-Bsymbolic
-
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-SONAME_SWITCH = -Wl,-soname -Wl,
-
-# Sequence of libraries DOES matter!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
-STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm
-STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
-STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lc
-THREADLIB= -lpthread
-
-#LIBSTLPORT=$(DYNAMIC) -lstlport_mipspro
-LIBSTLPORT=$(DYNAMIC)
-LIBSTLPORTST=
-#LIBSTLPORTST= -lstlport_mipspro
-
-LIBMGR= ar
-LIBFLAGS= -r
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC= irc
-RCFLAGS= -fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX= im
-DLLPRE= lib
-DLLPOST= .so
-
-
-LDUMP=c++filt
-
-
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index a79d3e47c6cf..b6c8f798a5f9 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -208,12 +208,14 @@ LINKFLAGS += -Wl,-zdynsort
.ENDIF
# libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed
+STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
# libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed
+STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
+X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
+
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
.IF "$(USE_STLP_DEBUG)" != ""
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 6d27121366e5..09d5d424b690 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -55,7 +55,6 @@ CFLAGSENABLESYMBOLS=-g
.IF "$(SNOW_LEOPARD_10_4)"!=""
JAVACOMPILER+=-target 1.5
-DYLD_INSERT_LIBRARIES=/usr/lib/libsqlite3.dylib
.EXPORT: DYLD_INSERT_LIBRARIES
.ENDIF # "$(SNOW_LEOPARD_10_4)"!=""
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index afcea59a9971..c4c777376561 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -199,7 +199,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
# libdl.so - no really an GUI library but required in this context
STDLIBGUIMT+=-ldl
STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lX11
+X11LINK_DYNAMIC = -lXext -lX11
# @@@ interposer needed for -Bdirect @@@
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index a28b097e13b4..67bafa3a1c14 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -205,7 +205,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
# libdl.so - no really an GUI library but required in this context
STDLIBGUIMT+=-ldl
STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lX11
+X11LINK_DYNAMIC = -lXext -lX11
# @@@ interposer needed for -Bdirect @@@
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 6de6b3c99763..048b59205e08 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -38,8 +38,8 @@
#define VER_FINAL 0
#define VER_DAY 1
-#define VER_MONTH 9
-#define VER_YEAR 2009
+#define VER_MONTH 1
+#define VER_YEAR 2010
#ifndef VER_FIRSTYEAR
#define VER_FIRSTYEAR VER_YEAR
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 6eb9a183d6bd..852af90168b0 100644
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -38,8 +38,8 @@
#define VER_FINAL 0
#define VER_DAY 1
-#define VER_MONTH 9
-#define VER_YEAR 2009
+#define VER_MONTH 1
+#define VER_YEAR 2010
#ifndef VER_FIRSTYEAR
#define VER_FIRSTYEAR VER_YEAR
generated by cgit (git 2.34.1) at 2025-02-24 07:35:10 +0000