ChangeLogTag: Tue Feb 23 15:08:32 UTC 2010 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 74 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f291bc1..068802e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Tue Feb 23 15:08:32 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
+
+        * config/wireshark.mpb:
+
+          Switched from using windows project types to the windows property.
+
+        * devtools/document_template.pl:
+
+          Account for arrow operator usage.
+
+        * modules/MakeProjectBase.pm:
+        * modules/ProjectCreator.pm:
+        * templates/make.mpd:
+
+          Added a very limited ability to modify builtin component types
+          (e.g., Source_Files, Header_Files, etc.).  Currently, only the
+          postcommand is useful and only for the 'make' project type.
+
 Fri Feb 19 15:25:47 UTC 2010  Adam Mitz  <mitza@ociweb.com>
 
         * docs/README:
diff --git a/config/wireshark.mpb b/config/wireshark.mpb
index b1d1bc36..1b9f46e8 100644
--- a/config/wireshark.mpb
+++ b/config/wireshark.mpb
@@ -22,7 +22,7 @@ project : glib {
     include $(WIRESHARK_SRC)/config.nmake
   }
 
-  specific(vc71,vc8,vc9,nmake) {
+  specific(prop:windows) {
     libpaths    += $(WIRESHARK_SRC)/wiretap $(WIRESHARK_SRC)/epan
     lit_libs    += wiretap-$(WIRETAP_VERSION) libwireshark
   } else {
diff --git a/devtools/document_template.pl b/devtools/document_template.pl
index f1c51f65..6536c539 100755
--- a/devtools/document_template.pl
+++ b/devtools/document_template.pl
@@ -288,10 +288,15 @@ if (open($fh, $input)) {
             }
           }
           else {
-            foreach my $ao (keys %arrow_op) {
-              if ($k =~ /^$ao/) {
-                $tvar = 1;
-                last;
+            if ($k =~ /^\w+\->/) {
+              $tvar = 1;
+            }
+            else {
+              foreach my $ao (keys %arrow_op) {
+                if ($k =~ /^$ao/) {
+                  $tvar = 1;
+                  last;
+                }
               }
             }
           }
@@ -311,10 +316,15 @@ if (open($fh, $input)) {
               if (defined $keywords{$n}) {
               }
               else {
-                foreach my $ao (keys %arrow_op) {
-                  if ($n =~ /^$ao/) {
-                    $tvar = 1;
-                    last;
+                if ($n =~ /^\w+\->/) {
+                  $tvar = 1;
+                }
+                else {
+                  foreach my $ao (keys %arrow_op) {
+                    if ($n =~ /^$ao/) {
+                      $tvar = 1;
+                      last;
+                    }
                   }
                 }
                 if (!$tvar) {
diff --git a/modules/MakeProjectBase.pm b/modules/MakeProjectBase.pm
index cc84ca8f..56184df3 100644
--- a/modules/MakeProjectBase.pm
+++ b/modules/MakeProjectBase.pm
@@ -16,6 +16,11 @@ use strict;
 # Subroutine Section
 # ************************************************************
 
+sub get_builtin_output {
+  #my($self, $input) = @_;
+  return ['$@'];   
+}
+
 sub dollar_special {
   #my $self = shift;
   return 1;
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index a78752ec..d6a52f07 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -3838,6 +3838,12 @@ sub get_special_value {
   elsif (index($type, $grouped_key) == 0) {
     return $self->get_grouped_value($type, $cmd, $based);
   }
+  elsif (index($type, 'source_file') == 0) {
+    ## This is a hack for dealing with the fact that built-in types
+    ## (e.g., Source_Files, Header_Files, etc.) are not real custom
+    ## definitions.  However, we can "modify" them to some extent.
+    return $self->get_builtin_value($type, $cmd, $based);
+  }
 
   return undef;
 }
@@ -3905,6 +3911,26 @@ sub get_grouped_value {
 }
 
 
+sub get_builtin_value {
+  my($self, $type, $cmd, $based) = @_;
+
+  ## If the passed in type does not have a generated_exts definition,
+  ## then try the type with an 's' on the end.
+  $type .= 's' if (!defined $self->{'generated_exts'}->{$type});
+
+  ## If we have a builtin type that has the variable ($cmd) that we are
+  ## looking for, process the value through command parameter conversion.
+  if (defined $self->{'generated_exts'}->{$type} &&
+      defined $self->{'generated_exts'}->{$type}->{$cmd}) {
+    return $self->convert_command_parameters(
+                    $type, $self->{'generated_exts'}->{$type}->{$cmd},
+                    $based, $self->get_builtin_output($based));
+  }
+
+  ## Otherwise, there's nothing here.
+  return undef;
+}
+
 sub get_command_subs {
   my $self = shift;
   my %valid;
@@ -5277,6 +5303,11 @@ sub getValidComponents {
 # Virtual Methods To Be Overridden
 # ************************************************************
 
+sub get_builtin_output {
+  #my($self, $input) = @_;
+  return [];
+}
+
 sub languageSupported {
   #my $self = shift;
   return $_[0]->get_language() eq Creator::cplusplus;
diff --git a/templates/make.mpd b/templates/make.mpd
index b6a2132d..31f03375 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -290,6 +290,7 @@ $(TEMPINCDIR):
 	@$(TESTDIRSTART) "<%targetoutdir%><%obj_dir%><%dirname(source_file)%>" $(TESTDIREND) $(MKDIR) "<%targetoutdir%><%obj_dir%><%dirname(source_file)%>"
 <%endif%>
 	<%if(ends_with(source_file, \.c))%>$(COMPILE.c)<%else%>$(COMPILE.cc)<%endif%> <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%><%if(pchuse && pch_source && pchsupport)%><%pchuse%><%pch_header%><%pchext%> <%if(pchstop)%><%pchstop%><%pch_header%><%endif%><%endif%>$(EXPORTFLAGS) $(OUTPUT_OPTION) <%source_file%>
+<%if(source_file->postcommand)%>	<%source_file->postcommand%><%endif%>
 
 <%endfor%>
 <%if(resource_files)%>