Change Version numbering scheme.

driver/iverilog.man.in

@@ -1,4 +1,4 @@
-.TH iverilog 1 "Aug 7th, 2015" "" "Version %M.%m.%n %E"
+.TH iverilog 1 "Aug 7th, 2015" "" "Version %M.%n%E"
 .SH NAME
 iverilog - Icarus Verilog compiler
 

iverilog-vpi.man.in

@@ -1,4 +1,4 @@
-.TH iverilog-vpi 1 "May 10th, 2015" "" "Version %M.%m.%n %E"
+.TH iverilog-vpi 1 "May 10th, 2015" "" "Version %M.%n%E"
 .SH NAME
 iverilog-vpi - Compile front end for VPI modules
 

scripts/MAKE_RELEASE.sh

@@ -4,7 +4,7 @@
 # the number for a snapshot and the path to a temporary directory.
 # for example:
 #
-#    sh scripts/MAKE_RELEASE.sh 0.9.1 ~/tmp
+#    sh scripts/MAKE_RELEASE.sh 10.1 ~/tmp
 #
 # The above assumes that there is a tag "v0_9_1" at the point
 # to be released. (The tag has the "v", but the argument to this
@@ -13,13 +13,17 @@
 # and finally creates a file called verilog-0.9.1.tar.gz that
 # contains the release ready to go.
 #
-# The complete steps to make a release x.y.z generally are:
+# The complete steps to make a release x.y generally are:
 #
-#   git tag -a v0_9_1
+#   Edit version_base.h to suit.
+#
+#   Edit verilog.spec to suit.
+#
+#   git tag -a v10_1
 #                 (Make the tag in the local git repository.)
 #
-#   sh scripts/MAKE_RELEASE.sh 0.9.1 ~/tmp
-#                 (Make the snapshot bundle verilog-0.9.1.tar.gz)
+#   sh scripts/MAKE_RELEASE.sh 10.1 ~/tmp
+#                 (Make the snapshot bundle verilog-10.1.tar.gz)
 #
 #   git push --tags
 #                 (Publish the tag to the repository.)

verilog.spec

@@ -10,7 +10,7 @@
 #
 Summary: Icarus Verilog
 Name: verilog%{suff}
-Version: 0.10.0.%{rev_date}
+Version: 10.0.%{rev_date}
 Release: 0
 License: GPL
 Group: Productivity/Scientific/Electronics

version.c

@@ -29,10 +29,7 @@ static void run_string(const char*txt)
 	    if (cp[0] == '%' && cp[1] != 0) {
 		  switch (cp[1]) {
 		      case 'M':
-			fprintf(stdout, "%u", VERSION_MAJOR1);
-			break;
-		      case 'm':
-			fprintf(stdout, "%u", VERSION_MAJOR2);
+			fprintf(stdout, "%u", VERSION_MAJOR);
 			break;
 		      case 'n':
 			fprintf(stdout, "%u", VERSION_MINOR);

version_base.h

@@ -3,17 +3,17 @@
  * Edit this definition in version_base.in to define the base version
  * number for the compiled result.
  */
-# define VERSION_MAJOR1  0
-# define VERSION_MAJOR2  10
+# define VERSION_MAJOR  10
 # define VERSION_MINOR   0
-# define VERSION_EXTRA   "(devel)"
 
-/* This is a concatenation of MAJOR1.MAJOR2 that is used by
-   vams_simparam.c to make a double value. */
-# define VERSION_MAJOR   0.10
+/*
+ * This will be appended to the version. Use this to mark development
+ * versions and the like.
+ */
+# define VERSION_EXTRA   " (devel)"
 
 # define VERSION_STRINGIFY(x) #x
-# define VERSION_STR(a,b,extra) VERSION_STRINGIFY(a.b) " " extra
+# define VERSION_STR(a,b,extra) VERSION_STRINGIFY(a.b) extra
 
 #define VERSION VERSION_STR(VERSION_MAJOR,VERSION_MINOR,VERSION_EXTRA)
 #endif