WebSVN – gelsvn – Diff – /trunk/MPC/modules/ProjectCreator.pm

                       'template_pre_extension'      => 0x08,
                       'header_pre_extension'        => 0x08,
                       'inline_pre_extension'        => 0x08,
                       'documentation_pre_extension' => 0x08,
                       'resource_pre_extension'      => 0x08,
+                      'generic_pre_extension'       => 0x08,
                       'pre_filename'                => 0x08,
                       'source_pre_filename'         => 0x08,
                       'template_pre_filename'       => 0x08,
                       'header_pre_filename'         => 0x08,
                       'inline_pre_filename'         => 0x08,
                       'documentation_pre_filename'  => 0x08,
                       'resource_pre_filename'       => 0x08,
+                      'generic_pre_filename'        => 0x08,
                       'source_outputext'            => 0x0a,
                       'template_outputext'          => 0x0a,
                       'header_outputext'            => 0x0a,
                       'inline_outputext'            => 0x0a,
                       'documentation_outputext'     => 0x0a,
   $self->{'defaulted'}             = {};
   $self->{'custom_types'}          = {};
   $self->{'parents_read'}          = {};
   $self->{'inheritance_tree'}      = {};
   $self->{'remove_files'}          = {};
+  $self->{'expanded'}              = {};
-  my($typefeaturef) = dirname($gfeature) . '/' .
+  my($typefeaturef) = $self->mpc_dirname($gfeature) . '/' .
                       $self->{'pctype'} . '.features';
   $typefeaturef = undef if (! -r $typefeaturef);
   $self->{'feature_parser'}        = new FeatureParser($features,
                                                        $gfeature,
                                                        $typefeaturef,
             $self->{'parents_read'}          = {};
             $self->{'inheritance_tree'}      = {};
             $self->{'remove_files'}          = {};
             $self->{'custom_special_output'} = {};
             $self->{'custom_special_depend'} = {};
+            $self->{'expanded'}              = {};
             $self->reset_generating_types();
+          }
+        }
         $self->{$typecheck} = 0;
+      }
         elsif ($comp eq 'specific') {
           my($type) = $self->get_process_project_type($name);
           if ($type eq $self->{'pctype'} ||
               $type eq $self->get_default_component_name()) {
             ($status, $errorString) = $self->parse_scope(
-                                        $ih, $values[1], $type,
+                                        $ih, $comp, $type,
                                         $self->{'valid_names'},
                                         $self->get_assignment_hash(),
                                         {});
+          }
           else {
             ## We still need to parse the scope, but we will be
             ## throwing away whatever is processed.  However, it
             ## could still be invalid code that will cause an error.
             ($status, $errorString) = $self->parse_scope(
-                                        $ih, $values[1], undef,
+                                        $ih, $comp, undef,
                                         $self->{'valid_names'},
                                         undef,
                                         $self->get_assignment_hash());
+          }
+        }
         elsif ($comp eq 'define_custom') {
           ($status, $errorString) = $self->parse_define_custom($ih, $name);
+        }
+        elsif ($comp eq 'expand') {
+          ($status, $errorString) = $self->parse_scope($ih, $comp, $name);
+        }
         else {
           $errorString = "Invalid component name: $comp";
           $status = 0;
+        }
+      }
   return 1, undef;
