From b0fa53865f49de46803638e253700c3bd785a042 Mon Sep 17 00:00:00 2001 From: npower Developer Date: Fri, 26 Feb 2010 13:24:33 +0000 Subject: npower14miscfixes: #i108853# fix build break --- solenv/inc/libs.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'solenv') diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 2ea3b4c890ce..a8cbcc9029a5 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -182,7 +182,9 @@ SAXLIB=-lsax$(DLLPOSTFIX) MAILLIB=-lmail DOCMGRLIB=-ldmg$(DLLPOSTFIX) BASICLIB=-lsb$(DLLPOSTFIX) +.IF "$(ENABLE_VBA)"=="YES" VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX) +.ENDIF DBTOOLSLIB=-ldbtools$(DLLPOSTFIX) HM2LIBSH=-lhmwrpdll HM2LIBST=-lhmwrap -- cgit From 074ec7222c44a2787b12825f1cf9899d020846b1 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 1 Mar 2010 12:34:24 +0100 Subject: vcl110: #i108947# add replace variable BUILDIDCWS --- solenv/bin/modules/installer/ziplist.pm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 3232daf2138f..1aa12fd4b31b 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -743,6 +743,11 @@ sub replace_variables_in_ziplist_variables my $localminor = $installer::globals::lastminor; if ( $installer::globals::minor ) { $localminor = $installer::globals::minor; } + my $buildidstringcws = $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . ")"; + + # the environment variable CWS_WORK_STAMP is set only in CWS + if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstringcws = $buildidstringcws . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; } + for ( my $i = 0; $i <= $#{$blockref}; $i++ ) { if ($installer::globals::lastminor) { ${$blockref}[$i] =~ s/\{milestone\}/$milestonevariable/; } @@ -753,6 +758,7 @@ sub replace_variables_in_ziplist_variables else { ${$blockref}[$i] =~ s/\{buildid\}//; } if ( $installer::globals::build ) { ${$blockref}[$i] =~ s/\{buildsource\}/$installer::globals::build/; } else { ${$blockref}[$i] =~ s/\{build\}//; } + ${$blockref}[$i] =~ s/\{buildidcws\}/$buildidstringcws/; } } -- cgit From 857e5a528f8c5d1c0d9101d5caf139d5f4a7999b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 15 Mar 2010 16:02:56 +0000 Subject: linuxaxp01: #i110145# first cut --- solenv/inc/unx.mk | 4 ++++ solenv/inc/unxlngaxp.mk | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 solenv/inc/unxlngaxp.mk (limited to 'solenv') diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index c6d756343d79..5f8509181c17 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -167,6 +167,10 @@ .INCLUDE : unxlnghppa.mk .ENDIF +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXL" +.INCLUDE : unxlngaxp.mk +.ENDIF + # --- general *ix settings --- HC=hc HCFLAGS= diff --git a/solenv/inc/unxlngaxp.mk b/solenv/inc/unxlngaxp.mk new file mode 100644 index 000000000000..bf7711a10c5b --- /dev/null +++ b/solenv/inc/unxlngaxp.mk @@ -0,0 +1,34 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# mk file for Unix Linux Alpha using gcc, please make generic modifications to unxlng.mk + +PICSWITCH:=-fPIC +.INCLUDE : unxlng.mk +CFLAGS+=-DAXP +DLLPOSTFIX=ll +BUILD64=1 -- cgit From bca8974cec32928a7571bcff39cd6501ef38f4d1 Mon Sep 17 00:00:00 2001 From: "Herbert Duerr [hdu]" Date: Mon, 22 Mar 2010 14:43:28 +0100 Subject: match case of PSDK directory names --- solenv/config/sdev300.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 055c5c146d98..7637cac01db2 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -2949,7 +2949,7 @@ wntmsci12 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%) + 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 @@ -3292,7 +3292,7 @@ wntmsci13 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%) + 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 -- cgit From 8ae6be190656205afeba2ce29d122f69b0684f34 Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 13 Apr 2010 07:47:15 +0200 Subject: obo47: #i110831# build breaks for wntmsci12 non pro in module shell --- solenv/inc/settings.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 5601f105704f..db766562892e 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -490,7 +490,7 @@ DBG_LEVEL*=0 optimize!=true dbgutil!=true DBG_LEVEL*=1 -USE_STLP_DEBUG=TRUE +USE_STLP_DEBUG*=TRUE .ENDIF .IF "$(debug)"!="" -- cgit From 43cec87eb7a2fee7db0417f0e8b22e0053a9d667 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Tue, 27 Apr 2010 18:15:28 +0200 Subject: native301 #i111110# error code -1 for errors in log files --- solenv/bin/modules/installer/worker.pm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index ff1d172c9b8f..a3c4d5d495b9 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -491,6 +491,12 @@ sub analyze_and_save_logfile if ( $installer::globals::creating_windows_installer_patch ) { $installer::globals::creating_windows_installer_patch = 0; } + # Exiting the packaging process, if an error occured. + # This is important, to get an error code "-1", if an error was found in the log file, + # that did not break the packaging process + + if ( ! $is_success) { installer::exiter::exit_program("ERROR: Found an error in the logfile. Packaging failed.", "analyze_and_save_logfile"); } + return ($is_success, $finalinstalldir); } -- cgit From 7256a6f202e86fa91d069bae157642114f760113 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Thu, 29 Apr 2010 13:18:59 +0200 Subject: native301 #162073# userdir whitespaces must be %20 --- solenv/bin/modules/installer/setupscript.pm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index 9da5340f915f..a3bf5abf50a9 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -155,6 +155,12 @@ sub add_lowercase_productname_setupscriptvariable $newline = "\%LCONEWORDPRODUCTNAME " . lc($value) . "\n"; push(@{$variablesref} ,$newline); $value = $original; + $value =~ s/\s*$//g; + $value =~ s/^\s*//g; + $value =~ s/ /\%20/g; + $newline = "\%MASKEDPRODUCTNAME " . $value . "\n"; + push(@{$variablesref} ,$newline); + $value = $original; $value =~ s/\s/\_/g; # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; } $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n"; -- cgit From f0bd59c63e7ff130f0325f83157097e1716f39db Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 5 May 2010 16:28:18 +0200 Subject: nativel #161976# new license file structure --- solenv/bin/make_installer.pl | 27 ++++++++++++++++----------- solenv/bin/modules/installer/epmfile.pm | 17 ++++++++++++++--- solenv/bin/modules/installer/scriptitems.pm | 20 ++++++++++++++++++++ solenv/bin/modules/installer/simplepackage.pm | 9 +++++++-- solenv/bin/modules/installer/ziplist.pm | 2 +- 5 files changed, 58 insertions(+), 17 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 143f60d986db..197f985bbf83 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1348,6 +1348,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # Debian allows no underline in package name if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; } + # Debian allows no underline in package name + if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; } + my $linkaddon = ""; my $linkpackage = 0; $installer::globals::add_required_package = ""; @@ -2126,17 +2129,19 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # include the license text into the table Control.idt - # my $licensefilesource = installer::windows::idtglobal::get_licensefilesource($onelanguage, $filesinproductlanguageresolvedarrayref); - my $licensefilesource = installer::windows::idtglobal::get_rtflicensefilesource($onelanguage, $includepatharrayref_lang); - my $licensefile = installer::files::read_file($licensefilesource); - installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, $allvariablesarrayref, $onelanguage, $loggingdir); - my $controltablename = $languageidtdir . $installer::globals::separator . "Control.idt"; - my $controltable = installer::files::read_file($controltablename); - installer::windows::idtglobal::add_licensefile_to_database($licensefile, $controltable); - installer::files::save_file($controltablename, $controltable); - - $infoline = "Added licensefile $licensefilesource into database $controltablename\n"; - push(@installer::globals::logfileinfo, $infoline); + if ( ! $allvariableshashref->{'HIDELICENSEDIALOG'} ) + { + my $licensefilesource = installer::windows::idtglobal::get_rtflicensefilesource($onelanguage, $includepatharrayref_lang); + my $licensefile = installer::files::read_file($licensefilesource); + installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, $allvariablesarrayref, $onelanguage, $loggingdir); + my $controltablename = $languageidtdir . $installer::globals::separator . "Control.idt"; + my $controltable = installer::files::read_file($controltablename); + installer::windows::idtglobal::add_licensefile_to_database($licensefile, $controltable); + installer::files::save_file($controltablename, $controltable); + + $infoline = "Added licensefile $licensefilesource into database $controltablename\n"; + push(@installer::globals::logfileinfo, $infoline); + } # include office directory in CustomAction table diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index ffe79136b57e..5521ba10bf57 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -426,6 +426,17 @@ sub create_epm_header } } + # Process for Linux packages, in which only a very basic license file is + # included into the package. + + if ( $installer::globals::islinuxbuild ) + { + if ( $variableshashref->{'COPYRIGHT_INTO_LINUXPACKAGE'} ) + { + $licensefilename = "linuxcopyrightfile"; + $license_in_package_defined = 1; + } + } # searching for and readme file for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ ) @@ -447,7 +458,7 @@ sub create_epm_header { my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, "" , 0); - if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find license file $licensefilename!", "create_epm_header"); } + if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find license file $licensefilename (A)!", "create_epm_header"); } # Special handling to add the content of the file "license_en-US" to the solaris copyrightfile. But not for all products @@ -500,12 +511,12 @@ sub create_epm_header if (!($foundlicensefile)) { - installer::exiter::exit_program("ERROR: Could not find license file $licensefilename", "create_epm_header"); + installer::exiter::exit_program("ERROR: Could not find license file $licensefilename (B)", "create_epm_header"); } if (!($foundreadmefile)) { - installer::exiter::exit_program("ERROR: Could not find readme file $readmefilename", "create_epm_header"); + installer::exiter::exit_program("ERROR: Could not find readme file $readmefilename (C)", "create_epm_header"); } # including %replaces diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 778ca23e740a..ecda4f9a4e0b 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1507,6 +1507,20 @@ sub add_License_Files_into_Installdir $newfile->{'specificlanguage'} = ""; $newfile->{'haslanguagemodule'} = "0"; + if ( defined $newfile->{'InstallName'} ) + { + if ( $newfile->{'InstallName'} =~ /^\s*(.*?)_$defaultlanguage\.?(\w*?)\s*$/ ) + { + my $localfilename = $1; + my $localextension = $2; + + if ( $localextension eq "" ) { $newfile->{'InstallName'} = $localfilename; } + else { $newfile->{'InstallName'} = $localfilename . "\." . $localextension; } + } + } + + $newfile->{'removelangfromfile'} = "1"; # Important for files with an InstallName, because language also has to be removed there. + if ( $foundofficedir ) { $newfile->{'Dir'} = $officedirectorygid; @@ -1529,6 +1543,12 @@ sub add_License_Files_into_Installdir $infoline = "New files: Adding file $newfilename for the installation root to the file list. Language: $defaultlanguage\n"; push( @installer::globals::logfileinfo, $infoline); + if ( defined $newfile->{'InstallName'} ) + { + $infoline = "New files: Using installation name: $newfile->{'InstallName'}\n"; + push( @installer::globals::logfileinfo, $infoline); + } + # Collecting license and readme file for the installation set push(@installer::globals::installsetfiles, $newfile); diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 9666ef3e1af5..08f6eacf9e24 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -407,7 +407,12 @@ sub create_package } my $sla = 'sla.r'; - my $ref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$sla, $includepatharrayref, 0); + my $ref = ""; + + if ( ! $allvariables->{'HIDELICENSEDIALOG'} ) + { + installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$sla, $includepatharrayref, 0); + } my $localtempdir = $tempdir; @@ -518,7 +523,7 @@ sub create_package } $systemcall = "cd $localtempdir && hdiutil makehybrid -hfs -hfs-openfolder $folder $folder -hfs-volume-name \"$volume_name\" -ov -o $installdir/tmp && hdiutil convert -ov -format UDZO $installdir/tmp.dmg -o $archive && "; - if ($$ref ne "") { + if (( $ref ne "" ) && ( $$ref ne "" )) { $systemcall .= "hdiutil unflatten $archive && Rez -a $$ref -o $archive && hdiutil flatten $archive &&"; } $systemcall .= "rm -f $installdir/tmp.dmg"; diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 00de1709473b..7f72963771f5 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -659,7 +659,7 @@ sub set_manufacturer if (( $allvariables->{'DEFINEDMANUFACTURER'} ) && ( $allvariables->{'DEFINEDMANUFACTURER'} ne "" )) { $sunname = $allvariables->{'DEFINEDMANUFACTURER'}; } else { installer::exiter::exit_program("ERROR: Property DEFINEDMANUFACTURER has to be set for this product!", "set_manufacturer"); } $installer::globals::manufacturer = $sunname; - $installer::globals::longmanufacturer = $sunname . ", Inc."; + $installer::globals::longmanufacturer = $sunname; } $allvariables->{'MANUFACTURER'} = $installer::globals::manufacturer; -- cgit From db9eb3d65d6a12c93435cad380c6646de23b6db7 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 5 May 2010 16:31:07 +0200 Subject: nativel #161976# new license file structure --- solenv/bin/modules/installer/windows/property.pm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 7b890d06d58f..2ef083178122 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -393,7 +393,23 @@ sub set_important_properties if ( $allvariables->{'HIDELICENSEDIALOG'} ) { my $onepropertyline = "HIDEEULA" . "\t" . "1" . "\n"; - push(@{$propertyfile}, $onepropertyline); + + my $already_defined = 0; + + for ( my $i = 0; $i <= $#{$propertyfile}; $i++ ) + { + if ( ${$propertyfile}[$i] =~ /^\s*HIDEEULA\t/ ) + { + ${$propertyfile}[$i] = $onepropertyline; + $already_defined = 1; + last; + } + } + + if ( ! $already_defined ) + { + push(@{$propertyfile}, $onepropertyline); + } } # Setting .NET requirements -- cgit From b9bf658b70d6f76d814f6a3a9ff9a956f4e070b6 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Thu, 15 Apr 2010 15:47:43 +0200 Subject: nativel #162024# no license into setup dialog --- solenv/bin/modules/installer/worker.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index a3c4d5d495b9..6cc3c1e3f5db 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -3138,7 +3138,8 @@ sub put_license_into_setup # find and read english license file my $licenselanguage = "en-US"; # always english ! - my $licensefilename = "LICENSE_" . $licenselanguage; + # my $licensefilename = "LICENSE_" . $licenselanguage; + my $licensefilename = "license_" . $licenselanguage . ".txt"; my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage); my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0); -- cgit From b0eef78fae983e9e4896b444a2777b7fb9c9f8d9 Mon Sep 17 00:00:00 2001 From: "Eike Rathke [er]" Date: Wed, 31 Mar 2010 15:08:00 +0200 Subject: OOO321l10n: #i110522# added qcv-ES for Catalan Valencian l10n --- solenv/bin/modules/installer/globals.pm | 1 + 1 file changed, 1 insertion(+) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 72ab0215dbcf..62efe5d70491 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -78,6 +78,7 @@ BEGIN "dgo", "kok", "mni", + "qcv-ES", "sat", "ug", "om", -- cgit From 074c09ff4c02800dbdbb339d2f4ebb64322ec41f Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 6 May 2010 11:11:19 +0200 Subject: ooo321l10n: added support for hi qcv-ES sq, removed hi-IN --- solenv/bin/modules/installer/globals.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 62efe5d70491..564df06e79e2 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -78,7 +78,7 @@ BEGIN "dgo", "kok", "mni", - "qcv-ES", + "ca-XV", "sat", "ug", "om", -- cgit From d499a8fedb1208dd993773501d1ef2afc674615b Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Fri, 16 Apr 2010 11:07:38 +0200 Subject: native299 #i110901# improving mechanism for DEFAULT_TO_ENGLISH_FOR_PACKING --- solenv/bin/modules/installer/archivefiles.pm | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm index 80c468b61db2..4a9586c9fdd4 100644 --- a/solenv/bin/modules/installer/archivefiles.pm +++ b/solenv/bin/modules/installer/archivefiles.pm @@ -50,18 +50,26 @@ sub put_language_into_name my $filename = ""; my $extension = ""; - if ( $oldname =~ /^\s*(.*)(\..*?)\s*$/ ) # files with extension + if ( $oldname =~ /en-US/ ) # files, that contain the language in the file name { - $filename = $1; - $extension = $2; + $newname = $oldname; + $newname =~ s/en-US/$onelanguage/; } - else + else # files, that do not contain the language in the file name { - $filename = $oldname; - $extension = ""; - } + if ( $oldname =~ /^\s*(.*)(\..*?)\s*$/ ) # files with extension + { + $filename = $1; + $extension = $2; + } + else + { + $filename = $oldname; + $extension = ""; + } - $newname = $1 . "_" . $onelanguage . $2; + $newname = $1 . "_" . $onelanguage . $2; + } return $newname; } -- cgit From 8dee240638c80bc959ebd2b48079e21cab9da906 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Thu, 29 Apr 2010 17:59:35 +0200 Subject: ause119:#i111023# add path to dtd --- solenv/inc/tg_config.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'solenv') diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk index 2f1b9fedde80..bbc720ed600e 100644 --- a/solenv/inc/tg_config.mk +++ b/solenv/inc/tg_config.mk @@ -120,10 +120,12 @@ $(PROCESSOUT)/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ + --path $(DTDDIR)/registry \ $(SYSXSLDIR)data_val.xsl $< $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ + --path $(DTDDIR)/registry \ $(SYSXSLDIR)alllang.xsl $< @+-$(RM) $(@:d)$*.val > $(NULLDEV) @@ -154,6 +156,7 @@ $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| %.xcu --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \ + --path $(DTDDIR)/registry \ $(SYSXSLDIR)alllang.xsl $< # --- languagepack tag modules --- -- cgit From f3039976e9510ddc7aa3dc9592bd90747f83b1d2 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Thu, 29 Apr 2010 18:03:43 +0200 Subject: ause119:#i110644# add backward compatibility defines --- solenv/bin/modules/installer/epmfile.pm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index ffe79136b57e..5e2d78ccbb27 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -1436,6 +1436,8 @@ sub set_autoprovreq_in_specfile $autoreqprovline = "AutoReqProv\: no\n"; } + $autoreqprovline .= "%define _binary_filedigest_algorithm 1\n%define _binary_payload w9.gzdio\n"; + for ( my $i = 0; $i <= $#{$changefile}; $i++ ) { # Adding "autoreqprov" behind the line beginning with: Group: -- cgit From aa71d04d5a275f53a226ff90e029a4bd28b26d99 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 3 May 2010 16:04:21 +0200 Subject: ause119: #i111342# add random to workfiles --- solenv/bin/mhids.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index f2d0acc649f6..a1229c398551 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -155,7 +155,9 @@ $filebase =~ s/\..*?$//; # now stript it to something that doesn't togger vista execution prevention :( $flbs = $filebase; $flbs =~ s/[aeiou]//g; -$workfile = "$tmpdir/${flbs}_".$$; +# call srand ony once per script! +srand(); +$workfile = "$tmpdir/${flbs}_".$$.rand(); #$workfile =~ s/setup/set_up/; # now get $workfile ready for shell usage... @@ -171,7 +173,7 @@ unlink "$workfile.obj"; if ( -f "$workfile.hid" ) { - unlink "$workfile.hid" or die "ERRROR - cannot remove $workfile.hid\n";; + unlink "$workfile.hid" or die "ERRROR - cannot remove $workfile.hid\n"; } # hack to quit for files which cannot be handled -- cgit From 0b0d59213a0da84dd509801fefefd8528bb4b139 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 4 May 2010 18:44:42 +0200 Subject: #i111346#: fix mechanism for fetching external tar balls from a pre-defined local path --- solenv/bin/cws.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl index f3abc0a7a320..f24db23897af 100644 --- a/solenv/bin/cws.pl +++ b/solenv/bin/cws.pl @@ -2206,6 +2206,7 @@ sub do_fetch my $ooo_svn_server = $config->get_ooo_svn_server(); my $so_svn_server = $config->get_so_svn_server(); my $prebuild_dir = $config->get_prebuild_binaries_location(); + my $external_tarball_source = $prebuild_dir; # Check early for platforms so we can bail out before anything time consuming is done # in case of a missing platform my @platforms; @@ -2368,10 +2369,10 @@ sub do_fetch } } - if ( !$onlysolver ) { + if ( !$onlysolver && defined($external_tarball_source) ) { my $source_root_dir = "$workspace/$masterws"; - my $external_tarball_source = "$prebuild_dir/$masterws/ext_sources"; - if ( -e "$source_root_dir/ooo/ooo.lst" && defined($prebuild_dir) && -d $external_tarball_source ) { + $external_tarball_source .= "/$masterws/ext_sources"; + if ( -e "$source_root_dir/ooo/ooo.lst" && -d $external_tarball_source ) { fetch_external_tarballs($source_root_dir, $external_tarball_source); } } -- cgit From fa10c486f890b14aafd78713a98475651796bf79 Mon Sep 17 00:00:00 2001 From: Release Engineering Date: Tue, 11 May 2010 18:31:42 +0200 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index f6920b285050..9a061e2aa107 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m77(Build:9496) -BUILD=9496 -LAST_MINOR=m77 +RSCREVISION=300m78(Build:9500) +BUILD=9500 +LAST_MINOR=m78 SOURCEVERSION=DEV300 -- cgit From 3e3511747ef294a93ba65baa9d4c67cdd4489171 Mon Sep 17 00:00:00 2001 From: Release Engineering Date: Tue, 11 May 2010 18:40:09 +0200 Subject: DEV300 --- solenv/inc/minor.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 9a061e2aa107..ec992a075900 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m78(Build:9500) -BUILD=9500 +RSCREVISION=300m78(Build:9501) +BUILD=9501 LAST_MINOR=m78 SOURCEVERSION=DEV300 -- cgit From c8c2f5d13aa2db8747d8f0090a0f4bfe03a9e588 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 12 May 2010 13:53:30 +0200 Subject: #i10000# build fix for *.location files --- solenv/bin/modules/CreatePDBRelocators.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm index 8f272fe896f8..c6e4f81a660f 100644 --- a/solenv/bin/modules/CreatePDBRelocators.pm +++ b/solenv/bin/modules/CreatePDBRelocators.pm @@ -106,8 +106,8 @@ sub create_pdb_relocators } # collect files - my @pdb_files; foreach my $repository (@{$self->{REPOSITORIES}}) { + my @pdb_files; my $o = $self->{SOLARVERSION} . "/$repository"; $repository =~ s/(.*?)\.(.*)/$1/; $self->collect_files( $o, $inpath, \@pdb_files); -- cgit From a11b5a618516e47d766bc342796a478d1b5bfc8f Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 18 May 2010 11:57:01 +0200 Subject: #i10000# fixed transplanted nativeb --- solenv/bin/modules/installer/windows/idtglobal.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm index 6f03228ca10a..b82f5175250b 100644 --- a/solenv/bin/modules/installer/windows/idtglobal.pm +++ b/solenv/bin/modules/installer/windows/idtglobal.pm @@ -769,9 +769,13 @@ sub prepare_language_idt_directory installer::systemactions::create_directory($destinationdir . $installer::globals::separator . "Binary"); installer::systemactions::copy_directory($installer::globals::idttemplatepath . $installer::globals::separator . "Binary", $destinationdir . $installer::globals::separator . "Binary"); - if (( $installer::globals::patch ) && ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} )) + if ((( $installer::globals::patch ) && ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} )) || ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} )) { - my $newsourcedir = $installer::globals::unpackpath . $installer::globals::separator . $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'}; # path setting in list file dependent from unpackpath !? + my $bitmapdir = ""; + if ( $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'} ) { $bitmapdir = $allvariables->{'WINDOWSPATCHBITMAPDIRECTORY'}; } + if ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} ) { $bitmapdir = $allvariables->{'WINDOWSBITMAPDIRECTORY'}; } + + my $newsourcedir = $installer::globals::unpackpath . $installer::globals::separator . $bitmapdir; # path setting in list file dependent from unpackpath !? $infoline = "\nOverwriting files in directory \"" . $destinationdir . $installer::globals::separator . "Binary" . "\" with files from directory \"" . $newsourcedir . "\".\n"; push( @installer::globals::logfileinfo, $infoline); if ( ! -d $newsourcedir ) -- cgit