[Libreoffice-commits] .: bin/lo-pack-sources

2013-01-22 Thread Libreoffice Gerrit user 
 bin/lo-pack-sources |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ffd2cc342f4ba54feeecbd3d31632131b45886ef
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Jan 22 17:35:46 2013 +0100

lo-pack-sources: run NOCONFIGURE=1 ./autogen.sh instead of autoreconf

autogen.sh runs the needed tools with the right include paths

Change-Id: Ia253b19566eeda31a1190a4fa7c543f7ffb63bfb

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 5341af5..de6a4be 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -131,15 +131,15 @@ sub generate_lo_module_changelog($$$)
 die Error: generating failed: $!\n;
 }
 
-sub run_autoreconf($$)
+sub run_autogen($$)
 {
 my ($dir, $module) = @_;
 
-print Running autoreconf for $module...\n;
+print Running autogen for $module...\n;
 system (cd $dir   .
-autoreconf -f -i   .
+NOCONFIGURE=1 ./autogen.sh   .
 rm -rf autom4te.cache   .
-cd - /dev/null 21)  die Error: autoreconf failed: $!\n;
+cd - /dev/null 21)  die Error: autogen failed: $!\n;
 }
 
 sub generate_sources_version_file($$)
@@ -266,7 +266,7 @@ sub prepare_module_sources()
 # prepare sources
 my $temp_dir = copy_lo_module_to_tempdir($source_dir, $module, 
$lo_topdir_name);
 generate_lo_module_changelog($source_dir, $temp_dir/$lo_topdir_name, 
$module);
-run_autoreconf($temp_dir/$lo_topdir_name, $module) if ($module eq 
'core');
+run_autogen($temp_dir/$lo_topdir_name, $module) if ($module eq 'core');
 generate_sources_version_file($temp_dir/$lo_topdir_name, 
$release_version) if ($module eq 'core');
 
 return $temp_dir;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bin/lo-pack-sources

2012-11-19 Thread Libreoffice Gerrit user 
 bin/lo-pack-sources |  147 +---
 1 file changed, 73 insertions(+), 74 deletions(-)

New commits:
commit b479f7f7675b8a539b35faaa6edcd282e09bba97
Author: Petr Mladek pmla...@suse.cz
Date:   Mon Nov 19 17:02:19 2012 +0100

lo-pack-sources: use the same top-level directory in all tarballs

It allows to avoid symlinks more easily.

In addition, I did some clean up. I removed support for packing pieces
from standalone checkout. I guess that noone is using it.

Change-Id: I3c712f5eb12108229a157c636e0a63eca4ae0d6b

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index c49ba6d..1c452e8 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -7,7 +7,8 @@ use strict;
 use File::Copy;
 use File::Temp qw/ tempfile tempdir /;
 
-my %piece_dir = (
+my %piece_dirname = (
+core  = ,
 dictionaries  = dictionaries,
 help  = helpcontent2,
 translations  = translations
@@ -88,27 +89,45 @@ sub copy_dir_filter_and_show_progress($$)
 print \n;
 }
 
+# copy files to temp dir; showing a progress; using a black list
+sub remove_empty_submodules($)
+{
+my ($target_topdir) = @_;
+
+foreach my $submodule (sort values %piece_dirname) {
+next unless ($submodule);
+print Removing empty submodule: $submodule...\n;
+rmdir $target_topdir/$submodule || die Error: Can't remove 
submodule directory: $target_topdir/$submodule;
+}
+}
+
 # copy the piece lo source directory into a tmp directory
 # omit the .git subdirectories
 sub copy_lo_piece_to_tempdir($$$)
 {
-my ($piece_dir, $piece, $piece_tarball_name) = @_;
+my ($source_dir, $piece, $lo_topdir_name) = @_;
 my $tempdir = tempdir( 'libreoffice-XX', DIR = File::Spec-tmpdir );
 
-mkdir $tempdir/$piece_tarball_name || die Can't create directory 
\$tempdir/$piece_tarball_name\: $!\n;
-copy_dir_filter_and_show_progress($piece_dir, 
$tempdir/$piece_tarball_name);
+mkdir $tempdir/$lo_topdir_name || die Can't create directory 
\$tempdir/$lo_topdir_name\: $!\n;
+mkdir $tempdir/$lo_topdir_name/$piece_dirname{$piece} || die Can't 
create directory \$tempdir/$lo_topdir_name/$piece_dirname{$piece}\: $!\n if 
($piece_dirname{$piece});
+
+copy_dir_filter_and_show_progress($source_dir/$piece_dirname{$piece}, 
$tempdir/$lo_topdir_name/$piece_dirname{$piece});
+remove_empty_submodules($tempdir/$lo_topdir_name/) if ($piece eq core);
 
 return $tempdir;
 }
 
 sub generate_lo_piece_changelog($$$)
 {
-my ($lo_piece_clone, $lo_piece_release_dir, $piece) = @_;
+my ($source_dir, $lo_piece_release_topdir, $piece) = @_;
+
+my $log_name = ChangeLog;
+$log_name .= -$piece_dirname{$piece} if ($piece_dirname{$piece});
 print Generating changelog for $piece...\n;
 #print 1:$lo_piece_clone, 2:$lo_piece_release_dir, 3:$piece\n;
-system (cd $lo_piece_clone   .
+system (cd $source_dir/$piece_dirname{$piece}   .
 git log --date=short --pretty='format:@%cd  %an  %ae  
[%H]%n%n%s%n%n%e%b' |  .
-  sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||' 
$lo_piece_release_dir/ChangeLog ) 
+  sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||' 
$lo_piece_release_topdir/$log_name ) 
 die Error: generating failed: $!\n;
 }
 
@@ -230,30 +249,25 @@ sub check_if_file_exists($$)
 }
 }
 