+}
+sub handle_scoped_unknown {
+  my($self)  = shift;
+  my($fh)    = shift;
+  my($type)  = shift;
+  my($flags) = shift;
+  my($line)  = shift;
+  if (defined $type) {
+    if ($type eq $self->get_default_component_name()) {
+      return 0, 'Can not set expansion in this context';
+    }
+    else {
+      if (!defined $self->{'expanded'}->{$type}) {
+        my($ok) = 1;
+        while($line =~ /\$(\w+)/) {
+          my($name) = $1;
+          my($val)  = '';
+          if ($name eq 'PWD') {
+            $val = $self->getcwd();
+          }
+          elsif (defined $ENV{$name}) {
+            $val = $ENV{$name};
+          }
+          else {
+            $ok = undef;
+            last;
+          }
+          $line =~ s/\$\w+/$val/;
+        }
+        $self->{'expanded'}->{$type} = $line if ($ok);
+      }
+      return 1, undef;
+    }
+  }
+  ## If the type is not defined, then this is something other than an
+  ## assignment in a 'specific' section and should be flagged as an error
+  return 0, "Unrecognized line: $line";
+}
 sub process_component_line {
   my($self)    = shift;
   my($tag)     = shift;
   my($line)    = shift;
   my($flags)   = shift;
     my(@files) = ();
     if ($line =~ /^"([^"]+)"$/) {
       push(@files, $1);
