ChangeLogTag: Thu Dec 2 12:57:11 UTC 2010 Chad Elliott <elliott_c@ociweb.com>Latest_ACETAO_Major

5 files changed, 59 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f4cca7f5..0017afa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Dec  2 12:57:11 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
+
+        * docs/README:
+        * docs/html/MakeProjectCreator.html:
+        * modules/ProjectCreator.pm:
+        * templates/vc8.mpd:
+
+          Committing changes provided by Artur Doci <artur at doci dot info>.
+          This provides support for the 'dependent_upon' keyword for use
+          within the scope of Header_Files for C++ projects for vc8 and vc9
+          only.
+
 Thu Dec  2 08:57:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * config/ndds_ts_defaults.mpb:
diff --git a/docs/README b/docs/README
index cddd9bd3..d3c9066e 100644
--- a/docs/README
+++ b/docs/README
@@ -183,6 +183,10 @@ buildflags      This keyword can only be used as a source component scoped
                 setting (ie. inside the scope of Source_Files).  It
                 specifies additional build flags that will be passed to the
                 compiler as the source files are being compiled.
+dependent_upon  This keyword can only be used as a header component scoped
+                setting (ie. inside the scope of Header_Files).  It
+                determines which file the header file is dependent
+                upon for vc8, and vc9 only.
 dllout          If defined, specifies where the dynamic libraries will be
                 placed.  This overrides libout in the dynamic case.
 libout          Specifies where the dynamic and static libraries will be placed
diff --git a/docs/html/MakeProjectCreator.html b/docs/html/MakeProjectCreator.html
index 84664068..6127f0e6 100644
--- a/docs/html/MakeProjectCreator.html
+++ b/docs/html/MakeProjectCreator.html
@@ -1698,6 +1698,21 @@
                   <tr>
                     <td rowspan="1" colspan="1">
                       <p class="Tbl-Body"><em class=
+                      "TableCode">dependent_upon</em></p>
+                    </td>
+
+                    <td rowspan="1" colspan="1">
+                      <p class="Tbl-Body">This keyword can only be used
+                      as a header component scoped setting (ie. inside
+                      the scope of Header_Files).  It determines which
+                      file the header file is dependent upon for vc8,
+                      and vc9 only.</p>
+                    </td>
+                  </tr>
+
+                  <tr>
+                    <td rowspan="1" colspan="1">
+                      <p class="Tbl-Body"><em class=
                       "TableCode">dllout</em></p>
                     </td>
 
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 88b47150..e8d82c64 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -167,7 +167,7 @@ my $generic_key = 'generic_files';
 ## order is determined by the TemplateParser.
 ##
 ## NOTE: If you are going to add a new constant, you must make it the
-##       numeric avlue of the CONFIGURATIONS constant and increment
+##       numeric value of the CONFIGURATIONS constant and increment
 ##       the existing CONFIGURATIONS value.
 use constant PROJECT_NAME     => 0;
 use constant DEPENDENCIES     => 1;
@@ -205,6 +205,8 @@ my %cppma = ('source_files' => ['buildflags',
                                 'managed',
                                 'no_pch',
                                ],
+             'header_files' => [ 'dependent_upon',
+                               ],
             );
 
 # ************************************************************
diff --git a/templates/vc8.mpd b/templates/vc8.mpd
index 703bbc50..a7ad5263 100644
--- a/templates/vc8.mpd
+++ b/templates/vc8.mpd
@@ -774,7 +774,15 @@
 <%if(compares(grouped_header_file, default_group))%>
 <%foreach(grouped_header_file->files)%>
 			<File
+<%if(flag_overrides(grouped_header_file->file, dependent_upon))%>
+				RelativePath="<%grouped_header_file->file%>"
+				FileType="3">
+				<File
+					RelativePath="<%flag_overrides(grouped_header_file->file, dependent_upon)%>">
+				</File>
+<%else%>
 				RelativePath="<%grouped_header_file->file%>">
+<%endif%>
 			</File>
 <%endfor%>
 <%else%>
@@ -783,7 +791,16 @@
 				Filter="">
 <%foreach(grouped_header_file->files)%>
 				<File
+<%if(flag_overrides(grouped_header_file->file, dependent_upon))%>
+					RelativePath="<%grouped_header_file->file%>"
+					FileType="3">
+					<File
+						RelativePath="<%flag_overrides(grouped_header_file->file, dependent_upon)%>">
+					</File>
+<%else%>
 					RelativePath="<%grouped_header_file->file%>">
+<%endif%>
+
 				</File>
 <%endfor%>
 			</Filter>
@@ -792,7 +809,15 @@
 <%else%>
 <%foreach(header_files)%>
 			<File
+<%if(flag_overrides(header_file, dependent_upon))%>
+				RelativePath="<%header_file%>"
+				FileType="3">
+				<File
+					RelativePath="<%flag_overrides(header_file, dependent_upon)%>">
+				</File>
+<%else%>
 				RelativePath="<%header_file%>">
+<%endif%>
 			</File>
 <%endfor%>
 <%endif%>