ChangeLogTag: Thu Feb 2 07:02:19 2006 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 29 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b8f9b95..eacc8636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Feb  2 07:02:19 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * clone_build_tree.pl:
+
+          Do not clone the .svn directory.  It's administrative just like
+          the CVS directory.
+
+        * modules/ProjectCreator.pm:
+
+          There was a bug where file with a path specified using the '>>'
+          operator would not be processed correctly on Windows based project
+          types.  Thanks to Thomas Rothfuss for reporting this.
+
 Mon Jan 30 12:07:35 2006  Chad Elliott  <elliott_c@ociweb.com>
 
         * PROBLEM-REPORT-FORM:
diff --git a/clone_build_tree.pl b/clone_build_tree.pl
index 4d416f1d..1b6117bb 100755
--- a/clone_build_tree.pl
+++ b/clone_build_tree.pl
@@ -48,6 +48,7 @@ my($hasSymlink) = ($@ eq '');
 
 sub findCallback {
   my($matches) = !(/^CVS\z/s && ($File::Find::prune = 1)            ||
+                   /^\.svn\z/s && ($File::Find::prune = 1)          ||
                    defined $exclude &&
                    /^$exclude\z/s && ($File::Find::prune = 1)       ||
                    /^\.cvsignore\z/s && ($File::Find::prune = 1)    ||
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index dbb9cdfd..5b2953c8 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -998,19 +998,17 @@ sub process_component_line {
         $out  = ($2 eq '>>' ? $3 : $out);
         $dep  = ($2 eq '<<' ? $3 : $dep);
 
-        $line =~ s/\s+$//;
         if ($2 eq $oop) {
           $status = 0;
           $error  = "Duplicate $oop used";
         }
+        $line =~ s/\s+$//;
       }
 
-      ## Since these (custom_special_*) are used by the TemplateParser,
-      ## the keys need to have slashes in the target format.  So, we will
-      ## convert slashes back to target.
+      ## Keys used internally to MPC need to be in forward slash format.
       my($key) = $line;
       if ($self->{'convert_slashes'}) {
-        $key = $self->slash_to_backslash($key);
+        $key =~ s/\\/\//g;
       }
       if (defined $out) {
         if (!defined $self->{'custom_special_output'}->{$tag}) {
@@ -3594,7 +3592,16 @@ sub get_custom_value {
         foreach my $ext (@{$self->{'valid_components'}->{'source_files'}}) {
           if ($file =~ /$ext$/) {
             $source = 1;
-            last;
+            ## We've found a file that matches one of the source file
+            ## extensions.  Now we have to make sure that it doesn't
+            ## match a template file extension.
+            foreach my $text (@{$self->{'valid_components'}->{'template_files'}}) {
+              if ($file =~ /$text$/) {
+                $source = 0;
+                last;
+              }
+            }
+            last if ($source);
           }
         }
         if (!$source) {
@@ -3611,6 +3618,8 @@ sub get_custom_value {
     $value = \@array;
   }
   elsif ($cmd eq 'dependencies') {
+    ## If we are converting slashes, change them back for this parameter
+    $based =~ s/\\/\//g if ($self->{'convert_slashes'});
     $value = $self->{'custom_special_depend'}->{$based};
   }
   elsif (defined $customDefined{$cmd} &&