+    }
     elsif ($line =~ /[\?\*\[\]]/) {
-      @files = glob($line);
+      @files = $self->mpc_glob($line);
+    }
     else {
       push(@files, $line);
+    }
   if ($status && $#exclude != -1 && defined $grname) {
     my($alldir)  = $self->get_assignment('recurse') || $flags{'recurse'};
     my(%checked) = ();
     my(@files)   = ();
     foreach my $exc (@exclude) {
-      my($dname) = dirname($exc);
+      my($dname) = $self->mpc_dirname($exc);
       if (!defined $checked{$dname}) {
         $checked{$dname} = 1;
         push(@files, $self->generate_default_file_list($dname,
                                                        \@exclude, $alldir));
+      }
       ## need to get the modified assignment value before we attempt to
       ## do so.
       $value = $self->modify_assignment_value($name, $value);
       foreach my $val (@{$self->create_array($value)}) {
         if (!exists $parts{$val}) {
+          my($qt) = ($val =~ /\s/ ? '"' : '');
-          $allowed .= $val . ' ';
+          $allowed .= $qt . $val . $qt . ' ';
+        }
+      }
       $allowed =~ s/\s+$//;
       return $allowed;
+    }
                   my(@front) = ();
                   my(@copy)  = @$array;
                   @$array = ();
                   foreach my $input (@input) {
-                    my($part) = $input;
+                    my($part) = $self->remove_wanted_extension(
-                    foreach my $wanted (@{$self->{'valid_components'}->{$gentype}}) {
-                      if ($part =~ s/$wanted$//) {
+                                   $input,
-                        last;
+                                   $self->{'valid_components'}->{$gentype});
-                      }
-                    }
                     $part = $self->escape_regex_special($part);
                     my(@files) = $self->generated_filenames($part, $gentype,
                                                             $tag, $input, 1);
                     if ($#copy != -1) {
                       my($found) = 0;
           if ($key ne $defgroup) {
             $group = $key;
+          }
           foreach my $val (@$array) {
-            my($f) = $val;
+            my($f) = $self->remove_wanted_extension(
-            foreach my $wanted (@{$self->{'valid_components'}->{$gentype}}) {
-              if ($f =~ s/$wanted$//) {
+                              $val,
-                last;
-              }
-            }
-            ## If the user provided file does not match any of the
+                              $self->{'valid_components'}->{$gentype});
-            ## extensions specified by the custom definition, we need
-            ## to remove the extension or else this file will not be
-            ## added to the project.
-            if ($f eq $val) {
-              $f =~ s/\.[^\.]+$//;
-            }
             push(@arr, $f);
+          }
+        }
+      }
   return $value;
+}
-sub relative {
+sub expand_variables {
   my($self)            = shift;
   my($value)           = shift;
+  my($keys)            = shift;
+  my($rel)             = shift;
   my($expand_template) = shift;
   my($scope)           = shift;
-  if (defined $value) {
-    if (UNIVERSAL::isa($value, 'ARRAY')) {
-      my(@built) = ();
-      foreach my $val (@$value) {
-        push(@built, $self->relative($val, $expand_template, $scope));
-      }
-      $value = \@built;
+  my($expand)          = shift;
-    }
-    elsif ($value =~ /\$/) {
-      my($useenv) = $self->get_use_env();
-      my($rel)    = ($useenv ? \%ENV : $self->get_relative());
-      my(@keys)   = keys %$rel;
+  my($warn)            = shift;
-      if (defined $keys[0]) {
-        my($expand) = $self->get_expand_vars();
-        my($cwd)    = $self->getcwd();
+  my($cwd)             = $self->getcwd();
-        my($start)  = 0;
+  my($start)           = 0;
-        ## Fix up the value for Windows switch the \\'s to /
+  ## Fix up the value for Windows switch the \\'s to /
-        if ($self->{'convert_slashes'}) {
+  if ($self->{'convert_slashes'}) {
-              ## value may contain a $() construct that may need to get
+        ## value may contain a $() construct that may need to get
-              ## replaced too.
+        ## replaced too.
-              $whole = '';
+        $whole = '';
+      }
-            else {
+      else {
-              if ($expand) {
+        if ($expand && $warn) {
-                $self->warning("Unable to expand $name.");
+          $self->warning("Unable to expand $name.");
+        }
+      }
+    }
-          $start += length($whole);
+    $start += length($whole);
+  }
+  return $value;
+}
+sub relative {
+  my($self)            = shift;
+  my($value)           = shift;
+  my($expand_template) = shift;
+  my($scope)           = shift;
+  if (defined $value) {
+    if (UNIVERSAL::isa($value, 'ARRAY')) {
+      my(@built) = ();
+      foreach my $val (@$value) {
+        my($rel) = $self->relative($val, $expand_template, $scope);
+        if (UNIVERSAL::isa($rel, 'ARRAY')) {
+          push(@built, @$rel);
+        }
+        else {
+          push(@built, $rel);
+        }
+      }
+      $value = \@built;
+    }
+    elsif ($value =~ /\$/) {
+      my($ovalue) = $value;
+      my(@keys) = keys %{$self->{'expanded'}};
+      if (defined $keys[0]) {
+        $value = $self->expand_variables($value, \@keys,
+                                         $self->{'expanded'},
+                                         $expand_template, $scope, 1);
+      }
+      if ($ovalue eq $value) {
+        my($rel) = ($self->get_use_env() ? \%ENV : $self->get_relative());
+        @keys = keys %$rel;
+        if (defined $keys[0]) {
+          $value = $self->expand_variables($value, \@keys, $rel,
+                                           $expand_template, $scope,
+                                           $self->get_expand_vars(), 1);
+        }
+      }
+    }
+  }
+  ## Values that have strings enclosed in double quotes are to
+  ## be interpreted as elements of an array
+  if (defined $value && $value =~ /^"[^"]+"(\s+"[^"]+")+$/) {
+    $value = $self->create_array($value);
+  }
   return $value;
+}
   $self->process_assignment('exename',    undef);
   $self->process_assignment('sharedname', undef);
   $self->process_assignment('staticname', undef);
+}
+sub remove_wanted_extension {
+  my($self)  = shift;
+  my($name)  = shift;
+  my($array) = shift;
+  my($orig)  = $name;
+  foreach my $wanted (@$array) {
+    if ($name =~ s/$wanted$//) {
+      last;
+    }
+  }
+  ## If the user provided file does not match any of the
+  ## extensions specified by the custom definition, we need
+  ## to remove the extension or else this file will not be
+  ## added to the project.
+  if ($name eq $orig) {
+    $name =~ s/\.[^\.]+$//;
+  }
+  return $name;
+}
 # ************************************************************
 # Virtual Methods To Be Overridden
 # ************************************************************
 sub escape_spaces {

Subversion Repositories gelsvn

(root)/trunk/MPC/modules/ProjectCreator.pm @ 202 – Rev 107 → 198