AVRO-3865, AVRO-3866: [Build][Perl][Python] Refer to share/VERSION.tx…

…t rather than copy it (#2508) (cherry picked from commit 032d5ac)
apache · Sep 22, 2023 · f64834c · f64834c
1 parent ce83da9
commit f64834c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/lang/perl/MANIFEST b/lang/perl/MANIFEST
@@ -41,7 +41,6 @@ META.yml
 LICENSE
 NOTICE
 README
-VERSION.txt
 t/00_compile.t
 t/01_names.t
 t/01_schema.t

diff --git a/lang/perl/Makefile.PL b/lang/perl/Makefile.PL
@@ -19,12 +19,7 @@ use Config;
 use inc::Module::Install;
 
 my $version;
-for ('VERSION.txt', '../../share/VERSION.txt') {
-    if (-f) {
-        $version = `cat $_`;
-        last;
-    }
-}
+$version = `cat ../../share/VERSION.txt`;
 chomp $version;
 
 license 'apache';

diff --git a/lang/perl/build.sh b/lang/perl/build.sh
@@ -58,7 +58,6 @@ case "$target" in
     ;;
 
   dist)
-    cp ../../share/VERSION.txt .
     perl ./Makefile.PL && make dist
     ;;
 

diff --git a/lang/py/build.sh b/lang/py/build.sh
@@ -27,7 +27,6 @@ clean() {
                  '*.avsc' \
                  '*.egg-info' \
                  '*.py[co]' \
-                 'VERSION.txt' \
                  '__pycache__' \
                  '.tox' \
                  'avro/test/interop' \
@@ -53,8 +52,8 @@ dist() (
 
 doc() {
   local doc_dir
-  [[ -s VERSION.txt ]] || cp ../../share/VERSION.txt .
-  doc_dir="../../build/avro-doc-$(<VERSION.txt)/api/py"
+  local version=$(cat ../../share/VERSION.txt)
+  doc_dir="../../build/avro-doc-$version/api/py"
   python3 -m tox -e docs
   mkdir -p "$doc_dir"
   cp -a docs/build/* "$doc_dir"
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,6 @@ case "$target" in @@
         ;;
       dist)
-        cp ../../share/VERSION.txt .
         perl ./Makefile.PL && make dist
         ;;
@@ Expand Down @@