Changeset 5756 for inc

Timestamp:

07/22/05 19:08:32 (3 years ago)

Author:

gaal

svk:copy_cache_prev:

7758

Message:

cleanups for default config.yml. Note that we need an empty makefile target
so that when the user edits their config.yml pugs gets recompiled. But the
initialization can't be in the rule because of the circular dependency that
would entail.

Files:

• inc/PugsBuild/Config.pm (modified) (1 diff)

inc/PugsBuild/Config.pm

@@ -37 +37 @@
     my($class, $filename) = @_;
     my $stream;
-    my $fh;
     
-    unless (open $fh, ($filename ||= "config.yml")) {
-        if (-e $filename) { die "open: $!"; } # real error
-        
-        # Makefile.PL uses PugsBuild::Config, which needs to read config.yml.
-        # However, config.yml is generated by a Makefile target.
-        # This whole block is a temporary workaround for the problem.
+    if (!-e ($filename ||= "config.yml")) {
         require File::Copy;
-        
-        File::Copy::copy ('util/config-template.yml', 'config.yml') or die "Copy failed";
-        warn "Default build config file created. Edit your settings in config.yml.";
-        
-        open $fh, "config.yml" or die "open: $!";
-    };
-    
+        File::Copy::copy ('util/config-template.yml', $filename) or
+            die "copy: $!";
+        warn <<".";
+Default build config file created. Edit your settings in $filename.
+.
+    }       
+
+    open my $fh, $filename or die "open: $filename: $!";
     { local $/; $stream = <$fh> }
     my $conf = $YAML->load($stream);