[openoffice] branch AOO418 updated: Revision number now generic... Repo based, whatever that repo is

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO418 by this push:
     new eb479a1  Revision number now generic... Repo based, whatever that repo is
eb479a1 is described below

commit eb479a108facc647fad290b2de01e9d59ad0ffd1
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Thu Oct 3 07:34:34 2019 -0400

    Revision number now generic... Repo based, whatever that repo is
    
    (cherry picked from commit f8d20be8900ce2a0a9c5a64c50774b89819d75c1)
---
 main/odk/pack/copying/makefile.mk                           | 2 +-
 main/solenv/bin/getrevision.pl                              | 4 ++--
 main/solenv/bin/modules/{SvnRevision.pm => RepoRevision.pm} | 2 +-
 main/solenv/bin/modules/installer/scriptitems.pm            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/odk/pack/copying/makefile.mk b/main/odk/pack/copying/makefile.mk
index d8759ee..60dc4af 100644
--- a/main/odk/pack/copying/makefile.mk
+++ b/main/odk/pack/copying/makefile.mk
@@ -31,7 +31,7 @@ TARGET=copying
 #----------------------------------------------------------------
 
 SCM_ROOT_PATH=$(shell dirname $(SRC_ROOT))
-SCMREVISION=$(shell $(PERL) -I$(SOLARENV)/bin/modules -e "use SvnRevision; print SvnRevision::DetectRevisionId(\"$(SCM_ROOT_PATH)\")")
+SCMREVISION=$(shell $(PERL) -I$(SOLARENV)/bin/modules -e "use RepoRevision; print RepoRevision::DetectRevisionId(\"$(SCM_ROOT_PATH)\")")
 
 IDLLIST:={$(subst,/,/ $(shell @$(FIND) $(IDLOUT)/com -type f))}
 DESTIDLLIST={$(subst,$(IDLOUT),$(DESTDIRIDL) $(IDLLIST))}
diff --git a/main/solenv/bin/getrevision.pl b/main/solenv/bin/getrevision.pl
index ed4959b..dfb08bf 100644
--- a/main/solenv/bin/getrevision.pl
+++ b/main/solenv/bin/getrevision.pl
@@ -31,8 +31,8 @@ BEGIN {
 }
 use lib (@lib_dirs);
 
-use SvnRevision;
+use RepoRevision;
 
 my $scm_root_dir=dirname($ENV{SRC_ROOT});
 
-print SvnRevision::DetectRevisionId("$scm_root_dir");
+print RepoRevision::DetectRevisionId("$scm_root_dir");
diff --git a/main/solenv/bin/modules/SvnRevision.pm b/main/solenv/bin/modules/RepoRevision.pm
similarity index 98%
rename from main/solenv/bin/modules/SvnRevision.pm
rename to main/solenv/bin/modules/RepoRevision.pm
index 81b811e..db04180 100644
--- a/main/solenv/bin/modules/SvnRevision.pm
+++ b/main/solenv/bin/modules/RepoRevision.pm
@@ -21,7 +21,7 @@
 
 
 
-package SvnRevision;
+package RepoRevision;
 
 #old SVN code unchanged
 sub DetectRevisionIdFromSVN ($)
diff --git a/main/solenv/bin/modules/installer/scriptitems.pm b/main/solenv/bin/modules/installer/scriptitems.pm
index ab022e1..cce3530 100644
--- a/main/solenv/bin/modules/installer/scriptitems.pm
+++ b/main/solenv/bin/modules/installer/scriptitems.pm
@@ -34,7 +34,7 @@ use installer::remover;
 use installer::systemactions;
 
 use File::Spec;
-use SvnRevision;
+use RepoRevision;
 use ExtensionsLst;
 
 use strict;
@@ -992,7 +992,7 @@ sub replace_setup_variables
 	my $productkey = $productname . " " . $productversion;
 
     my $scsrevision;
-    $scsrevision = "" unless ( $scsrevision = SvnRevision::DetectRevisionId(File::Spec->catfile($ENV{'SRC_ROOT'}, File::Spec->updir())) );
+    $scsrevision = "" unless ( $scsrevision = RepoRevision::DetectRevisionId(File::Spec->catfile($ENV{'SRC_ROOT'}, File::Spec->updir())) );
 
 	# string $buildid, which is used to replace the setup variable <buildid>