-- cgit v1.2.3 -- cgit v1.2.3 From d305e04cd729699886ed7ba89ddd493f65168a4d Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 3 Jul 2009 18:06:42 +0200 Subject: # i103316# don't require minor extension; rename source root --- solenv/bin/createpdbrelocators.pl | 3 +- solenv/bin/deliver.pl | 3 +- solenv/bin/modules/CreatePDBRelocators.pm | 17 ++-- solenv/bin/modules/installer/ziplist.pm | 3 +- solenv/bin/receditor | 2 +- solenv/config/sdev300.ini | 149 +++++++++++++++--------------- solenv/inc/set_wntx64.mk | 2 +- solenv/inc/settings.mk | 52 +++++------ 8 files changed, 120 insertions(+), 111 deletions(-) diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl index 66c4301be61e..cc685ec437c4 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] ) ) { @@ -75,7 +76,7 @@ if ( !$inpath || !$milestone ) { exit(1); } -my $rc = CreatePDBRelocators::create_pdb_relocators($inpath, $milestone, ""); +my $rc = CreatePDBRelocators::create_pdb_relocators($inpath, $milestoneext, ""); if ( !$rc ) { print STDERR "$script_name: creating PDB relocators failed!\n"; diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 74ed2020184a..e5d97db8b45c 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/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm index e279cf7daeb9..0159526a64a5 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); # #************************************************************************* @@ -47,7 +47,7 @@ use File::Basename; sub create_pdb_relocators { my $inpath = shift; - my $milestone = shift; + my $milestoneext = shift; my $pre = shift; my $solarversion = $ENV{SOLARVERSION}; @@ -67,8 +67,13 @@ sub create_pdb_relocators # 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 $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 ) { @@ -98,12 +103,12 @@ sub create_pdb_relocators my $target = ""; if ( $src_location =~ /\/so\// ) { - $location = "../../../src.$milestone/" . $src_location; + $location = "../../../src$milestoneext/" . $src_location; $target = "$pdb_dir/so/$relocator"; } else { - $location = "../../src.$milestone/" . $src_location; + $location = "../../src$milestoneext/" . $src_location; $target = "$pdb_dir/$relocator"; } diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index c1f1efbf98a8..fc540464dbc1 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}) or (defined $ENV{UPDMINOREXT}) ) +# 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 86a5fa1a2b85..f1aebad1b1ef 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -132,6 +132,7 @@ common SOLAR_JAVA SPEW STLPORT4 + UPDMINOREXT WITH_FONTOOO WITH_LANG } @@ -164,15 +165,15 @@ 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% } 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% } 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% } common_0:0 IF %OS% == MACOSX { @@ -312,7 +313,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% @@ -323,7 +324,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% @@ -334,7 +335,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% @@ -371,9 +372,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% @@ -381,7 +382,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 { @@ -606,7 +607,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% @@ -618,7 +619,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% @@ -630,7 +631,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% @@ -673,9 +674,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% @@ -684,7 +685,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 { @@ -931,7 +932,7 @@ unxlngx6 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% @@ -943,7 +944,7 @@ unxlngx6 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% @@ -955,7 +956,7 @@ unxlngx6 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% @@ -998,9 +999,9 @@ unxlngx6 PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin/perl PKGFORMAT rpm PTHREAD_CFLAGS -DNPTL - SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv + SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP% - SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv + SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv SOLARROOT %SOLAR_ENV_ROOT% SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP% SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP% @@ -1008,7 +1009,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 } @@ -1241,7 +1242,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% @@ -1253,7 +1254,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% @@ -1265,7 +1266,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% @@ -1323,9 +1324,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% @@ -1333,7 +1334,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 @@ -1562,7 +1563,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% @@ -1574,7 +1575,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% @@ -1586,7 +1587,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% @@ -1611,7 +1612,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 { @@ -1626,9 +1627,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% @@ -1637,7 +1638,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 { @@ -1868,7 +1869,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% @@ -1880,7 +1881,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% @@ -1892,7 +1893,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% @@ -1917,7 +1918,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 { @@ -1933,9 +1934,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% @@ -1944,7 +1945,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 { @@ -2182,7 +2183,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% @@ -2194,7 +2195,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% @@ -2206,7 +2207,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% @@ -2241,7 +2242,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 { @@ -2255,15 +2256,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 @@ -2446,7 +2447,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% @@ -2458,7 +2459,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% @@ -2470,7 +2471,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% @@ -2529,14 +2530,14 @@ unxubti8 PERL /usr/bin/perl PKGFORMAT deb PTHREAD_CFLAGS -DNPTL - SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv + SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv SOLARROOT %SOLAR_ENV_ROOT% SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP% SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP% SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586 SOLAR_PLUGIN TRUE SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP% - SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT% + SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT% USE_SHELL tcsh VBA_EXTENSION NO WITH_LANG en-US de @@ -2727,7 +2728,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% @@ -2743,7 +2744,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% @@ -2758,7 +2759,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% @@ -2809,20 +2810,20 @@ 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 { 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 @@ -3058,7 +3059,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% @@ -3076,7 +3077,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% @@ -3093,7 +3094,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% @@ -3151,20 +3152,20 @@ 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 { 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 @@ -3371,7 +3372,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% @@ -3394,7 +3395,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% @@ -3416,7 +3417,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% @@ -3497,14 +3498,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%) } @@ -3512,7 +3513,7 @@ wntmsci12 { 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) diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 808b5b2aee18..585a745aaa70 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 94623d259906..609c7085b88a 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -780,37 +780,37 @@ 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) -SOLARCOMMONBINDIR=$(SOLARVERSION)$/common$(PROEXT)$/bin$(EXT_UPDMINOR) -SOLARCOMMONRESDIR=$(SOLARVERSION)$/common$(PROEXT)$/res$(EXT_UPDMINOR) -SOLARCOMMONPCKDIR=$(SOLARVERSION)$/common$(PROEXT)$/pck$(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) +SOLARCOMMONBINDIR=$(SOLARVERSION)$/common$(PROEXT)$/bin$(UPDMINOREXT) +SOLARCOMMONRESDIR=$(SOLARVERSION)$/common$(PROEXT)$/res$(UPDMINOREXT) +SOLARCOMMONPCKDIR=$(SOLARVERSION)$/common$(PROEXT)$/pck$(UPDMINOREXT) .IF "$(common_build)"=="" SOLARCOMMONBINDIR=$(SOLARBINDIR) SOLARCOMMONRESDIR=$(SOLARRESDIR) -- cgit v1.2.3 -- cgit v1.2.3 From e50d6c5c9548db2e0a31150c6c1e9e1386395b95 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 7 Aug 2009 14:42:01 +0200 Subject: #i103316#, #i103805# - avoid absolute path in tg_srs.mk; rework localize.sdf detection --- solenv/inc/_tg_srs.mk | 20 ++++++++--------- solenv/inc/settings.mk | 59 +++++++++++++++++++++++++------------------------- solenv/inc/target.mk | 28 +++++++++++++----------- solenv/inc/tg_srs.mk | 2 +- 4 files changed, 56 insertions(+), 53 deletions(-) diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk index 5ffdaea6b88d..070a07a90fb0 100644 --- a/solenv/inc/_tg_srs.mk +++ b/solenv/inc/_tg_srs.mk @@ -28,7 +28,7 @@ $(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -83,7 +83,7 @@ $(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -138,7 +138,7 @@ $(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -193,7 +193,7 @@ $(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -248,7 +248,7 @@ $(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -303,7 +303,7 @@ $(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -358,7 +358,7 @@ $(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -413,7 +413,7 @@ $(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -468,7 +468,7 @@ $(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) @@ -523,7 +523,7 @@ $(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10F $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 6918dcb48c37..86d4d4668df3 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -650,34 +650,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 "$(USE_SHELL)"!="4nt" -#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ);pwd)$/,$(NULL) $(PWD)) -#.ELSE # "$(USE_SHELL)"!="4nt" -#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) ^ echo %_cwd)$/,$(NULL) $(PWD)) -#.ENDIF # "$(USE_SHELL)"!="4nt" -.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)"!="" @@ -798,7 +770,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)"!="" @@ -850,6 +821,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 0264ac9bb7c6..b0fabb84d649 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)"!="" -"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip + +# 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) - @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET) - @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)$/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip - @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)$/* $(COMMONMISC)$/$(PRJNAME) - @@-$(RM) -rf $(COMMONMISC)$/$(PRJNAME)_$(TARGET) -.ENDIF # "$(LOCALIZESDF)"!="" -.ENDIF # "$(LOCALIZATION_FOUND)"=="" -.ENDIF # "$(WITH_LANG)"!="" -.IF "$(LOCALIZESDF)"!="" -"$(LOCALIZESDF)%" : - echo $(LOCALIZESDF) +.IF "$(LOCALIZATION_FOUND)"=="" +.IF "$(LOCALSDFFILE)"!="" +$(LOCALSDFFILE) : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) - @$(TOUCH) $(LOCALIZESDF) + @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET) + -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) + $(TOUCH) $@ + +.ENDIF # "$(LOCALSDFFILE)"!="" +.ENDIF # "$(LOCALIZATION_FOUND)"=="" .ENDIF # "$(LOCALIZESDF)"!="" +.ENDIF # "$(WITH_LANG)"!="" .IF "$(EXTUPDATEINFO_NAME)"!="" $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE) diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk index 50db37401358..d5e757cda3ae 100644 --- a/solenv/inc/tg_srs.mk +++ b/solenv/inc/tg_srs.mk @@ -60,7 +60,7 @@ $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTIC $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ - -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME) + -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -- cgit v1.2.3 From 85e6aa66b9ce8913c1466fc971f6c1d2a4b2889f Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 7 Aug 2009 14:48:36 +0200 Subject: #i103316# - rework localize.sdf detection --- solenv/config/sdev300.ini | 7 +++++++ solenv/config/ssolar.cmn | 1 + 2 files changed, 8 insertions(+) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index b88d67b9cdbf..15f8e92b4cbe 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -125,6 +125,7 @@ common order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc reset { + ALT_L10N_MODULE ENVCFLAGS HOMEDRIVE HOMEPATH @@ -173,14 +174,17 @@ finish ca { 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%$/ooo%UPDMINOREXT% + SOURCE_ROOT_DIR $expand(%SOLARSRC%/..) } cax { 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 +207,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,10 +216,12 @@ finish common_a:0 IF %USE_SHELL% != 4nt { *o: cd %SOLARSRC% + ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so } common_a:1 IF %USE_SHELL% == 4nt { *o cdd %SOLARSRC% + ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so } common_jre:0 IF %JREPATH% == { diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index aa1442cc649d..c7ac35698957 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 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 From b1f9477fa2f4e9dd764966f595ae7a2c861041ea Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 28 Sep 2009 17:54:12 +0200 Subject: fixed broken manuan merge --- solenv/inc/settings.mk | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 3a8829448113..7c762c7e1eaa 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -646,29 +646,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)"!="" @@ -808,12 +785,12 @@ SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT) #.ELSE #UPDMINOREXT= #.ENDIF -SOLARRESDIR=$(SOLARVERSION)/gc$(INPATH)/res$(UPDMINOREXT) -SOLARRESXDIR=$(SOLARVERSION)/gc$(INPATH)/res$(UPDMINOREXT) -SOLARLIBDIR=$(SOLARVERSION)/gc$(INPATH)/lib$(UPDMINOREXT) -SOLARJAVADIR=$(SOLARVERSION)/gc$(INPATH)/java$(UPDMINOREXT) -SOLARINCDIR=$(SOLARVERSION)/gc$(INPATH)/inc$(UPDMINOREXT) -SOLARINCXDIR=$(SOLARVERSION)/gc$(INPATH)/inc$(UPDMINOREXT) +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$(UPDMINOREXT)/$(SOLARLANG) -- cgit v1.2.3 From 7535d77f6ae33900822e50eb349243008b931aa9 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 28 Sep 2009 18:00:47 +0200 Subject: fixed broken manual merge --- solenv/inc/target.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 705368b3b4e3..be919e591bcf 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1396,9 +1396,8 @@ $(UNIXTEXT) : $(UNIXTEXT:f) $(LOCALIZESDF)%: @echo $(LOCALIZESDF) @@-$(MKDIRHIER) $(@:d) + $(TOUCH) $@ -.IF "$(LOCALIZATION_FOUND)"=="" -.IF "$(LOCALIZESDF)"!="" "$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET) -- cgit v1.2.3 -- cgit v1.2.3 From 25717085d157e365e726a806697887f8a6e3fa97 Mon Sep 17 00:00:00 2001 From: Philipp Lohmann Date: Tue, 20 Oct 2009 23:12:55 +0200 Subject: #i106113# update from shtylman and kendy (thanks !) --- solenv/bin/build.pl | 0 solenv/bin/gccinstlib.pl | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 solenv/bin/build.pl mode change 100644 => 100755 solenv/bin/gccinstlib.pl diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl old mode 100644 new mode 100755 diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl old mode 100644 new mode 100755 -- cgit v1.2.3 From 220a3379d96e00c28502cb237fb10519c4988dd0 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 23 Oct 2009 17:28:10 +0200 Subject: ause109: #i106228# generate names that don't trigger windows Data Execution Prevention --- solenv/bin/mhids.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index f7e5193a3ec4..d94436d787da 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -138,7 +138,9 @@ $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 =~ s/[aeiou]//g; +$workfile = "$tmpdir/${flbs}_".$$; #$workfile =~ s/setup/set_up/; # now get $workfile ready for shell usage... -- cgit v1.2.3 From cd8eeaebf4eedf77e7a6b97e9f9266ea3b40cb84 Mon Sep 17 00:00:00 2001 From: hdu Date: Mon, 26 Oct 2009 12:11:12 +0100 Subject: #i106087# inconsistent freetype tests/workaround for old versions --- configure.in | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/configure.in b/configure.in index aff65d6d1583..5c8d55947751 100644 --- a/configure.in +++ b/configure.in @@ -3691,23 +3691,6 @@ fi AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) -dnl =================================================================== -dnl Check whether freetype2 supports emboldening -dnl =================================================================== -if test "$test_freetype" = "yes"; then - save_CPPFLAGS="$CPPFLAGS" - save_LDFLAGS="$LDFLAGS" - save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" - LDFLAGS="$LDFLAGS $FREETYPE_LIBS" - AC_CHECK_LIB(freetype, FT_GlyphSlot_Embolden, - [USE_FT_EMBOLDEN="YES"], [USE_FT_EMBOLDEN="NO"], []) - LDFLAGS="$save_LDFLAGS" - CPPFLAGS="$save_CPPFLAGS" - LIBS="$save_LIBS" -fi -AC_SUBST(USE_FT_EMBOLDEN) - if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \ test "$with_system_libxslt" != "no"; then if test -z "$with_system_libxml" -a -z "$with_system_libs" || \ -- cgit v1.2.3 From 9862e4b5acdd970ee586fdb5108a89e3032c9c45 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 26 Oct 2009 16:04:03 +0100 Subject: ause109: #i106293# remove 4nt from configure --- bootstrap.1 | 5 +-- configure | 31 +++++--------- configure.cmd | 2 +- configure.in | 28 +++++-------- set_soenv.in | 127 ++++------------------------------------------------------ 5 files changed, 30 insertions(+), 163 deletions(-) diff --git a/bootstrap.1 b/bootstrap.1 index 146d6f9443dd..622f68b228f4 100644 --- a/bootstrap.1 +++ b/bootstrap.1 @@ -21,16 +21,13 @@ if test "$BUILD_DMAKE" != "NO"; then # Special case! The w32/tcsh build needs CC pointing to the MSVC++ compiler # but we need a cygwin/gcc build dmake to understand the posix paths - if test "$GUI" = "WNT" -a "$USE_SHELL" != "4nt"; then + if test "$GUI" = "WNT"; then CC="" CXX="" export CC export CXX fi - # For the W32/4nt case - rm -rf objects - # For normal unixy systems if test -f "Makefile" ; then $GNUMAKE distclean || exit diff --git a/configure b/configure index 06ed74cb9b58..bbd1e35a1c1b 100755 --- a/configure +++ b/configure @@ -2401,9 +2401,8 @@ Optional Packages: Supported options: tcsh (default) bash - 4nt (windows only) - Usage: --with-use-shell=tcsh|bash|4nt + Usage: --with-use-shell=tcsh|bash --with-build-version Allows the builder to add a custom version tag that will appear in the Help/About box for QA @@ -4916,9 +4915,9 @@ fi { $as_echo "$as_me:$LINENO: checking which shell to use" >&5 $as_echo_n "checking which shell to use... " >&6; } if test $_os = "WINNT"; then - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then - { { $as_echo "$as_me:$LINENO: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&5 -$as_echo "$as_me: error: only \"tcsh\",\"bash\" or \"4nt\" are supported options" >&2;} + if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then + { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5 +$as_echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} { (exit 1); exit 1; }; } fi if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then @@ -4938,7 +4937,7 @@ link, and copy the program to the name of the link." >&2;} fi fi if test "$WITH_MINGWIN" = "yes" ; then - if test "$with_use_shell" = "4nt" -o "x$with_use_shell" = "x"; then + if test "x$with_use_shell" = "x"; then with_use_shell="tcsh" fi if test -z "$CC"; then @@ -4947,9 +4946,9 @@ link, and copy the program to the name of the link." >&2;} fi fi elif test $_os = "OS2"; then - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then - { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" or \"4nt\" are supported options" >&5 -$as_echo "$as_me: error: only \"tcsh\" or \"4nt\" are supported options" >&2;} + if test "$with_use_shell" != "tcsh"; then + { { $as_echo "$as_me:$LINENO: error: only \"tcsh\" is supported options" >&5 +$as_echo "$as_me: error: only \"tcsh\" is supported options" >&2;} { (exit 1); exit 1; }; } fi else @@ -4965,7 +4964,7 @@ $as_echo "$USE_SHELL" >&6; } -if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then +if test "$_os" = "WINNT" ; then { $as_echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5 $as_echo_n "checking for cygwin gcc/g++... " >&6; } if which gcc > /dev/null && which g++ > /dev/null ; then @@ -25526,20 +25525,10 @@ $as_echo "$as_me: error: Zip/Unzip are required to build, please install or use fi if test "$_os" = "WINNT"; then - if test "$with_use_shell" = "4nt" ; then - if test -z "`$ZIP -h | grep -i WinNT`" ; then -{ { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. -Probably there is a cygwin version in the path." >&5 -$as_echo "$as_me: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. -Probably there is a cygwin version in the path." >&2;} - { (exit 1); exit 1; }; } - fi - else - if test -n "`$ZIP -h | grep -i WinNT`" ; then + if test -n "`$ZIP -h | grep -i WinNT`" ; then { { $as_echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5 $as_echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;} { (exit 1); exit 1; }; } - fi fi fi diff --git a/configure.cmd b/configure.cmd index 1d847525f6f9..aff7e810b520 100755 --- a/configure.cmd +++ b/configure.cmd @@ -3,5 +3,5 @@ setlocal SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0 SET JAVA_HOME=e:\java150 SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin; -sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=4nt --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log +sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=bash --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log endlocal diff --git a/configure.in b/configure.in index aff65d6d1583..e41fa919e752 100644 --- a/configure.in +++ b/configure.in @@ -773,9 +773,8 @@ AC_ARG_WITH(use-shell, Supported options: tcsh (default) bash - 4nt (windows only) - Usage: --with-use-shell=tcsh|bash|4nt + Usage: --with-use-shell=tcsh|bash ],with_use_shell=$withval,with_use_shell="tcsh") AC_ARG_WITH(build-version, [ --with-build-version Allows the builder to add a custom version tag @@ -1317,14 +1316,14 @@ AC_SUBST(HYPH_SYSTEM_DIR) AC_SUBST(THES_SYSTEM_DIR) dnl =================================================================== -dnl WINNT uses tcsh, bash or 4nt all other O/S use tcsh or bash. +dnl all O/S use tcsh or bash. dnl The following sets the with_use_shell variable. dnl =================================================================== AC_MSG_CHECKING([which shell to use]) if test $_os = "WINNT"; then dnl =================================================================== - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash" -a "$with_use_shell" != "4nt"; then - AC_MSG_ERROR([only "tcsh","bash" or "4nt" are supported options]) + if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then + AC_MSG_ERROR([only "tcsh" or "bash" are supported options]) fi dnl =================================================================== dnl Sanity check! Native windows programs cannot use cygwin symlinks! @@ -1356,7 +1355,7 @@ link, and copy the program to the name of the link.]) dnl If using Mingwin32 then don't use 4NT dnl =================================================================== if test "$WITH_MINGWIN" = "yes" ; then - if test "$with_use_shell" = "4nt" -o "x$with_use_shell" = "x"; then + if test "x$with_use_shell" = "x"; then with_use_shell="tcsh" fi if test -z "$CC"; then @@ -1365,8 +1364,8 @@ link, and copy the program to the name of the link.]) fi fi elif test $_os = "OS2"; then - if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then - AC_MSG_ERROR([only "tcsh" or "4nt" are supported options]) + if test "$with_use_shell" != "tcsh"; then + AC_MSG_ERROR([only "tcsh" is supported options]) fi else dnl =================================================================== @@ -1382,11 +1381,11 @@ AC_SUBST(USE_SHELL) AC_SUBST(WITH_MINGWIN) dnl =================================================================== -dnl Extra check for Windows. Non 4nt-builds need gcc to build dmake +dnl Extra check for Windows. cygwin builds need gcc to build dmake dnl and g++ to build guw.exe although MS cl (or MinGW) is used to dnl build OOo. dnl =================================================================== -if test "$_os" = "WINNT" -a "$with_use_shell" != "4nt" ; then +if test "$_os" = "WINNT" ; then AC_MSG_CHECKING([for cygwin gcc/g++]) if which gcc > /dev/null && which g++ > /dev/null ; then AC_MSG_RESULT([found]) @@ -5328,15 +5327,8 @@ dnl =================================================================== dnl Zip must be a specific type for different build types. dnl =================================================================== if test "$_os" = "WINNT"; then - if test "$with_use_shell" = "4nt" ; then - if test -z "`$ZIP -h | grep -i WinNT`" ; then -AC_MSG_ERROR([$ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe. -Probably there is a cygwin version in the path.]) - fi - else - if test -n "`$ZIP -h | grep -i WinNT`" ; then + if test -n "`$ZIP -h | grep -i WinNT`" ; then AC_MSG_ERROR([$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe.]) - fi fi fi AC_SUBST(ZIP_HOME) diff --git a/set_soenv.in b/set_soenv.in index 71f6d6bf90df..462fb9533e97 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -38,8 +38,8 @@ use File::Basename; # IIa. Declaring variables for the system commands, etc. #-------------------------------------------------------- # -my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, - $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, +my ( $outfile, $outfile_sh, $bootfile, $newline, $comment, + $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $wps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW, $USE_MINGW, $platform, $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include, @@ -197,7 +197,6 @@ $ENABLEUNICODE = "TRUE"; $NEW_JAR_PACK = "TRUE"; $NO_BSYMBOLIC = "TRUE"; $comment = "#"; # UNIX script comment character -$comment4nt = "rem"; # Windows 4nt script comment character # Setting platform dependent constant values. if ( $platform =~ m/solaris/ ) @@ -676,17 +675,10 @@ elsif ( $platform =~ m/cygwin/ ) $MFC_INCLUDE = $PSDK_HOME.$ds."include".$ds."mfc"; } } - if ( "@USE_SHELL@" ne "4nt" ) { print "Setting W32 build with bash shell specific values... "; # No speacial treatment for CC an CXX anymore. $FLIPCMD = "slfl.pl"; $PATH_SEPERATOR = ';'; - } else # "@USE_SHELL@" ne "4nt" - { print "Setting W32 build with 4NT shell specific values... "; - # Change path to lower case. - $COMPATH = lc $COMPATH; - $PATH_SEPERATOR = ';'; - } } } elsif ( $platform =~ m/os2/ ) @@ -831,10 +823,6 @@ elsif ("@USE_SHELL@" eq "bash") $SHELL_PATH = '@SHELLPATH@'; $SHELL = '@SHELLPATH@'."\/bash"; } -elsif ("@USE_SHELL@" eq "4nt") -{ # @SHELLPATH@ is NO_SHELLPATH_NEEDED for 4nt - - $SHELL_PATH = ''; -} else { die "Not a recognized shell: @USE_SHELL@ !"; } @@ -918,20 +906,6 @@ $COMMON_BUILD_TOOLS = '$SRC_ROOT'.$ds."external".$ds."common"; # Generate alternate output file for sh? $outfile_sh = $outfile.".sh"; -if ($GUI eq "OS2") -{ - # Generate output file for 4os2? - $outfile_bat = $outfile; - $outfile_bat =~ s/set$/cmd/i; -} -elsif ("@USE_SHELL@" eq "4nt") -{ - # Generate output file for 4nt? - $outfile_bat = $outfile; - $outfile_bat =~ s/set$/bat/i; -} else { - undef $outfile_bat; -} if ($STLPORT4 ne $no_stl) { $ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64; @@ -1220,7 +1194,7 @@ elsif ($platform =~ m/cygwin/) } # Check if $SHELL_PATH is already set in PATH $tmppath = CygFormat($SHELL_PATH); - if ( ( "@USE_SHELL@" ne "4nt" ) && ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) ) + if ( ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) ) { $PATH .= $ps.$tmppath; } # Check if $CYGWIN_PATH is already set in PATH @@ -1522,7 +1496,6 @@ print "done\n"; # print "Setting the aliases... "; # 1. alias for a full product make. -# ToFile will take care for the right 4nt format $mkout = '"perl $SOLARENV/bin/mkout.pl"'; $deliver = '"perl $SOLARENV/bin/deliver.pl"'; $build = '"perl $SOLARENV/bin/build.pl"'; @@ -1543,12 +1516,6 @@ open( OUT, ">$outfile" ) || open( OUT_SH, ">$outfile_sh" ) || die "Cannot open $outfile_sh: $!\n"; -if(defined($outfile_bat)) -{ # Create bat environment file - open( OUT_BAT, ">$outfile_bat" ) || - die "Cannot open $outfile_bat: $!\n"; -} - # #------------------------------------------ # VII. Writing the data to the output file. @@ -1557,7 +1524,6 @@ if(defined($outfile_bat)) # Write file header. CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" ); CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" ); -CreateFileHeader( *OUT_BAT, $UPD, $platform, "4nt", "rem" ) if defined($outfile_bat); ToFile( "SRC_ROOT", $SRC_ROOT, "e" ); ToFile( "SHELL", $SHELL, "e" ); @@ -1986,12 +1952,8 @@ if ( $platform =~ m/os2/ ) } # $perlpre is only used for the following three variables -# and only set for 4nt. +# and only set for OS2. my $perlpre = ""; -if (( $platform =~ m/cygwin/ ) and ( '@USE_SHELL@' eq "4nt" )) { - ToFile( "HOME", " ", "e" ); - $perlpre = "perl ".${SOLARENV}.${BIN}.${ds}; -} if (( $platform =~ m/os2/ )) { $perlpre = "perl ".${SOLARENV}.${BIN}.${ds}; } @@ -2026,23 +1988,8 @@ if ( $platform =~ m/os2/ ) ToFile( "endif", $empty, "y"); ToFile( "fi", $empty, "z"); -# write make command for dmake for W32-4nt -if ( $platform =~ m/cygwin/ and '@USE_SHELL@' eq "4nt" ) -{ - ToFile( "build the dmake executable.", $empty, "c"); - ToFile( "if not exist \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe (cd \%SRC_ROOT\\dmake \^ set INCLUDE=\%COMPATH\\include;\%PSDK_HOME\\include \^ set LIB=\%COMPATH\\lib;\%PSDK_HOME\\lib \^ call make.bat win95-vpp40 \^ cd \%SRC_ROOT)", $empty, "x"); - ToFile( "if not exist \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe ( mkdir /S \%SOLARENV\\\%OUTPATH\\bin \^ copy dmake\\dmake.exe \%SOLARENV\\\%OUTPATH\\bin\\dmake.exe )", $empty, "x"); - ToFile( "\@echo Warning! LIB and INCLUDE will be cleared!", $empty, "x"); - ToFile( "\@unset INCLUDE LIB", $empty, "x"); - ToFile( "check for correct dmake.", $empty, "c"); - ToFile( '@if "%@SEARCH[dmake]" == "" ( @echo dmake not build or missing! Invalid build environment! ^ unset SOLARENV ^ cancel )', $empty, "x"); - ToFile( '@dmake -V > dmakecheck.out', $empty, "x"); - ToFile( '@ffind /Tcygwin /C /B dmakecheck.out && ( @echo Found cygwin build dmake! Invalid! ^ unset SOLARENV ^ cancel )', $empty, "x"); - ToFile( " ", $empty, "x"); -} - -# Check if the right dmake version is used. (W32-tcsh only) -if ( $platform =~ m/cygwin/ and '@USE_SHELL@' ne "4nt" ) { +# Check if the right dmake version is used. (W32 only) +if ( $platform =~ m/cygwin/ ) { ToFile( "Check if the right dmake version is used.", $empty, "c" ); # Invalidate build environment. ToFile( "WORK_STAMP", "_invalid_", "e" ); @@ -2075,9 +2022,6 @@ print OUT $unsetvars; print OUT_SH "export $exportvars$newline"; print OUT_SH "unset $unsetvarssh$newline"; -if(defined($outfile_bat)) -{ print OUT_BAT $unsetvarsbat; -} # #--------------------------- @@ -2088,10 +2032,6 @@ close( OUT ) || print "Can't close $outfile: $!"; close( OUT_SH ) || print "Can't close $outfile_sh: $!"; -if( defined($outfile_bat)) -{ close( OUT_BAT ) || print "Can't close $outfile_bat: $!"; -} - # #------------------------------ # IX. Sourcing the output file. @@ -2115,14 +2055,6 @@ if (rename( $outfile_sh, $tmp ) ne 1) { `mv -f $outfile_sh $tmp`; } -if(defined($outfile_bat)) -{ - $tmp = $SRC_ROOT.$ds.$outfile_bat; - if (rename( $outfile_bat, $tmp ) ne 1) - { `mv -f $outfile_bat $tmp`; - } -} - # #-------------------------------------------------------- # XII. Message at the end. @@ -2178,9 +2110,7 @@ if (rename( $bootfile, $tmp ) ne 1) } print "Configure completed\n"; -if ( "@USE_SHELL@" ne "4nt" ) { - print "You may now run ./bootstrap in $SRC_ROOT\n"; -} +print "You may now run ./bootstrap in $SRC_ROOT\n"; if ( $Warning ne "" ) { print "***** WARNINGS ISSUED *****\n"; } @@ -2201,7 +2131,7 @@ if ( $Warning ne "" ) { #------------------------------------------------------------- sub CheckPathName { my $retrn = $_[ 0 ]; - if (($platform =~ m/cygwin/) or ( '@USE_SHELL@' ne "4nt" )) + if ($platform =~ m/cygwin/) { # Check if the first character is not a '/'. if ( !( $_[ 0 ] =~ /^\// ) ) { $retrn = $ds.$_[ 0 ]; @@ -2277,21 +2207,6 @@ sub ToFile { if (defined $_[ 1 ] && $_[ 1 ] ne "" ) { my $envvar = $_[ 1 ]; my $envvarbash = $envvar; - if ("@USE_SHELL@" eq "4nt" ) { - # expand the variables - $envvar =~ s/(\$\{?\w+\}?)/$1/eeg ; - # Some variables need to be translated - if ( ($_[ 0 ] =~ /^PATH$/) and ($platform !~ m/os2/) ) { - # PATH is in cygwin format, but for 4nt it needs to be DOS. - $win_format_var = WinPath( $envvar, ":" ); - } else { - $win_format_var = WinFormat( $envvar ); - } - # The excluded variables are translated by cygwin - if ( $_[ 0 ] !~ /^PATH$|^TMP$|^TEMP$|^TMPDIR$|^HOME$/i ) { - $envvar = $win_format_var; - } - } # Tcsh/bash needs backslashes quoted $envvar =~ s/\\/\\\\/g; @@ -2302,17 +2217,10 @@ sub ToFile { print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline"; # to sh file $exportvars .= " $_[ 0 ]"; # add to export list for sh file - if(defined($outfile_bat)) { - print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ]$newline"; - print OUT_BAT "$set $_[ 0 ]=$win_format_var$newline"; - } } else { printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout $unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file $unsetvarssh .= " $_[ 0 ]"; # for sh file - if(defined($outfile_bat)) { - $unsetvarsbat .= "$unset $_[ 0 ] >& NUL$newline"; - } } } elsif ( $_[ 2 ] eq "a" ) @@ -2320,13 +2228,6 @@ sub ToFile { print "The $_[ 0 ] is set to: $_[ 1 ]\n"; # to stdout print OUT "$_[ 0 ] $_[ 1 ]$newline"; # to tcsh file print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline"; # to sh file - if(defined($outfile_bat)) # create the correct 4nt alias format - { my $aliastmp = $_[ 1 ]; - $aliastmp =~ s/\$/\%/g; - $aliastmp =~ s!/!\\!g; - $aliastmp =~ s!"!!g; - print OUT_BAT "$_[ 0 ]=".'`'.$aliastmp.'`'.$newline; - } } elsif ( $_[ 2 ] eq "c" ) { # Write a comment to file. @@ -2342,23 +2243,11 @@ sub ToFile { print OUT_SH "$comment$newline"; print OUT_SH "$comment $_[ 0 ]$newline"; print OUT_SH "$comment$newline"; - if(defined($outfile_bat)) { - print OUT_BAT "$newline"; - print OUT_BAT "$comment4nt$newline"; - print OUT_BAT "$comment4nt $_[ 0 ]$newline"; - print OUT_BAT "$comment4nt$newline"; - } } elsif ( $_[ 2 ] eq "n" ) { #Write a newline to a file print OUT "$newline"; print OUT_SH "$newline"; - print OUT_BAT "$newline" if defined($outfile_bat); - } - elsif ( $_[ 2 ] eq "x" ) - { - #Write first argument as is, and nothing else - print OUT_BAT "$_[ 0 ]$newline" if defined($outfile_bat); } elsif ( $_[ 2 ] eq "y" ) { -- cgit v1.2.3 From 8f66e50a5bd9054007637c879acce33644080819 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 26 Oct 2009 16:32:31 +0100 Subject: ause109: #i106296# introduce TARFILE_LOCATION to find source tarballs --- solenv/inc/tg_ext.mk | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index b0096d799161..7535b8bad799 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: cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) clean $(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) $@ -- cgit v1.2.3 From 918d66fd3706ba096d09bd2739a5c3f5ed2f5810 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 26 Oct 2009 19:49:37 +0100 Subject: ause109: #i106228# initialize first --- solenv/bin/mhids.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index d94436d787da..642bc2175914 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -139,6 +139,7 @@ $filebase = $filename; $filebase =~ s/.*[\\\/]//; $filebase =~ s/\..*?$//; # 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/; -- cgit v1.2.3 From 012114fb91ff5f16ba771f87ac00e35c41a59408 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 26 Oct 2009 20:03:30 +0100 Subject: ause109: #i106228# generated C files won't need stl header --- solenv/bin/mhids.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index 642bc2175914..b79ec8dbbdda 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -87,6 +87,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"; -- cgit v1.2.3 From ca3a8a8d689cb76348caa8dac442e1da2d934789 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Fri, 30 Oct 2009 12:28:15 +0100 Subject: #160940# adaptions for source_config --- solenv/bin/createpdbrelocators.pl | 4 +- solenv/bin/modules/CreatePDBRelocators.pm | 116 ++++++++++++++++++++---------- 2 files changed, 79 insertions(+), 41 deletions(-) diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl index 66c4301be61e..dbcf25ed46dd 100644 --- a/solenv/bin/createpdbrelocators.pl +++ b/solenv/bin/createpdbrelocators.pl @@ -74,8 +74,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, $milestone, ""); if ( !$rc ) { print STDERR "$script_name: creating PDB relocators failed!\n"; diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm index e279cf7daeb9..7479fbec96de 100644 --- a/solenv/bin/modules/CreatePDBRelocators.pm +++ b/solenv/bin/modules/CreatePDBRelocators.pm @@ -43,30 +43,49 @@ 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 $milestone = 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"; @@ -86,42 +105,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.$milestone/" . $src_location; + $target = "$pdb_dir/so/$relocator"; + } + else + { + $location = "../../$repository.$milestone/" . $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 +182,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 +191,7 @@ sub collect_files sub find_binary_execs { + my $self = shift; my $path = shift; my @files = glob("$path/*"); my @execs = grep(-x $_, @files); -- cgit v1.2.3 From 08499467b6ee37d97180c1cefb42abd3d34005dd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 31 Oct 2009 10:59:43 +0000 Subject: #cmcfixes65: #i103768# add fclose --- soltools/mkdepend/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From a8153b1afc8348fecf25667a287cf42cf389ff0f Mon Sep 17 00:00:00 2001 From: sb Date: Mon, 2 Nov 2009 11:06:59 +0100 Subject: sb117: #160937# removed unused special configuration data settings --- scp2/source/ooo/common_brand.scp | 3 --- scp2/source/ooo/directory_ooo.scp | 5 ----- 2 files changed, 8 deletions(-) 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"; -- cgit v1.2.3 From 90806bc0f9be84302ed236158d6e59d16e7e204a Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Mon, 2 Nov 2009 11:52:13 +0100 Subject: #i106545# add missing unit declarations --- solenv/bin/modules/SourceConfig.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index b1005b26d6c7..7ff3921d9410 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -44,6 +44,8 @@ use strict; use constant SOURCE_CONFIG_FILE_NAME => 'source_config'; use Carp; +use Cwd; +use File::Basename; ##### profiling ##### -- cgit v1.2.3 From 378acfdf57dab5e06ecda8c0c5723d71e1410958 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Mon, 2 Nov 2009 14:49:27 +0100 Subject: #i106558# different fixes --- solenv/bin/modules/SourceConfig.pm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index 7ff3921d9410..eb36827f3a91 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -141,9 +141,18 @@ sub get_all_modules sub get_active_modules { my $self = shift; - return sort keys %{$self->{ACTIVE_MODULES}}; + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + my @active_modules = sort keys %{$self->{ACTIVE_MODULES}}; + @active_modules = $self->get_all_modules() if (!scalar @active_modules); + return @active_modules; } +sub is_active +{ + my $self = shift; + my $module = shift; + return exists ($self->{ACTIVE_MODULES}{$module}); +} ##### private methods ##### @@ -165,10 +174,13 @@ 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 (!$self->{SOURCE_CONFIG_FILE}) { + if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) { + $self->{ACTIVE_MODULES}{$module}++ if (!exists($self->{ACTIVE_MODULES}{$module})); + } + } my $possible_path = "$repository_path/$module_entry"; if (-d $possible_path) { if (defined ${$self->{MODULE_PATHS}}{$module}) { @@ -310,6 +322,11 @@ SourceConfig::get_config_file_default_path() Returns default path for source configuration file +SourceConfig::is_active() + +Returns >0 (TRUE) if a module is active +Returns 0 (FALSE) if a module is not active + =head2 EXPORT SourceConfig::new() @@ -321,6 +338,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 -- cgit v1.2.3 From cd2a15f6418c3af05b59e0441c482f823d877ea3 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 4 Nov 2009 13:23:00 +0100 Subject: #i106558 fix methode is_active --- solenv/bin/modules/SourceConfig.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index eb36827f3a91..9f7bf951b245 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -151,7 +151,13 @@ sub is_active { my $self = shift; my $module = shift; - return exists ($self->{ACTIVE_MODULES}{$module}); + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + if (!scalar keys %{$self->{ACTIVE_MODULES}}) { + return exists ($self->{MODULE_PATHS}{$module}); + } + else { + return exists ($self->{ACTIVE_MODULES}{$module}); + } } ##### private methods ##### -- cgit v1.2.3 From 9ed7ca496abd9249922b68f1e694dc7394eedff8 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Thu, 5 Nov 2009 18:28:52 +0100 Subject: ause103: #i106644# some more switches to support selective copy --- solenv/config/sdev300.ini | 67 +++++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 7e0b39359290..b3c1da80284a 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,7 +138,7 @@ 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 @@ -132,6 +147,9 @@ common HOMEPATH JAVAHOME JAVA_HOME + LU_HGFLAG + LU_NOSOURCE + LU_RFLAGS MKDIRHIER PROEXT PROFULLSWITCH @@ -159,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 @@ -545,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 @@ -556,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 @@ -868,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 @@ -879,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 @@ -1180,7 +1201,7 @@ unxlngx6 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1191,7 +1212,7 @@ unxlngx6 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1501,7 +1522,7 @@ unxmacxi { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1512,7 +1533,7 @@ unxmacxi sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -1806,7 +1827,7 @@ unxsoli4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -1817,7 +1838,7 @@ unxsoli4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2120,7 +2141,7 @@ unxsols4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2131,7 +2152,7 @@ unxsols4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2390,7 +2411,7 @@ unxsolu4 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2401,7 +2422,7 @@ unxsolu4 sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2681,14 +2702,14 @@ unxubti8 { csh { - 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash } sh { 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET + 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r @@ -2979,7 +3000,7 @@ wntgcci1 { 150: setenv MYENV_PATH $PATH 160: setenv PATH $SSX_PATH - 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 260: setenv PATH $MYENV_PATH 270: unsetenv MYENV_PATH 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR @@ -2994,7 +3015,7 @@ wntgcci1 260: export PATH=$MYENV_PATH 270: unset MYENV_PATH 400: if [ $COPYALL ]; then - 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR @@ -3314,7 +3335,7 @@ wntmsci11 { 150: set MYENV_PATH=%PATH 160: set PATH=%SSX_PATH - 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% + 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 260: set PATH=%MYENV_PATH 270: unset MYENV_PATH 400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR% @@ -3705,7 +3726,7 @@ wntmsci12 sh { 400: if [ $COPYALL ]; then - 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 415: fi 600: umask 002 800: hash -r -- cgit v1.2.3 From 787d142a4c587c00cd848160d19c5db729c27e3b Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Fri, 6 Nov 2009 14:19:42 +0100 Subject: #i106558# optimize get_active_modules and is_active and errorhandling if no modules found --- solenv/bin/modules/SourceConfig.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index 9f7bf951b245..8fe741559fb3 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -141,7 +141,7 @@ sub get_all_modules sub get_active_modules { my $self = shift; - $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}} && !scalar keys %{$self->{ACTIVE_MODULES}}); my @active_modules = sort keys %{$self->{ACTIVE_MODULES}}; @active_modules = $self->get_all_modules() if (!scalar @active_modules); return @active_modules; @@ -151,7 +151,7 @@ sub is_active { my $self = shift; my $module = shift; - $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}} && !scalar keys %{$self->{ACTIVE_MODULES}}); if (!scalar keys %{$self->{ACTIVE_MODULES}}) { return exists ($self->{MODULE_PATHS}{$module}); } @@ -202,6 +202,7 @@ sub get_module_paths { croak("Cannot read $_ repository content"); }; }; + croak("No modules found!") if (!scalar keys %{$self->{MODULE_PATHS}}); }; sub get_config_file { -- cgit v1.2.3 From c942bbb6a5f120beef62cc5245f4fb62ded3efb7 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Mon, 9 Nov 2009 13:05:39 +0100 Subject: #i106558# output warning in get_module_path only if debug is set --- solenv/bin/modules/SourceConfig.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index 8fe741559fb3..881f92dd175d 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -47,6 +47,8 @@ use Carp; use Cwd; use File::Basename; +my $debug = 0; + ##### profiling ##### ##### ctor ##### @@ -112,7 +114,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; }; } -- cgit v1.2.3 From f68e2be0ed36a14bfbd6073be8a8b16aeca12515 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 10 Nov 2009 17:08:29 +0100 Subject: #i106558# changes after review --- solenv/bin/modules/SourceConfig.pm | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index 881f92dd175d..5189829e0c1c 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -68,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); @@ -139,26 +140,25 @@ sub get_all_modules return sort keys %{$self->{MODULE_PATHS}}; }; - sub get_active_modules { my $self = shift; - $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}} && !scalar keys %{$self->{ACTIVE_MODULES}}); - my @active_modules = sort keys %{$self->{ACTIVE_MODULES}}; - @active_modules = $self->get_all_modules() if (!scalar @active_modules); - return @active_modules; + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + if (scalar keys %{$self->{ACTIVATED_MODULES}}) { + return sort keys %{$self->{ACTIVATED_MODULES}}; + }; + return sort keys %{$self->{REAL_MODULES}}; } sub is_active { my $self = shift; my $module = shift; - $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}} && !scalar keys %{$self->{ACTIVE_MODULES}}); - if (!scalar keys %{$self->{ACTIVE_MODULES}}) { - return exists ($self->{MODULE_PATHS}{$module}); - } - else { - return exists ($self->{ACTIVE_MODULES}{$module}); + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}} && !scalar keys %{$self->{ACTIVATED_MODULES}}); + if (scalar keys %{$self->{ACTIVATED_MODULES}}) { + return exists ($self->{ACTIVATED_MODULES}{$module}); + } else { + return exists ($self->{REAL_MODULES}{$module}); } } @@ -184,10 +184,8 @@ sub get_module_paths { foreach my $module (readdir(DIRHANDLE)) { next if (($module =~ /^\.+/) || (!-d "$repository_path/$module")); my $module_entry = $module; - if (!$self->{SOURCE_CONFIG_FILE}) { - if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) { - $self->{ACTIVE_MODULES}{$module}++ if (!exists($self->{ACTIVE_MODULES}{$module})); - } + if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) { + $self->{REAL_MODULES}{$module}++; } my $possible_path = "$repository_path/$module_entry"; if (-d $possible_path) { @@ -250,7 +248,7 @@ sub read_config_file { next; } if ($module_section) { - ${$self->{ACTIVE_MODULES}}{$1}++; + ${$self->{ACTIVATED_MODULES}}{$1}++; next; }; }; @@ -333,7 +331,7 @@ Returns default path for source configuration file SourceConfig::is_active() -Returns >0 (TRUE) if a module is active +Returns 1 (TRUE) if a module is active Returns 0 (FALSE) if a module is not active =head2 EXPORT -- cgit v1.2.3 From 23fb6b010df425307737208a462751c94179ea5c Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 10 Nov 2009 17:38:05 +0100 Subject: #i106558# optimizing methods get_active_modules and is_active --- solenv/bin/modules/SourceConfig.pm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index 5189829e0c1c..7e646944a398 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -143,23 +143,22 @@ sub get_all_modules sub get_active_modules { my $self = shift; - $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); if (scalar keys %{$self->{ACTIVATED_MODULES}}) { return sort keys %{$self->{ACTIVATED_MODULES}}; - }; - return sort keys %{$self->{REAL_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; - $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}} && !scalar keys %{$self->{ACTIVATED_MODULES}}); if (scalar keys %{$self->{ACTIVATED_MODULES}}) { return exists ($self->{ACTIVATED_MODULES}{$module}); - } else { - return exists ($self->{REAL_MODULES}{$module}); } + $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}}); + return exists ($self->{REAL_MODULES}{$module}); } ##### private methods ##### -- cgit v1.2.3 From 3970dffa1d6d6d3977cf759d25432e885f11466a Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 12 Nov 2009 17:24:00 +0100 Subject: revert build breaker --- configure.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/configure.in b/configure.in index 5c8d55947751..aff65d6d1583 100644 --- a/configure.in +++ b/configure.in @@ -3691,6 +3691,23 @@ fi AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) +dnl =================================================================== +dnl Check whether freetype2 supports emboldening +dnl =================================================================== +if test "$test_freetype" = "yes"; then + save_CPPFLAGS="$CPPFLAGS" + save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" + LDFLAGS="$LDFLAGS $FREETYPE_LIBS" + AC_CHECK_LIB(freetype, FT_GlyphSlot_Embolden, + [USE_FT_EMBOLDEN="YES"], [USE_FT_EMBOLDEN="NO"], []) + LDFLAGS="$save_LDFLAGS" + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" +fi +AC_SUBST(USE_FT_EMBOLDEN) + if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \ test "$with_system_libxslt" != "no"; then if test -z "$with_system_libxml" -a -z "$with_system_libs" || \ -- cgit v1.2.3 From 306ac896af18d7c70a9d5bcf8a75bcb9c4a730ef Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Mon, 16 Nov 2009 01:20:32 +0100 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index eb479d4adafb..542c3d16be86 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m64(Build:9446) -BUILD=9446 -LAST_MINOR=m64 +RSCREVISION=300m65(Build:9457) +BUILD=9457 +LAST_MINOR=m65 SOURCEVERSION=DEV300 -- cgit v1.2.3 From 57f9b4fffac7a86aec79b8c5eefc4e31d1ffacc2 Mon Sep 17 00:00:00 2001 From: Vladimir Glazunov Date: Mon, 16 Nov 2009 15:38:48 +0100 Subject: masterfix: #i10000# wrong conflict resolution, here or in the cws ause10* --- solenv/inc/target.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 4516959e6cbc..eb4b35008e8a 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1393,17 +1393,20 @@ $(UNIXTEXT) : $(UNIXTEXT:f) # dummy target to keep the build happy if not even the .zip exists. localization tools deal with not existing # localize.sdf themself -$(LOCALIZESDF)%: +"$(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) + @-unzip -o -d $(COMMONMISC)/$(PRJNAME) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(subst,$(COMMONMISC)/$(PRJNAME)/, $@) + @@$(TOUCH) $@ +.ENDIF # "$(LOCALSDFFILE)"!="" +.ENDIF # "$(LOCALIZATION_FOUND)"=="" .ENDIF # "$(LOCALIZESDF)"!="" .ENDIF # "$(WITH_LANG)"!="" -- cgit v1.2.3 From 6c035c5af36c52d3f994976021d14633d13abbaf Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 16 Nov 2009 16:25:14 +0100 Subject: #i10000# packing without UPDMINOREXT set --- solenv/bin/modules/installer/javainstaller.pm | 1 - solenv/bin/modules/installer/ziplist.pm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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 fc540464dbc1..3232daf2138f 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -493,7 +493,7 @@ sub replace_minor_in_pathes { my $line = ${$patharrayref}[$i]; - if ((! defined $ENV{CWS_WORK_STAMP}) or (defined $ENV{UPDMINOREXT}) ) + if ( ! defined $ENV{CWS_WORK_STAMP} and defined $ENV{UPDMINOR} ) # if ( $installer::globals::minor ) { $line =~ s/\{minor\}/$installer::globals::minor/g; -- cgit v1.2.3 From f7fdc0ed4888d5e6e933492fd6bab0db2d065b56 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 16 Nov 2009 16:48:24 +0100 Subject: masterfix: #i10000# temporary add wntmsci13 --- solenv/config/sdev300.ini | 407 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 407 insertions(+) diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index b3c1da80284a..efee6a3e61b8 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -3773,3 +3773,410 @@ wntmsci12 tmp SOL_TMP_DIR } } +wntmsci13 +{ + environment + { + bs_sourceroot + { + SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) + SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%) + SOURCE_ROOT_USED TRUE + } + ca + { + BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% + COMPATH %SOL_TMP%$/r$/msvc9p + COMPROOT %SOL_TMP%$/r$/msvc9p + COPYALL TRUE + DEVROOT %SOL_TMP%$/r + DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK + ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% + FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 + F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + PCLEAN_PATH %SOLARROOT%$/etw + PERL %SOL_TMP%$/r$/%PERLDIR% + PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 + SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE + SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv + SOLARROOT %SOL_TMP%$/r + SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% + SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% +# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe + + } + cap + { + BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% + COMPATH %SOL_TMP%$/r$/msvc9p + COMPROOT %SOL_TMP%$/r$/msvc9p + COPYALL TRUE + COPY_PACKED TRUE + DEVROOT %SOL_TMP%$/r + DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK + ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% + FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5 + F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + PCLEAN_PATH %SOLARROOT%$/etw + PERL %SOL_TMP%$/r$/%PERLDIR% + PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1 + SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE + SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv + SOLARROOT %SOL_TMP%$/r + SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% + SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% + SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% +# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe + + } + cax + { + BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR% + COMPATH %SOL_TMP%$/r$/msvc9p + COMPROOT %SOL_TMP%$/r$/msvc9p + COPYALL FALSE + DSDK %COMPATH%$/DirectXSDK + ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP% + FSDK %COMPATH%$/Sdk$/v3.5 + F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0 + PCLEAN_PATH %SOL_TMP%$/r$/etw + PERL %SOL_TMP%$/r$/%PERLDIR% + PSDK %COMPATH%$/PlatformSDK$/V6.1 + SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE + SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv + SOLARROOT %SOL_TMP%$/r + SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% + SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP% + SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP% +# TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe + } + common + { + *build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH% + *build_client %PERL% %SOLARENV%$/bin$/build_client.pl + *copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl + *deliver %PERL% %SOLARENV%$/bin$/deliver.pl + *mkout %PERL% %SOLARENV%$/bin$/mkout.pl + *mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl + *o cd %SOLARENV%$/.. + *r cd %SOLARROOT% + *s cd %SOLARVERSION% + *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl + *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl + BIG_SVX + BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison + COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl + CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe + DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl + DMAKEROOT %SOLARENV%$/inc$/startup + ENABLE_PCH TRUE + ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86 + JDK13PATH %SOLAR_JDK13PATH% + JDK14PATH %SOLAR_JDK14PATH% + JDK15PATH %SOLAR_JDK15PATH% + LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH% + LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe + LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe + MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl + MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl + OJDK16PATH %SOLAR_OJDK16PATH% + PATH $cp(%PSDK%$/bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%) + PROF_EDITION TRUE + PSDKINC -I%PSDK%$/include + SOLAREXTRAINC -I%DSDK%$/include + SOLAR_JAVA TRUE + TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc + USE_DIRECTX5 TRUE + WINDOWS_VISTA_PSDK TRUE + SYSBASE TRUE + WITH_VC_REDIST TRUE + XCLASSPATH . + ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl + } + common0 + { + BS_ROOT n: + SOLAR_ENV_ROOT r: + SOLAR_SOURCE_ROOT o: + USE_SHELL bash + STAR_USE_SHELL bash + BTOOLDIR %WORK_STAMP%$/cygtools + PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl + } + common02 + { + PERL perl + } + common1 + { + COMPATH %SOLAR_ENV_ROOT%$/msvc9p + COMPROOT %SOLAR_ENV_ROOT%$/msvc9p + DEVROOT %SOLAR_ENV_ROOT% + DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK + FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5 + F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0 + NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode + PERL %SOLAR_ENV_ROOT%$/%PERLDIR% + PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/V6.1 + SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide + SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv + SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP% + SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv + SOLARROOT %SOLAR_ENV_ROOT% + SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP% + SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP% + SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP% + SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT% +# TEMP $dp(%TEMP%) +# TMP $dp(%TMP%) + } + common2 + { + ENABLE_GRAPHITE TRUE + BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR% + CALL_CDECL TRUE + CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%) + COM MSC + COMEX 12 + COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools) + COMMON_ENV_TOOLS %SOLARROOT%$/etools + COMP_ENV wntmsci13 + CPU I + CPUNAME INTEL + CVER M1500 + DYNAMIC_CRT TRUE + ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP% + GUI WNT + GUIBASE WIN + GVER NT351 + INPATH wntmsci13%PROEXT% + MOZILLABUILD %SOLARROOT%/mozilla-build-1.3 + OS WNT + OUTPATH wntmsci13 + PACKMS %SO_PACK%$/wntmsci13$/MS + SET_EXEPTIONS TRUE + SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install + SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3 + SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11 + SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06 + SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586 + SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl + SORT sort -T %TMP% +# TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe + use_shl_versions TRUE + } + common:3 IF %UPDATER% == YES + { + SHIPDRIVE %BS_ROOT%$/ship$/install + } + compath + { + COMPATH $dp(%STAR_COMPATH%) + } + distroot:0 if X%DIST_ROOT%X != XX + { + SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%) + SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%) + SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%) + } + envroot:0 IF X%ENV_ROOT%X != XX + { + SOLAR_ENV_ROOT $dp(%ENV_ROOT%) + } + jdk13 + { +# HOMEDRIVE %DEVROOT% +# HOMEPATH $/jdk131 + JAVAHOME %JDK13PATH% + JAVA_HOME %JDK13PATH% + JDKINC %JDK13PATH%$/include;%JDK13PATH%$/include$/win32 + JDKINCS -I%JDK13PATH%$/include -I%JDK13PATH%$/include$/win32 + JDKLIB %JDK13PATH%$/lib + JDKLIBS %JDK13PATH%$/lib + JDKPATH %JDK13PATH%$/bin + JDK_VERSION 131 + JREPATH %JDK13PATH%$/jre$/bin$/hotspot + XCLASSPATH .;%JDK13PATH%$/jre$/lib$/rt.jar;%JDK13PATH%$/lib$/tools.jar + } + jdk13path:0 if X%JDK_PATH%X != XX + { + SOLAR_JDK13PATH $dp(%JDK_PATH%) + } + jdk14 + { +# HOMEDRIVE %DEVROOT% +# HOMEPATH $/jdk141 + JAVAHOME %JDK14PATH% + JAVA_HOME %JDK14PATH% + JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include + JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32 + JDKLIB %JDK14PATH%$/lib + JDKLIBS %JDK14PATH%$/lib + JDKPATH %JDK14PATH%$/bin + JDK_VERSION 142 + JREPATH %JDK14PATH%$/jre$/bin$/client + XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar + } + jdk14path:0 if X%JDK_PATH%X != XX + { + SOLAR_JDK14PATH $dp(%JDK_PATH%) + } + jdk15 + { +# HOMEDRIVE %DEVROOT% +# HOMEPATH $/jdk151 + JAVAHOME %JDK15PATH% + JAVA_HOME %JDK15PATH% + JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include + JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32 + JDKLIB %JDK15PATH%$/lib + JDKLIBS %JDK15PATH%$/lib + JDKPATH %JDK15PATH%$/bin + JDK_VERSION 150 + JREPATH %JDK15PATH%$/jre$/bin$/client + XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar + } + jdk15path:0 if X%JDK_PATH%X != XX + { + SOLAR_JDK15PATH $dp(%JDK_PATH%) + } + nojava + { + DISABLE_JAVA TRUE + } + ojdk16 + { +# HOMEDRIVE %DEVROOT% +# HOMEPATH $/openjdk-6-b08-windows-i586 + JAVA_HOME %OJDK16PATH% + JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include + JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32 + JDKLIB %OJDK16PATH%$/lib + JDKLIBS %OJDK16PATH%$/lib + JDKPATH %OJDK16PATH%$/bin + JDK_VERSION 160 + JREPATH %OJDK16PATH%$/jre$/bin$/client + XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar + } + ojdk16path:0 if X%JDK_PATH%X != XX + { + SOLAR_OJDK16PATH $dp(%JDK_PATH%) + } + pre + { + ILIB %PRE%$/lib;%ILIB% + LIB %PRE%$/lib;%LIB% + } + pro + { + RES_ENUS TRUE + } + psdk + { + PSDK $dp(%STAR_PSDK%) + } + sourceroot:0 if X%SOURCE_ROOT%X != XX + { + SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%) + SOURCE_ROOT_USED TRUE + } + stl:0 IF X%STL_ROOT%X != XX + { + SOLAR_STLLIBPATH $dp(%STL_ROOT%$/..$/lib) + SOLAR_STLPATH $dp(%STL_ROOT%) + } + stl:1 IF X%STL_ROOT%X == XX + { + SOLAR_STLPATH %SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/stl + } + tmp + { + SOL_TMP $dp(%SOL_TMP_DIR%) + } + } + extern + { + COMSPEC + DIST_ROOT + ENV_ROOT + JDK_PATH + LOCALINI + OSTYPE + $dp(SOL_TMP) + $dp(SOURCE_ROOT) + $dp(STL_ROOT) + $dp(TMP) + $dp(TEMP) + } + order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + reset + { + COPYALL + CXX_X64_BINARY + DB2IMP + GCRINC + GCRLIB + GCRPATH + LIBMGR_X64_BINARY + LINK_X64_BINARY + NSIS_PATH + OLD_CHAOS + PERLDIR + SOLAR_ENV_ROOT + TFDEF + TFDIR + WST + } + script + { + sh + { + 400: if [ $COPYALL ]; then + 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE + 415: fi + 600: umask 002 + 800: hash -r + 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then + 851: export SO_GEN_ERROR + 852: fi + 860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then + 861: export SO_GEN_ERROR2 + 862: fi + 870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then + 871: echo $SO_GEN_ERROR + 872: fi + 880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then + 881: echo $SO_GEN_ERROR2 + 882: fi + } + } + switches + { + bs_sourceroot SOURCE_ROOT_TMP + bsclient + ca + cap + cax + compath STAR_COMPATH + distroot + envroot + jdk13 + jdk13path + jdk14 + jdk14path + jdk15 + jdk15path + l10n L10N_framework + nojava + ojdk16 + ojdk16path + pre PRE + pro + psdk STAR_PSDK + shell STAR_USE_SHELL + sourceroot + stl + tmp SOL_TMP_DIR + } +} + -- cgit v1.2.3 From 867b9406d220830960f79de3021d34445c8a8fcd Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Mon, 16 Nov 2009 21:01:44 +0100 Subject: #i10000# do not use a global variable --- solenv/bin/modules/CreatePDBRelocators.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm index 1f0280d38bb3..0b57e748b486 100644 --- a/solenv/bin/modules/CreatePDBRelocators.pm +++ b/solenv/bin/modules/CreatePDBRelocators.pm @@ -86,7 +86,7 @@ sub create_pdb_relocators # sanitize path $root_dir =~ s/\\/\//g; - $o =~ s/\\/\//g; + my $o =~ s/\\/\//g; my $premilestoneext = $milestoneext; if ( $pre ne "" ) { $premilestoneext = ~ s/^\.//; -- cgit v1.2.3