ChangeLogTag: Tue Sep 19 13:04:15 UTC 2006 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 131 insertions, 72 deletions

diff --git a/templates/ghs.mpd b/templates/ghs.mpd
index 00ca7cab..dcef2b65 100644
--- a/templates/ghs.mpd
+++ b/templates/ghs.mpd
@@ -1,133 +1,192 @@
-#!build
-default:
+#!gbuild
+#primaryTarget=<%primaryTarget("ppc_standalone.tgt")%>
 <%if(exename)%>
-	program
-	:outputname=<%if(exeout)%><%reltop_exeout%><%else%><%reltop%><%endif%>/<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%>
+	[Program]
+	-o <%if(exeout)%><%reltop_exeout%><%else%><%reltop%><%endif%>/<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%>
 <%if(need_staticflags)%>
-	:staticlink=true
+	{optional} -non_shared
 <%endif%>
 <%else%>
 <%if(sharedname)%>
-	shared_library
-	:outputname=<%if(dllout)%><%reltop_dllout%><%else%><%reltop_libout%><%endif%>/<%lib_prefix%><%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%libext(".so")%>
+	[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")%>
 <%else%>
 <%if(staticname)%>
-	library
-	:outputname=<%reltop_libout%>/<%lib_prefix%><%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%libext(".a")%>
+	[Library]
+	-o <%reltop_libout%>/<%lib_prefix%><%libname_prefix%><%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%libext(".a")%>
 <%else%>
-	subproject
+	[Subproject]
 <%endif%>
 <%endif%>
 <%endif%>
-<%foreach(custom_types)%>
-<%foreach(custom_type->input_files)%>
-<%custom_type->input_file%>
-	custom
-	:custom_processor.name=echo
-<%if(custom_type->input_file->output_files)%>
-	:depends=<%if(flag_overrides(custom_type->input_file, dependent))%><%foreach(dep, flag_overrides(custom_type->input_file, dependent))%><%dep%><%if(!has_extension(dep))%><%exe_ext%><%endif%> <%endfor%><%else%><%foreach(custom_type->dependent)%><%custom_type->dependent%><%if(!has_extension(custom_type->dependent))%><%exe_ext%><%endif%> <%endfor%><%endif%><%custom_type->input_file%><%if(custom_type->input_file->dependencies)%> <%custom_type->input_file->dependencies%><%endif%>
-<%if(flag_overrides(custom_type->input_file, gendir))%>
-	:preexec=cd <%reltop%>; <%mkdir("mkdir -p")%> <%flag_overrides(custom_type->input_file, gendir)%><%postmkdir%>
-<%endif%>
-<%if(custom_type->output_option)%>
-<%foreach(custom_type->input_file->output_files)%>
-	:preexec=cd <%reltop%>; <%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%><%if(custom_type->output_option)%> <%custom_type->output_option%> <%custom_type->input_file->output_file%><%endif%> <%custom_type->input_file%>
-<%endfor%>
-<%else%>
-	:preexec=cd <%reltop%>; <%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%><%endif%>
-<%if(flag_overrides(custom_type->input_file, postcommand))%>
-<%foreach(custom_type->input_file)%>
-	:preexec=cd <%reltop%>; <%flag_overrides(custom_type->input_file, postcommand)%>
-<%endfor%>
-<%else%>
-<%if(custom_type->postcommand)%>
-<%foreach(custom_type->input_file)%>
-	:preexec=cd <%reltop%>; <%custom_type->postcommand%>
-<%endfor%>
-<%endif%>
-<%endif%>
-<%if(pch_header && custom_type->pch_postrule)%>
-<%foreach(custom_type->input_file->source_output_files)%>
-	:preexec=cd <%reltop%>; echo #include "<%pch_header%>" > temporary.src
-        :preexec=cd <%reltop%>; <%cat("cat")%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%> >> temporary.src
-        :preexec=cd <%reltop%>; <%mv("mv -f")%> temporary.src <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>
-<%endfor%>
+<%if(bsp)%>
+	-bsp <%bsp%>
 <%endif%>
-
+<%if(os_dir)%>
+	-os_dir <%os_dir%>
 <%endif%>
-<%endfor%>
-<%endfor%>
 <%if(optimize)%>
-	:optimizestrategy=speed
+	-Ospeed
+	-OI
+<%else%>
+	-G
 <%endif%>
-<%if(pch_header)%>
-	:cx_pch_option=automatic
-	:cx_pch_dir=pch
+<%if(pch_header && !no_use_pch)%>
+	--pch
+<%foreach(pch_defines)%>
+	-D<%pch_define%>
+<%endfor%>
 <%endif%>
 <%foreach(reltop_includes)%>
-	:sysincdirs=<%reltop_include%>
+	-I<%reltop_include%>
 <%endfor%>
 <%foreach(reltop_libpaths)%>
-	:libdirs=<%reltop_libpath%>
+	-L<%reltop_libpath%>
 <%endfor%>
-<%if(syslibdirs)%>
-	:syslibdirs=<%syslibdirs%>
-<%endif%>
-<%if(deflibdirs)%>
-	:deflibdirs=<%deflibdirs%>
-<%endif%>
 <%if(libs || lit_libs || pure_libs)%>
 <%if(exename || sharedname)%>
 <%foreach(libs)%>
-	:libraries=-l<%libname_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>
+	-l<%libname_prefix%><%lib%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>
 <%endfor%>
 <%foreach(lit_libs)%>
-	:libraries=-l<%lit_lib%>
+	-l<%lit_lib%>
 <%endfor%>
 <%foreach(pure_libs)%>
-	:libraries=<%pure_lib%>
+	<%pure_lib%>
 <%endfor%>
 <%endif%>
 <%endif%>
 <%if(sharedname)%>
 <%foreach(dynamicflags)%>
-	:defines=<%dynamicflag%>
+	-D<%dynamicflag%>
 <%endfor%>
 <%endif%>
 <%if(need_staticflags)%>
 <%foreach(staticflags)%>
-	:defines=<%staticflag%>
+	-D<%staticflag%>
 <%endfor%>
 <%endif%>
 <%if(macros)%>
 <%foreach(macros)%>
-	:defines=<%macro%>
+	-D<%macro%>
+<%endfor%>
+<%endif%>
+<%if(compile_flags)%>
+<%foreach(compile_flags)%>
+	<%compile_flag%>
+<%endfor%>
+<%endif%>
+<%if(custom_only || !source_files && custom_types)%>
+.custom_build_rule		[HTML Source]
+<%endif%>
+<%scope(enter, escape, \\)%>
+<%foreach(custom_types)%>
+<%foreach(custom_type->input_files)%>
+<%if(!custom_only && source_files)%>
+<%custom_type->input_file%>		[Text]
+<%endif%>
+<%if(custom_type->input_file->output_files)%>
+<%if(custom_type->output_option)%>
+<%foreach(custom_type->input_file->output_files)%>
+<%if(!custom_only && source_files)%>
+<%custom_type->input_file->output_file%>
+<%endif%>
+<%if(flag_overrides(custom_type->input_file, dependent))%>
+<%foreach(dep, flag_overrides(custom_type->input_file, dependent))%>
+	:dependsRelative=<%dep%><%if(!has_extension(dep))%><%exe_ext%><%endif%>
 <%endfor%>
+<%else%>
+<%foreach(custom_type->dependent)%>
+	:dependsRelative=<%custom_type->dependent%><%if(!has_extension(custom_type->dependent))%><%exe_ext%><%endif%>
+<%endfor%>
+<%endif%>
+	:dependsRelative=<%custom_type->input_file%>
+<%if(custom_type->input_file->dependencies)%>
+<%foreach(custom_type->input_file->dependencies)%>
+	:dependsRelative=<%custom_type->input_file->dependencie%>
+<%endfor%>
+<%endif%>
+<%if(flag_overrides(custom_type->input_file, gendir))%>
+	:preexecShell='cd <%reltop%> && <%mkdir%> <%flag_overrides(custom_type->input_file, gendir)%><%postmkdir%>'
+<%endif%>
+	:preexecShell='cd <%reltop%> && <%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%><%if(custom_type->output_option)%> <%custom_type->input_file%> <%custom_type->output_option%> <%custom_type->input_file->output_file%><%else%> <%custom_type->input_file%><%endif%>'
+<%endfor%>
+<%else%>
+<%if(!custom_only && source_files)%>
+<%foreach(custom_type->input_file->source_output_files)%>
+<%if(forfirst)%>
+<%custom_type->input_file->source_output_file%>
+<%endif%>
+<%endfor%>
+<%endif%>
+<%if(flag_overrides(custom_type->input_file, dependent))%>
+<%foreach(dep, flag_overrides(custom_type->input_file, dependent))%>
+	:dependsRelative=<%dep%><%if(!has_extension(dep))%><%exe_ext%><%endif%>
+<%endfor%>
+<%else%>
+<%foreach(custom_type->dependent)%>
+	:dependsRelative=<%custom_type->dependent%><%if(!has_extension(custom_type->dependent))%><%exe_ext%><%endif%>
+<%endfor%>
+<%endif%>
+	:dependsRelative=<%custom_type->input_file%>
+<%if(custom_type->input_file->dependencies)%>
+<%foreach(custom_type->input_file->dependencies)%>
+	:dependsRelative=<%custom_type->input_file->dependencie%>
+<%endfor%>
+<%endif%>
+<%if(flag_overrides(custom_type->input_file, gendir))%>
+	:preexecShell='cd <%reltop%> && <%mkdir%> <%flag_overrides(custom_type->input_file, gendir)%><%postmkdir%>'
 <%endif%>
+	:preexecShell='cd <%reltop%> && <%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%>'
+<%if(flag_overrides(custom_type->input_file, postcommand))%>
+<%foreach(custom_type->input_file)%>
+	:preexecShell='cd <%reltop%> && <%flag_overrides(custom_type->input_file, postcommand)%>'
+<%endfor%>
+<%else%>
+<%if(custom_type->postcommand)%>
+<%foreach(custom_type->input_file)%>
+	:preexecShell='cd <%reltop%> && <%custom_type->postcommand%>'
+<%endfor%>
+<%endif%>
+<%endif%>
+<%if(pch_header && !no_use_pch && custom_type->pch_postrule)%>
+<%foreach(custom_type->input_file->source_output_files)%>
+	:preexecShell='cd <%reltop%> && echo #include "<%pch_header%>" > temporary.src'
+        :preexecShell='cd <%reltop%> && <%cat%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%><%slash%><%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%> >> temporary.src'
+        :preexecShell='cd <%reltop%> && <%mv%> temporary.src <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%><%slash%><%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>'
+<%endfor%>
+<%endif%>
+<%endif%>
+<%foreach(custom_type->input_file->output_files)%>
+	:extraOutputFile=<%custom_type->input_file->output_file%>
+<%endfor%>
+<%if(custom_only || !source_files)%>
+	-c
+	:postexecShell='<%rm%> .c && <%rm%> .h'
+<%endif%>
+<%endif%>
+<%endfor%>
+<%endfor%>
+<%scope(leave)%>
 <%foreach(source_files)%>
 <%source_file%>
-	C++
 <%if(compile_flags)%>
-	:cxx_compiler.args=<%compile_flags%><%if(flag_overrides(source_file, buildflags))%> <%flag_overrides(source_file, buildflags)%><%endif%>
+	-cxx_compiler.args=<%compile_flags%><%if(flag_overrides(source_file, buildflags))%> <%flag_overrides(source_file, buildflags)%><%endif%>
 <%else%>
 <%if(flag_overrides(source_file, buildflags))%>
-	:cxx_compiler.args=<%flag_overrides(source_file, buildflags)%>
+	-cxx_compiler.args=<%flag_overrides(source_file, buildflags)%>
 <%endif%>
 <%endif%>
 <%endfor%>
 <%foreach(header_files)%>
 <%header_file%>
-	include_file
 <%endfor%>
 <%foreach(inline_files)%>
 <%inline_file%>
-	include_file
 <%endfor%>
 <%foreach(resource_files)%>
 <%resource_file%>
-	script
 <%endfor%>
 <%foreach(documentation_files)%>
-<%documentation_file%>
-	documentation
+<%documentation_file%>		[Documentation]
 <%endfor%>