Remove the reltop_ uses in GHS template

Author: sonndinh

modules/GHSProjectCreator.pm

@@ -87,6 +87,10 @@ sub fill_value {
     $startre = $self->escape_regex_special($self->getstartdir());
   }
 
+  ## NOTE(sonndinh): As of Green Hills MULTI IDE v8.1.4, the paths do not
+  ## need to be relative to the top directory. Hence, most of the reltop_
+  ## uses in the GHS template are removed.
+
   ## The Green Hills project format is strange and needs all paths
   ## relative to the top directory, no matter where the source files
   ## reside.  The template uses reltop_ in front of the real project

modules/GHSWorkspaceCreator.pm

@@ -98,6 +98,7 @@ sub pre_workspace {
             "primaryTarget=$tgt$crlf",
             "customization=\${__OS_DIR}\\target\\integrity.bod$crlf",
             "[Project]$crlf",
+            "\t-DACE_HAS_CPP14$crlf",
             "\t-gcc$crlf",
             "\t--c++14$crlf",
             "\t--libcxx$crlf",

templates/ghs.mpd

@@ -1,24 +1,25 @@
 #!gbuild
 #primaryTarget=<%primaryTarget("ppc_integrity.tgt")%>
 <%if(exename)%>
-	[Program]
-	-o <%if(exeout)%><%reltop_exeout%><%else%><%reltop%><%endif%>/<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%>
+[Program]
+	-o <%if(exeout)%><%exeout%><%endif%>/<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%>
 <%if(need_staticflags)%>
 	-non_shared
 <%endif%>
 <%else%>
-<%comment("TODO-sonndinh: If we put the sharedname branch before the staticname branch, MPC picks")%>
-<%comment("the sharedname branch even if we have a specific clause with ghs type in .mpc file")%>
-<%comment("and call mpc.pl -type ghs with that .mpc file. As a temporary fix, put staticname first.")%>
-<%if(staticname)%>
-	[Library]
-	-o <%reltop_libout%>\<%lib_prefix%><%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%libext(".a")%>
+<%comment("sonndinh: When sharedname is defined and staticname is not set in the mpc file,")%>
+<%comment("the staticname takes the same value as sharedname. The opposite is also true.")%>
+<%comment("Because of that, we can't condition only on whether either of them is defined.")%>
+<%comment("This fixes that by including the template input variable need_staticflags.")%>
+<%if(!need_staticflags && sharedname)%>
+[Shared Object]
+  -o <%if(dllout)%><%dllout%><%else%><%libout%><%endif%>/<%lib_prefix%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%libext(".so")%>
 <%else%>
-<%if(sharedname)%>
-  [Shared Object]
-  -o <%if(dllout)%><%reltop_dllout%><%else%><%reltop_libout%><%endif%>/<%lib_prefix%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%libext(".so")%>
+<%if(need_staticflags && staticname)%>
+[Library]
+	-o <%libout%>/<%lib_prefix%><%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%libext(".a")%>
 <%else%>
-  [Subproject]
+[Subproject]
 <%endif%>
 <%endif%>
 <%endif%>
@@ -43,11 +44,11 @@
 	-D<%pch_define%>
 <%endfor%>
 <%endif%>
-<%foreach(reltop_includes)%>
-	-I<%reltop_include%>
+<%foreach(includes)%>
+	-I<%include%>
 <%endfor%>
-<%foreach(reltop_libpaths)%>
-	-L<%reltop_libpath%>
+<%foreach(libpaths)%>
+	-L<%libpath%>
 <%endfor%>
 <%if(libs || lit_libs || pure_libs)%>
 <%if(exename || sharedname)%>