Thu May 16 17:46:26 UTC 2019 Chad Elliott <elliott_c@ociweb.com>

Author: ocielliottc

ChangeLog

@@ -1,3 +1,13 @@
+Thu May 16 17:46:26 UTC 2019  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/DirectoryManager.pm:
+        * modules/IARWorkspaceCreator.pm:
+        * modules/TemplateParser.pm:
+        * templates/iar.mpd:
+
+          Made it so the $WS_DIR$ and $PROJ_DIR$ variables are prepended
+          only if the path is relative.
+
 Wed May 15 18:25:52 UTC 2019  Chad Elliott  <elliott_c@ociweb.com>
 
         * templates/iar.mpd:

modules/DirectoryManager.pm

@@ -196,7 +196,7 @@ sub path_is_relative {
   ## To determine if the path is relative, we just determine if it is not
   ## an absolute path.
   #my($self, $path) = @_;
-  return (index($_[1], '/') != 0 && $_[1] !~ /^[A-Z]:\//i);
+  return (index($_[1], '/') != 0 && $_[1] !~ /^[A-Z]:[\/\\]/i && $_[1] !~ /^\$\(\w+\)/);
 }
 
 # ************************************************************

modules/IARWorkspaceCreator.pm

@@ -53,9 +53,12 @@ sub write_comps {
             $self->create_command_line_string($0, @ARGV),
             ' -->', $crlf;
   foreach my $project ($self->sort_dependencies($self->get_projects(), 0)) {
+    ## Only emit the prefix if the path is relative.  IAR requires it unless
+    ## the path is fully qualified.
     print $fh "  <project>$crlf",
-              "    <path>\$WS_DIR\$\\", $self->slash_to_backslash($project),
-              "</path>$crlf",
+              "    <path>";
+    print $fh '$WS_DIR$\\' if ($self->path_is_relative($project));
+    print $fh $self->slash_to_backslash($project), "</path>$crlf",
               "  </project>$crlf";
   }
 }

modules/TemplateParser.pm

@@ -91,6 +91,7 @@ my %keywords = ('if'              => 0,
                 'new_guid'        => 0,
                 'deref'           => 0,
                 'set'             => 0,
+                'is_relative'     => $get_type|$doif_type|$get_combined_type,
                );
 
 my %target_type_vars = ('type_is_static'   => 1,
@@ -1991,6 +1992,28 @@ sub handle_set {
   }
 }
 
+
+sub get_is_relative {
+  my($self, $name) = @_;
+  return $self->doif_is_relative($self->get_value_with_default($name));
+}
+
+
+sub doif_is_relative {
+  my($self, $val) = @_;
+  return $self->{'prjc'}->path_is_relative($val) if (defined $val);
+  return undef;
+}
+
+
+sub handle_is_relative {
+  my($self, $name) = @_;
+  my $val = $self->get_value_with_default($name);
+  $self->append_current(
+         $self->{'prjc'}->path_is_relative($val) ? '1' : '0') if (defined $val);
+}
+
+
 sub prepare_parameters {
   my($self, $prefix) = @_;
   my $input = $self->get_value($prefix . '->input_file');

templates/iar.mpd

@@ -363,7 +363,7 @@
                 <option>
                     <name>CCIncludePath2</name>
 <%foreach(includes)%>
-                    <state><%include%></state>
+		    <state><%if(is_relative(include))%>$PROJ_DIR$/<%endif%><%include%></state>
 <%endfor%>
                 </option>
                 <option>
@@ -1071,7 +1071,7 @@
         <name>Documentation Files</name>
 <%foreach(documentation_files)%>
         <file>
-            <name>$PROJ_DIR$\<%documentation_file%></name>
+            <name><%if(is_relative(documentation_file))%>$PROJ_DIR$/<%endif%><%documentation_file%></name>
         </file>
 <%endfor%>
     </group>
@@ -1081,7 +1081,7 @@
         <name>Header Files</name>
 <%foreach(header_files)%>
         <file>
-            <name>$PROJ_DIR$\<%header_file%></name>
+            <name><%if(is_relative(header_file))%>$PROJ_DIR$/<%endif%><%header_file%></name>
         </file>
 <%endfor%>
     </group>
@@ -1091,7 +1091,7 @@
         <name>Inline Files</name>
 <%foreach(inline_files)%>
         <file>
-            <name>$PROJ_DIR$\<%inline_file%></name>
+            <name><%if(is_relative(inline_file))%>$PROJ_DIR$/<%endif%><%inline_file%></name>
         </file>
 <%endfor%>
     </group>
@@ -1101,7 +1101,7 @@
         <name>Source Files</name>
 <%foreach(source_files)%>
         <file>
-            <name>$PROJ_DIR$\<%source_file%></name>
+            <name><%if(is_relative(source_file))%>$PROJ_DIR$/<%endif%><%source_file%></name>
         </file>
 <%endfor%>
     </group>
@@ -1111,7 +1111,7 @@
         <name>Template Files</name>
 <%foreach(template_files)%>
         <file>
-            <name>$PROJ_DIR$\<%template_file%></name>
+            <name><%if(is_relative(template_file))%>$PROJ_DIR$/<%endif%><%template_file%></name>
             <excluded>
 <%foreach(configurations)%>
                 <configuration><%configuration%></configuration>
@@ -1127,7 +1127,7 @@
         <name><%ucw(custom_type)%></name>
 <%foreach(custom_type->input_files)%>
         <file>
-            <name>$PROJ_DIR$\<%custom_type->input_file%></name>
+            <name><%if(is_relative(custom_type->input_file))%>$PROJ_DIR$/<%endif%><%custom_type->input_file%></name>
 <%if(custom_type->input_file->output_files)%>
 <%foreach(configurations)%>
             <configuration>