summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog55
-rw-r--r--modules/CCWorkspaceCreator.pm3
-rw-r--r--modules/ConfigParser.pm7
-rw-r--r--modules/Driver.pm2
-rw-r--r--modules/Options.pm4
-rw-r--r--modules/ProjectCreator.pm18
-rw-r--r--modules/TemplateParser.pm1
-rw-r--r--modules/VC8WorkspaceCreator.pm66
-rw-r--r--modules/WorkspaceCreator.pm18
-rwxr-xr-xregistry.pl32
-rw-r--r--templates/cc.mpd2
-rw-r--r--templates/make.mpd34
-rw-r--r--templates/makedll.mpt30
-rw-r--r--templates/vc8csharp.mpd3
-rw-r--r--templates/vc8java.mpd3
-rwxr-xr-xtemplates/vc8vb.mpd3
16 files changed, 215 insertions, 66 deletions
diff --git a/ChangeLog b/ChangeLog
index ec4470c7..9d895838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+Wed Jan 24 19:04:58 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
+
+ * modules/CCWorkspaceCreator.pm:
+
+ Fixed a bug in the dependency code that would make the wrong
+ directory when the -into option was used.
+
+ * modules/ConfigParser.pm:
+
+ Provide diagnostic information when an environment variable is
+ used in the configuration file, but is not defined by the user.
+
+ * modules/Driver.pm:
+
+ Keep one more directory level when printing out the configuration
+ file.
+
+ * modules/Options.pm:
+
+ Removed an extra parameter when setting the template variable
+ overrides. It was no longer necessary due to my change from Fri
+ Jan 12 15:24:27 UTC 2007.
+
+ * modules/ProjectCreator.pm:
+ * modules/TemplateParser.pm:
+
+ Fixed a bug where a scoped assignment would make the original
+ assignment disappear completely. The original assignment needs to
+ be maintained so that when the assignment is used outside of a
+ scope it has the value specified by the user.
+
+ * modules/VC8WorkspaceCreator.pm:
+ * modules/WorkspaceCreator.pm:
+ * templates/vc8csharp.mpd:
+ * templates/vc8java.mpd:
+ * templates/vc8vb.mpd:
+
+ Provide project references based on the 'after' keyword setting
+ for c#, vb and java projects only.
+
+ * registry.pl:
+
+ Added commands to process .mpc files.
+
+ * templates/cc.mpd:
+
+ Only output the dependency tag if the 'after' keyword has been
+ set.
+
+ * templates/make.mpd:
+ * templates/makedll.mpt:
+
+ Changed the way that output directories are made. The targets no
+ longer depend on the output directory, they are made on the fly.
+
Fri Jan 19 15:34:17 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
* modules/TemplateParser.pm:
diff --git a/modules/CCWorkspaceCreator.pm b/modules/CCWorkspaceCreator.pm
index 13a75ce3..18f47099 100644
--- a/modules/CCWorkspaceCreator.pm
+++ b/modules/CCWorkspaceCreator.pm
@@ -64,6 +64,7 @@ sub add_dependencies {
if (open($fh, "$outdir/$proj")) {
my($write) = 0;
my(@read) = ();
+ my($cwd) = $self->getcwd();
while(<$fh>) {
if (/MPC\s+ADD\s+DEPENDENCIES/) {
my(@projs) = ();
@@ -71,7 +72,7 @@ sub add_dependencies {
my($deps) = $self->get_validated_ordering($proj);
foreach my $dep (@$deps) {
my($relative) = $self->get_relative_dep_file($creator,
- "$outdir/$proj",
+ "$cwd/$proj",
$dep);
if (defined $relative) {
if (!$write) {
diff --git a/modules/ConfigParser.pm b/modules/ConfigParser.pm
index 18259103..0fd13cd5 100644
--- a/modules/ConfigParser.pm
+++ b/modules/ConfigParser.pm
@@ -94,7 +94,12 @@ sub preprocess {
while($str =~ /\$([\(\w\)]+)/) {
my($name) = $1;
$name =~ s/[\(\)]//g;
- my($val) = $ENV{$name} || '';
+ my($val) = $ENV{$name};
+ if (!defined $val) {
+ $val = '';
+ $self->diagnostic("$name was used in the configuration file, " .
+ "but was not defined.");
+ }
$str =~ s/\$([\(\w\)]+)/$val/;
}
return $str;
diff --git a/modules/Driver.pm b/modules/Driver.pm
index 83f3d05e..900135c8 100644
--- a/modules/Driver.pm
+++ b/modules/Driver.pm
@@ -254,7 +254,7 @@ sub run {
my($cfg) = new ConfigParser(\%valid_cfg);
if (defined $cfgfile) {
my($ellipses) = $cfgfile;
- $ellipses =~ s!.*(/[^/]+/[^/]+/[^/]+/[^/]+/[^/]+)!...$1!;
+ $ellipses =~ s!.*(/[^/]+/[^/]+/[^/]+/[^/]+/[^/]+/[^/]+)!...$1!;
$self->diagnostic("Using $ellipses");
my($status, $error) = $cfg->read_file($cfgfile);
if (!$status) {
diff --git a/modules/Options.pm b/modules/Options.pm
index eca06a6a..a7ad4d34 100644
--- a/modules/Options.pm
+++ b/modules/Options.pm
@@ -479,9 +479,7 @@ sub options {
my($pc) = new ProjectCreator();
if ($pc->parse_assignment($value, \@values)) {
$addtemp{$values[1]} = [] if (!defined $addtemp{$values[1]});
- ## The extra parameter (3rd) indicates that this value was
- ## specified on the command line
- push(@{$addtemp{$values[1]}}, [$values[0], $values[2], 1]);
+ push(@{$addtemp{$values[1]}}, [$values[0], $values[2]]);
my($keywords) = ProjectCreator::getKeywords();
if (defined $$keywords{$values[1]}) {
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index cd6adaab..492ff02e 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -349,13 +349,10 @@ sub convert_to_template_assignment {
## If the value we are going to set for $name has been used as a
## scoped template variable, we need to hijack the whole assignment
## and turn it into a template variable assignment.
- my($modified) = undef;
my($atemp) = $self->get_addtemp();
foreach my $key (grep(/::$name$/, keys %$atemp)) {
- $modified = 1;
$self->update_template_variable(0, $calledfrom, $key, $value);
}
- return $modified;
}
@@ -384,9 +381,8 @@ sub process_assignment {
}
}
- if ($calledfrom == 0 &&
- $self->convert_to_template_assignment($name, $value, $calledfrom)) {
- return;
+ if ($calledfrom == 0) {
+ $self->convert_to_template_assignment($name, $value, $calledfrom);
}
$self->SUPER::process_assignment($name, $value, $assign);
@@ -412,9 +408,8 @@ sub addition_core {
my($nval) = shift;
my($assign) = shift;
- if (!$self->convert_to_template_assignment($name, $value, 1)) {
- $self->SUPER::addition_core($name, $value, $nval, $assign);
- }
+ $self->convert_to_template_assignment($name, $value, 1);
+ $self->SUPER::addition_core($name, $value, $nval, $assign);
}
@@ -425,9 +420,8 @@ sub subtraction_core {
my($nval) = shift;
my($assign) = shift;
- if (!$self->convert_to_template_assignment($name, $value, -1)) {
- $self->SUPER::subtraction_core($name, $value, $nval, $assign);
- }
+ $self->convert_to_template_assignment($name, $value, -1);
+ $self->SUPER::subtraction_core($name, $value, $nval, $assign);
}
diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index b87b5b46..3164ce3c 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -322,6 +322,7 @@ sub get_value {
if (defined $$uvalue[0]) {
$value = $uvalue;
$adjust = 0;
+ $fromprj = 1;
}
if (!defined $value) {
diff --git a/modules/VC8WorkspaceCreator.pm b/modules/VC8WorkspaceCreator.pm
index c0c31bc7..f89f6aff 100644
--- a/modules/VC8WorkspaceCreator.pm
+++ b/modules/VC8WorkspaceCreator.pm
@@ -49,6 +49,72 @@ sub pre_workspace {
'# ', $self->create_command_line_string($0, @ARGV), $crlf);
}
+sub post_workspace {
+ my($self) = shift;
+ my($fh) = shift;
+ my($creator) = shift;
+ my($pjs) = $self->get_project_info();
+ my(@projects) = ();
+ my(%gmap) = ();
+
+ foreach my $project ($self->sort_dependencies($self->get_projects(), 0)) {
+ my($name, $deps, $guid, $lang) = @{$$pjs{$project}};
+ if ($lang eq 'csharp' || $lang eq 'java' || $lang eq 'vb') {
+ $gmap{$name} = [$guid, $lang];
+ push(@projects, $project);
+ }
+ }
+
+ foreach my $project (@projects) {
+ my($ph) = new FileHandle();
+ my($outdir) = $self->get_outdir();
+ $outdir = $self->getcwd() if ($outdir eq '.');
+ if (open($ph, "$outdir/$project")) {
+ my($write) = 0;
+ my(@read) = ();
+ my($crlf) = $self->crlf();
+ my($cwd) = $self->getcwd();
+
+ while(<$ph>) {
+ if (/^(\s*)<!\-\-\s+MPC\s+ADD\s+DEPENDENCIES/) {
+ my($spc) = $1;
+ my($deps) = $self->get_validated_ordering($project);
+ foreach my $dep (@$deps) {
+ my($lang) = $gmap{$dep}->[1];
+ if (defined $lang &&
+ ($lang eq 'csharp' || $lang eq 'java' || $lang eq 'vb')) {
+ my($relative) = $self->get_relative_dep_file($creator,
+ "$cwd/$project",
+ $dep);
+ if (defined $relative) {
+ push(@read, $spc . '<ProjectReference Include="' .
+ $relative . '">' . $crlf,
+ $spc . ' <Project>{' . $gmap{$dep}->[0] .
+ '}</Project>' . $crlf,
+ $spc . ' <Name>' . $dep . '</Name>' . $crlf,
+ $spc . '</ProjectReference>' . $crlf);
+ $write = 1;
+ }
+ }
+ }
+ last if (!$write);
+ }
+ else {
+ push(@read, $_);
+ }
+ }
+ close($ph);
+
+ if ($write && open($ph, ">$outdir/$project")) {
+ foreach my $line (@read) {
+ print $ph $line;
+ }
+ close($ph);
+ }
+ }
+ }
+}
+
sub adjust_names {
my($self) = shift;
my($name) = shift;
diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm
index d192d380..e228c08d 100644
--- a/modules/WorkspaceCreator.pm
+++ b/modules/WorkspaceCreator.pm
@@ -943,13 +943,13 @@ sub write_workspace {
my($tmp) = "$outdir/MWC$>.$$";
my($different) = 1;
if (open($fh, ">$tmp")) {
- $self->pre_workspace($fh);
+ $self->pre_workspace($fh, $creator);
$self->write_comps($fh, $creator, $addfile);
my($wsHelper) = WorkspaceHelper::get($self);
$wsHelper->perform_custom_processing($fh, $creator, $addfile);
- $self->post_workspace($fh);
+ $self->post_workspace($fh, $creator);
close($fh);
if (-r $name &&
@@ -987,13 +987,13 @@ sub write_workspace {
}
else {
if (open($fh, ">$name")) {
- $self->pre_workspace($fh);
+ $self->pre_workspace($fh, $creator);
$self->write_comps($fh, $creator, $addfile);
my($wsHelper) = WorkspaceHelper::get($self);
$wsHelper->perform_custom_processing($fh, $creator, $addfile);
- $self->post_workspace($fh);
+ $self->post_workspace($fh, $creator);
close($fh);
if ($addfile) {
@@ -2323,8 +2323,9 @@ sub workspace_per_project {
sub pre_workspace {
- #my($self) = shift;
- #my($fh) = shift;
+ #my($self) = shift;
+ #my($fh) = shift;
+ #my($creator) = shift;
}
@@ -2337,8 +2338,9 @@ sub write_comps {
sub post_workspace {
- #my($self) = shift;
- #my($fh) = shift;
+ #my($self) = shift;
+ #my($fh) = shift;
+ #my($creator) = shift;
}
diff --git a/registry.pl b/registry.pl
index 538e3b66..15c004fc 100755
--- a/registry.pl
+++ b/registry.pl
@@ -26,11 +26,11 @@ my($MPC_ROOT) = $FindBin::Bin;
$MPC_ROOT =~ s!/!\\!g;
my($version) = '1.2';
-my(%types) = ('nmake' => 'NMAKE',
- 'bmake' => 'Borland Make',
- 'vc6' => 'DSW',
- 'vc71' => 'SLN 7.1',
- 'vc8' => 'SLN 8.0',
+my(%types) = ('nmake' => ['NMAKE', 'NMAKE'],
+ 'bmake' => ['Borland Make', 'Borland Make'],
+ 'vc6' => ['DSW', 'DSP'],
+ 'vc71' => ['SLN 7.1', 'VCPROJ 7.1'],
+ 'vc8' => ['SLN 8.0', 'VCPROJ 8.0'],
);
# ******************************************************************
@@ -88,6 +88,25 @@ sub set_mwc_command {
}
+sub set_mpc_command {
+ my($type) = shift;
+ my($desc) = shift;
+ my($shell) = 'HKEY_CLASSES_ROOT/mpcfile/shell';
+ my($hash) = $Registry->{$shell};
+
+ if (!defined $hash) {
+ $Registry->{$shell} = {};
+ $hash = $Registry->{$shell};
+ }
+
+ my($key) = 'MPC' . uc($type) . '/';
+ $hash->{$key} = {'/' => "MPC -> $desc"};
+
+ $key .= 'command/';
+ $hash->{$key} = {'/' => "cmd /c \"$MPC_ROOT\\mpc.pl -type $type %L || pause\""};
+}
+
+
sub delete_key {
my($key) = shift;
my($val) = $Registry->{$key};
@@ -146,7 +165,8 @@ set_ext_icon('mpc', 1);
set_ext_icon('mpb', 1);
foreach my $type (keys %types) {
- set_mwc_command($type, $types{$type});
+ set_mwc_command($type, $types{$type}->[0]);
+ set_mpc_command($type, $types{$type}->[1]);
}
print "You may need to log out and then ",
diff --git a/templates/cc.mpd b/templates/cc.mpd
index 6a367744..912dc41a 100644
--- a/templates/cc.mpd
+++ b/templates/cc.mpd
@@ -16,7 +16,9 @@ Tool="DspBiosBuilder"
Config="<%configuration%>"
<%endfor%>
+<%if(after)%>
; MPC ADD DEPENDENCIES
+<%endif%>
[Source Files]
<%foreach(source_files)%>
Source="<%source_file%>"
diff --git a/templates/make.mpd b/templates/make.mpd
index 8203fda9..7734d303 100644
--- a/templates/make.mpd
+++ b/templates/make.mpd
@@ -59,6 +59,8 @@ RM = <%delete("rm -rf")%>
CP = <%copy("cp -p")%>
NUL = <%devnull("/dev/null")%>
MKDIR = <%makedir("mkdir -p")%>
+TESTDIRSTART = <%testdirstart("test -d")%>
+TESTDIREND = <%testdirend("||")%>
EXEEXT = <%exe_ext%>
LIBPREFIX = <%lib_prefix%><%libname_prefix%>
<%foreach(configurations)%>
@@ -133,10 +135,8 @@ specialscript:
<%endif%>
<%endif%>
-$(BTARGETDIR):
- @$(MKDIR) "$@"
-
-$(BIN): $(BTARGETDIR)<%if(tempinc)%> $(TEMPINCDIR)<%endif%><%if(prelinktargetobj)%> <%targetoutdir%><%obj_dir%><%prelinktargetobj%><%else%><%if(prelinktarget)%> <%prelinktarget%><%endif%><%endif%> $(OBJS)
+$(BIN):<%if(tempinc)%> $(TEMPINCDIR)<%endif%><%if(prelinktargetobj)%> <%targetoutdir%><%obj_dir%><%prelinktargetobj%><%else%><%if(prelinktarget)%> <%prelinktarget%><%endif%><%endif%> $(OBJS)
+ @$(TESTDIRSTART) "$(BTARGETDIR)" $(TESTDIREND) $(MKDIR) "$(BTARGETDIR)"
<%if(prelink)%>
<%eval(prelink)%>
<%endif%>
@@ -149,17 +149,13 @@ $(BIN): $(BTARGETDIR)<%if(tempinc)%> $(TEMPINCDIR)<%endif%><%if(prelinktargetobj
<%if(dll_ext && sharedname)%>
all:<%if(prebuild)%> __prebuild__<%endif%><%if(version && versupport)%> $(SHLIB).<%version%><%endif%> $(SHLIB)<%if(postbuild)%> __postbuild__<%endif%>
-<%if(dllout)%>
-$(SHTARGETDIR):
- @$(MKDIR) "$@"
-
-<%endif%>
<%if(version && versupport)%>
$(SHLIB):
cd $(SHTARGETDIR) && ln -s $(SHLIB_BASE).<%version%> $(SHLIB_BASE)
<%endif%>
-$(SHLIB)<%if(version && versupport)%>.<%version%><%endif%>: $(SHTARGETDIR) <%if(tempinc)%>$(TEMPINCDIR) <%endif%>$(OBJS)
+$(SHLIB)<%if(version && versupport)%>.<%version%><%endif%>: <%if(tempinc)%>$(TEMPINCDIR) <%endif%>$(OBJS)
+ @$(TESTDIRSTART) "$(SHTARGETDIR)" $(TESTDIREND) $(MKDIR) "$(SHTARGETDIR)"
<%if(prelink)%>
<%eval(prelink)%>
<%endif%>
@@ -175,13 +171,9 @@ all:<%if(prebuild)%> __prebuild__<%endif%> $(LIB)<%if(postbuild)%> __postbuild__
<%endif%>
<%endif%>
-<%if(!exename)%>
-$(LTARGETDIR):
- @$(MKDIR) "$@"
-
-<%endif%>
<%if(staticname)%>
-$(LIB): $(LTARGETDIR) <%if(tempinc)%>$(TEMPINCDIR) <%endif%>$(OBJS)
+$(LIB): <%if(tempinc)%>$(TEMPINCDIR) <%endif%>$(OBJS)
+ @$(TESTDIRSTART) "$(LTARGETDIR)" $(TESTDIREND) $(MKDIR) "$(LTARGETDIR)"
$(AR) $(ARFLAGS) <%libgenopt%>$(LIB) $(OBJS)<%if(tempinc)%> `find $(TEMPINCDIR) -name \*.o\*`<%endif%>
<%if(ranlib)%>
ranlib $(LIB)
@@ -204,7 +196,7 @@ PATH := $(PATH):<%custom_type->libpath%>
<%if(custom_type->input_file->output_files)%>
<%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%><%slash%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%fornotlast(" ")%><%endfor%>: <%custom_type->input_file%><%if(custom_type->input_file->dependencies)%> <%custom_type->input_file->dependencies%><%endif%><%if(flag_overrides(custom_type->input_file, dependent))%> <%flag_overrides(custom_type->input_file, dependent)%><%else%><%if(custom_type->dependent)%> <%custom_type->dependent%><%endif%><%endif%>
<%if(flag_overrides(custom_type->input_file, gendir))%>
- @$(MKDIR) <%flag_overrides(custom_type->input_file, gendir)%>
+ @$(TESTDIRSTART) "<%flag_overrides(custom_type->input_file, gendir)%>" $(TESTDIREND) $(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%> <%if(custom_type->output_option)%><%custom_type->input_file%> <%custom_type->output_option%> "$@"<%else%><%custom_type->input_file%><%endif%>
<%if(flag_overrides(custom_type->input_file, postcommand))%>
@@ -242,13 +234,13 @@ generated: $(GENERATED_DIRTY)
<%if(tempinc)%>
$(TEMPINCDIR):
- @-test -d $(TEMPINCDIR) || $(MKDIR) $(TEMPINCDIR) 2> $(NUL) || true
+ @-$(TESTDIRSTART) "$(TEMPINCDIR)" $(TESTDIREND) $(MKDIR) "$(TEMPINCDIR)" 2> $(NUL)
<%endif%>
<%if(pch_source && pchsupport)%>
<%targetoutdir%><%obj_dir%><%noextension(pch_source)%>$(OBJEXT): <%pch_source%>
<%if(targetoutdir || obj_dir)%>
- @$(MKDIR) <%targetoutdir%><%obj_dir%><%dirname(pch_source)%>
+ @$(TESTDIRSTART) "<%targetoutdir%><%obj_dir%><%dirname(pch_source)%>" $(TESTDIREND) $(MKDIR) "<%targetoutdir%><%obj_dir%><%dirname(pch_source)%>"
<%endif%>
$(COMPILE.cc) <%if(pchcreate)%><%pchcreate%><%targetoutdir%><%obj_dir%><%pch_header%><%pchext%> <%endif%>$(EXPORTFLAGS)<%if(!pchnobj)%> $(OUTPUT_OPTION)<%endif%> <%pch_source%>
<%if(pchnobj)%>
@@ -259,7 +251,7 @@ $(TEMPINCDIR):
<%foreach(source_files)%>
<%targetoutdir%><%obj_dir%><%noextension(source_file)%>$(OBJEXT): <%source_file%>
<%if(targetoutdir || obj_dir)%>
- @$(MKDIR) <%targetoutdir%><%obj_dir%><%dirname(source_file)%>
+ @$(TESTDIRSTART) "<%targetoutdir%><%obj_dir%><%dirname(source_file)%>" $(TESTDIREND) $(MKDIR) "<%targetoutdir%><%obj_dir%><%dirname(source_file)%>"
<%endif%>
$(COMPILE.cc) <%if(flag_overrides(source_file, buildflags))%><%flag_overrides(source_file, buildflags)%> <%endif%><%if(pchuse && pch_source && pchsupport)%><%pchuse%><%pch_header%><%pchext%> <%if(pchstop)%><%pchstop%><%pch_header%><%endif%><%endif%>$(EXPORTFLAGS) $(OUTPUT_OPTION) <%source_file%>
@@ -269,7 +261,7 @@ $(TEMPINCDIR):
<%foreach(resource_files)%>
<%targetoutdir%><%obj_dir%><%resource_file%>$(RESEXT):
<%if(targetoutdir || obj_dir)%>
- @$(MKDIR) <%targetoutdir%><%obj_dir%><%dirname(resource_file)%>
+ @$(TESTDIRSTART) "<%targetoutdir%><%obj_dir%><%dirname(resource_file)%>" $(TESTDIREND) $(MKDIR) "<%targetoutdir%><%obj_dir%><%dirname(resource_file)%>"
<%endif%>
<%rc%><%foreach(includes)%> -I<%include%><%endfor%> <%resource_file%> <%targetoutdir%><%obj_dir%><%resource_file%>$(RESEXT)
diff --git a/templates/makedll.mpt b/templates/makedll.mpt
index cc34bdef..bce50d99 100644
--- a/templates/makedll.mpt
+++ b/templates/makedll.mpt
@@ -305,19 +305,21 @@ cygwin {
}
mingw {
- versupport =
- lib_prefix =
- dll_ext = .dll
- lib_ext = .lib
- exe_ext = .exe
- ldlibs = -lwsock32 -lnetapi32
- rc = rc
- devnull = nul
- delete = del /f/s/q
- type = type
- copy = copy /y
- makedir = mkdir
- move = move /y
+ versupport =
+ lib_prefix =
+ dll_ext = .dll
+ lib_ext = .lib
+ exe_ext = .exe
+ ldlibs = -lwsock32 -lnetapi32
+ rc = rc
+ devnull = nul
+ delete = del /f/s/q
+ type = type
+ copy = copy /y
+ makedir = mkdir
+ move = move /y
+ testdirstart = if not exist
+ testdirend =
}
dmc_win {
@@ -335,6 +337,8 @@ dmc_win {
makedir = mkdir
move = move /y
supports_include =
+ testdirstart = if not exist
+ testdirend =
}
tandem {
diff --git a/templates/vc8csharp.mpd b/templates/vc8csharp.mpd
index efa2d871..365f2977 100644
--- a/templates/vc8csharp.mpd
+++ b/templates/vc8csharp.mpd
@@ -77,6 +77,9 @@
<%endfor%>
<%endfor%>
<ItemGroup>
+<%if(after)%>
+ <!-- MPC ADD DEPENDENCIES -->
+<%endif%>
<%foreach(libs)%>
<Reference Include="<%libname_prefix%><%lib%>">
<Name><%libname_prefix%><%lib%></Name>
diff --git a/templates/vc8java.mpd b/templates/vc8java.mpd
index 1acc8dbb..c8de6bb0 100644
--- a/templates/vc8java.mpd
+++ b/templates/vc8java.mpd
@@ -63,6 +63,9 @@
<%endfor%>
<%endfor%>
<ItemGroup>
+<%if(after)%>
+ <!-- MPC ADD DEPENDENCIES -->
+<%endif%>
<%foreach(libs)%>
<Reference Include="<%libname_prefix%><%lib%>">
<Name><%libname_prefix%><%lib%></Name>
diff --git a/templates/vc8vb.mpd b/templates/vc8vb.mpd
index eb032d4b..0e86376a 100755
--- a/templates/vc8vb.mpd
+++ b/templates/vc8vb.mpd
@@ -73,6 +73,9 @@
<%endfor%>
<%endfor%>
<ItemGroup>
+<%if(after)%>
+ <!-- MPC ADD DEPENDENCIES -->
+<%endif%>
<%foreach(libs)%>
<Reference Include="<%libname_prefix%><%lib%>">
<Name><%libname_prefix%><%lib%></Name>