make sure the version installed is updated on a testup with changed files

diff --git a/.gitignore b/.gitignore
index 259ff893e06c111527c69f9ca8e54a60b95402b5..1f108e940ab7123000b518d73c4ea38330521af0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+MANIFEST.bak
 test.cfg
 INSTALL.html
 INSTALL.txt

diff --git a/MANIFEST b/MANIFEST
index e7d1e7602d901d2ba0bc5f7c22f3bfda57f59889..0563934c224dfb9d72a4c7068949d7e0b2636ebc 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -718,6 +718,7 @@ site/util/bse_s3.pl
 site/util/bse_session_clean.pl
 site/util/bse_storage.pl
 site/util/bse_thumb.pl
+site/util/bse_versiondeps.pl
 site/util/bseaddimages.pl
 site/util/bsexlsprod.pl
 site/util/check_versions.pl

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 908de2b5ec0eb9bb517929959b07e750446afa0d..605ee3d14350058abe14dddd360c30178d3a31c6 100644 (file)
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -5,6 +5,7 @@
 \.gitignore$
 ^\.svn/
 /\.svn/
+^\.git/
 ^test\.cfg$
 ^test-.*cfg$
 ^nswfitc\.cfg$

diff --git a/Makefile b/Makefile
index 27e0ec287b00107e14ae29c70c85c5f954f83482..2d8f39cb05eab258d52ea0a046e1f2c051804e8d 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ DISTTAR=../$(DISTNAME).tar
 DISTTGZ=$(DISTTAR).gz
 WEBBASE=/home/httpd/html/bse
 
-MODULES=$(shell grep cgi-bin/.*\.pm MANIFEST | sed -e '/^\#/d' -e 's/[ \t].*// -e /^site\/cgi-bin\/modules\/BSE\/Modules\.pm$/d' )
+MODULES=$(shell grep cgi-bin/.*\.pm MANIFEST | sed -e '/^\#/d' -e 's/[ \t].*//' -e '/^site\/cgi-bin\/modules\/BSE\/\(Modules\|Version\)\.pm/d' )
+VERSIONDEPS=$(shell perl site/util/bse_versiondeps.pl MANIFEST)
 
 help:
        @echo make dist - build the tar.gz file and copy to distribution directory
@@ -83,7 +84,7 @@ site/util/mysql.str: schema/bse.sql
 
 version: site/cgi-bin/modules/BSE/Version.pm
 
-site/cgi-bin/modules/BSE/Version.pm: Makefile
+site/cgi-bin/modules/BSE/Version.pm: $(VERSIONDEPS)
        perl site/util/bse_mkgitversion.pl $(VERSION) site/cgi-bin/modules/BSE/Version.pm
 
 modversion: site/cgi-bin/modules/BSE/Modules.pm

diff --git a/site/util/bse_versiondeps.pl b/site/util/bse_versiondeps.pl
new file mode 100644 (file)
index 0000000..b0d199b
--- /dev/null
+++ b/site/util/bse_versiondeps.pl
@@ -0,0 +1,15 @@
+#!perl -l
+use strict;
+use ExtUtils::Manifest qw(maniread);
+
+my $mani_name = shift || "MANIFEST";
+
+my $mani = maniread($mani_name);
+
+for (sort { lc $a cmp lc $b } keys %$mani) {
+  /(Version|Modules)\.pm$/ and next;
+  /::/ and next;
+  print;
+}
+
+-d ".git" and print ".git";

diff --git a/site/util/check_versions.pl b/site/util/check_versions.pl
index fd532f1e0d45ba2b7b3d91da531cdb6f02810589..483102569cfab2f934d6767a9c8245df2a25dd3e 100644 (file)
--- a/site/util/check_versions.pl
+++ b/site/util/check_versions.pl
@@ -6,7 +6,7 @@ my %vers;
 my @check = `git status -s`;
 chomp @check;
 @check = sort grep /cgi-bin\/.*\.pm$/, @check;
-@check = grep !m(BSE/Modules\.pm), @check;
+@check = grep !m(BSE/(Modules|Version)\.pm), @check;
 my @errors;
 for my $check (@check) {
   $check =~ /^D/ and next;