summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bootstrap.15
-rwxr-xr-xconfigure31
-rwxr-xr-xconfigure.cmd2
-rw-r--r--configure.in28
-rw-r--r--scp2/source/ooo/common_brand.scp1
-rw-r--r--set_soenv.in127
-rw-r--r--solenv/bin/createpdbrelocators.pl5
-rwxr-xr-xsolenv/bin/deliver.pl3
-rw-r--r--solenv/bin/mhids.pl7
-rw-r--r--solenv/bin/modules/CreatePDBRelocators.pm128
-rw-r--r--solenv/bin/modules/SourceConfig.pm42
-rw-r--r--solenv/bin/modules/installer/javainstaller.pm1
-rw-r--r--solenv/bin/modules/installer/ziplist.pm3
-rwxr-xr-xsolenv/bin/receditor2
-rw-r--r--solenv/config/sdev300.ini635
-rw-r--r--solenv/config/ssolar.cmn1
-rw-r--r--solenv/inc/_tg_srs.mk20
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/set_wntx64.mk2
-rw-r--r--solenv/inc/settings.mk110
-rw-r--r--solenv/inc/target.mk26
-rw-r--r--solenv/inc/tg_ext.mk37
-rw-r--r--solenv/inc/tg_srs.mk2
-rw-r--r--soltools/mkdepend/main.c3
24 files changed, 809 insertions, 418 deletions
diff --git a/bootstrap.1 b/bootstrap.1
index 146d6f9443dd..622f68b228f4 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -21,16 +21,13 @@ if test "$BUILD_DMAKE" != "NO"; then
# Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler
# but we need a cygwin/gcc build dmake to understand the posix paths
- if test "$GUI" = "WNT" -a "$USE_SHELL" != "4nt"; then
+ if test "$GUI" = "WNT"; then
CC=""
CXX=""
export CC
export CXX
fi
- # For the W32/4nt case
- rm -rf objects
-
# For normal unixy systems
if test -f "Makefile" ; then
$GNUMAKE distclean || exit
diff --git a/configure b/configure
index 06ed74cb9b58..bbd1e35a1c1b 100755
--- a/configure
+++ b/configure
@@ -2401,9 +2401,8 @@ Optional Packages:
Supported options:
tcsh (default)
bash
- 4nt (windows only)
- Usage: --with-use-shell=tcsh|bash|4nt
+ Usage: --with-use-shell=tcsh|bash
--with-build-version Allows the builder to add a custom version tag
that will appear in the Help/About box for QA
@@ -4916,9 +4915,9 @@ fi
{ $as_echo "$as_me:$LINENO: checking which shell to use" >&5
$as_echo_n "checking which shell to use... " >&6; }
if test $_os = "WINNT"; then
- if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then
- { { $as_echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5
-$as_echo "$as_me: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&2;}
+ if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
+ { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5
+$as_echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;}
{ (exit 1); exit 1; }; }
fi
if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then
@@ -4938,7 +4937,7 @@ link, and copy the program to the name of the link." >&2;}
fi
fi
if test "$WITH_MINGWIN" = "yes" ; then
- if test "$with_use_shell" = "4nt" -o "x$with_use_shell" = "x"; then
+ if test "x$with_use_shell" = "x"; then
with_use_shell="tcsh"
fi
if test -z "$CC"; then
@@ -4947,9 +4946,9 @@ link, and copy the program to the name of the link." >&2;}
fi
fi
elif test $_os = "OS2"; then
- if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then
- { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"4nt\" are supported options" >&5
-$as_echo "$as_me: error: only \"tcsh\" or \"4nt\" are supported options" >&2;}
+ if test "$with_use_shell" != "tcsh"; then
+ { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" is supported options" >&5
+$as_echo "$as_me: error: only \"tcsh\" is supported options" >&2;}
{ (exit 1); exit 1; }; }
fi
else
@@ -4965,7 +4964,7 @@ $as_echo "$USE_SHELL" >&6; }
-if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then
+if test "$_os" = "WINNT" ; then
{ $as_echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5
$as_echo_n "checking for cygwin gcc/g++... " >&6; }
if which gcc > /dev/null && which g++ > /dev/null ; then
@@ -25526,20 +25525,10 @@ $as_echo "$as_me: error: Zip/Unzip are required to build, please install or use
fi
if test "$_os" = "WINNT"; then
- if test "$with_use_shell" = "4nt" ; then
- if test -z "`$ZIP -h | grep -i WinNT`" ; then
-{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
-Probably there is a cygwin version in the path." >&5
-$as_echo "$as_me: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
-Probably there is a cygwin version in the path." >&2;}
- { (exit 1); exit 1; }; }
- fi
- else
- if test -n "`$ZIP -h | grep -i WinNT`" ; then
+ if test -n "`$ZIP -h | grep -i WinNT`" ; then
{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5
$as_echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;}
{ (exit 1); exit 1; }; }
- fi
fi
fi
diff --git a/configure.cmd b/configure.cmd
index 1d847525f6f9..aff7e810b520 100755
--- a/configure.cmd
+++ b/configure.cmd
@@ -3,5 +3,5 @@ setlocal
SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0
SET JAVA_HOME=e:\java150
SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
-sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=4nt --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
+sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=bash --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
endlocal
diff --git a/configure.in b/configure.in
index aff65d6d1583..e41fa919e752 100644
--- a/configure.in
+++ b/configure.in
@@ -773,9 +773,8 @@ AC_ARG_WITH(use-shell,
Supported options:
tcsh (default)
bash
- 4nt (windows only)
- Usage: --with-use-shell=tcsh|bash|4nt
+ Usage: --with-use-shell=tcsh|bash
],with_use_shell=$withval,with_use_shell="tcsh")
AC_ARG_WITH(build-version,
[ --with-build-version Allows the builder to add a custom version tag
@@ -1317,14 +1316,14 @@ AC_SUBST(HYPH_SYSTEM_DIR)
AC_SUBST(THES_SYSTEM_DIR)
dnl ===================================================================
-dnl WINNT uses tcsh, bash or 4nt all other O/S use tcsh or bash.
+dnl all O/S use tcsh or bash.
dnl The following sets the with_use_shell variable.
dnl ===================================================================
AC_MSG_CHECKING([which shell to use])
if test $_os = "WINNT"; then
dnl ===================================================================
- if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then
- AC_MSG_ERROR([only "tcsh","bash" or "4nt" are supported options])
+ if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then
+ AC_MSG_ERROR([only "tcsh" or "bash" are supported options])
fi
dnl ===================================================================
dnl Sanity check! Native windows programs cannot use cygwin symlinks!
@@ -1356,7 +1355,7 @@ link, and copy the program to the name of the link.])
dnl If using Mingwin32 then don't use 4NT
dnl ===================================================================
if test "$WITH_MINGWIN" = "yes" ; then
- if test "$with_use_shell" = "4nt" -o "x$with_use_shell" = "x"; then
+ if test "x$with_use_shell" = "x"; then
with_use_shell="tcsh"
fi
if test -z "$CC"; then
@@ -1365,8 +1364,8 @@ link, and copy the program to the name of the link.])
fi
fi
elif test $_os = "OS2"; then
- if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then
- AC_MSG_ERROR([only "tcsh" or "4nt" are supported options])
+ if test "$with_use_shell" != "tcsh"; then
+ AC_MSG_ERROR([only "tcsh" is supported options])
fi
else
dnl ===================================================================
@@ -1382,11 +1381,11 @@ AC_SUBST(USE_SHELL)
AC_SUBST(WITH_MINGWIN)
dnl ===================================================================
-dnl Extra check for Windows. Non 4nt-builds need gcc to build dmake
+dnl Extra check for Windows. cygwin builds need gcc to build dmake
dnl and g++ to build guw.exe although MS cl (or MinGW) is used to
dnl build OOo.
dnl ===================================================================
-if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then
+if test "$_os" = "WINNT" ; then
AC_MSG_CHECKING([for cygwin gcc/g++])
if which gcc > /dev/null && which g++ > /dev/null ; then
AC_MSG_RESULT([found])
@@ -5328,15 +5327,8 @@ dnl ===================================================================
dnl Zip must be a specific type for different build types.
dnl ===================================================================
if test "$_os" = "WINNT"; then
- if test "$with_use_shell" = "4nt" ; then
- if test -z "`$ZIP -h | grep -i WinNT`" ; then
-AC_MSG_ERROR([$ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
-Probably there is a cygwin version in the path.])
- fi
- else
- if test -n "`$ZIP -h | grep -i WinNT`" ; then
+ if test -n "`$ZIP -h | grep -i WinNT`" ; then
AC_MSG_ERROR([$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe.])
- fi
fi
fi
AC_SUBST(ZIP_HOME)
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 76bc8d6cf9c0..faa679409e22 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -87,7 +87,6 @@ Module gid_Module_Root_Brand
gid_Brand_File_Lib_Npsoplugin,
gid_Brand_File_Lib_Subscrib_C05,
gid_Brand_File_Share_Registry_Brand_Xcd,
- gid_Brand_File_Share_Registry_C01_Xcd,
gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Xdg_Base,
gid_Brand_File_Share_Xdg_Calc,
diff --git a/set_soenv.in b/set_soenv.in
index 71f6d6bf90df..462fb9533e97 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -38,8 +38,8 @@ use File::Basename;
# IIa. Declaring variables for the system commands, etc.
#--------------------------------------------------------
#
-my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
- $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
+my ( $outfile, $outfile_sh, $bootfile, $newline, $comment,
+ $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
$wps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
$USE_MINGW, $platform,
$cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,
@@ -197,7 +197,6 @@ $ENABLEUNICODE = "TRUE";
$NEW_JAR_PACK = "TRUE";
$NO_BSYMBOLIC = "TRUE";
$comment = "#"; # UNIX script comment character
-$comment4nt = "rem"; # Windows 4nt script comment character
# Setting platform dependent constant values.
if ( $platform =~ m/solaris/ )
@@ -676,17 +675,10 @@ elsif ( $platform =~ m/cygwin/ )
$MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc";
}
}
- if ( "@USE_SHELL@" ne "4nt" ) {
print "Setting W32 build with bash shell specific values... ";
# No speacial treatment for CC an CXX anymore.
$FLIPCMD = "slfl.pl";
$PATH_SEPERATOR = ';';
- } else # "@USE_SHELL@" ne "4nt"
- { print "Setting W32 build with 4NT shell specific values... ";
- # Change path to lower case.
- $COMPATH = lc $COMPATH;
- $PATH_SEPERATOR = ';';
- }
}
}
elsif ( $platform =~ m/os2/ )
@@ -831,10 +823,6 @@ elsif ("@USE_SHELL@" eq "bash")
$SHELL_PATH = '@SHELLPATH@';
$SHELL = '@SHELLPATH@'."\/bash";
}
-elsif ("@USE_SHELL@" eq "4nt")
-{ # @SHELLPATH@ is NO_SHELLPATH_NEEDED for 4nt -
- $SHELL_PATH = '';
-}
else {
die "Not a recognized shell: @USE_SHELL@ !";
}
@@ -918,20 +906,6 @@ $COMMON_BUILD_TOOLS = '$SRC_ROOT'.$ds."external".$ds."common";
# Generate alternate output file for sh?
$outfile_sh = $outfile.".sh";
-if ($GUI eq "OS2")
-{
- # Generate output file for 4os2?
- $outfile_bat = $outfile;
- $outfile_bat =~ s/set$/cmd/i;
-}
-elsif ("@USE_SHELL@" eq "4nt")
-{
- # Generate output file for 4nt?
- $outfile_bat = $outfile;
- $outfile_bat =~ s/set$/bat/i;
-} else {
- undef $outfile_bat;
-}
if ($STLPORT4 ne $no_stl) {
$ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64;
@@ -1220,7 +1194,7 @@ elsif ($platform =~ m/cygwin/)
}
# Check if $SHELL_PATH is already set in PATH
$tmppath = CygFormat($SHELL_PATH);
- if ( ( "@USE_SHELL@" ne "4nt" ) && ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) )
+ if ( ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) )
{ $PATH .= $ps.$tmppath;
}
# Check if $CYGWIN_PATH is already set in PATH
@@ -1522,7 +1496,6 @@ print "done\n";
#
print "Setting the aliases... ";
# 1. alias for a full product make.
-# ToFile will take care for the right 4nt format
$mkout = '"perl $SOLARENV/bin/mkout.pl"';
$deliver = '"perl $SOLARENV/bin/deliver.pl"';
$build = '"perl $SOLARENV/bin/build.pl"';
@@ -1543,12 +1516,6 @@ open( OUT, ">$outfile" ) ||
open( OUT_SH, ">$outfile_sh" ) ||
die "Cannot open $outfile_sh: $!\n";
-if(defined($outfile_bat))
-{ # Create bat environment file
- open( OUT_BAT, ">$outfile_bat" ) ||
- die "Cannot open $outfile_bat: $!\n";
-}
-
#
#------------------------------------------
# VII. Writing the data to the output file.
@@ -1557,7 +1524,6 @@ if(defined($outfile_bat))
# Write file header.
CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" );
CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
-CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat);
ToFile( "SRC_ROOT", $SRC_ROOT, "e" );
ToFile( "SHELL", $SHELL, "e" );
@@ -1986,12 +1952,8 @@ if ( $platform =~ m/os2/ )
}
# $perlpre is only used for the following three variables
-# and only set for 4nt.
+# and only set for OS2.
my $perlpre = "";
-if (( $platform =~ m/cygwin/ ) and ( '@USE_SHELL@' eq "4nt" )) {
- ToFile( "HOME", " ", "e" );
- $perlpre = "perl ".${SOLARENV}.${BIN}.${ds};
-}
if (( $platform =~ m/os2/ )) {
$perlpre = "perl ".${SOLARENV}.${BIN}.${ds};
}
@@ -2026,23 +1988,8 @@ if ( $platform =~ m/os2/ )
ToFile( "endif", $empty, "y");
ToFile( "fi", $empty, "z");
-# write make command for dmake for W32-4nt
-if ( $platform =~ m/cygwin/ and '@USE_SHELL@' eq "4nt" )
-{
- ToFile( "build the dmake executable.", $empty, "c");
- ToFile( "if not exist \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe (cd \%SRC_ROOT\\dmake \^ set INCLUDE=\%COMPATH\\include;\%PSDK_HOME\\include \^ set LIB=\%COMPATH\\lib;\%PSDK_HOME\\lib \^ call make.bat win95-vpp40 \^ cd \%SRC_ROOT)", $empty, "x");
- ToFile( "if not exist \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe ( mkdir /S \%SOLARENV\\\%OUTPATH\\bin \^ copy dmake\\dmake.exe \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe )", $empty, "x");
- ToFile( "\@echo Warning! LIB and INCLUDE will be cleared!", $empty, "x");
- ToFile( "\@unset INCLUDE LIB", $empty, "x");
- ToFile( "check for correct dmake.", $empty, "c");
- ToFile( '@if "%@SEARCH[dmake]" == "" ( @echo dmake not build or missing! Invalid build environment! ^ unset SOLARENV ^ cancel )', $empty, "x");
- ToFile( '@dmake -V > dmakecheck.out', $empty, "x");
- ToFile( '@ffind /Tcygwin /C /B dmakecheck.out && ( @echo Found cygwin build dmake! Invalid! ^ unset SOLARENV ^ cancel )', $empty, "x");
- ToFile( " ", $empty, "x");
-}
-
-# Check if the right dmake version is used. (W32-tcsh only)
-if ( $platform =~ m/cygwin/ and '@USE_SHELL@' ne "4nt" ) {
+# Check if the right dmake version is used. (W32 only)
+if ( $platform =~ m/cygwin/ ) {
ToFile( "Check if the right dmake version is used.", $empty, "c" );
# Invalidate build environment.
ToFile( "WORK_STAMP", "_invalid_", "e" );
@@ -2075,9 +2022,6 @@ print OUT $unsetvars;
print OUT_SH "export $exportvars$newline";
print OUT_SH "unset $unsetvarssh$newline";
-if(defined($outfile_bat))
-{ print OUT_BAT $unsetvarsbat;
-}
#
#---------------------------
@@ -2088,10 +2032,6 @@ close( OUT ) || print "Can't close $outfile: $!";
close( OUT_SH ) || print "Can't close $outfile_sh: $!";
-if( defined($outfile_bat))
-{ close( OUT_BAT ) || print "Can't close $outfile_bat: $!";
-}
-
#
#------------------------------
# IX. Sourcing the output file.
@@ -2115,14 +2055,6 @@ if (rename( $outfile_sh, $tmp ) ne 1)
{ `mv -f $outfile_sh $tmp`;
}
-if(defined($outfile_bat))
-{
- $tmp = $SRC_ROOT.$ds.$outfile_bat;
- if (rename( $outfile_bat, $tmp ) ne 1)
- { `mv -f $outfile_bat $tmp`;
- }
-}
-
#
#--------------------------------------------------------
# XII. Message at the end.
@@ -2178,9 +2110,7 @@ if (rename( $bootfile, $tmp ) ne 1)
}
print "Configure completed\n";
-if ( "@USE_SHELL@" ne "4nt" ) {
- print "You may now run ./bootstrap in $SRC_ROOT\n";
-}
+print "You may now run ./bootstrap in $SRC_ROOT\n";
if ( $Warning ne "" ) {
print "***** WARNINGS ISSUED *****\n";
}
@@ -2201,7 +2131,7 @@ if ( $Warning ne "" ) {
#-------------------------------------------------------------
sub CheckPathName
{ my $retrn = $_[ 0 ];
- if (($platform =~ m/cygwin/) or ( '@USE_SHELL@' ne "4nt" ))
+ if ($platform =~ m/cygwin/)
{ # Check if the first character is not a '/'.
if ( !( $_[ 0 ] =~ /^\// ) )
{ $retrn = $ds.$_[ 0 ];
@@ -2277,21 +2207,6 @@ sub ToFile {
if (defined $_[ 1 ] && $_[ 1 ] ne "" ) {
my $envvar = $_[ 1 ];
my $envvarbash = $envvar;
- if ("@USE_SHELL@" eq "4nt" ) {
- # expand the variables
- $envvar =~ s/(\$\{?\w+\}?)/$1/eeg ;
- # Some variables need to be translated
- if ( ($_[ 0 ] =~ /^PATH$/) and ($platform !~ m/os2/) ) {
- # PATH is in cygwin format, but for 4nt it needs to be DOS.
- $win_format_var = WinPath( $envvar, ":" );
- } else {
- $win_format_var = WinFormat( $envvar );
- }
- # The excluded variables are translated by cygwin
- if ( $_[ 0 ] !~ /^PATH$|^TMP$|^TEMP$|^TMPDIR$|^HOME$/i ) {
- $envvar = $win_format_var;
- }
- }
# Tcsh/bash needs backslashes quoted
$envvar =~ s/\\/\\\\/g;
@@ -2302,17 +2217,10 @@ sub ToFile {
print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline"; # to sh file
$exportvars .= " $_[ 0 ]"; # add to export list for sh file
- if(defined($outfile_bat)) {
- print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ]$newline";
- print OUT_BAT "$set $_[ 0 ]=$win_format_var$newline";
- }
} else {
printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout
$unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file
$unsetvarssh .= " $_[ 0 ]"; # for sh file
- if(defined($outfile_bat)) {
- $unsetvarsbat .= "$unset $_[ 0 ] >& NUL$newline";
- }
}
}
elsif ( $_[ 2 ] eq "a" )
@@ -2320,13 +2228,6 @@ sub ToFile {
print "The $_[ 0 ] is set to: $_[ 1 ]\n"; # to stdout
print OUT "$_[ 0 ] $_[ 1 ]$newline"; # to tcsh file
print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline"; # to sh file
- if(defined($outfile_bat)) # create the correct 4nt alias format
- { my $aliastmp = $_[ 1 ];
- $aliastmp =~ s/\$/\%/g;
- $aliastmp =~ s!/!\\!g;
- $aliastmp =~ s!"!!g;
- print OUT_BAT "$_[ 0 ]=".'`'.$aliastmp.'`'.$newline;
- }
}
elsif ( $_[ 2 ] eq "c" )
{ # Write a comment to file.
@@ -2342,23 +2243,11 @@ sub ToFile {
print OUT_SH "$comment$newline";
print OUT_SH "$comment $_[ 0 ]$newline";
print OUT_SH "$comment$newline";
- if(defined($outfile_bat)) {
- print OUT_BAT "$newline";
- print OUT_BAT "$comment4nt$newline";
- print OUT_BAT "$comment4nt $_[ 0 ]$newline";
- print OUT_BAT "$comment4nt$newline";
- }
}
elsif ( $_[ 2 ] eq "n" )
{ #Write a newline to a file
print OUT "$newline";
print OUT_SH "$newline";
- print OUT_BAT "$newline" if defined($outfile_bat);
- }
- elsif ( $_[ 2 ] eq "x" )
- {
- #Write first argument as is, and nothing else
- print OUT_BAT "$_[ 0 ]$newline" if defined($outfile_bat);
}
elsif ( $_[ 2 ] eq "y" )
{
diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl
index 66c4301be61e..8b6218adbab2 100644
--- a/solenv/bin/createpdbrelocators.pl
+++ b/solenv/bin/createpdbrelocators.pl
@@ -62,6 +62,7 @@ print "$script_name -- version: $script_rev\n";
my $inpath = $ENV{INPATH};
my $milestone = $ENV{UPDMINOR};
+my $milestoneext = $ENV{UPDMINOREXT};
if ( $ARGV[0] ) {
if ( $milestone && ( $milestone ne $ARGV[0] ) ) {
@@ -74,8 +75,8 @@ if ( !$inpath || !$milestone ) {
print STDERR "$script_name: INAPTH or UPDMINOR not set!\n";
exit(1);
}
-
-my $rc = CreatePDBRelocators::create_pdb_relocators($inpath, $milestone, "");
+my $relocators = CreatePDBRelocators->new();
+my $rc = $relocators->create_pdb_relocators($inpath, $milestoneext, "");
if ( !$rc ) {
print STDERR "$script_name: creating PDB relocators failed!\n";
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 611a08a47f62..9db619fe7902 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -462,6 +462,7 @@ sub init_globals
my $solarversion = $ENV{'SOLARVERSION'};
my $updater = $ENV{'UPDATER'};
my $updminor = $ENV{'UPDMINOR'};
+ my $updminorext = $ENV{'UPDMINOREXT'};
my $work_stamp = $ENV{'WORK_STAMP'};
# special security check for release engineers
@@ -485,7 +486,7 @@ sub init_globals
$ext = "";
if ( ($opt_minor || $updminor) && !$dest ) {
if ( $updminor ) {
- $ext = ".$updminor";
+ $ext = "$updminorext";
}
else {
print_error("can't determine UPDMINOR", 0);
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
index c6fc230cabd4..52a62ef70040 100644
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@@ -88,6 +88,8 @@ sub setcompiler
$outobj_flag = "-Fo";
$objext = ".obj";
$preprocess_flag = "-EP"; # preprocess to stdout
+ $solarincludes =~ s/\/stl/\/xstlx/g;
+ $defs =~ s/\/stl/\/xstlx/g;
} elsif ( "$whichcom" eq "C52" ) {
$appext = ""; # windows for now
$compiler = "cc";
@@ -154,7 +156,10 @@ $filename =~ s/\\/\//g;
$filebase = $filename;
$filebase =~ s/.*[\\\/]//;
$filebase =~ s/\..*?$//;
-$workfile = "$tmpdir/${filebase}_".$$;
+# now stript it to something that doesn't togger vista execution prevention :(
+$flbs = $filebase;
+$flbs =~ s/[aeiou]//g;
+$workfile = "$tmpdir/${flbs}_".$$;
#$workfile =~ s/setup/set_up/;
# now get $workfile ready for shell usage...
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index e279cf7daeb9..0b57e748b486 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -35,7 +35,7 @@
# PDB relocator files are used to find debug infos
# for analysis of creash reports
#
-# usage: create_pdb_relocators($inpath, $milestone, $pre);
+# usage: create_pdb_relocators($inpath, $milestoneext, $pre);
#
#*************************************************************************
@@ -43,32 +43,57 @@ package CreatePDBRelocators;
use strict;
use File::Basename;
+use SourceConfig;
-sub create_pdb_relocators
+sub new
{
- my $inpath = shift;
- my $milestone = shift;
- my $pre = shift;
+ my $Object = shift;
+ my $solarversion = shift;
+ my $self = {};
+ my @repositories;
- my $solarversion = $ENV{SOLARVERSION};
+ if (!defined ($solarversion)) {
+ $solarversion = $ENV{SOLARVERSION};
+ }
if ( !$solarversion ) {
print STDERR "can't determine SOLARVERSION.\n";
- return undef;
+ exit (1);
}
- my $o = $ENV{SRC_ROOT};
- if ( !$o ) {
- print STDERR "can't determine SOLAR_SRC.\n";
- return undef;
+ $self->{SOLARVERSION} = $solarversion;
+
+ my $SourceConfigObj = SourceConfig->new();
+ @repositories = $SourceConfigObj->get_repositories();
+
+ if (!scalar @repositories) {
+ print STDERR "no repository and no working directory found.\n";
+ exit (2);
}
+ $self->{REPOSITORIES} = \@repositories;
+ bless($self, $Object);
+ return $self;
+}
+sub create_pdb_relocators
+{
+ my $self = shift;
+ my $inpath = shift;
+ my $milestoneext = shift;
+ my $pre = shift;
+
+ my $solarversion = $self->{SOLARVERSION};
my $root_dir = "$solarversion/$inpath";
# sanitize path
$root_dir =~ s/\\/\//g;
- $o =~ s/\\/\//g;
- my $pdb_dir = $root_dir . "/pdb.$pre$milestone";
- my $pdb_so_dir = $root_dir . "/pdb.$pre$milestone/so";
+ my $o =~ s/\\/\//g;
+ my $premilestoneext = $milestoneext;
+ if ( $pre ne "" ) {
+ $premilestoneext = ~ s/^\.//;
+ $premilestoneext = ".pre$premilestoneext";
+ }
+ my $pdb_dir = $root_dir . "/pdb$premilestoneext";
+ my $pdb_so_dir = $root_dir . "/pdb$premilestoneext/so";
# create pdb directories if necessary
if ( ! -d $pdb_dir ) {
@@ -86,42 +111,60 @@ sub create_pdb_relocators
# collect files
my @pdb_files;
- collect_files( $o, $inpath, \@pdb_files);
-
- foreach (@pdb_files) {
- my $relocator = basename($_) . ".location";
- /$o\/(.*)/i;
-
- my $src_location = $1;
-
- my $location = "";
- my $target = "";
- if ( $src_location =~ /\/so\// )
- {
- $location = "../../../src.$milestone/" . $src_location;
- $target = "$pdb_dir/so/$relocator";
- }
- else
- {
- $location = "../../src.$milestone/" . $src_location;
- $target = "$pdb_dir/$relocator";
- }
+ foreach my $repository (@{$self->{REPOSITORIES}}) {
+ my $o = $self->{SOLARVERSION} . "/$repository";
+ $repository =~ s/(.*?)\.(.*)/$1/;
+ $self->collect_files( $o, $inpath, \@pdb_files);
+
+ foreach (@pdb_files) {
+ my $relocator = basename($_) . ".location";
+ /$o\/(.*)/i;
+
+ my $src_location = $1;
+
+ my $location = "";
+ my $target = "";
+ if ( $src_location =~ /\/so\// )
+ {
+ $location = "../../../$repository$milestoneext/" . $src_location;
+ $target = "$pdb_dir/so/$relocator";
+ }
+ else
+ {
+ $location = "../../$repository$milestoneext/" . $src_location;
+ $target = "$pdb_dir/$relocator";
+ }
- if ( !open(RELOCATOR, ">$target") ) {
- print STDERR "can't write file '$target'\n";
- return undef;
+ if ( !open(RELOCATOR, ">$target") ) {
+ print STDERR "can't write file '$target'\n";
+ return undef;
+ }
+ print RELOCATOR "$location\n";
+ close(RELOCATOR);
}
- print RELOCATOR "$location\n";
- close(RELOCATOR);
}
return 1;
}
+sub collect_files_from_all_repositories
+{
+ my $self = shift;
+ my ($platform, $filesref) = @_;
+ my $repository;
+ my $ret;
+ foreach $repository (@{$self->{REPOSITORIES}}) {
+ my $srcdir = $self->{SOLARVERSION} . "/$repository";
+ $ret |= $self->collect_files ($srcdir, $platform, $filesref);
+ }
+ return $ret;
+}
+
sub collect_files
{
+ my $self = shift;
my ($srcdir, $platform, $filesref) = @_;
my $template = "$srcdir/*/$platform";
- if ( $^O eq 'MSWin32' ) {
+ if ( $ENV{GUI} eq "WNT" ) {
# collect all pdb files on o:
# regular glob does not work with two wildcard on WNT
my @bin = glob("$template/bin/*.pdb");
@@ -145,8 +188,8 @@ sub collect_files
my @mac_lib = glob("$template/lib/*.dylib*");
my @mac_lib_so = glob("$template/lib/so/*.dylib*");
# collect all binary executables on o:
- my @bin = find_binary_execs("$template/bin");
- my @bin_so = find_binary_execs("$template/bin/so");
+ my @bin = $self->find_binary_execs("$template/bin");
+ my @bin_so = $self->find_binary_execs("$template/bin/so");
@$filesref = (@lib, @lib_so, @mac_lib, @mac_lib_so, @bin, @bin_so);
}
return 1;
@@ -154,6 +197,7 @@ sub collect_files
sub find_binary_execs
{
+ my $self = shift;
my $path = shift;
my @files = glob("$path/*");
my @execs = grep(-x $_, @files);
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 23d89d882bb8..e43b1f50a990 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -44,6 +44,10 @@ use strict;
use constant SOURCE_CONFIG_FILE_NAME => 'source_config';
use Carp;
+use Cwd;
+use File::Basename;
+
+my $debug = 0;
##### profiling #####
@@ -64,8 +68,9 @@ sub new {
$self->{REPOSITORIES} = {};
$self->{MODULE_PATHS} = {};
$self->{MODULE_BUILD_LIST_PATHS} = {};
- $self->{ACTIVE_MODULES} = {};
+ $self->{ACTIVATED_MODULES} = {};
$self->{MODULE_REPOSITORY} = {};
+ $self->{REAL_MODULES} = {};
$self->{SOURCE_CONFIG_FILE} = get_config_file($source_root);
$self->{SOURCE_CONFIG_DEFAULT} = Cwd::realpath($source_root) .'/'.SOURCE_CONFIG_FILE_NAME;
read_config_file($self);
@@ -110,7 +115,7 @@ sub get_module_path {
if (defined ${$self->{MODULE_PATHS}}{$module}) {
return ${$self->{MODULE_PATHS}}{$module};
} else {
- Carp::cluck("No path for module $module in active repositories!!\n");
+ Carp::cluck("No path for module $module in active repositories!!\n") if ($debug);
return undef;
};
}
@@ -135,13 +140,26 @@ sub get_all_modules
return sort keys %{$self->{MODULE_PATHS}};
};
-
sub get_active_modules
{
my $self = shift;
- return sort keys %{$self->{ACTIVE_MODULES}};
+ if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
+ return sort keys %{$self->{ACTIVATED_MODULES}};
+ }
+ $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
+ return sort keys %{$self->{REAL_MODULES}};
}
+sub is_active
+{
+ my $self = shift;
+ my $module = shift;
+ if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
+ return exists ($self->{ACTIVATED_MODULES}{$module});
+ }
+ $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
+ return exists ($self->{REAL_MODULES}{$module});
+}
##### private methods #####
@@ -163,10 +181,11 @@ sub get_module_paths {
my $repository_path = ${$self->{REPOSITORIES}}{$repository};
if (opendir DIRHANDLE, $repository_path) {
foreach my $module (readdir(DIRHANDLE)) {
- next if ($module =~ /^\.+/);
+ next if (($module =~ /^\.+/) || (!-d "$repository_path/$module"));
my $module_entry = $module;
- $module =~ s/\.lnk$//;
- $module =~ s/\.link$//;
+ if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) {
+ $self->{REAL_MODULES}{$module}++;
+ }
my $possible_path = "$repository_path/$module_entry";
if (-d $possible_path) {
if (defined ${$self->{MODULE_PATHS}}{$module}) {
@@ -182,6 +201,7 @@ sub get_module_paths {
croak("Cannot read $_ repository content");
};
};
+ croak("No modules found!") if (!scalar keys %{$self->{MODULE_PATHS}});
};
sub get_config_file {
@@ -227,7 +247,7 @@ sub read_config_file {
next;
}
if ($module_section) {
- ${$self->{ACTIVE_MODULES}}{$1}++;
+ ${$self->{ACTIVATED_MODULES}}{$1}++;
next;
};
};
@@ -308,6 +328,11 @@ SourceConfig::get_config_file_default_path()
Returns default path for source configuration file
+SourceConfig::is_active()
+
+Returns 1 (TRUE) if a module is active
+Returns 0 (FALSE) if a module is not active
+
=head2 EXPORT
SourceConfig::new()
@@ -319,6 +344,7 @@ SourceConfig::get_module_build_list($module)
SourceConfig::get_module_repository($module)
SourceConfig::get_config_file_path()
SourceConfig::get_config_file_default_path()
+SourceConfig::is_active($module)
=head1 AUTHOR
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
index 980b48dcbc0a..b9735e5aee29 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -461,7 +461,6 @@ sub set_classpath_for_install_sdk
else { installer::exiter::exit_program("ERROR: Environment variable \"INPATH\" not set!", "set_classpath_for_install_sdk"); }
if ( defined( $ENV{ 'UPDMINOREXT' } ) ) { $updMinorExt = $ENV{'UPDMINOREXT'}; }
- else { installer::exiter::exit_program("ERROR: Environment variable \"UPDMINOREXT\" not set!", "set_classpath_for_install_sdk") if ( ! $ENV{UPDATER} ); }
$installsdk = $solarVersion . $installer::globals::separator . $inPath . $installer::globals::separator . "bin" . $updMinorExt;
$installsdk = $installsdk . $installer::globals::separator . "javainstaller";
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index c1f1efbf98a8..3232daf2138f 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -493,7 +493,8 @@ sub replace_minor_in_pathes
{
my $line = ${$patharrayref}[$i];
- if ( $installer::globals::minor )
+ if ( ! defined $ENV{CWS_WORK_STAMP} and defined $ENV{UPDMINOR} )
+# if ( $installer::globals::minor )
{
$line =~ s/\{minor\}/$installer::globals::minor/g;
# no difference for minor and minornonpre (ToDo ?)
diff --git a/solenv/bin/receditor b/solenv/bin/receditor
index f5d00bfb23fa..1011aeb5d826 100755
--- a/solenv/bin/receditor
+++ b/solenv/bin/receditor
@@ -3,4 +3,4 @@ if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'configure' or 'setsolar'
exit 1
fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL= -jar ${SOLARVER}/${INPATH}/bin.${UPDMINOR}/receditor.jar
+exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL= -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/receditor.jar
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 6d3a0961fbe4..efee6a3e61b8 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -34,6 +34,9 @@ common
ENABLE_SVCTAGS YES
ENABLE_VBA YES
ISERVER iserver.germany.sun.com
+ LU_HGFLAG ""
+ LU_NOSOURCE ""
+ LU_RFLAG ""
NEW_JAR_PACK TRUE
NO_REC_RES TRUE
OOODMAKEMODE YES
@@ -74,6 +77,10 @@ common
{
ENABLE_CRASHDUMP STATIC
}
+ hg
+ {
+ LU_HGFLAG hg_source
+ }
maxproc
{
MAXPROC maxproc=%MAXPROCESS%
@@ -82,6 +89,10 @@ common
{
DISABLE_JAVA TRUE
}
+ nosource
+ {
+ LU_NOSOURCE no_source
+ }
pro:0 IF %UPDATER% == YES
{
DELIVER_TO_ZIP TRUE
@@ -97,6 +108,10 @@ common
PROEXT .pro
PROFULLSWITCH product=full
}
+ r_only
+ {
+ LU_RFLAG r_only
+ }
shell
{
SHELL %STAR_USE_SHELL%
@@ -123,14 +138,18 @@ common
STL_ROOT
UPDATER
}
- order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc
+ order 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
{
+ ALT_L10N_MODULE
ENVCFLAGS
HOMEDRIVE
HOMEPATH
JAVAHOME
JAVA_HOME
+ LU_HGFLAG
+ LU_NOSOURCE
+ LU_RFLAGS
MKDIRHIER
PROEXT
PROFULLSWITCH
@@ -138,9 +157,10 @@ common
SOLARSRC
SOLAR_JAVA
SPEW
- STLPORT4
- WITH_FONTOOO
- WITH_LANG
+ STLPORT4
+ UPDMINOREXT
+ WITH_FONTOOO
+ WITH_LANG
}
restore
{
@@ -157,9 +177,12 @@ common
crashdump
cwsname CWS_WORK_STAMP
envroot
- nojava
- pro
+ hg
+ nojava
+ nosource
+ pro
maxproc MAXPROCESS
+ r_only
shell STAR_USE_SHELL
tmp SOL_TMP_DIR
verbose VERBOSE
@@ -172,15 +195,18 @@ finish
{
ca
{
- SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+ SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+ SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
}
cap
{
- SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+ SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+ SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
}
cax
{
- SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+ SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+ SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
}
common_0:0 IF %OS% == MACOSX
{
@@ -203,6 +229,7 @@ finish
SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB%
SOLARSRC %SRC_ROOT%
+ SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
}
common_2:0 IF X%CWS_WORK_STAMP%X == XX
{
@@ -211,6 +238,7 @@ finish
common_a
{
*o: cd %SOLARSRC%
+ ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
}
common_jre:0 IF %JREPATH% ==
{
@@ -316,7 +344,7 @@ unxfbsdi
COPYALL TRUE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOLARROOT%/etools
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -327,7 +355,7 @@ unxfbsdi
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOLARROOT%/etools
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -338,7 +366,7 @@ unxfbsdi
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -375,9 +403,9 @@ unxfbsdi
COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
DEVROOT %SOLAR_ENV_ROOT%
PKGFORMAT some_dummy
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -385,7 +413,7 @@ unxfbsdi
SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
common2
{
@@ -538,7 +566,7 @@ unxfbsdi
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -549,7 +577,7 @@ unxfbsdi
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -609,7 +637,7 @@ unxlngi6
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -621,7 +649,7 @@ unxlngi6
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -633,7 +661,7 @@ unxlngi6
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -676,9 +704,9 @@ unxlngi6
LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
PKGFORMAT rpm
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -687,7 +715,7 @@ unxlngi6
SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
common2
{
@@ -861,7 +889,7 @@ unxlngi6
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -872,7 +900,7 @@ unxlngi6
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -934,7 +962,7 @@ unxlngx6
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -946,7 +974,7 @@ unxlngx6
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -958,7 +986,7 @@ unxlngx6
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1001,9 +1029,9 @@ unxlngx6
PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
PKGFORMAT rpm
PTHREAD_CFLAGS -DNPTL
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -1011,7 +1039,7 @@ unxlngx6
SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
USE_SYSTEM_STL YES
XAU_LIBS -lXau
}
@@ -1173,7 +1201,7 @@ unxlngx6
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1184,7 +1212,7 @@ unxlngx6
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -1244,7 +1272,7 @@ unxmacxi
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1256,7 +1284,7 @@ unxmacxi
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1268,7 +1296,7 @@ unxmacxi
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1326,9 +1354,9 @@ unxmacxi
OPENSSL_LIBS -lssl -lcrypto
PERL %SOLAR_ENV_ROOT%/bt_macosx_intel/%WORK_STAMP%/bin/perl
PKGFORMAT dmg
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -1336,7 +1364,7 @@ unxmacxi
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%
- SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
SYSTEM_CURL YES
SYSTEM_LIBXML YES
SYSTEM_LIBXSLT YES
@@ -1494,7 +1522,7 @@ unxmacxi
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1505,7 +1533,7 @@ unxmacxi
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -1565,7 +1593,7 @@ unxsoli4
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1577,7 +1605,7 @@ unxsoli4
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1589,7 +1617,7 @@ unxsoli4
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1614,7 +1642,7 @@ unxsoli4
SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
SOLAR_JAVA TRUE
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
- __cdpath %DRIVE_O%/%WORK_STAMP%/src%UPDMINOREXT%
+ __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
common0
{
@@ -1629,9 +1657,9 @@ unxsoli4
LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl
PKGFORMAT pkg
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -1640,7 +1668,7 @@ unxsoli4
SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.intel
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
common2
{
@@ -1799,7 +1827,7 @@ unxsoli4
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -1810,7 +1838,7 @@ unxsoli4
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -1871,7 +1899,7 @@ unxsols4
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1883,7 +1911,7 @@ unxsols4
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1895,7 +1923,7 @@ unxsols4
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -1920,7 +1948,7 @@ unxsols4
SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
SOLAR_JAVA TRUE
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
- __cdpath %DRIVE_O%/%WORK_STAMP%/src%UPDMINOREXT%
+ __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
common0
{
@@ -1936,9 +1964,9 @@ unxsols4
LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
PKGFORMAT pkg
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -1947,7 +1975,7 @@ unxsols4
SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.sparc
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
common2
{
@@ -2113,7 +2141,7 @@ unxsols4
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2124,7 +2152,7 @@ unxsols4
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -2185,7 +2213,7 @@ unxsolu4
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -2197,7 +2225,7 @@ unxsolu4
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -2209,7 +2237,7 @@ unxsolu4
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -2244,7 +2272,7 @@ unxsolu4
SYSTEM_LIBXML YES
SYSTEM_LIBXSLT YES
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
- __cdpath %DRIVE_O%/%WORK_STAMP%/src%UPDMINOREXT%
+ __cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
}
common0
{
@@ -2258,15 +2286,15 @@ unxsolu4
DEVROOT %SOLAR_ENV_ROOT%
PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
PKGFORMAT pkg
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_15.sparc
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
USE_SYSTEM_STL YES
}
common2
@@ -2383,7 +2411,7 @@ unxsolu4
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2394,7 +2422,7 @@ unxsolu4
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -2449,7 +2477,7 @@ unxubti8
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -2461,7 +2489,7 @@ unxubti8
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -2473,7 +2501,7 @@ unxubti8
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -2530,14 +2558,14 @@ unxubti8
PERL /usr/bin/perl
PKGFORMAT deb
PTHREAD_CFLAGS -DNPTL
- SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
SOLAR_PLUGIN TRUE
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
USE_SHELL tcsh
VBA_EXTENSION NO
WITH_LANG en-US de
@@ -2674,14 +2702,14 @@ unxubti8
{
csh
{
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
600: umask 002
800: rehash
}
sh
{
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -2728,7 +2756,7 @@ wntgcci1
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -2744,7 +2772,7 @@ wntgcci1
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -2759,7 +2787,7 @@ wntgcci1
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -2810,21 +2838,21 @@ wntgcci1
PKGFORMAT some_dummy
PSDK %SOLAR_ENV_ROOT%$/MinGW$/w32api
SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc7net$/Common7$/ide
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
}
common2
{
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
CALL_CDECL TRUE
- CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/src%UPDMINOREXT%
+ CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
COM GCC
COMMON_BUILD_TOOLS %SOLARROOT%$/btools
COMMON_ENV_TOOLS %SOLARROOT%$/etools
@@ -2972,7 +3000,7 @@ wntgcci1
{
150: setenv MYENV_PATH $PATH
160: setenv PATH $SSX_PATH
- 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 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
260: setenv PATH $MYENV_PATH
270: unsetenv MYENV_PATH
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
@@ -2987,7 +3015,7 @@ wntgcci1
260: export PATH=$MYENV_PATH
270: unset MYENV_PATH
400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
851: export SO_GEN_ERROR
@@ -3050,7 +3078,7 @@ wntmsci11
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -3068,7 +3096,7 @@ wntmsci11
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -3085,7 +3113,7 @@ wntmsci11
PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
PSDK %COMPATH%$/PlatformSDK
SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -3143,21 +3171,21 @@ wntmsci11
PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
}
common2
{
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
CALL_CDECL TRUE
- CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/src%UPDMINOREXT%
+ CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
COM MSC
COMEX 11
COMMON_BUILD_TOOLS %SOLARROOT%$/btools
@@ -3307,7 +3335,7 @@ wntmsci11
{
150: set MYENV_PATH=%PATH
160: set PATH=%SSX_PATH
- 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET%
+ 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% $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%
@@ -3364,7 +3392,7 @@ wntmsci12
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -3387,7 +3415,7 @@ wntmsci12
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%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -3409,7 +3437,7 @@ wntmsci12
PERL %SOL_TMP%$/r$/%PERLDIR%
PSDK %COMPATH%$/PlatformSDK$/V6.1
SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ 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%
@@ -3485,14 +3513,14 @@ wntmsci12
PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
- SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
- SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
+ SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
# TEMP $dp(%TEMP%)
# TMP $dp(%TMP%)
}
@@ -3501,7 +3529,7 @@ wntmsci12
ENABLE_GRAPHITE TRUE
BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
CALL_CDECL TRUE
- CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/src%UPDMINOREXT%)
+ CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
COM MSC
COMEX 12
COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
@@ -3698,7 +3726,7 @@ wntmsci12
sh
{
400: if [ $COPYALL ]; then
- 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
+ 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
415: fi
600: umask 002
800: hash -r
@@ -3745,3 +3773,410 @@ wntmsci12
tmp SOL_TMP_DIR
}
}
+wntmsci13
+{
+ environment
+ {
+ 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
+ {
+ BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+ COMPATH %SOL_TMP%$/r$/msvc9p
+ COMPROOT %SOL_TMP%$/r$/msvc9p
+ COPYALL TRUE
+ COPY_PACKED TRUE
+ DEVROOT %SOL_TMP%$/r
+ DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
+ ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+ 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%
+ SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+
+ }
+ cax
+ {
+ BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+ COMPATH %SOL_TMP%$/r$/msvc9p
+ COMPROOT %SOL_TMP%$/r$/msvc9p
+ COPYALL FALSE
+ DSDK %COMPATH%$/DirectXSDK
+ ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+ FSDK %COMPATH%$/Sdk$/v3.5
+ F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+ PCLEAN_PATH %SOL_TMP%$/r$/etw
+ PERL %SOL_TMP%$/r$/%PERLDIR%
+ PSDK %COMPATH%$/PlatformSDK$/V6.1
+ SHARED_COM_SDK_PATH %COMPATH%$/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%
+ SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+ }
+ common
+ {
+ *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+ *build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+ *copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+ *deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+ *mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+ *mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+ *o cd %SOLARENV%$/..
+ *r cd %SOLARROOT%
+ *s cd %SOLARVERSION%
+ *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+ *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
+ BIG_SVX
+ BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
+ COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+ CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
+ DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+ DMAKEROOT %SOLARENV%$/inc$/startup
+ ENABLE_PCH TRUE
+ ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
+ JDK13PATH %SOLAR_JDK13PATH%
+ JDK14PATH %SOLAR_JDK14PATH%
+ JDK15PATH %SOLAR_JDK15PATH%
+ LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
+ LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
+ LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
+ MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+ MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+ OJDK16PATH %SOLAR_OJDK16PATH%
+ PATH $cp(%PSDK%$/bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+ PROF_EDITION TRUE
+ PSDKINC -I%PSDK%$/include
+ SOLAREXTRAINC -I%DSDK%$/include
+ SOLAR_JAVA TRUE
+ TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+ USE_DIRECTX5 TRUE
+ WINDOWS_VISTA_PSDK TRUE
+ SYSBASE TRUE
+ WITH_VC_REDIST TRUE
+ XCLASSPATH .
+ ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+ }
+ common0
+ {
+ BS_ROOT n:
+ SOLAR_ENV_ROOT r:
+ SOLAR_SOURCE_ROOT o:
+ USE_SHELL bash
+ STAR_USE_SHELL bash
+ BTOOLDIR %WORK_STAMP%$/cygtools
+ PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
+ }
+ common02
+ {
+ PERL perl
+ }
+ common1
+ {
+ COMPATH %SOLAR_ENV_ROOT%$/msvc9p
+ COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
+ DEVROOT %SOLAR_ENV_ROOT%
+ DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
+ FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
+ F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
+ NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+ PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+ PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1
+ SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
+ SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+ SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+ SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+ SOLARROOT %SOLAR_ENV_ROOT%
+ SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+ SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+ SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+ SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+# TEMP $dp(%TEMP%)
+# TMP $dp(%TMP%)
+ }
+ common2
+ {
+ ENABLE_GRAPHITE TRUE
+ BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
+ CALL_CDECL TRUE
+ CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
+ COM MSC
+ COMEX 12
+ COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
+ COMMON_ENV_TOOLS %SOLARROOT%$/etools
+ COMP_ENV wntmsci13
+ CPU I
+ CPUNAME INTEL
+ CVER M1500
+ DYNAMIC_CRT TRUE
+ ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+ GUI WNT
+ GUIBASE WIN
+ GVER NT351
+ INPATH wntmsci13%PROEXT%
+ MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
+ OS WNT
+ OUTPATH wntmsci13
+ PACKMS %SO_PACK%$/wntmsci13$/MS
+ SET_EXEPTIONS TRUE
+ SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
+ SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+ SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+ SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+ SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
+ SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl
+ SORT sort -T %TMP%
+# TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
+ use_shl_versions TRUE
+ }
+ common:3 IF %UPDATER% == YES
+ {
+ SHIPDRIVE %BS_ROOT%$/ship$/install
+ }
+ compath
+ {
+ COMPATH $dp(%STAR_COMPATH%)
+ }
+ distroot:0 if X%DIST_ROOT%X != XX
+ {
+ SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+ SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
+ SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+ }
+ envroot:0 IF X%ENV_ROOT%X != XX
+ {
+ 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
+ {
+# HOMEDRIVE %DEVROOT%
+# HOMEPATH $/jdk141
+ JAVAHOME %JDK14PATH%
+ JAVA_HOME %JDK14PATH%
+ JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
+ JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+ JDKLIB %JDK14PATH%$/lib
+ JDKLIBS %JDK14PATH%$/lib
+ JDKPATH %JDK14PATH%$/bin
+ JDK_VERSION 142
+ JREPATH %JDK14PATH%$/jre$/bin$/client
+ XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
+ }
+ jdk14path:0 if X%JDK_PATH%X != XX
+ {
+ SOLAR_JDK14PATH $dp(%JDK_PATH%)
+ }
+ jdk15
+ {
+# HOMEDRIVE %DEVROOT%
+# HOMEPATH $/jdk151
+ JAVAHOME %JDK15PATH%
+ JAVA_HOME %JDK15PATH%
+ JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
+ JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+ JDKLIB %JDK15PATH%$/lib
+ JDKLIBS %JDK15PATH%$/lib
+ JDKPATH %JDK15PATH%$/bin
+ JDK_VERSION 150
+ JREPATH %JDK15PATH%$/jre$/bin$/client
+ XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
+ }
+ jdk15path:0 if X%JDK_PATH%X != XX
+ {
+ SOLAR_JDK15PATH $dp(%JDK_PATH%)
+ }
+ nojava
+ {
+ DISABLE_JAVA TRUE
+ }
+ ojdk16
+ {
+# HOMEDRIVE %DEVROOT%
+# HOMEPATH $/openjdk-6-b08-windows-i586
+ JAVA_HOME %OJDK16PATH%
+ JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
+ JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
+ JDKLIB %OJDK16PATH%$/lib
+ JDKLIBS %OJDK16PATH%$/lib
+ JDKPATH %OJDK16PATH%$/bin
+ JDK_VERSION 160
+ JREPATH %OJDK16PATH%$/jre$/bin$/client
+ XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
+ }
+ ojdk16path:0 if X%JDK_PATH%X != XX
+ {
+ SOLAR_OJDK16PATH $dp(%JDK_PATH%)
+ }
+ pre
+ {
+ ILIB %PRE%$/lib;%ILIB%
+ LIB %PRE%$/lib;%LIB%
+ }
+ pro
+ {
+ RES_ENUS TRUE
+ }
+ psdk
+ {
+ PSDK $dp(%STAR_PSDK%)
+ }
+ sourceroot:0 if X%SOURCE_ROOT%X != XX
+ {
+ 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
+ {
+ SOL_TMP $dp(%SOL_TMP_DIR%)
+ }
+ }
+ extern
+ {
+ COMSPEC
+ DIST_ROOT
+ ENV_ROOT
+ JDK_PATH
+ LOCALINI
+ OSTYPE
+ $dp(SOL_TMP)
+ $dp(SOURCE_ROOT)
+ $dp(STL_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
+ PERLDIR
+ SOLAR_ENV_ROOT
+ TFDEF
+ TFDIR
+ WST
+ }
+ script
+ {
+ sh
+ {
+ 400: if [ $COPYALL ]; then
+ 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+ 415: fi
+ 600: umask 002
+ 800: hash -r
+ 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+ 851: export SO_GEN_ERROR
+ 852: fi
+ 860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+ 861: export SO_GEN_ERROR2
+ 862: fi
+ 870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+ 871: echo $SO_GEN_ERROR
+ 872: fi
+ 880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+ 881: echo $SO_GEN_ERROR2
+ 882: fi
+ }
+ }
+ switches
+ {
+ bs_sourceroot SOURCE_ROOT_TMP
+ bsclient
+ ca
+ cap
+ cax
+ compath STAR_COMPATH
+ distroot
+ envroot
+ jdk13
+ jdk13path
+ jdk14
+ jdk14path
+ jdk15
+ jdk15path
+ l10n L10N_framework
+ nojava
+ ojdk16
+ ojdk16path
+ pre PRE
+ pro
+ psdk STAR_PSDK
+ shell STAR_USE_SHELL
+ sourceroot
+ stl
+ tmp SOL_TMP_DIR
+ }
+}
+
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index dca20cc902b1..877d82e566a5 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -25,6 +25,7 @@ common
rsc_once
wrapper_override_cc_wrapper
*zipdep
+ ALT_L10N_MODULE
AWK
BIG_SVX
BIG_TOOLS
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 1dea9b066680..063f98f2f322 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -27,7 +27,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -80,7 +80,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -133,7 +133,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -186,7 +186,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -239,7 +239,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -292,7 +292,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -345,7 +345,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -398,7 +398,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -451,7 +451,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
@@ -504,7 +504,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index eb479d4adafb..542c3d16be86 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m64(Build:9446)
-BUILD=9446
-LAST_MINOR=m64
+RSCREVISION=300m65(Build:9457)
+BUILD=9457
+LAST_MINOR=m65
SOURCEVERSION=DEV300
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 35d9e483ded8..fb8178f7e510 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -140,7 +140,7 @@ L_X64=$(SOLARLIBDIR_X64)
VERSIONOBJ_X64=$(SLO_X64)/_version.obj
BIN_X64=$(BIN)/x64
RES_X64=$(RES)/x64
-SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(EXT_UPDMINOR)/x64
+SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)/x64
LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64)
.IF "$(LIBTARGET)"==""
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 49b9d2c8e755..8d068bd28c04 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -648,29 +648,6 @@ MISC=$(OUT)/misc
COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))}
.ENDIF
-L10N_MODULE*=l10n
-ALT_L10N_MODULE*=l10n_so
-
-.IF "$(WITH_LANG)"!=""
-.INCLUDE .IGNORE: $(SOLARSRC)/$(L10N_MODULE)/localization_present.mk
-.INCLUDE .IGNORE: $(SOLARSRC)/$(ALT_L10N_MODULE)/localization_present.mk
-
-.IF "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYSDF:=$(SOLARSRC)/$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
-.IF "$(ALT_LOCALIZATION_FOUND)"!=""
-TRYALTSDF:=$(SOLARSRC)/$(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
-# TODO: check performance impact...
-LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
-.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!=""
-some_local_helper_var:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) ))
-LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(some_local_helper_var) $(LOCALIZESDF))
-LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf $(LOCALIZESDF))
-.ELSE # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-LOCALIZESDF:=$(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf
-.ENDIF # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!=""
-.ENDIF # "$(WITH_LANG)"!=""
-
-
OUTCXX=$(OUT)/cxx
.IF "$(PACKAGE)"!=""
@@ -791,7 +768,6 @@ SRSX=$(OUT)/srs
# Resource-Pfad fuer .RC und .RES
RES=$(OUT)/res
-
# das normale MISC wird nicht an LDMISC angepasst, stattdessen MISCX
.IF "$(make_xl)"!=""
@@ -801,39 +777,39 @@ BIN=$(PRJ)/$(OUTPATH).xl/bin
# damit gezielt Abhaengigkeiten auf s: angegeben werden koennen
.IF "$(common_build)"!=""
-SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(EXT_UPDMINOR)
+SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(UPDMINOREXT)
.ELSE
-SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(EXT_UPDMINOR)
+SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT)
.ENDIF
-.IF "$(UPDMINOR)" != ""
-EXT_UPDMINOR=.$(UPDMINOR)
-.ELSE
-EXT_UPDMINOR=
-.ENDIF
-SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res$(EXT_UPDMINOR)
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(EXT_UPDMINOR)
-SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib$(EXT_UPDMINOR)
-SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java$(EXT_UPDMINOR)
-SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc$(EXT_UPDMINOR)
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(EXT_UPDMINOR)
+#.IF "$(UPDMINOR)" != ""
+#UPDMINOREXT=.$(UPDMINOR)
+#.ELSE
+#UPDMINOREXT=
+#.ENDIF
+SOLARRESDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)
+SOLARLIBDIR=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)
+SOLARJAVADIR=$(SOLARVERSION)/$(INPATH)/java$(UPDMINOREXT)
+SOLARINCDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)
.IF "$(SOLARLANG)"!="deut"
.IF "$(SOLARLANG)" != ""
-SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(EXT_UPDMINOR)/$(SOLARLANG)
-SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(EXT_UPDMINOR)/$(SOLARLANG)
-.ENDIF
-.ENDIF
-SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin$(EXT_UPDMINOR)
-SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr$(EXT_UPDMINOR)
-SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par$(EXT_UPDMINOR)
-SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml$(EXT_UPDMINOR)
-SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc$(EXT_UPDMINOR)
-SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck$(EXT_UPDMINOR)
-SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf$(EXT_UPDMINOR)
-SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin$(EXT_UPDMINOR)
-SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res$(EXT_UPDMINOR)
-SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck$(EXT_UPDMINOR)
-SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf$(EXT_UPDMINOR)
+SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(SOLARLANG)
+SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)/$(SOLARLANG)
+.ENDIF
+.ENDIF
+SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin$(UPDMINOREXT)
+SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr$(UPDMINOREXT)
+SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par$(UPDMINOREXT)
+SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml$(UPDMINOREXT)
+SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc$(UPDMINOREXT)
+SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck$(UPDMINOREXT)
+SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf$(UPDMINOREXT)
+SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin$(UPDMINOREXT)
+SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res$(UPDMINOREXT)
+SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck$(UPDMINOREXT)
+SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf$(UPDMINOREXT)
.IF "$(common_build)"==""
SOLARCOMMONBINDIR=$(SOLARBINDIR)
SOLARCOMMONRESDIR=$(SOLARRESDIR)
@@ -843,6 +819,36 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
.EXPORT : SOLARBINDIR
+L10N_MODULE*=$(SOLARSRC)$/l10n
+ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
+
+.IF "$(WITH_LANG)"!=""
+.INCLUDE .IGNORE: $(L10N_MODULE)/localization_present.mk
+.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/localization_present.mk
+
+# check for localizations not hosted in l10n module. if a file exists there
+# it won't in l10n
+.IF "$(ALT_LOCALIZATION_FOUND)"!=""
+TRYALTSDF:=$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI)))
+.ENDIF # "$(ALT_LOCALIZATION_FOUND)"!=""
+# if the l10n module exists, use split localize.sdf directly from there
+.IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
+# still check for existence as there may be no localization yet
+TRYSDF:=$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI)))
+.ENDIF # "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
+# else use localize.sdf from local output tree if localization .zip exists
+.IF "$(LOCALIZESDF)"==""
+LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI)))
+.ENDIF # "$(LOCALIZESDF)"==""
+# dummy target to keep the build happy.
+.IF "$(LOCALIZESDF)"==""
+LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf
+.ENDIF # "$(LOCALIZESDF)"==""
+.ENDIF # "$(WITH_LANG)"!=""
+
.IF "$(PRE)"==""
#JARDIR=$(CLASSDIR)
JARDIR=$(OUT)/class
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index ca28d651989d..eb4b35008e8a 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1389,24 +1389,26 @@ $(UNIXTEXT) : $(UNIXTEXT:f)
.ENDIF # "$(UNIXTEXT)"!=""
.IF "$(WITH_LANG)"!=""
-.IF "$(LOCALIZATION_FOUND)"==""
.IF "$(LOCALIZESDF)"!=""
+
+# dummy target to keep the build happy if not even the .zip exists. localization tools deal with not existing
+# localize.sdf themself
+"$(LOCALIZESDF)%":
+ @echo $(LOCALIZESDF)
+ @@-$(MKDIRHIER) $(@:d)
+ $(TOUCH) $@
+
+.IF "$(LOCALIZATION_FOUND)"==""
+.IF "$(LOCALSDFFILE)"!=""
"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip
@@-$(MKDIRHIER) $(@:d)
@@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET)
- @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(FI)
- @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)/* $(COMMONMISC)/$(PRJNAME)
- @@-$(RM) -rf $(COMMONMISC)/$(PRJNAME)_$(TARGET)
-.ENDIF # "$(LOCALIZESDF)"!=""
+ @-unzip -o -d $(COMMONMISC)/$(PRJNAME) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(subst,$(COMMONMISC)/$(PRJNAME)/, $@)
+ @@$(TOUCH) $@
+.ENDIF # "$(LOCALSDFFILE)"!=""
.ENDIF # "$(LOCALIZATION_FOUND)"==""
-.ENDIF # "$(WITH_LANG)"!=""
-
-.IF "$(LOCALIZESDF)"!=""
-"$(LOCALIZESDF)%" :
- echo $(LOCALIZESDF)
- @@-$(MKDIRHIER) $(@:d)
- @$(TOUCH) $(LOCALIZESDF)
.ENDIF # "$(LOCALIZESDF)"!=""
+.ENDIF # "$(WITH_LANG)"!=""
.IF "$(EXTUPDATEINFO_NAME)"!=""
$(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 5318f2d8350b..bb5402813282 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -68,6 +68,9 @@ fake_root_dir=/$(TARFILE_NAME)
fake_back=../
.ENDIF "$(TARFILE_IS_FLAT)" != ""
+TARFILE_LOCATION*=$(BACK_PATH)$(fake_back)download
+TARFILE_LOCATION2=$(eq,$(BACK_PATH)$(fake_back)download,$(TARFILE_LOCATION) $(PRJ)/download $(TARFILE_LOCATION))
+
P_CONFIGURE_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(CONFIGURE_DIR)
P_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR)
P_INSTALL_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR)
@@ -112,56 +115,56 @@ clean:
$(COMMAND_ECHO)cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) clean
$(COMMAND_ECHO)$(RM) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
-$(MISC)/%.unpack : $(PRJ)/download/%.tar.bz2
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2
@-$(RM) $@
.IF "$(GUI)"=="UNX"
- @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+ @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
.ELSE # "$(GUI)"=="UNX"
- @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+ @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
.ENDIF # "$(GUI)"=="UNX"
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
-$(MISC)/%.unpack : $(PRJ)/download/%.tar.Z
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z
@-$(RM) $@
.IF "$(GUI)"=="UNX"
- @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
+ @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ")
.ELSE # "$(GUI)"=="UNX"
- @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+ @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
.ENDIF # "$(GUI)"=="UNX"
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
-$(MISC)/%.unpack : $(PRJ)/download/%.tar.gz
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.gz
@-$(RM) $@
- @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+ @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
-$(MISC)/%.unpack : $(PRJ)/download/%.tgz
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tgz
@-$(RM) $@
- @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
+ @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - )
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
-$(MISC)/%.unpack : $(PRJ)/download/%.tar
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar
@-$(RM) $@
- @noop $(assign UNPACKCMD := $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar)
+ @noop $(assign UNPACKCMD := $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_NAME).tar)
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
-$(MISC)/%.unpack : $(PRJ)/download/%.zip
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
@-$(RM) $@
- @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).zip)
+ @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_NAME).zip)
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
-$(MISC)/%.unpack : $(PRJ)/download/%.jar
+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
@-$(RM) $@
.IF "$(OS)"=="SOLARIS"
- @noop $(assign UNPACKCMD := jar xf $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar)
+ @noop $(assign UNPACKCMD := jar xf $(TARFILE_LOCATION)/$(TARFILE_NAME).jar)
.ELSE # "$(OS)"=="SOLARIS"
- @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar)
+ @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_NAME).jar)
.ENDIF # "$(OS)"=="SOLARIS"
@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
@$(RENAME) $@.$(INPATH) $@
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 9a8ec8bb72c2..3d79bd932b00 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -59,7 +59,7 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESD
@echo "Making: " $(@:f)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
$(COMMAND_ECHO)-$(RM) $@
- $(COMMAND_ECHO)-$(MKDIRHIER) $(SOLARSRC)/$(PRJNAME)/common$(PROEXT)/misc/$(PRJNAME)
+ $(COMMAND_ECHO)-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)
$(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index de5b66256d1e..a786f5a4d7f6 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -718,8 +718,9 @@ void redirect(line, makefile)
#if defined(USGISH) || defined(_SEQUENT_) || defined(USE_CHMOD)
chmod(makefile, st.st_mode);
#else
- fchmod(fileno(fdout), st.st_mode);
+ fchmod(fileno(fdout), st.st_mode);
#endif /* USGISH */
+ fclose(fdin);
}
#if NeedVarargsPrototypes
generated by cgit v1.2.1 (git 2.18.0) at 2023-06-05 13:21:32 +0000