diff options
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/vstudio/_vstudio.lua | 53 | ||||
| -rw-r--r-- | src/actions/vstudio/vs2005_csproj.lua | 22 |
2 files changed, 39 insertions, 36 deletions
diff --git a/src/actions/vstudio/_vstudio.lua b/src/actions/vstudio/_vstudio.lua index 4976508..d0b75d4 100644 --- a/src/actions/vstudio/_vstudio.lua +++ b/src/actions/vstudio/_vstudio.lua @@ -142,17 +142,20 @@ local fname = premake.project.getfilename(prj, "%%") os.remove(fname .. ".vcproj") - os.remove(fname .. ".vcproj.user") os.remove(fname .. ".vcxproj") - os.remove(fname .. ".vcxproj.user") os.remove(fname .. ".vcxproj.filters") os.remove(fname .. ".csproj") - os.remove(fname .. ".csproj.user") os.remove(fname .. ".pidb") os.remove(fname .. ".sdf") + + if _OPTIONS.generate_user then + os.remove(fname .. ".vcproj.user") + os.remove(fname .. ".vcxproj.user") + os.remove(fname .. ".csproj.user") + end end function vstudio.cleantarget(name) @@ -222,10 +225,14 @@ onproject = function(prj) if premake.isdotnetproject(prj) then premake.generate(prj, "%%.csproj", vstudio.cs2002.generate) - premake.generate(prj, "%%.csproj.user", vstudio.cs2002.generate_user) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.csproj.user", vstudio.cs2002.generate_user) + end else premake.generate(prj, "%%.vcproj", vstudio.vc200x.generate) - premake.generate(prj, "%%.vcproj.user", vstudio.vc200x.generate_user) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.vcproj.user", vstudio.vc200x.generate_user) + end end end, @@ -263,10 +270,14 @@ onproject = function(prj) if premake.isdotnetproject(prj) then premake.generate(prj, "%%.csproj", vstudio.cs2002.generate) - premake.generate(prj, "%%.csproj.user", vstudio.cs2002.generate_user) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.csproj.user", vstudio.cs2002.generate_user) + end else premake.generate(prj, "%%.vcproj", vstudio.vc200x.generate) - premake.generate(prj, "%%.vcproj.user", vstudio.vc200x.generate_user) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.vcproj.user", vstudio.vc200x.generate_user) + end end end, @@ -304,10 +315,14 @@ onproject = function(prj) if premake.isdotnetproject(prj) then premake.generate(prj, "%%.csproj", vstudio.cs2005.generate) - premake.generate(prj, "%%.csproj.user", vstudio.cs2005.generate_user) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.csproj.user", vstudio.cs2005.generate_user) + end else premake.generate(prj, "%%.vcproj", vstudio.vc200x.generate) - premake.generate(prj, "%%.vcproj.user", vstudio.vc200x.generate_user) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.vcproj.user", vstudio.vc200x.generate_user) + end end end, @@ -347,10 +362,14 @@ onproject = function(prj) if premake.isdotnetproject(prj) then premake.generate(prj, "%%.csproj", vstudio.cs2005.generate) - premake.generate(prj, "%%.csproj.user", vstudio.cs2005.generate_user) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.csproj.user", vstudio.cs2005.generate_user) + end else premake.generate(prj, "%%.vcproj", vstudio.vc200x.generate) - premake.generate(prj, "%%.vcproj.user", vstudio.vc200x.generate_user) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.vcproj.user", vstudio.vc200x.generate_user) + end end end, @@ -393,11 +412,15 @@ onproject = function(prj) if premake.isdotnetproject(prj) then premake.generate(prj, "%%.csproj", vstudio.cs2005.generate) - premake.generate(prj, "%%.csproj.user", vstudio.cs2005.generate_user) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.csproj.user", vstudio.cs2005.generate_user) + end else - premake.generate(prj, "%%.vcxproj", premake.vs2010_vcxproj) - premake.generate(prj, "%%.vcxproj.user", premake.vs2010_vcxproj_user) - premake.generate(prj, "%%.vcxproj.filters", vstudio.vc2010.generate_filters) + premake.generate(prj, "%%.vcxproj", premake.vs2010_vcxproj) + if _OPTIONS.generate_user then + premake.generate(prj, "%%.vcxproj.user", premake.vs2010_vcxproj_user) + end + premake.generate(prj, "%%.vcxproj.filters", vstudio.vc2010.generate_filters) end end, diff --git a/src/actions/vstudio/vs2005_csproj.lua b/src/actions/vstudio/vs2005_csproj.lua index 6b6238c..afa3710 100644 --- a/src/actions/vstudio/vs2005_csproj.lua +++ b/src/actions/vstudio/vs2005_csproj.lua @@ -38,7 +38,7 @@ local basename = fname:sub(1, -9)
local testname = basename .. ".xaml"
if premake.findfile(prj, testname) then
- return "SubTypeCode", path.getname(testname)
+ return "SubTypeCode", testname
end
else
-- is there a *.Designer.cs file?
@@ -207,23 +207,6 @@ end
end
---
--- Write the build events groups.
---
-
- function cs2005.buildevents(cfg)
- if #cfg.prebuildcommands > 0 then - _p(' <PropertyGroup>')
- _p(' <PreBuildEvent>%s</PreBuildEvent>', premake.esc(table.implode(cfg.prebuildcommands, "", "", "\r\n")))
- _p(' </PropertyGroup>')
- end - if #cfg.postbuildcommands > 0 then - _p(' <PropertyGroup>')
- _p(' <PostBuildEvent>%s</PostBuildEvent>', premake.esc(table.implode(cfg.postbuildcommands, "", "", "\r\n")))
- _p(' </PropertyGroup>')
- end - end
-
--
-- The main function: write the project file.
@@ -282,9 +265,6 @@ local msbuild = iif(_ACTION < "vs2012", "Bin", "Tools")
_p(' <Import Project="$(MSBuild%sPath)\\Microsoft.CSharp.targets" />', msbuild)
- -- build events
- cs2005.buildevents(prj)
-
_p(' <!-- To modify your build process, add your task inside one of the targets below and uncomment it.')
_p(' Other similar extension points exist, see Microsoft.Common.targets.')
_p(' <Target Name="BeforeBuild">')
|