allow to download main source tarballs again

The file "core.ver" was removed in configure together with other "core.*"
files. It was ugly name. Better to use "sources.ver" and the variable
"lo_sources_ver=..."

The source version is not used in "unpack-sources", so do not source the .ver file
at all.

The source tarballs are put into "major.minor.micro" version subdirectory
on the download site now.

1 files changed, 5 insertions, 6 deletions

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index b57ae1bde3a8..11fcd7421d54 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -117,14 +117,13 @@ sub run_autoreconf($$)
             "cd - >/dev/null 2>&1") && die "Error: autoreconf failed: $!\n";
 }
 
-sub generate_version_file($$$)
+sub generate_sources_version_file($$)
 {
-    my ($dir, $piece, $release_version) = @_;
+    my ($dir, $release_version) = @_;
 
-    # FIXME: crazy hacks to copy libreoffice-build without too big and useless subdirectories and to show a progress
-    open (VERFILE, ">$dir/$piece.ver") || die "Can't open $dir/lo-$piece.ver: $!\n";
+    open (VERFILE, ">$dir/sources.ver") || die "Can't open $dir/sources.ver: $!\n";
 
-    print VERFILE "lo_core_ver=$release_version\n";
+    print VERFILE "lo_sources_ver=$release_version\n";
 
     close VERFILE;
 }
@@ -248,7 +247,7 @@ sub prepare_piece_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_version_file("$temp_dir/$piece_tarball_name", $piece, $release_version) if ($piece eq 'core');
+    generate_sources_version_file("$temp_dir/$piece_tarball_name", $release_version) if ($piece eq 'core');
 
     return $temp_dir;
 }