Changeset 6466

Timestamp:

Feb 21, 2006, 4:30:09 PM (20 years ago)

Author:

jhoblitt

Message:

allow glueforge METADATA blocks to be omitted from the complex config

File:

• trunk/glueforge/glueforge.in (modified) (3 diffs)

trunk/glueforge/glueforge.in

@@ -3 +3 @@
 # Copyright (C) 2005-2006  Joshua Hoblitt
 #
-# $Id: glueforge.in,v 1.47 2006-02-22 00:26:03 jhoblitt Exp $
+# $Id: glueforge.in,v 1.48 2006-02-22 02:30:09 jhoblitt Exp $
 
 use strict;
@@ -64 +64 @@
 die "can't eval contents of $template/config.pl: $@" if $@;
 
-my $mangler = Template->new({ INCLUDE_PATH => $template });
+my $mangler = Template->new({ INCLUDE_PATH => $template, EVAL_PERL => 1 });
 
 foreach my $t ( keys %tt ) {
@@ -208 +208 @@
     }
 
-    die "missing glueforge METADATA" unless defined $glueforge_meta;
-
     # global data
 
-    # process glueforge metadata for global data
     my ($pkg_name, $pkg_namespace);
-    foreach my $item (@{$glueforge_meta->{value}}) {
-        if ($item->{name} eq 'pkg_name') {
-            $pkg_name = $item->{value};
-        } elsif ($item->{name} eq 'pkg_namespace') {
-            $pkg_namespace = $item->{value};
-        } else {
-            die "invalid glueforge METADATA key: $item->{name}";
+    unless (defined $glueforge_meta) {
+        # set default values
+        warn "missing glueforge METADATA, using default values";
+        $pkg_name = "foodb";
+        $pkg_namespace = "foo";
+    } else {
+        # process glueforge metadata for global data
+
+        foreach my $item (@{$glueforge_meta->{value}}) {
+            if ($item->{name} eq 'pkg_name') {
+                $pkg_name = $item->{value};
+            } elsif ($item->{name} eq 'pkg_namespace') {
+                $pkg_namespace = $item->{value};
+            } else {
+                die "invalid glueforge METADATA key: $item->{name}";
+            }
         }
     }