diff options
37 files changed, 1169 insertions, 674 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 aac619ea3ea9..9998b3c359dd 100755 --- a/configure +++ b/configure @@ -2395,9 +2395,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 @@ -4896,9 +4895,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 @@ -4918,7 +4917,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 @@ -4927,9 +4926,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 @@ -4945,7 +4944,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 @@ -25382,20 +25381,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 bce4a1bfce40..6217774bd74d 100644 --- a/configure.in +++ b/configure.in @@ -130,7 +130,7 @@ AC_ARG_ENABLE(evolution2, ],,) AC_ARG_WITH(system-stdlibs, [ --with-system-stdlibs use libstdc++/libgcc_s already on system -],,checkforprelink=yes) +],,checkforstdlibproblems=yes) AC_ARG_WITH(system-mspack, [ --with-system-mspack use libmspack already installed on system ],,) @@ -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 @@ -1302,14 +1301,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! @@ -1341,7 +1340,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 @@ -1350,8 +1349,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 =================================================================== @@ -1367,11 +1366,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]) @@ -2625,7 +2624,7 @@ _ACEOF if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then gccvisbroken=yes else - if $EGREP -q '@PLT|\$stub' visibility.s; then + if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then gccvisbroken=no; else gccvisbroken=yes; @@ -2805,8 +2804,8 @@ if test "$SOLAR_JAVA" != ""; then _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` - if test "$_jdk_ver" -lt 10600; then - AC_MSG_ERROR([IBM JDK is too old, you need at least 1.6]) + if test "$_jdk_ver" -lt 10500; then + AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5]) fi AC_MSG_RESULT([checked (IBM JDK $_jdk)]) @@ -3494,10 +3493,16 @@ dnl =================================================================== dnl Check for prelinked libgcc_s.so.1 dnl =================================================================== if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then - if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then - with_system_stdlibs=yes - AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) - echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn + if test -n "$checkforstdlibproblems"; then + if test -f /etc/rpm/macros.prelink; then + with_system_stdlibs=yes + AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) + echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn + elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then + with_system_stdlibs=yes + AC_MSG_WARN([platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) + echo "platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn + fi fi fi @@ -5240,15 +5245,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 8a3b0b4443f1..88c1e02a7591 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -101,12 +101,9 @@ Module gid_Module_Root_Brand gid_Brand_File_Lib_Npsoplugin, gid_Brand_File_Lib_Subscrib_C05, gid_Brand_File_Oo_Office_Compatibility_Xcu, - gid_Brand_File_Registry_Spool_Oo_Inet_defaultsearchengine_Xcu_C01, gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu, gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu, gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Writer_directcursor_Xcu_C01, - gid_Brand_File_Registry_Spool_Oo_Office_Writer_defaultfontarial_Xcu_C01, gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration, gid_Brand_File_Share_Xdg_Base, diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 62b569e8f730..ce9fd987d038 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -892,11 +892,6 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Setup HostName = "Setup"; End -Directory gid_Dir_Share_Registry_Modules_Oo_Inet - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "Inet"; -End - Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; HostName = "Accelerators"; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 16855101dfd2..a49efd11958f 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1561,6 +1561,9 @@ End #ifndef DISABLE_NEON SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1) + #ifndef SYSTEM_NEON + SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) + #endif #endif SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1) diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 0d85cc529b63..24027743d58a 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -212,6 +212,9 @@ SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR) .IF "$(DISABLE_NEON)" == "TRUE" SCPDEFS+=-DDISABLE_NEON .ENDIF +.IF "$(SYSTEM_NEON)" == "YES" +SCPDEFS+=-DSYSTEM_NEON +.ENDIF # if yes or unset (neon not used) -> do not install openssl library! .IF $(SYSTEM_OPENSSL) != "YES" diff --git a/set_soenv.in b/set_soenv.in index 4e230b16a574..0892b12af5fd 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/ ) @@ -496,6 +495,17 @@ elsif ( $platform =~ m/linux/ ) $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."server"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."native_threads"; } + elsif ($platform =~ m/^hppa/) + { print "Setting Linux hppa specific values... "; + $outfile = "LinuxHPPAEnv.Set"; + $CPU = "H"; + $CPUNAME = "HPPA"; + $OUTPATH = "unxlnghppa"; + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa".$ds."server"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."hppa".$ds."native_threads"; + $EPM_FLAGS = "-a hppa"; + } elsif ($platform =~ m/^alpha/) { print "Setting Linux Alpha specific values... "; $outfile = "LinuxAlphaEnv.Set"; @@ -649,17 +659,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/ ) @@ -804,10 +807,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@ !"; } @@ -891,20 +890,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; @@ -1193,7 +1178,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 @@ -1484,7 +1469,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"'; @@ -1505,12 +1489,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. @@ -1519,7 +1497,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" ); @@ -1948,12 +1925,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}; } @@ -1985,23 +1958,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" ); @@ -2034,9 +1992,6 @@ print OUT $unsetvars; print OUT_SH "export $exportvars$newline"; print OUT_SH "unset $unsetvarssh$newline"; -if(defined($outfile_bat)) -{ print OUT_BAT $unsetvarsbat; -} # #--------------------------- @@ -2047,10 +2002,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. @@ -2074,14 +2025,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. @@ -2137,9 +2080,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"; } @@ -2160,7 +2101,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 ]; @@ -2236,21 +2177,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; @@ -2261,17 +2187,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" ) @@ -2279,13 +2198,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. @@ -2301,23 +2213,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/build.pl b/solenv/bin/build.pl index 40c310929eaa..cc0677220777 100644..100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -96,18 +96,12 @@ $modules_number++; $perl = ""; $remove_command = ""; - if ( $^O eq 'MSWin32' ) { - $perl = "$ENV{PERL}"; - $remove_command = "rmdir /S /Q"; - $nul = '> NULL'; - } else { - use Cwd 'chdir'; - $perl = 'perl'; - $remove_command = 'rm -rf'; - $nul = '> /dev/null'; - }; + use Cwd 'chdir'; + $perl = 'perl'; + $remove_command = 'rm -rf'; + $nul = '> /dev/null'; - $QuantityToBuild = 0; + $processes_to_run = 0; # delete $pid when not needed %projects_deps_hash = (); # hash of projects with no dependencies, # that could be built now @@ -117,7 +111,7 @@ %running_children = (); $dependencies_hash = 0; $cmd_file = ''; - $BuildAllParents = 0; + $build_all_parents = 0; $show = 0; $checkparents = 0; $deliver = 0; @@ -135,7 +129,7 @@ @broken_modules_names = (); # array of modules, which cannot be built further @dmake_args = (); %dead_parents = (); - $CurrentPrj = ''; + $initial_module = ''; $all_dependent = 1; # a flag indicating if the hash has independent keys $build_from_with_branches = ''; $build_all_cont = ''; @@ -207,12 +201,15 @@ my %module_paths = (); # hash with absolute module paths my %active_modules = (); my $generate_config = 0; + my $add_modules_to_config = 0; my %add_to_config = (); my %remove_from_config = (); my $clear_config = 0; my $finisched_children = 0; my $debug = 0; %module_deps_hash_pids = (); + my @argv = @ARGV; + my $source_config_file; ### main ### get_options(); @@ -234,11 +231,11 @@ $deliver_env{'L10N_framework'}++; }; - if ($generate_config) { + if ($generate_config && ($clear_config || (scalar keys %remove_from_config)||(scalar keys %add_to_config))) { generate_config_file(); exit 0; } - $StandDir = get_stand_dir(); # This also sets $CurrentPrj + $StandDir = get_stand_dir(); # This also sets $initial_module get_module_and_buildlist_paths(); provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS})); @@ -278,14 +275,14 @@ start_interactive() if ($interactive); if ($checkparents) { - GetParentDeps( $CurrentPrj, \%global_deps_hash ); + get_parent_deps( $initial_module, \%global_deps_hash ); } else { - BuildAll(); + build_all(); } if (scalar keys %broken_build) { cancel_build(); # } elsif (!$custom_job && $post_custom_job) { -# do_post_custom_job(CorrectPath($StandDir.$CurrentPrj)); +# do_post_custom_job(CorrectPath($StandDir.$initial_module)); }; print_warnings(); if (scalar keys %active_modules) { @@ -294,11 +291,10 @@ }; }; if (scalar keys %dead_parents) { - my ($DeadPrj); print $new_line.$new_line; print $echo."WARNING! Project(s):\n"; - foreach $DeadPrj (keys %dead_parents) { - print $echo."$DeadPrj\n"; + foreach (keys %dead_parents) { + print $echo."$_\n"; }; print $new_line; print $echo."not found and couldn't be built. Dependencies on that module(s) ignored. Maybe you should correct build lists.\n"; @@ -352,7 +348,7 @@ sub rename_file { sub generate_config_file { my $source_config = SourceConfig -> new(); - my $source_config_file = $source_config->get_config_file_path(); + $source_config_file = $source_config->get_config_file_path(); my $temp_config_file = File::Temp::tmpnam($ENV{TMP}); my @config_content_new = (); my $addition_message; @@ -364,7 +360,6 @@ sub generate_config_file { close SOURCE_CONFIG_FILE; my ($module_section, $repository_section); foreach (@config_content) { - $line++; if ((!/^\S+/)||(/^\s*#+/)) { push(@config_content_new, $_); next; @@ -422,8 +417,7 @@ sub generate_config_file { }; print_warnings(); print $addition_message if ($addition_message); - print "Module(s) $removal_message removed from $source_config_file\n" if ($removal_message); - exit(0); + print "Module(s):\n$removal_message\nremoved from $source_config_file\n" if ($removal_message); }; # @@ -437,50 +431,25 @@ sub add_modules_to_source_config { $message .= "$_ "; }; if ($message) { - return 'Module(s) ' .$message . 'are added to the ' . $source_config_file . "\n\n"; + return "Module(s):\n" .$message . "\nare added to the " . $source_config_file . "\n\n"; } else { return ''; }; }; sub start_interactive { - if ( $^O eq 'MSWin32' ) { - my $posix_sys_wait = 'POSIX ":sys_wait_h"'; - eval "use $posix_sys_wait"; - die "couldn't use $posix_sys_wait: $!\n" if ($@); - - pipe(FROM_PARENT, TO_CHILD) or die "pipe: $!"; - pipe(HTML_PIPE, TO_PARENT) or die "pipe: $!"; - + $pid = open(HTML_PIPE, "-|"); + print "Pipe is open\n"; - if (my $pid = fork()) { - $html_listener_pid = 1; - close FROM_PARENT; - close TO_PARENT; - ioctl(HTML_PIPE, 0x8004667e, 1); - return; - } else { - close HTML_PIPE; - close TO_CHILD; - select TO_PARENT; - $|++; - $parent_process = 0; - start_html_listener(); - } - } else { - $pid = open(HTML_PIPE, "-|"); - print "Pipe is open\n"; - - if ($pid) { # parent - # make file handle non-bloking - my $flags = ''; - fcntl(HTML_PIPE, F_GETFL, $flags); - $flags |= O_NONBLOCK; - fcntl(HTML_PIPE, F_SETFL, $flags); - } else { # child - $parent_process = 0; - start_html_listener(); - }; + if ($pid) { # parent + # make file handle non-bloking + my $flags = ''; + fcntl(HTML_PIPE, F_GETFL, $flags); + $flags |= O_NONBLOCK; + fcntl(HTML_PIPE, F_SETFL, $flags); + } else { # child + $parent_process = 0; + start_html_listener(); }; }; @@ -516,7 +485,6 @@ sub start_html_message_trigger { if ($child_id) { # parent - $html_message_trigger{$child_id}++; # print "started listener trigger\n"; } else { my $buffer_size = 1024; @@ -673,20 +641,20 @@ sub get_build_list_path { # # Get dependencies hash of the current and all parent projects # -sub GetParentDeps { +sub get_parent_deps { my (%parents_deps_hash, $module, $parent); my $prj_dir = shift; my $deps_hash = shift; - my @UnresolvedParents = get_parents_array($prj_dir); - $parents_deps_hash{$_}++ foreach (@UnresolvedParents); + my @unresolved_parents = get_parents_array($prj_dir); + $parents_deps_hash{$_}++ foreach (@unresolved_parents); $$deps_hash{$prj_dir} = \%parents_deps_hash; - while ($module = pop(@UnresolvedParents)) { + while ($module = pop(@unresolved_parents)) { my %parents_deps_hash = (); $parents_deps_hash{$_}++ foreach (get_parents_array($module)); $$deps_hash{$module} = \%parents_deps_hash; foreach $Parent (keys %parents_deps_hash) { if (!defined($$deps_hash{$Parent})) { - push (@UnresolvedParents, $Parent); + push (@unresolved_parents, $Parent); }; }; }; @@ -743,19 +711,16 @@ sub reverse_dependensies { # # Build everything that should be built # -sub BuildAll { - if ($BuildAllParents) { +sub build_all { + if ($build_all_parents) { my ($Prj, $PrjDir, $orig_prj); - GetParentDeps( $CurrentPrj, \%global_deps_hash); + get_parent_deps( $initial_module, \%global_deps_hash); if (scalar keys %active_modules) { - $active_modules{$CurrentPrj}++; - $modules_types{$CurrentPrj} = 'mod'; + $active_modules{$initial_module}++; + $modules_types{$initial_module} = 'mod'; }; modules_classify(keys %global_deps_hash); store_weights(\%global_deps_hash); - if (keys %active_modules && ($build_from || $incompatible)) { - print_error("There are active module in $source_config_file. Please remove these modules to proceed.\n"); - }; prepare_build_from(\%global_deps_hash) if ($build_from); prepare_incompatible_build(\%global_deps_hash) if ($incompatible); if ($build_all_cont || $build_since) { @@ -763,12 +728,25 @@ sub BuildAll { push (@warnings, "\nThere are active module in $source_config_file. Inactive modules are skipped.\n\n"); prepare_build_all_cont(\%global_deps_hash); }; + if ($generate_config) { + %add_to_config = %global_deps_hash; + generate_config_file(); + exit 0; + } elsif (keys %incompatibles) { + my @missing_modules = (); + foreach (keys %global_deps_hash) { + push(@missing_modules, $_) if (!defined $active_modules{$_}); + }; + if (scalar @missing_modules) { + print_error("There are modules:\n@missing_modules\n\nthat should be built, but they are not activated. Please, verify your $source_config_file.\n"); + }; + }; backup_deps_hash(\%global_deps_hash, \%global_deps_hash_backup); expand_dependencies (\%global_deps_hash_backup); reverse_dependensies(\%global_deps_hash_backup); $modules_number = scalar keys %global_deps_hash; initialize_html_info($_) foreach (keys %global_deps_hash); - if ($QuantityToBuild) { + if ($processes_to_run) { build_multiprocessing(); return; }; @@ -789,7 +767,7 @@ sub BuildAll { my $info_hash = $html_info{$Prj}; $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $Prj); $module_by_hash{\%LocalDepsHash} = $Prj; - BuildDependent(\%LocalDepsHash); + build_dependent(\%LocalDepsHash); print $check_error_string; }; @@ -797,16 +775,16 @@ sub BuildAll { $build_is_finished{$Prj}++; }; } else { - store_build_list_content($CurrentPrj); - get_module_dep_hash($CurrentPrj, \%LocalDepsHash); - initialize_html_info($CurrentPrj); - my $info_hash = $html_info{$CurrentPrj}; - $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $CurrentPrj); - $module_by_hash{\%LocalDepsHash} = $CurrentPrj; + store_build_list_content($initial_module); + get_module_dep_hash($initial_module, \%LocalDepsHash); + initialize_html_info($initial_module); + my $info_hash = $html_info{$initial_module}; + $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $initial_module); + $module_by_hash{\%LocalDepsHash} = $initial_module; if ($server_mode) { run_server(); } else { - BuildDependent(\%LocalDepsHash); + build_dependent(\%LocalDepsHash); }; }; }; @@ -884,7 +862,8 @@ sub dmake_dir { }; _exit(0); } elsif ($error_code && ($error_code != -1)) { - print_error("Error $? occurred while making $BuildDir"); + return $error_code; +# print_error("Error $? occurred while making $BuildDir"); }; }; @@ -1075,7 +1054,7 @@ sub get_deps_hash { if (scalar @errors) { my $message = "$module_to_build/prj/build.lst has wrongly written string(s):\n"; $message .= "$_\n" foreach(@errors); - if ($QuantityToBuild) { + if ($processes_to_run) { $broken_build{$module_to_build} = $message; $dependencies_hash = undef; return; @@ -1097,7 +1076,7 @@ sub get_deps_hash { add_prerequisite_job($dependencies_hash, $module_to_build, $pre_custom_job); add_prerequisite_job($dependencies_hash, $module_to_build, $pre_job); add_dependent_job($dependencies_hash, $module_to_build, $custom_job); - add_dependent_job($dependencies_hash, $module_to_build, $post_job) if ($module_to_build ne $CurrentPrj); + add_dependent_job($dependencies_hash, $module_to_build, $post_job) if ($module_to_build ne $initial_module); add_dependent_job($dependencies_hash, $module_to_build, $post_custom_job); }; store_weights($dependencies_hash); @@ -1163,11 +1142,7 @@ sub mark_platform { # sub CorrectPath { $_ = shift; - if ( ($^O eq 'MSWin32') && (!defined $ENV{SHELL})) { - s/\//\\/g; - } else {; - s/\\/\//g; - }; + s/\\/\//g; return $_; }; @@ -1232,7 +1207,7 @@ sub get_stand_dir { do { foreach (@possible_build_lists) {# ('build.lst', 'build.xlist'); if (-e $StandDir . '/prj/'.$_) { - $CurrentPrj = File::Basename::basename($StandDir); + $initial_module = File::Basename::basename($StandDir); $StandDir = File::Basename::dirname($StandDir); return $StandDir; } elsif ($StandDir eq $previous_dir) { @@ -1381,9 +1356,9 @@ sub find_indep_prj { my ($Dependencies, $i); my @candidates = (); $all_dependent = 1; - handle_dead_children(0) if ($QuantityToBuild); + handle_dead_children(0) if ($processes_to_run); my $children = children_number(); - return '' if (!$server_mode && $children && ($children >= $QuantityToBuild)); + return '' if (!$server_mode && $children && ($children >= $processes_to_run)); $Dependencies = shift; if (scalar keys %$Dependencies) { foreach my $job (keys %$Dependencies) { @@ -1500,7 +1475,7 @@ sub print_error { sub usage { print STDERR "\nbuild\n"; - print STDERR "Syntax: build [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add module1,module2[,...,moduleN]]] [--interactive]\n"; + print STDERR "Syntax: build [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--interactive]\n"; print STDERR "Example1: build --from sfx2\n"; print STDERR " - build all projects dependent from sfx2, starting with sfx2, finishing with the current module\n"; print STDERR "Example2: build --all:sfx2\n"; @@ -1555,10 +1530,10 @@ sub usage { sub get_options { my ($arg, $dont_grab_output); while ($arg = shift @ARGV) { - $arg =~ /^-P$/ and $QuantityToBuild = shift @ARGV and next; - $arg =~ /^-P(\d+)$/ and $QuantityToBuild = $1 and next; - $arg =~ /^--all$/ and $BuildAllParents = 1 and next; - $arg =~ /^-a$/ and $BuildAllParents = 1 and next; + $arg =~ /^-P$/ and $processes_to_run = shift @ARGV and next; + $arg =~ /^-P(\d+)$/ and $processes_to_run = $1 and next; + $arg =~ /^--all$/ and $build_all_parents = 1 and next; + $arg =~ /^-a$/ and $build_all_parents = 1 and next; $arg =~ /^--show$/ and $show = 1 and next; $arg =~ /^--checkmodules$/ and $checkparents = 1 and $ignore = 1 and next; $arg =~ /^-s$/ and $show = 1 and next; @@ -1571,17 +1546,17 @@ sub get_options { $arg =~ /^--file$/ and $cmd_file = shift @ARGV and next; $arg =~ /^-F$/ and $cmd_file = shift @ARGV and next; - $arg =~ /^--with_branches$/ and $BuildAllParents = 1 + $arg =~ /^--with_branches$/ and $build_all_parents = 1 and $build_from_with_branches = shift @ARGV and next; - $arg =~ /^-b$/ and $BuildAllParents = 1 + $arg =~ /^-b$/ and $build_all_parents = 1 and $build_from_with_branches = shift @ARGV and next; - $arg =~ /^--all:(\S+)$/ and $BuildAllParents = 1 + $arg =~ /^--all:(\S+)$/ and $build_all_parents = 1 and $build_all_cont = $1 and next; - $arg =~ /^-a:(\S+)$/ and $BuildAllParents = 1 + $arg =~ /^-a:(\S+)$/ and $build_all_parents = 1 and $build_all_cont = $1 and next; if ($arg =~ /^--from$/ || $arg =~ /^-f$/) { - $BuildAllParents = 1; + $build_all_parents = 1; get_incomp_projects(); next; }; @@ -1589,11 +1564,11 @@ sub get_options { $arg =~ /^-p$/ and $prepare = 1 and next; $arg =~ /^--prepare:/ and $prepare = 1 and $only_platform = $' and next; $arg =~ /^-p:/ and $prepare = 1 and $only_platform = $' and next; - $arg =~ /^--since$/ and $BuildAllParents = 1 + $arg =~ /^--since$/ and $build_all_parents = 1 and $build_since = shift @ARGV and next; - $arg =~ /^-c$/ and $BuildAllParents = 1 + $arg =~ /^-c$/ and $build_all_parents = 1 and $build_since = shift @ARGV and next; - $arg =~ /^-s$/ and $BuildAllParents = 1 + $arg =~ /^-s$/ and $build_all_parents = 1 and $build_since = shift @ARGV and next; $arg =~ /^--help$/ and usage() and do_exit(0); $arg =~ /^-h$/ and usage() and do_exit(0); @@ -1601,10 +1576,14 @@ sub get_options { $arg =~ /^--genconf$/ and $generate_config = 1 and next; if ($arg =~ /^--add$/) { get_list_of_modules(\%add_to_config); + $add_modules_to_config++; next; }; if ($arg =~ /^--remove$/) { get_list_of_modules(\%remove_from_config); + if (!scalar %remove_from_config) { + print_error('No module list supplied!!'); + }; next; }; ($arg =~ /^--clear$/ || $arg =~ /^--removeall$/) and $clear_config = 1 and next; @@ -1637,7 +1616,7 @@ sub get_options { # print_error('Please prepare the workspace on one of UNIX platforms') if ($prepare && ($ENV{GUI} ne 'UNX')); print_error('Switches --with_branches and --since collision') if ($build_from_with_branches && $build_since); if ($show) { - $QuantityToBuild = 0; + $processes_to_run = 0; $cmd_file = ''; }; print_error('Switches --job and --deliver collision') if ($custom_job && $deliver); @@ -1647,7 +1626,7 @@ sub get_options { if ($prepare) { print_error("--prepare is for use with --from switch only!\n") if (!$incompatible); }; - if ($QuantityToBuild) { + if ($processes_to_run) { if ($ignore && !$html) { print_error("Cannot ignore errors in multiprocessing build"); }; @@ -1675,8 +1654,8 @@ sub get_options { if ((scalar %add_to_config) || (scalar %remove_from_config)) { print_error('"--add" or/and "--remove"' . $error_message); }; - } elsif ((!scalar %add_to_config) && !$clear_config && (!scalar %remove_from_config)){ - print_error('Please supply necessary switch for "--genconf" (--add|--remove|--removeall)'); + } elsif ((!scalar %add_to_config) && !$clear_config && (!scalar %remove_from_config) && !$build_all_parents){ + print_error('Please supply necessary switch for "--genconf" (--add|--remove|--removeall). --add can be used with --from and such'); }; if ($only_platform) { @@ -1698,7 +1677,7 @@ sub get_options { sub get_module_and_buildlist_paths { my $source_config = SourceConfig -> new($StandDir); - my $source_config_file = $source_config->get_config_file_path(); + $source_config_file = $source_config->get_config_file_path(); $active_modules{$_}++ foreach ($source_config->get_active_modules()); my %active_modules_copy = %active_modules; foreach ($source_config->get_all_modules()) { @@ -1744,33 +1723,37 @@ sub get_switch_options { # sub cancel_build { # close_server_socket(); - $modules_number -= scalar keys %global_deps_hash; my $broken_modules_number = scalar @broken_modules_names; + my $message_part = 'build '; + if (scalar keys %incompatibles) { + my @incompatible_modules = keys %incompatibles; + if ($stop_build_on_error) { + $message_part .= "--from @incompatible_modules:@broken_modules_names\n"; + } else { + $message_part .= "--from @broken_modules_names\n"; + }; + } else { + $message_part .= "--all:@broken_modules_names\n"; + }; if ($broken_modules_number) { - $modules_number -= $broken_modules_number; print "\n"; print $broken_modules_number; print " module(s): "; foreach (@broken_modules_names) { print "\n\t$_"; -# RemoveFromDependencies($_, \%global_deps_hash); }; print "\nneed(s) to be rebuilt\n\nReason(s):\n\n"; foreach (keys %broken_build) { print "ERROR: error " . $broken_build{$_} . " occurred while making $_\n"; }; - print "\nAttention: if you build and deliver the above module(s) you may prolongue your the build issuing command \"build --from @broken_modules_names\"\n"; + print "\nAttention: if you fix the errors in above module(s) you may prolongue your the build issuing command:\n\n\t" . $message_part; } else { -# if ($ENV{GUI} eq 'WNT') { - while (children_number()) { - handle_dead_children(1); - } - foreach (keys %broken_build) { - print "ERROR: error " . $broken_build{$_} . " occurred while making $_\n"; - }; -# } else { -# kill 9 => -$$; -# }; + while (children_number()) { + handle_dead_children(1); + } + foreach (keys %broken_build) { + print "ERROR: error " . $broken_build{$_} . " occurred while making $_\n"; + }; }; print "\n"; do_exit(1); @@ -1827,9 +1810,9 @@ sub handle_dead_children { }; }; }; - sleep 1 if (children_number() >= $QuantityToBuild || ($force_wait && ($running_children == children_number()))); + sleep 1 if (children_number() >= $processes_to_run || ($force_wait && ($running_children == children_number()))); } else { - if (children_number() >= $QuantityToBuild || + if (children_number() >= $processes_to_run || ($force_wait && ($running_children == children_number()))) { $pid = wait(); } else { @@ -1845,7 +1828,7 @@ sub handle_dead_children { $finisched_children++; }; }; - } while(children_number() >= $QuantityToBuild); + } while(children_number() >= $processes_to_run); }; sub give_second_chance { @@ -1881,38 +1864,44 @@ sub clear_from_child { # # Build the entire project according to queue of dependencies # -sub BuildDependent { +sub build_dependent { $dependencies_hash = shift; my $pid = 0; my $child_nick = ''; $running_children{$dependencies_hash} = 0 if (!defined $running_children{$dependencies_hash}); while ($child_nick = pick_prj_to_build($dependencies_hash)) { - if ($QuantityToBuild) { + if ($processes_to_run) { do { if (defined $modules_with_errors{$dependencies_hash} && !$ignore) { - return 0 if ($BuildAllParents); + return 0 if ($build_all_parents); last; }; # start current child & all # that could be started now - start_child($child_nick, $dependencies_hash) if ($child_nick); - return 1 if ($BuildAllParents); + if ($child_nick) { + start_child($child_nick, $dependencies_hash); + return 1 if ($build_all_parents); + } else { + return 0 if ($build_all_parents); + if (scalar keys %$dependencies_hash) { + handle_dead_children(1); + }; + }; $child_nick = pick_prj_to_build($dependencies_hash); } while (scalar keys %$dependencies_hash || $child_nick); while (children_number()) { -# print "#### 1902: Starting waiting for dead child\n"; handle_dead_children(1); }; -# if (defined $last_module) { -# $build_is_finished{$last_module}++ if (!defined $modules_with_errors{$last_module}); -# }; if (defined $modules_with_errors{$dependencies_hash}) { cancel_build(); } mp_success_exit(); } else { - dmake_dir($child_nick); + if (dmake_dir($child_nick)) { + push(@broken_modules_names, $module_by_hash{$dependencies_hash}); + cancel_build(); + }; }; $child_nick = ''; }; @@ -2010,7 +1999,7 @@ sub build_multiprocessing { sub mp_success_exit { # close_server_socket(); # if (!$custom_job && $post_custom_job) { -# do_post_custom_job(CorrectPath($StandDir.$CurrentPrj)); +# do_post_custom_job(CorrectPath($StandDir.$initial_module)); # }; print "\nMultiprocessing build is finished\n"; print "Maximal number of processes run: $maximal_processes\n"; @@ -2045,7 +2034,7 @@ sub build_actual_queue { delete $$build_queue{$Prj}; next; }; - $started_children =+ BuildDependent($projects_deps_hash{$Prj}); + $started_children =+ build_dependent($projects_deps_hash{$Prj}); if ((!scalar keys %{$projects_deps_hash{$Prj}}) && !$running_children{$projects_deps_hash{$Prj}}) { if (!defined $modules_with_errors{$projects_deps_hash{$Prj}} || $ignore) @@ -2142,7 +2131,7 @@ sub print_announce { $prj_type = $modules_types{$Prj} if (defined $modules_types{$Prj}); my $text; if ($prj_type eq 'lnk') { - if (scalar keys %active_modules && (!defined $active_modules{$Prj})) { + if (!defined $active_modules{$Prj}) { $text = "Skipping module $Prj\n"; } else { $text = "Skipping link to $Prj\n"; @@ -2193,7 +2182,7 @@ sub modules_classify { next; }; if (( $module_paths{$module} =~ /\.lnk$/) || ($module_paths{$module} =~ /\.link$/) - || (scalar keys %active_modules && (!defined $active_modules{$module}))) { + || (!defined $active_modules{$module})) { $modules_types{$module} = 'lnk'; next; }; @@ -2224,19 +2213,10 @@ sub provide_consistency { # sub get_workspace_lst { - my $home; - if ( $^O eq 'MSWin32' ) { - $home = $ENV{TEMP}; - } - else { - $home = $ENV{HOME}; - } - my $inifile = "$home/localini/stand.lst"; + my $home = $ENV{HOME}; + my $inifile = $ENV{HOME}. '/localini/stand.lst'; if (-f $inifile) { return $inifile; -# } else { -# $inifile = get_globalini() . "/stand.lst"; -# return $inifile if (-f $inifile); }; return ''; } @@ -2391,7 +2371,11 @@ sub prepare_incompatible_build { delete $$deps_hash{$build_all_cont}; }; @modules_built = keys %$deps_hash; - clear_delivered() if ($prepare); + %add_to_config = %$deps_hash; + if ($prepare) { + generate_config_file(); + clear_delivered(); + } my $old_output_tree = ''; foreach $prj (sort keys %$deps_hash) { if ($prepare) { @@ -2416,7 +2400,7 @@ sub prepare_incompatible_build { if ($old_output_tree) { push(@warnings, 'Some module(s) contain old output tree(s)!'); }; - if (scalar @warnings) { + if (!$generate_config && scalar @warnings) { print "WARNING(S):\n"; print STDERR "$_\n" foreach (@warnings); print "\nATTENTION: If you are performing an incompatible build, please break the build with Ctrl+C and prepare the workspace with \"--prepare\" switch!\n\n" if (!$prepare); @@ -2439,7 +2423,7 @@ sub prepare_build_from { my ($prj, $deps_hash); $deps_hash = shift; my %from_deps_hash = (); # hash of dependencies of the -from project - GetParentDeps($build_from_with_branches, \%from_deps_hash); + get_parent_deps($build_from_with_branches, \%from_deps_hash); foreach $prj (keys %from_deps_hash) { delete $$deps_hash{$prj}; RemoveFromDependencies($prj, $deps_hash); @@ -2508,9 +2492,9 @@ sub get_list_of_modules { }; }; }; - if (!scalar %$hash_ref) { - print_error('No module list supplied!!'); - }; +# if (!scalar %$hash_ref) { +# print_error('No module list supplied!!'); +# }; }; sub get_incomp_projects { @@ -2530,6 +2514,26 @@ sub get_incomp_projects { }; }; +sub get_workspace_platforms { + my $workspace_patforms = shift; + my $solver_path = $ENV{SOLARVERSION}; + opendir(SOLVERDIR, $solver_path); + @dir_list = readdir(SOLVERDIR); + close SOLVERDIR; + foreach (@dir_list) { + next if /^common/; + next if /^\./; + if (open(LS, "ls $solver_path/$_/inc/*minor.mk 2>$nul |")) { + foreach my $string (<LS>) { + chomp $string; + if ($string =~ /minor.mk$/) { + $$workspace_patforms{$_}++ + }; + }; + close LS; + }; + }; +}; sub get_platforms { my $platforms_ref = shift; @@ -2542,17 +2546,22 @@ sub get_platforms { my $workspace_lst = get_workspace_lst(); if ($workspace_lst) { - my $workspace_db = GenInfoParser->new(); - my $success = $workspace_db->load_list($workspace_lst); - if ( !$success ) { - print_error("Can't load workspace list '$workspace_lst'.", 4); - } - my $access_path = $ENV{WORK_STAMP} . '/Environments'; - my @platforms_available = $workspace_db->get_keys($access_path); - my $solver = $ENV{SOLARVERSION}; - foreach (@platforms_available) { - my $s_path = $solver . '/' . $_; - $$platforms_ref{$_}++ if (-d $s_path); + my $workspace_db; + eval { $workspace_db = GenInfoParser->new(); }; + if (!$@) { + my $success = $workspace_db->load_list($workspace_lst); + if ( !$success ) { + print_error("Can't load workspace list '$workspace_lst'.", 4); + } + my $access_path = $ENV{WORK_STAMP} . '/Environments'; + my @platforms_available = $workspace_db->get_keys($access_path); + my $solver = $ENV{SOLARVERSION}; + foreach (@platforms_available) { + my $s_path = $solver . '/' . $_; + $$platforms_ref{$_}++ if (-d $s_path); + }; + } else { + get_workspace_platforms(\%platforms); }; }; @@ -2621,12 +2630,8 @@ sub read_ssolar_vars { my ($setsolar, $tmp_file); $setsolar = $ENV{ENV_ROOT} . '/etools/setsolar.pl'; my ($platform, $solar_vars) = @_; - if ( $^O eq 'MSWin32' ) { - $tmp_file = $ENV{TEMP} . "\\solar.env.$$.tmp"; - } else { - $setsolar = '/net/jumbo2.germany/buildenv/r/etools/setsolar.pl' if ! -e $setsolar; - $tmp_file = $ENV{HOME} . "/.solar.env.$$.tmp"; - }; + $setsolar = '/net/jumbo2.germany/buildenv/r/etools/setsolar.pl' if ! -e $setsolar; + $tmp_file = $ENV{HOME} . "/.solar.env.$$.tmp"; if (!-e $setsolar) { print STDERR "There is no setsolar found. Falling back to current platform settings\n"; return; @@ -2663,14 +2668,8 @@ sub get_solar_vars { next if(!/^\w+\s+(\w+)/o); next if (!defined $deliver_env{$1}); $var = $1; - if ( $^O eq 'MSWin32' ) { - my $string_tail = $'; - $string_tail =~ /=(\S+)$/o; - $value = $1; - } else { - /\'(\S+)\'$/o; - $value = $1; - }; + /\'(\S+)\'$/o; + $value = $1; $$solar_vars{$var} = $value; }; close SOLARTABLE; @@ -2691,8 +2690,8 @@ sub get_current_module { if ( ! $result ) { print_error("Cannot rename $module_name: $!\n"); } - if ( $CurrentPrj eq $link_name) { - $CurrentPrj = $module_name; + if ( $initial_module eq $link_name) { + $initial_module = $module_name; } chdir $module_name; getcwd(); @@ -2700,26 +2699,17 @@ sub get_current_module { sub check_dir { my $start_dir = getcwd(); - my @dir_entries = split(/[\\\/]/, $start_dir); + my @dir_entries = split(/[\\\/]/, $ENV{PWD}); my $current_module = $dir_entries[$#dir_entries]; - $current_module = $` if (($current_module =~ /(\.lnk)$/) || ($current_module =~ /(\.link)$/)); - my $link_name = $ENV{SOLARSRC}.'/'.$current_module.$1; - if ( $^O eq 'MSWin32' ) { - $start_dir =~ s/\\/\//go; - $link_name =~ s/\\/\//go; - if (lc($start_dir) eq lc($link_name)) { - get_current_module($current_module); - }; - } elsif ((-l $link_name) && (chdir $link_name)) { - if ($start_dir eq getcwd()) { - # we're dealing with link => fallback to SOLARSRC under UNIX - $StandDir = $ENV{SOLARSRC}.'/'; - get_current_module($current_module); - return; - } else { - chdir $start_dir; - getcwd(); - }; + if (($current_module =~ /(\.lnk)$/) || ($current_module =~ /(\.link)$/)) { + $current_module = $`; + # we're dealing with a link => fallback to SOLARSRC under UNIX + $StandDir = $ENV{SOLARSRC}.'/'; + get_current_module($current_module); + return; + } else { + chdir $start_dir; + getcwd(); }; }; @@ -2836,7 +2826,7 @@ sub generate_html_file { print HTML 'document.write(" </ul>");' . "\n"; print HTML 'document.write(" </div>");' . "\n"; }; - if ($BuildAllParents) { + if ($build_all_parents) { print HTML 'document.write("<table valign=top cellpadding=0 hspace=0 vspace=0 cellspacing=0 border=0>");' . "\n"; print HTML 'document.write(" <tr>");' . "\n"; print HTML 'document.write(" <td><a id=ErroneousModules href=\"javascript:top.Error(\'\', \''; @@ -2874,7 +2864,7 @@ sub generate_html_file { foreach (@modules_order) { next if ($modules_types{$_} eq 'lnk'); - next if (scalar keys %active_modules && (!defined $active_modules{$_})); + next if (!defined $active_modules{$_}); my ($errors_info_line, $dirs_info_line, $errors_number, $successes_percent, $errors_percent, $time) = get_html_info($_); #<one module> print HTML 'document.write(" <tr>");' . "\n"; @@ -3517,7 +3507,7 @@ sub get_job_string { my $build_queue = shift; my $job = $dmake; my ($job_dir, $dependencies_hash); - if ($BuildAllParents) { + if ($build_all_parents) { fill_modules_queue($build_queue); do { ($job_dir, $dependencies_hash) = pick_jobdir($build_queue); 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/cws.pl b/solenv/bin/cws.pl index 96ea6610fa67..801d62add78c 100644 --- a/solenv/bin/cws.pl +++ b/solenv/bin/cws.pl @@ -59,9 +59,11 @@ use Cws; #### globals #### -# TODO: replace dummy vales with actual SVN->hg migration milestones +# TODO: replace dummy vales with actual SVN->hg and source_config migration milestones my $dev300_migration_milestone = 'm64'; +my $dev300_source_config_milestone = 'm65'; my $ooo320_migration_milestone = 'm999'; +my $ooo320_source_config_milestone = 'm999'; # valid command with possible abbreviations my @valid_commands = ( @@ -101,6 +103,9 @@ for (@valid_commands) { # set by --debug switch my $debug = 0; +# set by --profile switch +my $profile = 0; + #### main #### @@ -126,6 +131,7 @@ sub parse_command_line 'migration', 'childworkspace|child|c=s', 'debug', + 'profile', 'commit|C', 'switch|s', 'platforms|p=s', @@ -195,6 +201,10 @@ sub verify_options $debug = 1; next; } + if ( /profile/ ) { + $profile = 1; + next; + } if (!exists $valid_command_options_hash{$_}) { print_error("can't use option '--$_' with subcommand '$command'.", 1); } @@ -576,7 +586,7 @@ sub hg_local_clone_repository hg_strip($dest, $revision); } my $t2 = Benchmark->new(); - print_time_elapsed($t1, $t2); + print_time_elapsed($t1, $t2) if $profile; } sub hg_lan_clone_repository @@ -589,7 +599,7 @@ sub hg_lan_clone_repository print_message("... clone LAN repository '$lan_source' to '$dest'"); hg_clone($lan_source, $dest, "-U -r $milestone_tag"); my $t2 = Benchmark->new(); - print_time_elapsed($t1, $t2); + print_time_elapsed($t1, $t2) if $profile; } sub hg_remote_pull_repository @@ -601,7 +611,7 @@ sub hg_remote_pull_repository print_message("... pull from REMOTE repository '$remote_source' to '$dest'"); hg_pull($dest, $remote_source); my $t2 = Benchmark->new(); - print_time_elapsed($t1, $t2); + print_time_elapsed($t1, $t2) if $profile; } sub hg_update_repository @@ -612,7 +622,7 @@ sub hg_update_repository print_message("... update repository '$dest'"); hg_update($dest); my $t2 = Benchmark->new(); - print_time_elapsed($t1, $t2); + print_time_elapsed($t1, $t2) if $profile; } # Check if clone source and destination are on the same filesystem, @@ -1312,10 +1322,11 @@ sub relink_workspace { sub update_solver { - my $platform = shift; - my $source = shift; - my $solver = shift; - my $milestone = shift; + my $platform = shift; + my $source = shift; + my $solver = shift; + my $milestone = shift; + my $source_config = shift; my @zip_sub_dirs = ('bin', 'doc', 'idl', 'inc', 'lib', 'par', 'pck', 'pdb', 'pus', 'rdb', 'res', 'xml', 'sdf'); @@ -1344,6 +1355,7 @@ sub update_solver my $nzips = @zips; print_message("... unzipping $nzips zip archives for platform '$platform'"); + foreach(@zips) { my $zip = Archive::Zip->new(); unless ( $zip->read( "$platform_source/$_" ) == AZ_OK ) { @@ -1351,7 +1363,8 @@ sub update_solver } # TODO: check for erorrs foreach (@zip_sub_dirs) { - unless ( $zip->extractTree($_, "$platform_solver/$_.$milestone") == AZ_OK ) { + my $extract_destination = $source_config ? "$platform_solver/$_" : "$platform_solver/$_.$milestone"; + unless ( $zip->extractTree($_, $extract_destination) == AZ_OK ) { print_error("Can't extract stream from zip file '$platform_source/$_': $!.", 44); } } @@ -1453,11 +1466,40 @@ sub get_scm_for_milestone } } else { - $scm = 'SVN' + $scm = 'SVN'; } return $scm; } +# TODO: special provisions for "source_config" migration, remove this +# some time after migration +sub get_source_config_for_milestone +{ + my $masterws = shift; + my $milestone = shift; + + my $milestone_sequence_number = extract_milestone_sequence_number($milestone); + my $dev300_migration_sequence_number = extract_milestone_sequence_number($dev300_source_config_milestone); + my $ooo320_migration_sequence_number = extract_milestone_sequence_number($ooo320_source_config_milestone); + + my $source_config = 0; + + if ( $masterws eq 'DEV300' ) { + if ( $milestone_sequence_number >= $dev300_migration_sequence_number ) { + $source_config = 1; + } + } + elsif ( $masterws eq 'OOO320' ) { + if ( $milestone_sequence_number >= $ooo320_migration_sequence_number ) { + $source_config = '1'; + } + } + else { + $source_config = 0; + } + return $source_config; +} + sub extract_milestone_sequence_number { my $milestone = shift; @@ -2264,11 +2306,24 @@ sub do_fetch hg_clone_repository('ooo', $cws, "$work_master/ooo", $clone_milestone_only); hg_clone_repository('so', $cws, "$work_master/sun", $clone_milestone_only); } - my $linkdir = "$work_master/src.$milestone"; - if ( !mkdir($linkdir) ) { - print_error("Can't create directory '$linkdir': $!.", 8); + if ( get_source_config_for_milestone($masterws, $milestone) ) { + # write source_config file + my $source_config_file = "$work_master/source_config"; + if ( !open(SOURCE_CONFIG, ">$source_config_file") ) { + print_error("Can't create source_config file '$source_config_file': $!.", 8); + } + print SOURCE_CONFIG "[repositories]\n"; + print SOURCE_CONFIG "ooo=active\n"; + print SOURCE_CONFIG "sun=active\n"; + close(SOURCE_CONFIG); + } + else { + my $linkdir = "$work_master/src.$milestone"; + if ( !mkdir($linkdir) ) { + print_error("Can't create directory '$linkdir': $!.", 8); + } + relink_workspace($linkdir); } - relink_workspace($linkdir); } else { if ( $scm eq 'SVN' ) { @@ -2294,12 +2349,13 @@ sub do_fetch print_error("Can't create directory '$solver': $!.", 8); } } + my $source_config = get_source_config_for_milestone($masterws, $milestone); foreach(@platforms) { my $time_solver_start = Benchmark->new(); print_message("... copying platform solver '$_'."); - update_solver($_, $prebuild_dir, $solver, $milestone); + update_solver($_, $prebuild_dir, $solver, $milestone, $source_config); my $time_solver_stop = Benchmark->new(); - print_time_elapsed($time_solver_start, $time_solver_stop); + print_time_elapsed($time_solver_start, $time_solver_stop) if $profile; } } my $time_fetch_stop = Benchmark->new(); 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 6205e1d9f345..51d9d38ebe10 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% @@ -1000,9 +1028,9 @@ unxlngx6 DEVROOT %SOLAR_ENV_ROOT% 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% @@ -1010,7 +1038,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 } @@ -1172,7 +1200,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 @@ -1183,7 +1211,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 @@ -1243,7 +1271,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% @@ -1255,7 +1283,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% @@ -1267,7 +1295,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% @@ -1325,9 +1353,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% @@ -1335,7 +1363,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 @@ -1493,7 +1521,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 @@ -1504,7 +1532,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 @@ -1564,7 +1592,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% @@ -1576,7 +1604,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% @@ -1588,7 +1616,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% @@ -1613,7 +1641,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 { @@ -1628,9 +1656,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% @@ -1639,7 +1667,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 { @@ -1798,7 +1826,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 @@ -1809,7 +1837,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 @@ -1870,7 +1898,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% @@ -1882,7 +1910,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% @@ -1894,7 +1922,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% @@ -1919,7 +1947,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 { @@ -1935,9 +1963,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% @@ -1946,7 +1974,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 { @@ -2112,7 +2140,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 @@ -2123,7 +2151,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 @@ -2184,7 +2212,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% @@ -2196,7 +2224,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% @@ -2208,7 +2236,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% @@ -2243,7 +2271,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 { @@ -2257,15 +2285,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 @@ -2382,7 +2410,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 @@ -2393,7 +2421,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 @@ -2448,7 +2476,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% @@ -2460,7 +2488,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% @@ -2472,7 +2500,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% @@ -2528,14 +2556,14 @@ unxubti8 PAM_LINK NO PERL /usr/bin/perl PKGFORMAT deb - 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 @@ -2672,14 +2700,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 @@ -2726,7 +2754,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% @@ -2742,7 +2770,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% @@ -2757,7 +2785,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% @@ -2808,21 +2836,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 @@ -2970,7 +2998,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 @@ -2985,7 +3013,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 @@ -3048,7 +3076,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% @@ -3066,7 +3094,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% @@ -3083,7 +3111,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% @@ -3141,21 +3169,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 @@ -3305,7 +3333,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% @@ -3362,7 +3390,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% @@ -3385,7 +3413,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% @@ -3407,7 +3435,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% @@ -3483,14 +3511,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%) } @@ -3499,7 +3527,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) @@ -3696,7 +3724,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 @@ -3743,3 +3771,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 622ff9390de7..71629f1e44e6 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..b952cb5586fb 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=300m66(Build:9460) +BUILD=9460 +LAST_MINOR=m66 SOURCEVERSION=DEV300 diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 71909c8d348b..7b8e6f2aaadd 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -224,7 +224,7 @@ $(SLO)/%.obj : %.cpp .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cxx - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -249,7 +249,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cc - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc @@ -266,7 +266,7 @@ $(SLO)/%.obj : $(MISC)/%.cc .ENDIF $(OBJ)/%.obj : $(MISC)/%.cxx - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -321,7 +321,7 @@ $(OBJ)/%.obj : %.c .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : $(MISC)/%.c - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c @@ -343,7 +343,7 @@ $(OBJ)/%.obj : $(MISC)/%.c .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.c - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c @@ -404,7 +404,7 @@ $(OBJ)/%.obj : %.m # Objective-C files $(OBJ)/%.obj : $(MISC)/%.m - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m @@ -415,7 +415,7 @@ $(OBJ)/%.obj : $(MISC)/%.m # Objective-C files $(SLO)/%.obj : $(MISC)/%.m - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m @@ -461,7 +461,7 @@ $(OBJ)/%.obj : %.mm # Objective-C++ files $(OBJ)/%.obj : $(MISC)/%.mm - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm @@ -476,7 +476,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : $(MISC)/%.mm - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm 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/solenv/inc/unx.mk b/solenv/inc/unx.mk index 3b960431e26b..36e5cd70447f 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -167,6 +167,10 @@ .INCLUDE : unxlngm68k.mk .ENDIF +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXH" +.INCLUDE : unxlnghppa.mk +.ENDIF + # --- general *ix settings --- HC=hc HCFLAGS= diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk index 61edc8dcaf51..62817d5604fc 100644 --- a/solenv/inc/unxfbsdx.mk +++ b/solenv/inc/unxfbsdx.mk @@ -50,3 +50,4 @@ CFLAGSOPT= # no optimizing for non products # platform specific identifier for shared libs DLLPOSTFIX=fx +BUILD64=1 diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk index 6baf600fee35..2f18fe7b43c6 100644 --- a/solenv/inc/unxlnga.mk +++ b/solenv/inc/unxlnga.mk @@ -33,5 +33,5 @@ .INCLUDE : unxlng.mk CFLAGS+=-DIA64 -CFLAGSCXX+=-fno-use-cxa-atexit DLLPOSTFIX=la +BUILD64=1 diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk new file mode 100644 index 000000000000..240eef609365 --- /dev/null +++ b/solenv/inc/unxlnghppa.mk @@ -0,0 +1,39 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: unxlnghppa.mk,v $ +# +# $Revision: 1.2 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# mk file for Unix Linux HPPA using GCC, please make generic modifications to unxlng.mk +PICSWITCH:=-fPIC +.INCLUDE : unxlng.mk +CDEFS+=-DHPPA +CFLAGS+= +CFLAGSCC+= +CFLAGSCXX+= +DLLPOSTFIX=lh diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk index a206d61543b2..25d5118839e4 100644 --- a/solenv/inc/unxlngm68k.mk +++ b/solenv/inc/unxlngm68k.mk @@ -37,5 +37,5 @@ PICSWITCH:=-fPIC CDEFS+=-DM68K CFLAGS+=-fsigned-char -fno-omit-frame-pointer CFLAGSCC+=-fsigned-char -CFLAGSCXX+=-fsigned-char -fno-use-cxa-atexit +CFLAGSCXX+=-fsigned-char DLLPOSTFIX=lm diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk index 8a82cefb0b14..b108888d190b 100644 --- a/solenv/inc/unxlngr.mk +++ b/solenv/inc/unxlngr.mk @@ -35,5 +35,4 @@ CDEFAULTOPT=-Os .INCLUDE : unxlng.mk CDEFS+=-DARM32 CFLAGS+=-fno-omit-frame-pointer -CFLAGSCXX+=-fno-use-cxa-atexit DLLPOSTFIX=lr diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk index 5bb9f5b198b2..ba74a55cfdc3 100644 --- a/solenv/inc/unxlngx.mk +++ b/solenv/inc/unxlngx.mk @@ -33,7 +33,6 @@ .INCLUDE : unxlng.mk CDEFS+=-DX86_64 -CFLAGSCXX+=-fno-use-cxa-atexit MODULES_WITH_WARNINGS+=\ svx DLLPOSTFIX=lx 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 |