lib/build/analyze.step in uppercutbuild-1.3.0.0 vs lib/build/analyze.step in uppercutbuild-1.4.0.0

- old
+ new

@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> -<project name="Analyzer" default="go"> +<project name="Analyzers" default="go"> <!-- Project UppercuT - http://projectuppercut.org --> <!-- DO NOT EDIT THIS FILE - Add custom tasks in BuildTasks.Custom folder with file by the same name - find out more at http://uppercut.pbwiki.com --> <property name="build.config.settings" value="__NONE__" overwrite="false" /> <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" /> <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" /> @@ -9,71 +9,36 @@ <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" /> <property name="path.to.toplevel" value=".." /> <property name="folder.build_scripts" value="build" overwrite="false" /> <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" /> <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" /> - <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" /> - <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" /> - <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" /> <property name="is.replaced" value="false" /> <property name="fail.build.on.error" value="true" /> <target name="go" depends="run_tasks" /> <target name="run_tasks"> - <echo message="Running ${project::get-name()} tasks." /> + <echo level="Warning" message="" /> + <echo level="Warning" message="====================" /> + <echo level="Warning" message="${project::get-name()}" /> + <echo level="Warning" message="====================" /> <call target="prepare" if="${target::exists('prepare')}" /> - <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}" /> - <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}" /> + <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" /> + <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" /> <call target="run_normal_tasks" if="${not is.replaced}" /> - <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" /> + <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" /> </target> <target name="run_normal_tasks" depends="run_analyzers" description="Analyzing project for quality indicators." /> - <target name="custom_tasks_before"> - <echo message="Running custom tasks if ${file.custom.step.before} exists." /> - <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" /> - <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}"> - <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" /> - </exec> - <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}"> - <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" /> - </exec> - </target> - - <target name="custom_tasks_replace"> - <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." /> - <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" /> - <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" /> - <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" /> - <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" > - <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" /> - </exec> - <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" /> - <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" > - <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" /> - </exec> - </target> - <target name="run_analyzers"> <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}test.step" inheritall="true" /> <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}ncover.step" inheritall="true" failonerror="false" /> <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}ndepend.step" inheritall="true" failonerror="false" /> <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}nitriq.step" inheritall="true" failonerror="false" /> + <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}metrics.step" inheritall="true" failonerror="false" /> <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}moma.step" inheritall="true" failonerror="false" /> - </target> - - <target name="custom_tasks_after"> - <echo message="Running custom tasks if ${file.custom.step.after} exists." /> - <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" /> - <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" > - <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" /> - </exec> - <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" > - <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" /> - </exec> </target> </project> \ No newline at end of file