diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-05-14 18:53:49 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-05-14 18:53:49 +0000 |
commit | 5dbd449b59081491a3f1ab6dabb41fbe41600790 (patch) | |
tree | eb91f5c7e81c3cb77e1101cfc2300be5d68a5c57 | |
parent | 713054ac3f32014e5876b42b8e7646a552d25873 (diff) | |
download | MPC-5dbd449b59081491a3f1ab6dabb41fbe41600790.tar.gz |
ChangeLogTag: Wed May 14 13:52:37 2003 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r-- | modules/ProjectCreator.pm | 7 | ||||
-rw-r--r-- | templates/em3.mpd | 6 | ||||
-rw-r--r-- | templates/em3vcp.mpd | 6 | ||||
-rw-r--r-- | templates/make.mpd | 4 | ||||
-rw-r--r-- | templates/nmake.mpd | 8 | ||||
-rw-r--r-- | templates/vc6.mpd | 6 | ||||
-rw-r--r-- | templates/vc6dsp.mpd | 6 | ||||
-rw-r--r-- | templates/vc7.mpd | 4 |
8 files changed, 26 insertions, 21 deletions
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index ad3d4262..4d0fd095 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -1639,8 +1639,13 @@ sub check_custom_output { last; } else { + my($base) = $built; + if ($self->convert_slashes()) { + $base =~ s/\\/\//g; + } + my($re) = $self->escape_regex_special(basename($base)); foreach my $c (@$comps) { - if ($c =~ /$built$/) { + if ($c =~ /$re$/) { push(@outputs, $built); last; } diff --git a/templates/em3.mpd b/templates/em3.mpd index 2363d1eb..206553df 100644 --- a/templates/em3.mpd +++ b/templates/em3.mpd @@ -248,8 +248,8 @@ InputDir=<%dirname(custom_type->input_file)%> <%if(custom_type->output_option)%> <%foreach(custom_type->input_file->output_files)%> -".\<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_file%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_file%> +"<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> <%endfor%> <%else%> @@ -257,7 +257,7 @@ BuildCmds= \ <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%foreach(custom_type->input_file->output_files)%> -".\<%custom_type->input_file->output_file%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) <%endfor%> diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd index 2363d1eb..206553df 100644 --- a/templates/em3vcp.mpd +++ b/templates/em3vcp.mpd @@ -248,8 +248,8 @@ InputDir=<%dirname(custom_type->input_file)%> <%if(custom_type->output_option)%> <%foreach(custom_type->input_file->output_files)%> -".\<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_file%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_file%> +"<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> <%endfor%> <%else%> @@ -257,7 +257,7 @@ BuildCmds= \ <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%foreach(custom_type->input_file->output_files)%> -".\<%custom_type->input_file->output_file%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) <%endfor%> diff --git a/templates/make.mpd b/templates/make.mpd index 0af89d3c..099cf8df 100644 --- a/templates/make.mpd +++ b/templates/make.mpd @@ -71,9 +71,9 @@ OUTPUT_OPTION = -o $@ <%if(custom_types)%> <%foreach(custom_types)%> <%foreach(custom_type->input_files)%> -GENERATED_DIRTY += <%foreach(custom_type->input_file->output_files)%><%if(custom_type->output_option)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%endif%><%custom_type->input_file->output_file%><%endfor%> +GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%> <%foreach(custom_type->input_file->output_files)%> -<%if(custom_type->output_option)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%endif%><%custom_type->input_file->output_file%>: <%custom_type->input_file%> +<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>: <%custom_type->input_file%> <%custom_type->command%> <%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%> $@<%endif%> <%endfor%> diff --git a/templates/nmake.mpd b/templates/nmake.mpd index 95e33144..d169f64a 100644 --- a/templates/nmake.mpd +++ b/templates/nmake.mpd @@ -48,7 +48,7 @@ OUTDIR=<%libout%> <%endif%> INTDIR=<%intermediate_dir%>\<%noextension(project_file)%> -ALL : <%if(idl_files)%>IDL_STUBS <%endif%><%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> ".\<%if(custom_type->output_option)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%endif%><%custom_type->input_file->output_file%>"<%endfor%><%endfor%><%endfor%> +ALL : <%if(idl_files)%>IDL_STUBS <%endif%><%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%dllout%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%>.exe<%endif%>"<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%foreach(custom_type->input_file->output_files)%> "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>"<%endfor%><%endfor%><%endfor%> DEPEND : depgen.pl<%foreach(includes)%> -I"<%include%>"<%endfor%><%foreach(defines cpu_defines common_defines)%> -D<%define%>=1<%endfor%><%if(type_is_dynamic)%><%foreach(dllflags)%> -D<%dllflag%>=1<%endfor%><%endif%><%if(need_libflags)%><%foreach(libflags)%> -D<%libflag%>=1<%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%>=1<%endfor%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%> @@ -92,7 +92,7 @@ REALCLEAN : CLEAN <%foreach(custom_types)%> <%foreach(custom_type->input_files)%> <%foreach(custom_type->input_file->output_files)%> - -@erase "<%if(custom_type->output_option)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%endif%><%custom_type->input_file->output_file%>" + -@erase "<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>" <%endfor%> <%endfor%> <%endfor%> @@ -258,12 +258,12 @@ InputPath=.\<%custom_type->input_file%> InputName=<%basenoextension(custom_type->input_file)%> InputDir=<%dirname(custom_type->input_file)%> -<%foreach(custom_type->input_file->output_files)%>".\<%if(custom_type->output_option)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%endif%><%custom_type->input_file->output_file%>" <%endfor%>: $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +<%foreach(custom_type->input_file->output_files)%>"<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>" <%endfor%>: $(SOURCE) "$(INTDIR)" "$(OUTDIR)" <<tempfile.bat @echo off <%if(custom_type->output_option)%> <%foreach(custom_type->input_file->output_files)%> - <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_file%> + <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> <%endfor%> <%else%> <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) diff --git a/templates/vc6.mpd b/templates/vc6.mpd index 0786e8b2..5224e74e 100644 --- a/templates/vc6.mpd +++ b/templates/vc6.mpd @@ -233,8 +233,8 @@ InputDir=<%dirname(custom_type->input_file)%> <%if(custom_type->output_option)%> <%foreach(custom_type->input_file->output_files)%> -".\<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_file%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_file%> +"<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> <%endfor%> <%else%> @@ -242,7 +242,7 @@ BuildCmds= \ <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%foreach(custom_type->input_file->output_files)%> -".\<%custom_type->input_file->output_file%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) <%endfor%> diff --git a/templates/vc6dsp.mpd b/templates/vc6dsp.mpd index 0786e8b2..5224e74e 100644 --- a/templates/vc6dsp.mpd +++ b/templates/vc6dsp.mpd @@ -233,8 +233,8 @@ InputDir=<%dirname(custom_type->input_file)%> <%if(custom_type->output_option)%> <%foreach(custom_type->input_file->output_files)%> -".\<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_file%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_file%> +"<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%custom_type->output_option%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%> <%endfor%> <%else%> @@ -242,7 +242,7 @@ BuildCmds= \ <%custom_type->command%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> $(InputPath) <%foreach(custom_type->input_file->output_files)%> -".\<%custom_type->input_file->output_file%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%>.\<%custom_type->input_file->output_file%><%endif%>" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) <%endfor%> diff --git a/templates/vc7.mpd b/templates/vc7.mpd index 7a8591cc..33c75ed0 100644 --- a/templates/vc7.mpd +++ b/templates/vc7.mpd @@ -189,8 +189,8 @@ <Tool Name="VCCustomBuildTool" Description="Invoking <%custom_type->command%> on <%custom_type->input_file%>" - CommandLine="<%custom_type->command%> <%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%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%custom_type->input_file->output_files%><%endif%>" - Outputs="<%foreach(custom_type->input_file->output_files)%><%if(custom_type->output_option)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%endif%><%endif%><%custom_type->input_file->output_file%><%fornotlast(";")%><%endfor%>"/> + CommandLine="<%custom_type->command%> <%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%> <%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_files)%><%else%><%custom_type->input_file->output_files%><%endif%><%endif%>" + Outputs="<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(";")%><%endfor%>"/> </FileConfiguration> <%endfor%> </File> |