From f64834cc8141b585ae169e09012519ee038a6bc1 Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Fri, 22 Sep 2023 17:53:20 +0900 Subject: [PATCH] AVRO-3865, AVRO-3866: [Build][Perl][Python] Refer to share/VERSION.txt rather than copy it (#2508) (cherry picked from commit 032d5ac07d94c8b07376793f3d35e6f54aedb499) --- lang/perl/MANIFEST | 1 - lang/perl/Makefile.PL | 7 +------ lang/perl/build.sh | 1 - lang/py/build.sh | 5 ++--- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/lang/perl/MANIFEST b/lang/perl/MANIFEST index bc8f9341af0..d308e85ea01 100644 --- 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 index 69447e5651f..ffac5e9d11b 100644 --- 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 index 2b689276b82..e7634dbabab 100755 --- 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 index 1c0f188f14c..483d5b3b9a9 100755 --- 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-$(