[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - 2 commits - bin/lo-pack-sources

[Christian Lohmaier]

 bin/lo-pack-sources |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 071ab0ae58e372168b00ceb1b4c5d847c6983f6f
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Jan 17 19:50:33 2017 +0100

    making portable sed statements is not worth the hassle
    
    change to git's own formatting capabilities by using the text-wrap
    option with only indent settings/no rewrapping → %w(0,8,8)
    and also omit the additional empty line when there only is a summary,
    but no body in the commit message (remove a %n, make it %+b)
    finally drop the now no-longer needed starmarker (the @)
    
    previous differences in sed caused unnecessarily large diffs for
    distro-packagers, see
    https://anonscm.debian.org/git/pkg-openoffice/libreoffice-dictionaries.git/commit/?h=upstream&id=3dceac52f75030e87519e73b42babde51e471d9f
    now it will change once, but then we can put all the blame on git :-)
    
    Change-Id: Ifa719d062582c54c9c23b4ae08d4bae9a396e83c
    (cherry picked from commit 562edf0f09ba4e82fb9186aa75ee88fd7f68d18f)

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 87e3650..d43b71b 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -126,8 +126,8 @@ sub generate_lo_module_changelog($$$)
     $log_name .= "-$module_dirname{$module}" if ($module_dirname{$module});
     print "Generating changelog for $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/' -e 's/^\t@//' >$lo_module_release_topdir/$log_name" ) &&
+            "git log --date=short --pretty='format:%cd  %an  <%ae>  [%H]%n%n%w(0,8,8)%s%n%e%+b' | " .
+            ">$lo_module_release_topdir/$log_name" ) &&
         die "Error: generating failed: $!\n";
 }
 
commit a031981fbc593edba649ac0f33a5d8feb82d1ede
Author: jan Iversen <jani at documentfoundation.org>
Date:   Sat Oct 22 17:52:54 2016 +0200

    update lo-pack-sources
    
    os-x has a problem with progress bar on tar
    Also remade to sed expression to a simpler one that osx understands.
    change
    
    change
    
    Change-Id: If09573760a4bedfa285519241582bbd639a4e976
    Reviewed-on: https://gerrit.libreoffice.org/30043
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>
    (cherry picked from commit d2e9d3d0ed42f0fc24255c64546d8d256ca33aae)

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index fdaf6da..87e3650 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -85,7 +85,7 @@ sub copy_dir_filter_and_show_progress($$)
     # copy sources from git and show progress
     system ("cd $source_dir && " .
             "git archive --format=tar HEAD | " .
-            "  tar -xf - -C $target_dir --checkpoint=500 --checkpoint-action=exec=\"echo -n .\"") &&
+            "  tar -xf - -C $target_dir ") &&
         die "Error: copying failed: $!\n";
     print "\n";
 }
@@ -125,10 +125,9 @@ sub generate_lo_module_changelog($$$)
     my $log_name = "ChangeLog";
     $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_module_release_topdir/$log_name" ) &&
+            "  sed -e 's/^/\t/' -e 's/^\t@//' >$lo_module_release_topdir/$log_name" ) &&
         die "Error: generating failed: $!\n";
 }
 
@@ -160,7 +159,7 @@ sub generate_tarball($$$)
 
     print "Creating $tarball...";
     # generate the tarball in the current directory; avoid "./" prefix in the stored paths; show progress
-    system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 --checkpoint-action=exec=\"echo -n .\" $lo_topdir_name") && 
+    system ("tar -c $tar_compress_option -f $tarball -C $dir $lo_topdir_name") && 
         die "Error: releasing failed: $!\n";
     print "\n";
 }