diff options
author | James H. Hill <hilljh82@gmail.com> | 2006-03-27 18:39:37 +0000 |
---|---|---|
committer | James H. Hill <hilljh82@gmail.com> | 2006-03-27 18:39:37 +0000 |
commit | d17b31cb5bf26a9e39ea280d264d58d38978dad6 (patch) | |
tree | a4cb4e34dfc691076e637cc98a9a37a636bac91e | |
parent | 2299cadf1373bebde2a3764fdd417795cfa09113 (diff) | |
download | MPC-d17b31cb5bf26a9e39ea280d264d58d38978dad6.tar.gz |
Mon Mar 27 17:00:31 UTC 2006 James H. Hill <hillj@isis.vanderbilt.edu>
-rw-r--r-- | ChangeLog | 17 | ||||
-rw-r--r-- | modules/ProjectCreator.pm | 2 | ||||
-rw-r--r-- | templates/vc7csharp.mpd | 6 | ||||
-rw-r--r-- | templates/vc7vb.mpd | 8 | ||||
-rw-r--r-- | templates/vc8csharp.mpd | 3 |
5 files changed, 35 insertions, 1 deletions
@@ -1,3 +1,20 @@ +Mon Mar 27 17:00:31 UTC 2006 James H. Hill <hillj@isis.vanderbilt.edu> + + * modules/ProjectCreator.pm: + + Added support of ASP.NET project files (.aspx files) to both + Visual Basic and C# project. + + * templates/vc7vb.mpd: + + - Changed default extension for resx files from .cs to .vb + - Added template code to correctly handle .aspx files + + * templates/vc7csharp.mpd: + * templates/vc8csharp.mpd: + + - Added template code to correctly handle .aspx files + Thu Mar 23 14:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> If linkflags contains -aa then generate option.aa.enabled as 1 diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index 3279938b..dd37ba4c 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -168,6 +168,7 @@ my(%cppec) = ('source_files' => $cppvc{'template_files'}, my(%csvc) = ('source_files' => [ "\\.cs" ], 'config_files' => [ "\\.config" ], 'resx_files' => [ "\\.resx" ], + 'aspx_files' => [ "\\.aspx" ], 'ico_files' => [ "\\.ico" ], 'documentation_files' => [ "README", "readme", "\\.doc", "\\.txt", "\\.html" ], ); @@ -192,6 +193,7 @@ my(%jvc) = ('source_files' => [ "\\.java" ], my(%vbvc) = ('source_files' => [ "\\.vb" ], 'config_files' => [ "\\.config" ], 'resx_files' => [ "\\.resx" ], + 'aspx_files' => [ "\\.aspx" ], 'ico_files' => [ "\\.ico" ], 'documentation_files' => [ "README", "readme", "\\.doc", "\\.txt", "\\.html" ], ); diff --git a/templates/vc7csharp.mpd b/templates/vc7csharp.mpd index 229bbb14..dc9d1693 100644 --- a/templates/vc7csharp.mpd +++ b/templates/vc7csharp.mpd @@ -110,6 +110,12 @@ <%endif%> <%endfor%> <%endfor%> +<%foreach(aspx_files)%> + <File + RelPath = "<%aspx_file%>" + BuildAction = "Content" + /> +<%endfor%> <%foreach(ico_files)%> <File RelPath = "<%ico_file%>" diff --git a/templates/vc7vb.mpd b/templates/vc7vb.mpd index addc256b..f888781d 100644 --- a/templates/vc7vb.mpd +++ b/templates/vc7vb.mpd @@ -91,7 +91,7 @@ <%foreach(resx_files)%> <File RelPath = "<%resx_file%>" - DependentUpon = "<%noextension(resx_file)%>.cs" + DependentUpon = "<%noextension(resx_file)%>.vb" BuildAction = "EmbeddedResource" /> <%endfor%> @@ -106,6 +106,12 @@ <%endif%> <%endfor%> <%endfor%> +<%foreach(aspx_files)%> + <File + RelPath = "<%aspx_file%>" + BuildAction = "Content" + /> +<%endfor%> <%foreach(ico_files)%> <File RelPath = "<%ico_file%>" diff --git a/templates/vc8csharp.mpd b/templates/vc8csharp.mpd index 4a7de84e..06115212 100644 --- a/templates/vc8csharp.mpd +++ b/templates/vc8csharp.mpd @@ -92,6 +92,9 @@ <SubType><%if(flag_overrides(source_file, subtype))%><%flag_overrides(source_file, subtype)%><%else%>Code<%endif%></SubType> </Compile> <%endfor%> +<%foreach(aspx_files)%> + <Content Include="<%aspx_file%>" /> +<%endfor%> <%foreach(ico_files)%> <Content Include="<%ico_file%>" /> <%endfor%> |