diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-07-27 16:50:00 +0200 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-07-27 16:50:00 +0200 |
commit | 2fdbf8fe1765a598ae9da94efa36f864027a12b9 (patch) | |
tree | 84857d6b179152dbf78890da4e66392e174822b7 /solenv | |
parent | 44224addb980da9a43e23e2789408585597f523f (diff) | |
parent | d3f9253b1c8bdf2060d95651ad503a83a9af0d26 (diff) |
merged OOO330 m2
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/bin/make_installer.pl | 10 | ||||
-rw-r--r-- | solenv/bin/modules/installer/control.pm | 10 | ||||
-rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 55 | ||||
-rw-r--r-- | solenv/bin/modules/installer/globals.pm | 1 | ||||
-rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 2 | ||||
-rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 2 | ||||
-rw-r--r-- | solenv/bin/modules/installer/systemactions.pm | 26 | ||||
-rw-r--r--[-rwxr-xr-x] | solenv/config/sooo330.ini (renamed from solenv/config/sdev300.ini) | 5 | ||||
-rw-r--r-- | solenv/config/ssolar.cmn | 1 | ||||
-rw-r--r-- | solenv/inc/minor.mk | 10 | ||||
-rw-r--r-- | solenv/inc/settings.mk | 3 | ||||
-rw-r--r-- | solenv/inc/unxlng.mk | 8 | ||||
-rw-r--r-- | solenv/inc/version.hrc | 6 | ||||
-rw-r--r-- | solenv/inc/version.lst | 30 | ||||
-rw-r--r-- | solenv/inc/version_so.hrc | 6 | ||||
-rw-r--r-- | solenv/inc/versionlist.mk | 30 | ||||
-rw-r--r-- | solenv/prj/d.lst | 2 |
17 files changed, 187 insertions, 20 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 127f28cd7631..335ecf961253 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -655,7 +655,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) $installer::globals::globalinfo_copied = 1; my $logminor = ""; - my $avoidlanginlog = 0; if ( $installer::globals::updatepack ) { $logminor = $installer::globals::lastminor; } else { $logminor = $installer::globals::minor; } @@ -663,14 +662,15 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) my $loglanguagestring_orig = $loglanguagestring; if (length($loglanguagestring) > $installer::globals::max_lang_length) { + my $number_of_languages = installer::systemactions::get_number_of_langs($loglanguagestring); chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/ .*//g"`); - $loglanguagestring = $shorter; - $avoidlanginlog = 1; + my $id = substr($shorter, 0, 8); # taking only the first 8 digits + $loglanguagestring = "lang_" . $number_of_languages . "_id_" . $id; } $installer::globals::logfilename = "log_" . $installer::globals::build; if ( $logminor ne "" ) { $installer::globals::logfilename .= "_" . $logminor; } - if ( ! $avoidlanginlog ) { $installer::globals::logfilename .= "_" . $loglanguagestring; } + $installer::globals::logfilename .= "_" . $loglanguagestring; $installer::globals::logfilename .= ".log"; $loggingdir = $loggingdir . $loglanguagestring . $installer::globals::separator; installer::systemactions::create_directory($loggingdir); @@ -732,7 +732,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if (!($installer::globals::is_copy_only_project)) { - if ( $installer::globals::iswindowsbuild ) + if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" )) { installer::windows::msiglobal::set_global_code_variables($languagesarrayref, $languagestringref, $allvariableshashref, $alloldproperties); } diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index f4edc8129255..bd700be38758 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -405,6 +405,16 @@ sub determine_ship_directory my $shipdrive = $ENV{'SHIPDRIVE'}; my $languagestring = $$languagesref; + + if (length($languagestring) > $installer::globals::max_lang_length ) + { + my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring); + chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`); + # $languagestring = $shorter; + my $id = substr($shorter, 0, 8); # taking only the first 8 digits + $languagestring = "lang_" . $number_of_languages . "_id_" . $id; + } + my $productstring = $installer::globals::product; my $productsubdir = ""; diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 136eca913dd9..f8e35f208251 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -2308,6 +2308,55 @@ sub determine_rpm_version return $rpmversion; } +#################################################### +# Writing some info about rpm into the log file +#################################################### + +sub log_rpm_info +{ + my $systemcall = ""; + my $infoline = ""; + + $infoline = "\nLogging rpmrc content using --showrc\n\n"; + push( @installer::globals::logfileinfo, $infoline); + + if ( $installer::globals::rpm ne "" ) + { + $systemcall = "$installer::globals::rpm --showrc |"; + } + else + { + $systemcall = "rpm --showrc |"; + } + + my @fullrpmout = (); + + open (RPM, "$systemcall"); + while (<RPM>) {push(@fullrpmout, $_); } + close (RPM); + + if ( $#fullrpmout > -1 ) + { + for ( my $i = 0; $i <= $#fullrpmout; $i++ ) + { + my $rpmout = $fullrpmout[$i]; + $rpmout =~ s/\s*$//g; + + $infoline = "$rpmout\n"; + $infoline =~ s/error/e_r_r_o_r/gi; # avoiding log problems + push( @installer::globals::logfileinfo, $infoline); + } + } + else + { + $infoline = "Problem in systemcall: $systemcall : No return value\n"; + push( @installer::globals::logfileinfo, $infoline); + } + + $infoline = "End of logging rpmrc\n\n"; + push( @installer::globals::logfileinfo, $infoline); +} + ################################################# # Systemcall to start the packaging process ################################################# @@ -2560,6 +2609,12 @@ sub create_packages_without_epm mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/"); } + if ( ! $installer::globals::rpminfologged ) + { + log_rpm_info(); + $installer::globals::rpminfologged = 1; + } + my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build 0\" $specfilename --target $target $buildrootstring 2\>\&1 |"; installer::logger::print_message( "... $systemcall ...\n" ); diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 71429e278f4e..ccef960e0337 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -179,6 +179,7 @@ BEGIN $rpm = ""; $rpmcommand = ""; $rpmquerycommand = ""; + $rpminfologged = 0; $debian = ""; $installertypedir = ""; $controlledmakecabversion = "5"; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index 0961b598902f..d3ce8a1d3a32 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -530,7 +530,7 @@ sub control_required_parameter # and the UpgradeCode for the product are defined. # The name "codes.txt" can be overwritten in Product definition with CODEFILENAME (msiglobal.pm) - if ($installer::globals::iswindowsbuild) + if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" )) { $installer::globals::codefilename = $installer::globals::idttemplatepath . $installer::globals::separator . $installer::globals::codefilename; installer::files::check_file($installer::globals::codefilename); diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index a073e60a6697..7a2c4cb3f5e3 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1868,7 +1868,7 @@ sub remove_Languagepacklibraries_from_Installset } $infoline = "\n"; - push( @installer::globals::logfileinfo, $infoline); + push( @installer::globals::globallogfileinfo, $infoline); return \@newitemsarray; } diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index 981dc40f3209..24b070574189 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -292,6 +292,27 @@ sub remove_empty_directory } ####################################################################### +# Calculating the number of languages in the string +####################################################################### + +sub get_number_of_langs +{ + my ($languagestring) = @_; + + my $number = 1; + + my $workstring = $languagestring; + + while ( $workstring =~ /^\s*(.*)_(.*?)\s*$/ ) + { + $workstring = $1; + $number++; + } + + return $number; +} + +####################################################################### # Creating the directories, in which files are generated or unzipped ####################################################################### @@ -380,8 +401,11 @@ sub create_directories if (length($languagestring) > $installer::globals::max_lang_length ) { + my $number_of_languages = get_number_of_langs($languagestring); chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`); - $languagestring = $shorter; + # $languagestring = $shorter; + my $id = substr($shorter, 0, 8); # taking only the first 8 digits + $languagestring = "lang_" . $number_of_languages . "_id_" . $id; } $path = $path . $languagestring . $installer::globals::separator; diff --git a/solenv/config/sdev300.ini b/solenv/config/sooo330.ini index 3e80e1460885..dcd0c0564afe 100755..100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sooo330.ini @@ -8,6 +8,7 @@ common BIG_SVX TRUE BMP_WRITES_FLAG TRUE BUILD_SPECIAL TRUE + BUILD_STAX YES BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT common_build TRUE COMMON_OUTDIR common @@ -66,6 +67,7 @@ common } common:3 IF %UPDATER% != YES { + ENABLE_CRASHDUMP DUMMY } crashdump { @@ -90,10 +92,11 @@ common pro:0 IF %UPDATER% == YES { DELIVER_TO_ZIP TRUE + ENABLE_CRASHDUMP TRUE product full PROEXT .pro PROFULLSWITCH product=full - WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar + WITH_LANG en-US af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu } pro:1 IF %UPDATER% != YES { diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index 937c345e2de8..de332146a1f0 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -44,6 +44,7 @@ common BUILD_TOOLS BUILD_TYPE BUILD_SPECIAL + BUILD_STAX BUILD_X64 CLASSPATH CALL_CDECL diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 42eb91b48474..ef764a7ee545 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ -RSCVERSION=300 -RSCREVISION=300m84(Build:9512) -BUILD=9512 -LAST_MINOR=m84 -SOURCEVERSION=DEV300 +RSCVERSION=330 +RSCREVISION=330m2(Build:9516) +BUILD=9516 +LAST_MINOR=m2 +SOURCEVERSION=OOO330 diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index cfd4d89bb3bc..68bbc797d8af 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -827,6 +827,9 @@ LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) .IF "$(LOCALIZESDF)"=="" LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI))) +.IF "$(LOCALIZESDF)"=="" +LOCALSDFFILE!:= +.ENDIF # "$(LOCALIZESDF)"=="" .ENDIF # "$(LOCALIZESDF)"=="" # dummy target to keep the build happy. .IF "$(LOCALIZESDF)"=="" diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk index be8c5d01b714..aff552dde89c 100644 --- a/solenv/inc/unxlng.mk +++ b/solenv/inc/unxlng.mk @@ -198,6 +198,14 @@ STDLIBCUIMT+=-ltcmalloc STDSHLGUIMT+=-ltcmalloc STDSHLCUIMT+=-ltcmalloc .ENDIF + +.IF "$(ALLOC)" == "JEMALLOC" +STDLIBGUIMT+=-ljemalloc +STDLIBCUIMT+=-ljemalloc +STDSHLGUIMT+=-ljemalloc +STDSHLCUIMT+=-ljemalloc +.ENDIF + .IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" LINKFLAGS += -Wl,--hash-style=both .ELSE diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc index d4c205f942b9..9c2b9be4189a 100644 --- a/solenv/inc/version.hrc +++ b/solenv/inc/version.hrc @@ -26,14 +26,14 @@ *************************************************************************/ #define VERSION 3 -#define SUBVERSION 2 +#define SUBVERSION 3 //#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID) // .0 + VER_CONCEPT // .100 + VER_ALPHA // .200 + VER_BETA // .300 + VER_GAMMA // .500 + VER_FINAL -//#define VER_CONCEPT 0 +//#define VER_CONCEPT 0 //#define VER_BETA 6 #define VER_FINAL 0 @@ -54,7 +54,7 @@ #endif // ----------------------------------------------------------------------- -// language/character set specification table +// language/character set specification table // ----------------------------------------------------------------------- RCD_LANGUAGE rcdata diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst new file mode 100644 index 000000000000..ac49f6c6fcf6 --- /dev/null +++ b/solenv/inc/version.lst @@ -0,0 +1,30 @@ +#************************************************************************* +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +OOOBASEVERSIONMAJOR=3 +OOOBASEVERSIONMINOR=3 +OOOBASEVERSIONMICRO=0 diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc index 70ea1c193ee6..9773f10fdddf 100644 --- a/solenv/inc/version_so.hrc +++ b/solenv/inc/version_so.hrc @@ -26,14 +26,14 @@ *************************************************************************/ #define VERSION 9 -#define SUBVERSION 2 +#define SUBVERSION 3 //#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID) // .0 + VER_CONCEPT // .100 + VER_ALPHA // .200 + VER_BETA // .300 + VER_GAMMA // .500 + VER_FINAL -//#define VER_CONCEPT 0 +//#define VER_CONCEPT 0 //#define VER_BETA 6 #define VER_FINAL 0 @@ -54,7 +54,7 @@ #endif // ----------------------------------------------------------------------- -// language/character set specification table +// language/character set specification table // ----------------------------------------------------------------------- RCD_LANGUAGE rcdata diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk new file mode 100644 index 000000000000..31a255e48be1 --- /dev/null +++ b/solenv/inc/versionlist.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# 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 +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.INCLUDE: version.lst + +.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst index e69de29bb2d1..edbfc190c808 100644 --- a/solenv/prj/d.lst +++ b/solenv/prj/d.lst @@ -0,0 +1,2 @@ +mkdir: %_DEST%\bin%_EXT%
+..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
|