-sub check_if_already_released($$$)
+sub check_if_already_released($$)
 {
-my ($lo_core_tarball_name, $p_piece_tarball_name, $force, $bzip2, $xz, 
$pack_lo_core, $pack_lo_pieces) = @_;
+my ($p_piece_tarball_name, $force, $bzip2, $xz, $pack_lo_core, 
$pack_lo_pieces) = @_;
 
-check_if_file_exists($lo_core_tarball_name.tar.bz2, $force)  if 
($pack_lo_core  defined $bzip2);
-check_if_file_exists($lo_core_tarball_name.tar.xz, $force) if 
($pack_lo_core  defined $xz);
-
-if ($pack_lo_pieces) {
-foreach my $tarball_name ( values %{$p_piece_tarball_name} ) {
-check_if_file_exists($tarball_name.tar.bz2, $force) if (defined 
$bzip2);
-check_if_file_exists($tarball_name.tar.xz, $force) if (defined 
$xz);
-}
+foreach my $tarball_name ( sort values %{$p_piece_tarball_name} ) {
+check_if_file_exists($tarball_name.tar.bz2, $force) if (defined 
$bzip2);
+check_if_file_exists($tarball_name.tar.xz, $force) if (defined $xz);
 }
 }
 
 sub prepare_piece_sources()
 {
-my ($piece_dir, $release_version, $piece, $piece_tarball_name) = @_;
+my ($source_dir, $release_version, $piece, $lo_topdir_name) = @_;
 
 # prepare sources
-my $temp_dir = copy_lo_piece_to_tempdir($piece_dir, $piece, 
$piece_tarball_name);
-generate_lo_piece_changelog($piece_dir, $temp_dir/$piece_tarball_name, 
$piece);
-run_autoreconf($temp_dir/$piece_tarball_name, $piece) if ($piece eq 
'core');
-generate_sources_version_file($temp_dir/$piece_tarball_name, 
$release_version) if ($piece eq 'core');
+my

[Libreoffice-commits] .: bin/lo-pack-sources

2012-11-19 Thread Libreoffice Gerrit user 
 bin/lo-pack-sources |  133 ++--
 1 file changed, 68 insertions(+), 65 deletions(-)

New commits:
commit 39afe720fe2c0ccaa9a806d842de0cc1f34bc106
Author: Petr Mladek pmla...@suse.cz
Date:   Mon Nov 19 18:13:02 2012 +0100

lo-pack-sources: use module instead of piece

we use git submodules, so it makes more sense (hopefully)

Replaced options:
--no-lo-pieces with --no-submodule
--piece=piece with --module=module

Removed hopefully unused option:
--no-lo-core

Change-Id: Icbf742991ccda2f7833a5b50d51cb1421885383d

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 1c452e8..5341af5 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -7,7 +7,7 @@ use strict;
 use File::Copy;
 use File::Temp qw/ tempfile tempdir /;
 
-my %piece_dirname = (
+my %module_dirname = (
 core  = ,
 dictionaries  = dictionaries,
 help  = helpcontent2,
@@ -94,48 +94,48 @@ sub remove_empty_submodules($)
 {
 my ($target_topdir) = @_;
 
-foreach my $submodule (sort values %piece_dirname) {
+foreach my $submodule (sort values %module_dirname) {
 next unless ($submodule);
 print Removing empty submodule: $submodule...\n;
 rmdir $target_topdir/$submodule || die Error: Can't remove 
submodule directory: $target_topdir/$submodule;
 }
 }
 
-# copy the piece lo source directory into a tmp directory
+# copy the source directory into a tmp directory
 # omit the .git subdirectories
-sub copy_lo_piece_to_tempdir($$$)
+sub copy_lo_module_to_tempdir($$$)
 {
-my ($source_dir, $piece, $lo_topdir_name) = @_;
+my ($source_dir, $module, $lo_topdir_name) = @_;
 my $tempdir = tempdir( 'libreoffice-XX', DIR = File::Spec-tmpdir );
 
 mkdir $tempdir/$lo_topdir_name || die Can't create directory 
\$tempdir/$lo_topdir_name\: $!\n;
-mkdir $tempdir/$lo_topdir_name/$piece_dirname{$piece} || die Can't 
create directory \$tempdir/$lo_topdir_name/$piece_dirname{$piece}\: $!\n if 
($piece_dirname{$piece});
+mkdir $tempdir/$lo_topdir_name/$module_dirname{$module} || die Can't 
create directory \$tempdir/$lo_topdir_name/$module_dirname{$module}\: $!\n 
if ($module_dirname{$module});
 
-copy_dir_filter_and_show_progress($source_dir/$piece_dirname{$piece}, 
$tempdir/$lo_topdir_name/$piece_dirname{$piece});
-remove_empty_submodules($tempdir/$lo_topdir_name/) if ($piece eq core);
+copy_dir_filter_and_show_progress($source_dir/$module_dirname{$module}, 
$tempdir/$lo_topdir_name/$module_dirname{$module});
+remove_empty_submodules($tempdir/$lo_topdir_name/) if ($module eq 
core);
 
 return $tempdir;
 }
 
-sub generate_lo_piece_changelog($$$)
+sub generate_lo_module_changelog($$$)
 {
-my ($source_dir, $lo_piece_release_topdir, $piece) = @_;
+my ($source_dir, $lo_module_release_topdir, $module) = @_;
 
 my $log_name = ChangeLog;
-$log_name .= -$piece_dirname{$piece} if ($piece_dirname{$piece});
-print Generating changelog for $piece...\n;
-#print 1:$lo_piece_clone, 2:$lo_piece_release_dir, 3:$piece\n;
-system (cd $source_dir/$piece_dirname{$piece}   .
+$log_name .= -$module_dirname{$module} if ($module_dirname{$module});
+print Generating changelog for $module...\n;
+#print 1:$lo_module_clone, 2:$lo_module_release_dir, 3:$module\n;
+system (cd $source_dir/$module_dirname{$module}   .
 git log --date=short --pretty='format:@%cd  %an  %ae  
[%H]%n%n%s%n%n%e%b' |  .
-  sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||' 
$lo_piece_release_topdir/$log_name ) 
+  sed -e 's|^\([^@]\)|\t\1|' -e 's|^@||' 
$lo_module_release_topdir/$log_name ) 
 die Error: generating failed: $!\n;
 }
 
 sub run_autoreconf($$)
 {
-my ($dir, $piece) = @_;
+my ($dir, $module) = @_;
 
-print Running autoreconf for $piece...\n;
+print Running autoreconf for $module...\n;
 system (cd $dir   .
 autoreconf -f -i   .
 rm -rf autom4te.cache   .
@@ -251,28 +251,28 @@ sub check_if_file_exists($$)
 
 sub check_if_already_released($$)
 {
-my ($p_piece_tarball_name, $force, $bzip2, $xz, $pack_lo_core, 
$pack_lo_pieces) = @_;
+my ($p_module_tarball_name, $force, $bzip2, $xz, $pack_lo_core, 
$pack_lo_modules) = @_;
 
-foreach my $tarball_name ( sort values %{$p_piece_tarball_name} ) {
+foreach my $tarball_name ( sort values %{$p_module_tarball_name} ) {
 check_if_file_exists($tarball_name.tar.bz2, $force) if (defined 
$bzip2);
 check_if_file_exists($tarball_name.tar.xz, $force) if (defined $xz);
 }
 }
 
-sub prepare_piece_sources()
+sub prepare_module_sources()
 {
-my ($source_dir, $release_version, $piece, $lo_topdir_name) = @_;
+my ($source_dir, $release_version, $module, $lo_topdir_name) = @_;
 
 # prepare sources
-my $temp_dir = copy_lo_piece_to_tempdir($source_dir, $piece,

[Libreoffice-commits] .: bin/lo-pack-sources

2012-11-16 Thread Libreoffice Gerrit user 
 bin/lo-pack-sources |   31 ---
 1 file changed, 20 insertions(+), 11 deletions(-)

New commits:
commit d0776ccbd5a7b69dc85fba214e0916f1b6bd2eb1
Author: Petr Mladek pmla...@suse.cz
Date:   Fri Nov 16 18:31:28 2012 +0100

bin/lo-pack-sources: fix to work with submodules

I still want to use the same top level dir in all tarballs but not today :-)

Change-Id: Iddbc8f91a84c4c73133a0eb4305d8aef7dc5c043

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index d04d5c9..c49ba6d 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -7,14 +7,20 @@ use strict;
 use File::Copy;
 use File::Temp qw/ tempfile tempdir /;
 
+my %piece_dir = (
+dictionaries  = dictionaries,
+help  = helpcontent2,
+translations  = translations
+);
+
 # get libreoffice-build version from the given libreoffice-build sources
 sub get_config_version($)
 {
 my ($lo_core_dir) = @_;
 my $version;
 
-open (CONFIGURE, $lo_core_dir/configure.in) ||
-die can't open \$lo_core_dir/configure.in\ for reading: $!\n;
+open (CONFIGURE, $lo_core_dir/configure.ac) ||
+die can't open \$lo_core_dir/configure.ac\ for reading: $!\n;
 
 while (my $line = CONFIGURE) {
 chomp $line;
@@ -283,7 +289,7 @@ sub generate_tarballs($$)
 my $piece_dir = $source_dir;
 foreach my $piece ( keys %{$p_piece_tarball_name} ) {
 print \n--- Generating $piece ---\n;
-$piece_dir = $source_dir/clone/$piece if ($is_lo_core_dir);
+$piece_dir = $source_dir/$piece_dir{$piece} if ($is_lo_core_dir);
 generate_piece_tarball($piece_dir, $release_version, $piece, $md5, 
$bzip2, $xz, $p_piece_tarball_name-{$piece});
 }
 }
@@ -340,7 +346,6 @@ my $lo_core_tempdir;
 my $force;
 my $verbose=1;
 my $is_lo_core_dir=0;
-my @pieces=(dictionaries, help, translations);
 my %piece_tarball_name;
 
 ###
@@ -372,8 +377,10 @@ for my $arg (@ARGV) {
 $pack_lo_pieces=0;
 } elsif ($arg =~ m/--piece=(.*)/) {
   # process just one piece and do not pack libreoffice-build
-  @pieces=();
-  push @pieces, $1;
+  die(Error: unknown piece: $1) unless (defined $piece_dir{$1});
+  my $dir = $piece_dir{$1};
+  %piece_dir=();
+  $piece_dir{$1} = $dir;
   $pack_lo_core=0;
 } elsif ($arg =~ /^-/ ) {
 die Error: unknown option: $arg\n;
@@ -402,12 +409,12 @@ unless ( -d $source_dir ) {
 $is_lo_core_dir=1 if (-f $source_dir/autogen.sh  -f 
$source_dir/config_host.mk.in);
 
 # all tarballs are generated from the libreoffice-core directory
-if (@pieces  1  $is_lo_core_dir == 0 ) {
+if (%piece_dir  1  $is_lo_core_dir == 0 ) {
 die Error: \$source_dir\ is not a valid libreoffice-core directory\n;
 }
 
 # just a single piece tarball can be generated from piece directory; version 
must be explicitly set in this case
-if (@pieces == 1$is_lo_core_dir == 0! defined $set_version ) {
+if (%piece_dir == 1$is_lo_core_dir == 0! defined $set_version ) {
 die Error: version must be set using the --set-version=version 
option\n unless (defined $set_version);
 }
 
@@ -444,11 +451,13 @@ if ($is_lo_core_dir) {
 }
 
 # define tarball names
-$lo_core_tarball_name = libreoffice-core-$release_version;
-foreach my $piece (@pieces) {
-if (-d $source_dir/clone/$piece) {
+$lo_core_tarball_name = libreoffice-$release_version;
+foreach my $piece (keys %piece_dir) {
+if (-f $source_dir/$piece_dir{$piece}/.git) {
+print Add piece $piece\n;
 $piece_tarball_name{$piece} = libreoffice-$piece-$release_version;
 } else {
+print did not found: $source_dir/$piece_dir{$piece}/.git\n;
 print Warning: $piece sources are not available - skipping\n;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bin/lo-pack-sources

2011-10-27 Thread Miklos Vajna 
 bin/lo-pack-sources |   60 
 1 file changed, 60 deletions(-)

New commits:
commit a32662e141e861f2a4960e7e1c21ee3b70b0e57d
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Oct 27 15:58:27 2011 +0200

lo-pack-sources: remove unused functions

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index cb4372f..1a24baf 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -107,24 +107,6 @@ sub get_release_version()
 }
 
 
-sub generate_lo_build_blacklist($)
-{
-my ($blacklist) = @_;
-
-# FIXME: crazy hacks to copy libreoffice-build without too big and useless 
subdirectories and to show a progress
-open (BLACKLIST, $blacklist) || die Can't open $blacklist: $!\n;
-
-# IMPORTANT: Do not remove .git directories because git log is called 
during make dist
-print BLACKLIST */.svn\n;
-print BLACKLIST rawbuild/*\n;
-print BLACKLIST build/*\n;
-print BLACKLIST clone/*\n;
-print BLACKLIST src/libreoffice-*.tar.bz2\n;
-print BLACKLIST src/-*\n;
-
-close BLACKLIST;
-}
-
 sub generate_lo_piece_blacklist($)
 {
 my ($blacklist) = @_;
@@ -177,23 +159,6 @@ sub copy_dir_filter_and_show_progress($$$)
 print \n;
 }
 
-# copy the local version of libreoffice-build into a tmp directory
-# omit the .svn subdirectories
-sub copy_lo_build_to_tempdir($)
-{
-my ($lo_build_dir) = @_;
-
-my $tempdir = tempdir( 'libreoffice-XX', DIR = File::Spec-tmpdir );
-my $blacklist = $tempdir/libreoffice-build.copy.blacklist;
-
-generate_lo_build_blacklist($blacklist);
-copy_dir_filter_and_show_progress($lo_build_dir, $tempdir, $blacklist);
-
-unlink $blacklist;
-
-return $tempdir;
-}
-
 # copy the piece lo source directory into a tmp directory
 # omit the .git subdirectories
 sub copy_lo_piece_to_tempdir($$$)
@@ -250,17 +215,6 @@ sub generate_version_file($$$)
 close VERFILE;
 }
 
-sub release_lo_build($)
-{
-my ($lo_build_dir) = @_;
-
-print Creating libreoffice-build tarball...\n;
-system (cd $lo_build_dir   .
-./autogen.sh --with-distro=GoOoLinux   .
-make dist   .
-cd - /dev/null 21)  die Error: releasing failed: $!\n;
-}
-
 sub release_lo_piece($$)
 {
 my ($lo_piece_dir, $piece_tarball_name) = @_;
@@ -415,18 +369,6 @@ sub check_if_already_released($$)
 }
 }
 
-sub prepare_lo_build_tarball()
-{
-my ($lo_build_dir, $release_version, $md5, $lo_build_tarball_name) = @_;
-
-my $temp_dir = copy_lo_build_to_tempdir($lo_build_dir);
-set_config_version($temp_dir, $release_version);
-release_lo_build($temp_dir);
-generate_md5($temp_dir, $lo_build_tarball_name, .tar.gz) if (defined 
$md5);
-
-return $temp_dir;
-}
-
 sub prepare_lo_piece_tarball($)
 {
 my ($piece_dir, $release_version, $md5, $piece, $piece_tarball_name) = @_;
@@ -461,8 +403,6 @@ sub generate_tarballs($)
 my ($source_dir, $releases_archive_dir, $release_version, $md5, 
$lo_build_tarball_name, $p_piece_tarball_name, $pack_lo_build, $pack_lo_pieces, 
$is_lo_build_dir) = @_;
 
 if ($pack_lo_build) {
-#my $temp_dir=prepare_lo_build_tarball($source_dir, $release_version, 
$md5, $lo_build_tarball_name);
-#move_tarball_to_final_location($temp_dir, $releases_archive_dir, 
$md5, $lo_build_tarball_name.tar.gz);
 my $temp_dir=prepare_lo_piece_tarball($source_dir, $release_version, 
$md5, bootstrap, $lo_build_tarball_name);
 move_tarball_to_final_location($temp_dir, $releases_archive_dir, $md5, 
$lo_build_tarball_name.tar.bz2);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits