diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-07-07 19:08:17 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-07-07 19:08:17 +0000 |
| commit | 555afd597ca10c4952f95fd2205099e95bc840d7 (patch) | |
| tree | 6c28ea4b453fe3a6338aecb264dc8f885c9e4398 | |
| parent | 75b35760f91aab3d648f9aa0c2d12eebd453b53b (diff) | |
| download | MPC-555afd597ca10c4952f95fd2205099e95bc840d7.tar.gz | |
ChangeLogTag: Thu Jul 7 14:05:44 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | modules/MakeProjectBase.pm | 14 | ||||
| -rw-r--r-- | modules/ProjectCreator.pm | 8 | ||||
| -rw-r--r-- | templates/make.mpd | 4 |
4 files changed, 25 insertions, 14 deletions
@@ -1,3 +1,16 @@ +Thu Jul 7 14:05:44 2005 Chad Elliott <elliott_c@ociweb.com> + + * modules/MakeProjectBase.pm: + * modules/ProjectCreator.pm: + + Factor code out of MakeProjectBase into ProjectCreator which will + allow for less code in future Make based modules. + + * templates/make.mpd: + + Modified to generate Makefiles that do not have lines that end in + spaces. + Wed Jul 6 13:00:22 2005 Chad Elliott <elliott_c@ociweb.com> * modules/Options.pm: diff --git a/modules/MakeProjectBase.pm b/modules/MakeProjectBase.pm index c70aeced..32e64bce 100644 --- a/modules/MakeProjectBase.pm +++ b/modules/MakeProjectBase.pm @@ -33,17 +33,9 @@ sub sort_files { } -sub project_file_name { - my($self) = shift; - my($name) = shift; - - if (!defined $name) { - $name = $self->project_name(); - } - - return $self->get_modified_project_file_name( - "Makefile.$name", - $self->project_file_extension()); +sub project_file_prefix { + #my($self) = shift; + return 'Makefile.'; } 1; diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index e5b0a4fe..5d7ad3bc 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -4327,7 +4327,7 @@ sub project_file_name { } return $self->get_modified_project_file_name( - $name, + $self->project_file_prefix() . $name, $self->project_file_extension()); } @@ -4423,6 +4423,12 @@ sub fill_value { } +sub project_file_prefix { + #my($self) = shift; + return ''; +} + + sub project_file_extension { #my($self) = shift; return ''; diff --git a/templates/make.mpd b/templates/make.mpd index ccb240ab..ee88d208 100644 --- a/templates/make.mpd +++ b/templates/make.mpd @@ -113,7 +113,7 @@ specialscript: $(BTARGETDIR): @$(MKDIR) "$@" -$(BIN): $(BTARGETDIR) <%foreach(configurations)%><%if(tempinc)%>$(TEMPINCDIR) <%endif%><%endfor%>$(OBJS) <%foreach(configurations)%><%foreach(platforms)%><%if(prelink)%><%targetoutdir%><%noextension(prelink)%>$(OBJEXT)<%endif%><%endfor%><%endfor%> +$(BIN): $(BTARGETDIR)<%foreach(configurations)%><%if(tempinc)%> $(TEMPINCDIR)<%endif%><%foreach(platforms)%><%if(prelink)%> <%targetoutdir%><%noextension(prelink)%>$(OBJEXT)<%endif%><%endfor%><%endfor%> $(OBJS) $(LINK.cc) $(OUTPUT_OPTION) $(OBJS) $(LDLIBS) <%else%> @@ -178,7 +178,7 @@ GENERATED_DIRTY =<%foreach(custom_types)%><%foreach(custom_type->input_files) <%if(flag_overrides(custom_type->input_file, gendir))%> @$(MKDIR) <%flag_overrides(custom_type->input_file, gendir)%> <%endif%> - <%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(custom_type->output_option)%><%custom_type->output_option%> "$@"<%endif%> + <%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(custom_type->output_option)%> <%custom_type->output_option%> "$@"<%endif%> <%if(flag_overrides(custom_type->input_file, postcommand))%> <%foreach(custom_type->input_file)%> <%flag_overrides(custom_type->input_file, postcommand)%> |