Changeset 8273

Timestamp:

Aug 10, 2006, 12:25:51 PM (20 years ago)

Author:

jhoblitt

Message:

add pkg_version support

Location:

trunk/glueforge

Files:

• glueforge.in (modified) (6 diffs)
• templates/psdb/configure_ac.tt (modified) (1 diff)

trunk/glueforge/glueforge.in

@@ -3 +3 @@
 # Copyright (C) 2005-2006  Joshua Hoblitt
 #
-# $Id: glueforge.in,v 1.48 2006-02-22 02:30:09 jhoblitt Exp $
+# $Id: glueforge.in,v 1.49 2006-08-10 22:25:51 jhoblitt Exp $
 
 use strict;
@@ -210 +210 @@
     # global data
 
-    my ($pkg_name, $pkg_namespace);
+    my ($pkg_name, $pkg_namespace, $pkg_version);
     unless (defined $glueforge_meta) {
         # set default values
@@ -224 +224 @@
             } elsif ($item->{name} eq 'pkg_namespace') {
                 $pkg_namespace = $item->{value};
+            } elsif ($item->{name} eq 'pkg_version') {
+                $pkg_version = $item->{value};
             } else {
                 die "invalid glueforge METADATA key: $item->{name}";
@@ -233 +235 @@
     die "pkg_namespace is required in complex config" unless defined
         $pkg_namespace;
+    die "pkg_version is required in complex config" unless defined
+        $pkg_version;
 
     my %data;
     $data{pkg_name}         = $pkg_name;
     $data{pkg_namespace}    = $pkg_namespace;
+    $data{pkg_version}      = $pkg_version;
 
     # setup one table per nested metadata
@@ -378 +383 @@
 
 A complex config file consists of a series of C<METADATA> blocks.  One (and
-only one) of these blocks I<must> be named C<glueforge>. This block
-contains the global package configuration data.  Only the keys C<pkg_name> and
-C<pkg_namespace> are allowed in this block and they are both required.
+only one) of these blocks I<must> be named C<glueforge>. This block contains
+the global package configuration data.  Only the keys C<pkg_name>,
+C<pkg_namespace>, and C<pkg_version> are allowed in this block and they are
+both required.
 
 All other C<METADATA> blocks describe a single table with the name of the
@@ -393 +399 @@
     pkg_name        STR  foodb 
     pkg_namespace   STR  foo
+    pkg_version     STR  0.0.1
 END
 

trunk/glueforge/templates/psdb/configure_ac.tt

@@ -1 +1 @@
 AC_PREREQ(2.59)
 
-AC_INIT([[% pkg_name %]], [0.0.1], [pan-starrs.ifa.hawaii.edu])
+AC_INIT([[% pkg_name %]], [[% pkg_version %]], [pan-starrs.ifa.hawaii.edu])
 AC_CONFIG_SRCDIR([[% pkg_name %].pc.in])