Add a VERSION file for PG.

In order to reach it cleanly there needs to be a link PG_VERSION in webwork2/ to the file pg/VERSION.
aubreyja · Sep 7, 2012 · 86be5c0 · 86be5c0
1 parent 3daecc4
commit 86be5c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/PG_VERSION b/PG_VERSION
@@ -0,0 +1 @@
+../pg/VERSION
diff --git a/conf/defaults.config b/conf/defaults.config
@@ -29,7 +29,9 @@
 # file, you can put a directive in localOverrides.conf.
 
 include("conf/site.conf");
-include("VERSION");
+include("VERSION");  # get WW version 
+include("PG_VERSION"); # get PG VERSION -- # these addresses are fragile.  Should we change the way include() works?
+
 ################################################################################
 # site.conf  should contain basic information about directories and URLs on
 # your server

diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
@@ -1019,10 +1019,11 @@ sub footer(){
 	my $self = shift;
 	my $r = $self->r;
 	my $ce = $r->ce;
-	my $version = $ce->{WW_VERSION}||"unknown -- set version in defaults.config";
+	my $ww_version = $ce->{WW_VERSION}||"unknown -- set version in defaults.config";
+	my $pg_version = $ce->{PG_VERSION}||"unknown -- set version in defaults.config";
 	my $copyright_years = $ce->{WW_COPYRIGHT_YEARS}||"1996-2011";
 	print CGI::p({-id=>"last-modified"}, $r->maketext("Page generated at [_1]", timestamp($self)));
-	print CGI::div({-id=>"copyright"}, "WeBWorK &#169; $copyright_years", "| version: $version |", CGI::a({-href=>"http://webwork.maa.org/"}, $r->maketext("The WeBWorK Project"), ));
+	print CGI::div({-id=>"copyright"}, "WeBWorK &#169; $copyright_years", "| ww_version: $ww_version | pg_version: $pg_version|", CGI::a({-href=>"http://webwork.maa.org/"}, $r->maketext("The WeBWorK Project"), ));
 	return ""
 }