Changeset 733 for trunk

Timestamp:

Dec 15, 2008, 11:23:45 PM (15 years ago)

Author:

Peter Johansson

Message:

fixes #362 - in export mode revision number will be an empty string

Location:

trunk/lib

Files:

• Makefile.am (modified) (2 diffs)
• OptionVersion.cc (modified) (1 diff)
• html_utility.cc (modified) (1 diff)

trunk/lib/Makefile.am

@@ -64 +64 @@
   @echo '// subversion_info.cc generated from subversion_info.cc.in.' > $@ ;\
   revision=`$(SVNVERSION) $(top_srcdir)` ;\
-  $(SED) -e 's/sub_2_svn_revision/'$$revision'/g' \
+  $(SED) -e 's/sub_2_svn_revision/r'$$revision'/g' \
   $(srcdir)/subversion_info.cc.in >> $@ ;
 
@@ -74 +74 @@
   @year=`svn info $(top_srcdir)|$(SED) -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\
   $(SED) -e 's/20[0-9][0-9]/'$$year'/g' $(srcdir)/copyright_year.cc > $@ ;
+
+else
+# this is needed in 'svn export' build
+$(srcdir)/subversion_info.cc:
+  $(SED) -e 's/sub_2_svn_revision//g' \
+  $(srcdir)/subversion_info.cc.in >> $@ ;
+
 endif
 

trunk/lib/OptionVersion.cc

@@ -52 +52 @@
       cs << " (";
       if (DEV_BUILD)
-        cs << "r" << svn_revision() << " ";
+        cs << svn_revision() << " ";
       cs << "compiled " << compilation_time() << ", " << compilation_date() 
          << ")";

trunk/lib/html_utility.cc

@@ -68 +68 @@
                  PACKAGE_STRING, 0, "");
     if (DEV_BUILD)
-      os << " (dev build r" << svn_revision() << ")";
+      os << " (dev build " << svn_revision() << ")";
     os << "\n</p>\n</div>\n</body>\n</html>\n";
   }