From 85822219bc6baa7fc39e39bd4afbb780525c011d Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Mon, 23 May 2011 09:24:04 +0200 Subject: [PATCH 1/9] use $GNUMAKE to print the build instructions --- set_soenv.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/set_soenv.in b/set_soenv.in index b2d6bfd7a360..414dae21a1cb 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -86,7 +86,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD, - $PROEXT, $TARFILE_LOCATION, + $PROEXT, $TARFILE_LOCATION, $GNUMAKE, $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS); # #------------------------------------------- @@ -135,6 +135,7 @@ $GLIBC = ""; # Whether the platform uses glibc $PROEXT = "@PROEXT@"; $EPM_FLAGS = ""; $CL_X64 = '@CL_X64@'; +$GNUMAKE = "@GNUMAKE@"; # #-------------------------------------------------------------------- @@ -2191,10 +2192,10 @@ if ( $Warning ne "" ) print "*********************************************************". "******************* $newline"; -print "To build, issue:\nmake\n\n"; -print "To install when the build is finished, issue:\nmake install\n\n"; -print "If you want to develop LibreOffice, you might prefer:\nmake dev-install\n\n"; -print "If you want to run the smoketest, issue:\nmake check\n\n"; +print "To build, issue:\n$GNUMAKE\n\n"; +print "To install when the build is finished, issue:\n$GNUMAKE install\n\n"; +print "If you want to develop LibreOffice, you might prefer:\n$GNUMAKE dev-install\n\n"; +print "If you want to run the smoketest, issue:\n$GNUMAKE check\n\n"; $bootfile = "bootstrap"; open( OUT, ">$bootfile" ) || From 338c51bf3b1432503882adec4f76b9f7df06b3d4 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Mon, 23 May 2011 09:23:54 +0200 Subject: [PATCH 2/9] fix ant home --- distro-configs/LibreOfficeOpenBSD.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index db5f33ec994a..6e28d69983a3 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -21,9 +21,10 @@ --enable-ext-report-builder --enable-ext-wiki-publisher --with-alloc=system ---with-ant-home=/usr/local/ant/lib +--with-ant-home=/usr/local/ant --with-extension-integration --with-fonts +--with-java --with-java-target-version=1.5 --with-jdk-home=/usr/local/jdk-1.5.0 --with-myspell-dicts From b867617f7aca0a4536d4ca4507351de55e8eed4b Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 4 May 2011 01:55:36 +0200 Subject: [PATCH 3/9] always request an unversioned lib from gcc in gccinstlib.pl * this otherwise breaks on ubuntu natty as there is (rightfully) no libgcc_s.so.1 file served by gcc -print-file-name --- solenv/bin/gccinstlib.pl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl index 90c8f02a3e06..654c95b7290a 100755 --- a/solenv/bin/gccinstlib.pl +++ b/solenv/bin/gccinstlib.pl @@ -38,19 +38,23 @@ if ($Dest =~ /--help/ || @ARGV < 1) { print "Syntax:\n gcc-instlib \n"; exit (0); } + +%SrcAndDest = (); + foreach $File (@ARGV) { my $string; - - open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$File|") || die "Failed to exec $cc -print-file-name=$File $!"; + my $normalized_file = $File; + $normalized_file =~ s/\.so\.\d+/.so/; + open (GCCOut, "LANGUAGE=C LC_ALL=C $cc -print-file-name=$normalized_file|") || die "Failed to exec $cc -print-file-name=$normalized_file $!"; $string=; chomp ($string); - push (@CopySrc, $string); + $SrcAndDest{$string} = "$Dest/$File"; close (GCCOut); } -foreach $Src (@CopySrc) { - printf "copy $Src to $Dest\n"; - system ("/bin/cp $Src $Dest") && die "copy failed: $!"; +while (($Src, $FullDest) = each %SrcAndDest) { + printf "copy $Src to $FullDest\n"; + system ("/bin/cp $Src $FullDest") && die "copy failed: $!"; } From 2ab9cf9a79ca07a67c718301e49953e4475df94e Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 16 May 2011 12:28:28 +0200 Subject: [PATCH 4/9] handle --with-lang=ALL case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fridrich Štrba --- solenv/bin/ooinstall | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 89aea81a6741..ee77975496bf 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -65,9 +65,19 @@ $ENV{LOCAL_COMMON_OUT} = $ENV{OUT}; # the installer to use the English localization of the file instead. $ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1; +my @larr; $langs=$ENV{WITH_LANG}; $langs='en-US' if $langs eq ''; -my @larr = grep { $_ ne '' } split(/ /, $langs); +if ($langs eq 'ALL') { + opendir(DIR,$ENV{L10N_MODULE} . "/source"); + @larr = readdir(DIR); + @larr = grep { $_ ne '.' } @larr; + @larr = grep { $_ ne '..' } @larr; + closedir(DIR); +} +else { + @larr = grep { $_ ne '' } split(/ /, $langs); +} $langs = join (",", @larr); $destdir=''; From ec0ddde4c6b61d33cb49fa621565ca7eafef8b10 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 23 May 2011 19:49:46 +0200 Subject: [PATCH 5/9] don't forget en-US when dev-installing ALL languages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fridrich Štrba --- solenv/bin/ooinstall | 1 + 1 file changed, 1 insertion(+) diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index ee77975496bf..115a5f95e1d2 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -73,6 +73,7 @@ if ($langs eq 'ALL') { @larr = readdir(DIR); @larr = grep { $_ ne '.' } @larr; @larr = grep { $_ ne '..' } @larr; + @larr = (@larr,"en-US"); closedir(DIR); } else { From 296bea4e0d862f243f33d9d8a36d64b03b99db03 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Wed, 25 May 2011 15:43:39 +0200 Subject: [PATCH 6/9] lo-pack-sources: do not pack fetched stuff into the source tarball --- bin/lo-pack-sources | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources index 26ac6c1fc94d..75181fae4ca2 100755 --- a/bin/lo-pack-sources +++ b/bin/lo-pack-sources @@ -144,6 +144,10 @@ sub generate_lo_piece_blacklist($) print BLACKLIST "config.parms\n"; print BLACKLIST "git-hooks\n"; print BLACKLIST "Linux*Env.Set.sh\n"; + print BLACKLIST "src/tmp*\n"; + print BLACKLIST "src/fetch.log\n"; + print BLACKLIST "src/libreoffice-*.tar.bz2\n"; + print BLACKLIST "src/????????????????????????????????-*\n"; print BLACKLIST "warn\n"; close BLACKLIST; From 5815228c11749c37969b75ceda45de21964420ef Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 30 May 2011 17:08:26 +0200 Subject: [PATCH 7/9] lo-commit-stat: add --log-dir option allow to generate the log into another directory --- bin/lo-commit-stat | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat index 8c53ec96fc85..a18a4b8303e0 100755 --- a/bin/lo-commit-stat +++ b/bin/lo-commit-stat @@ -195,11 +195,12 @@ sub get_branch_name($) return $branch; } -sub open_log_file($$$$) +sub open_log_file($$$$$) { - my ($log_prefix, $log_suffix, $top_dir, $branch_name) = @_; + my ($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name) = @_; my $logfilename = "$log_prefix-$branch_name-$log_suffix.log"; + $logfilename = "$log_dir/$logfilename" if (defined $log_dir); if (-f $logfilename) { print "WARNING: The log file already exists: $logfilename\n"; @@ -308,12 +309,13 @@ sub usage() { print "This script generates LO git commit summary\n\n" . - "Usage: lo-commit-stat [--help] [--no-pieces] [--piece=] --log-suffix= topdir [git_arg...]\n\n" . + "Usage: lo-commit-stat [--help] [--no-pieces] [--piece=] --log-dir= --log-suffix= topdir [git_arg...]\n\n" . "Options:\n" . " --help print this help\n" . " --no-pieces read changes just from the main repository, ignore other cloned repos\n" . " --piece= summarize just changes from the given piece\n" . + " --log-dir= directory where to put the generated log\n" . " --log-suffix= suffix of the log file name; the result will be\n" . " commit-log--.log; the branch name\n" . " is detected automatically\n" . @@ -341,6 +343,7 @@ sub usage() my $piece; my $top_dir; my $log_prefix = "commit-log"; +my $log_dir; my $log_suffix; my $log; my $git_command = "git log"; @@ -360,6 +363,8 @@ foreach my $arg (@ARGV) { $piece = $1; } elsif ($arg =~ m/--log-suffix=(.*)/) { $log_suffix = "$1"; + } elsif ($arg =~ m/--log-dir=(.*)/) { + $log_dir = "$1"; } elsif ($arg eq '--bugs') { $print_filters{'bug'} = 1; $log_prefix = "bugfixes" @@ -384,12 +389,14 @@ $git_command .= " " . join ' ', @git_args if (@git_args); (-d "$top_dir") || die "Error: not a directory: $top_dir\n"; (-f "$top_dir/.git/config") || die "Error: can't find $top_dir/.git/config\n"; +(!defined $log_dir) || (-d $log_dir) || die "Error: directory does no exist: $log_dir\n"; + (defined $log_suffix) || die "Error: define log suffix using --log-suffix=\n"; $branch_name = get_branch_name($top_dir); load_data(\%data, $top_dir, $piece, $branch_name, $git_command); -$log = open_log_file($log_prefix, $log_suffix, $top_dir, $branch_name); +$log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, $branch_name); print_stat(\%data, \%print_filters, $print_mode, $log); close $log; From 0686300c9b28ffdacf5a7a1363b2c5e294d00997 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Sun, 5 Jun 2011 12:15:41 +0200 Subject: [PATCH 8/9] set gb_COMPILEROPTFLAGS in the correct place for cxx generated objects --- solenv/gbuild/LinkTarget.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b71a05de0f17..fe39548e253c 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -569,7 +569,7 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2) $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2)) $(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1)) -$(call gb_GenCxxObject_get_target,$(2)) : CXXFLAGS += $(3) $(gb_COMPILEROPTFLAGS) +$(call gb_GenCxxObject_get_target,$(2)) : CXXFLAGS += $(3) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2) @@ -629,7 +629,7 @@ $(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj))) endef define gb_LinkTarget_add_generated_exception_object -$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS)) +$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS)) endef define gb_LinkTarget_add_generated_exception_objects From 55bdcf0c672ff68669c85ee14a7711417b99b5b0 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 3 Jun 2011 21:48:49 +0200 Subject: [PATCH 9/9] Revert "Reverting one Oxygenoffice change until _KAMI_ makes it work" This reverts commit 77eb7f58d973eeb397dac0702646fc811894851c. The original build problems were fixed in libs-core/sysui. Signed-off-by: pmladek@suse.cz --- solenv/inc/productversion.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk index 002c63ad71d6..948d0c044b00 100644 --- a/solenv/inc/productversion.mk +++ b/solenv/inc/productversion.mk @@ -25,7 +25,7 @@ # #************************************************************************* -PRODUCTLIST = libreoffice broffice +PRODUCTLIST = libreoffice broffice oxygenoffice # default values to minimize maintainance effort PRODUCTVERSION = 3.4