You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/03/23 16:25:10 UTC
svn commit: r926613 - in /subversion/trunk/build/generator: gen_win.py
templates/vcnet_vcproj.ezt templates/vcnet_vcxproj.ezt
Author: rhuijben
Date: Tue Mar 23 15:25:10 2010
New Revision: 926613
URL: http://svn.apache.org/viewvc?rev=926613&view=rev
Log:
Add some more usefull command output than 'Performing Custom Build' on
compiling java files from Visual Studio/MSBuild.
* build/generator/gen_win.py
(get_proj_sources): Fix scope of a few variables and generate a
description to pass to the custom build.
* build/generator/templates/vcnet_vcproj.ezt
* build/generator/templates/vcnet_vcxproj.ezt
(*): Apply custom description.
Modified:
subversion/trunk/build/generator/gen_win.py
subversion/trunk/build/generator/templates/vcnet_vcproj.ezt
subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt
Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=926613&r1=926612&r2=926613&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue Mar 23 15:25:10 2010
@@ -480,9 +480,10 @@ class WinGeneratorBase(GeneratorBase):
jar_exe = os.path.join(self.jdk_path, "bin", jar_exe)
if not isinstance(target, gen_base.TargetProject):
- cbuild = None
- ctarget = None
for source, object, reldir in self.get_win_sources(target):
+ cbuild = None
+ ctarget = None
+ cdesc = None
if isinstance(target, gen_base.TargetJavaHeaders):
classes = self.path(target.classes)
if self.junit_path is not None:
@@ -496,6 +497,7 @@ class WinGeneratorBase(GeneratorBase):
self.quote(headers), classname)
ctarget = self.path(object.filename_win)
+ cdesc = "Generating %s" % (object.filename_win)
elif isinstance(target, gen_base.TargetJavaClasses):
classes = targetdir = self.path(target.classes)
@@ -510,6 +512,7 @@ class WinGeneratorBase(GeneratorBase):
targetdir, sourcepath)))
ctarget = self.path(object.filename)
+ cdesc = "Compiling %s" % (source)
rsrc = self.path(str(source))
if quote_path and '-' in rsrc:
@@ -517,6 +520,7 @@ class WinGeneratorBase(GeneratorBase):
sources.append(ProjectItem(path=rsrc, reldir=reldir, user_deps=[],
custom_build=cbuild, custom_target=ctarget,
+ custom_desc=cdesc,
extension=os.path.splitext(rsrc)[1]))
if isinstance(target, gen_base.TargetJavaClasses) and target.jar:
Modified: subversion/trunk/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/vcnet_vcproj.ezt?rev=926613&r1=926612&r2=926613&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/trunk/build/generator/templates/vcnet_vcproj.ezt Tue Mar 23 15:25:10 2010
@@ -128,7 +128,8 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="[sources.custom_build]"
- AdditionalDependencies="[for sources.user_deps]"[sources.user_deps]";[end]"
+[is sources.custom_desc ""][else] Description="[sources.custom_desc]"
+[end] AdditionalDependencies="[for sources.user_deps]"[sources.user_deps]";[end]"
Outputs=""[sources.custom_target]""/>
</FileConfiguration>
[end][end][end]
Modified: subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt?rev=926613&r1=926612&r2=926613&view=diff
==============================================================================
--- subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt Tue Mar 23 15:25:10 2010
@@ -91,7 +91,8 @@
[for configs][for platforms] <Command Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_build]</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[for sources.user_deps][sources.user_deps];[end]%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_target];%(Outputs)</Outputs>
-[end][end] </CustomBuild>
+[is sources.custom_desc ""][else]<Message Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_desc]</Message>
+[end][end][end] </CustomBuild>
[else][is sources.extension ".c"] <ClCompile Include="[sources.path]" />
[else][is sources.extension ".cpp"] <ClCompile Include="[sources.path]" />
[else] <None Include="[sources.path]" />
RE: svn commit: r926613 - in /subversion/trunk/build/generator: gen_win.py templates/vcnet_vcproj.ezt templates/vcnet_vcxproj.ezt
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Greg Stein [mailto:gstein@gmail.com]
> Sent: dinsdag 23 maart 2010 22:00
> To: dev@subversion.apache.org
> Subject: Re: svn commit: r926613 - in
> /subversion/trunk/build/generator: gen_win.py
> templates/vcnet_vcproj.ezt templates/vcnet_vcxproj.ezt
>
> On Tue, Mar 23, 2010 at 11:25, <rh...@apache.org> wrote:
> >...
> > +++ subversion/trunk/build/generator/templates/vcnet_vcproj.ezt Tue
> Mar 23 15:25:10 2010
> > @@ -128,7 +128,8 @@
> > <Tool
> > Name="VCCustomBuildTool"
> >
> CommandLine="[sources.custom_build]"
> > - AdditionalDependencies="[for
> sources.user_deps]"[sources.user_deps]";[end]"
> > +[is sources.custom_desc ""][else]
> Description="[sources.custom_desc]"
> > +[end] AdditionalDependencies="[for
> sources.user_deps]"[sources.user_deps]";[end]"
>
> That's an ugly construction. Just use:
>
> [if-any sources.custom_desc]...[end]
Thanks, r926847.
Bert
Re: svn commit: r926613 - in /subversion/trunk/build/generator:
gen_win.py templates/vcnet_vcproj.ezt templates/vcnet_vcxproj.ezt
Posted by Greg Stein <gs...@gmail.com>.
On Tue, Mar 23, 2010 at 11:25, <rh...@apache.org> wrote:
>...
> +++ subversion/trunk/build/generator/templates/vcnet_vcproj.ezt Tue Mar 23 15:25:10 2010
> @@ -128,7 +128,8 @@
> <Tool
> Name="VCCustomBuildTool"
> CommandLine="[sources.custom_build]"
> - AdditionalDependencies="[for sources.user_deps]"[sources.user_deps]";[end]"
> +[is sources.custom_desc ""][else] Description="[sources.custom_desc]"
> +[end] AdditionalDependencies="[for sources.user_deps]"[sources.user_deps]";[end]"
That's an ugly construction. Just use:
[if-any sources.custom_desc]...[end]
>...
> +++ subversion/trunk/build/generator/templates/vcnet_vcxproj.ezt Tue Mar 23 15:25:10 2010
> @@ -91,7 +91,8 @@
> [for configs][for platforms] <Command Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_build]</Command>
> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[for sources.user_deps][sources.user_deps];[end]%(AdditionalInputs)</AdditionalInputs>
> <Outputs Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_target];%(Outputs)</Outputs>
> -[end][end] </CustomBuild>
> +[is sources.custom_desc ""][else]<Message Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_desc]</Message>
> +[end][end][end] </CustomBuild>
Same.
>...
Cheers,
-g