uppercutbuild 1.3.0.0 → 1.4.0.0

data/lib/build/gemsBuild.step

@@ -34,53 +34,28 @@
   <property name="version.revision" value="0" overwrite="false" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
   
-  <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="false" />
 
   <target name="go" depends="run_tasks" if="${folder.gems.exists}" />
 
   <target name="run_tasks" if="${folder.gems.exists}">
-    <echo message="Running ${project::get-name()} tasks." />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <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="build_gem, remove_gem_files"
           description="Building gems." />
 
-  <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="build_gem">
-    <echo message="Finding and building all gems in ${dirs.drop.gems}."/>
+    <echo level="Warning" message="Finding and building all gems in ${dirs.drop.gems}."/>
     <foreach item="File" property="spec.file">
       <in>
         <items>
@@ -107,15 +82,4 @@
     </delete>
   </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>

data/lib/build/gemsPrepare.step

@@ -41,21 +41,20 @@
   <property name="gem.build.date" value="20100801" overwrite="false" />
   <property name="file.gems.version" value="${dirs.drop.gems}${path.separator}VERSION" />
   
-  
-  <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="false" />
 
   <target name="go" depends="run_tasks" if="${folder.gems.exists}" />
 
   <target name="run_tasks" if="${folder.gems.exists}">
-    <echo message="Running ${project::get-name()} tasks." />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <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"
@@ -63,38 +62,13 @@
           description="Packaging gems." />
 
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.drop.gems}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.drop.gems}."/>
     <delete dir="${dirs.drop.gems}" failonerror="false" />
     <mkdir dir="${dirs.drop.gems}" />
   </target>
 
-  <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="copy_gems_folder">
-    <echo message="Packaging gem specifications and special files from ${dirs.gems} to ${dirs.drop.gems}."/>
+    <echo level="Warning" message="Packaging gem specifications and special files from ${dirs.gems} to ${dirs.drop.gems}."/>
     <copy todir="${dirs.drop.gems}">
       <fileset basedir="${dirs.gems}">
         <include name="**/**" />
@@ -103,7 +77,7 @@
   </target>
   
   <target name="copy_app_drop_to_lib_folder">
-    <echo message="Packaging application gem pieces into ${dirs.drop.gems}${path.separator}lib from ${dirs.drop}${path.separator}${folder.app.drop}."/>
+    <echo level="Warning" message="Packaging application gem pieces into ${dirs.drop.gems}${path.separator}lib from ${dirs.drop}${path.separator}${folder.app.drop}."/>
     <copy todir="${dirs.drop.gems}${path.separator}lib">
       <fileset basedir="${dirs.drop}${path.separator}${folder.app.drop}">
         <include name="**/**" />
@@ -112,7 +86,7 @@
   </target>
   
   <target name="copy_docs_to_doc_folder">
-    <echo message="Packaging docs to ${dirs.drop.gems}${path.separator}docs."/>
+    <echo level="Warning" message="Packaging docs to ${dirs.drop.gems}${path.separator}docs."/>
     <copy todir="${dirs.drop.gems}${path.separator}docs" failonerror="false">
       <fileset basedir="${dirs.drop}${path.separator}${folder.documentation}">
         <include name="**/**" />
@@ -121,10 +95,10 @@
   </target>
   
   <target name="copy_notices_to_doc_folder">
-    <echo message="Packaging readme file to ${dirs.drop.gems}${path.separator}docs."/>
+    <echo level="Warning" message="Packaging readme file to ${dirs.drop.gems}${path.separator}docs."/>
     <copy file="${dirs.current}${path.separator}..${path.separator}README.markdown" tofile="${dirs.drop.gems}${path.separator}docs${path.separator}README" failonerror="false" />
     
-    <echo message="Packaging other legal stuff to ${dirs.drop.gems}${path.separator}docs."/>
+    <echo level="Warning" message="Packaging other legal stuff to ${dirs.drop.gems}${path.separator}docs."/>
     <copy todir="${dirs.drop.gems}${path.separator}docs" failonerror="false">
       <fileset basedir="${dirs.drop}${path.separator}LEGAL">
         <include name="**/*" />
@@ -144,21 +118,10 @@
   </target>
   
   <target name="generate_version_file">
-    <echo message="Generating ${file.gems.version} with ${assembly.version.full}${version.gem.suffix} for the version" if="${not use.gem.build_date}" />
-    <echo file="${file.gems.version}" if="${not use.gem.build_date}" append="false" failonerror="false">${assembly.version.full}${version.gem.suffix}</echo>
-    <echo message="Generating ${file.gems.version} with ${assembly.version.full}.${gem.build.date}${version.gem.suffix} for the version" if="${use.gem.build_date}" />
-    <echo file="${file.gems.version}" if="${use.gem.build_date}" append="false" failonerror="false">${assembly.version.full}.${gem.build.date}${version.gem.suffix}</echo>
+    <echo level="Warning" message="Generating ${file.gems.version} with ${assembly.version.full}${version.gem.suffix} for the version" if="${not use.gem.build_date}" />
+    <echo level="Warning" file="${file.gems.version}" if="${not use.gem.build_date}" append="false" failonerror="false">${assembly.version.full}${version.gem.suffix}</echo>
+    <echo level="Warning" message="Generating ${file.gems.version} with ${assembly.version.full}.${gem.build.date}${version.gem.suffix} for the version" if="${use.gem.build_date}" />
+    <echo level="Warning" file="${file.gems.version}" if="${use.gem.build_date}" append="false" failonerror="false">${assembly.version.full}.${gem.build.date}${version.gem.suffix}</echo>
   </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>

data/lib/build/generateBuildInfo.step

@@ -29,55 +29,30 @@
   <property name="msbuild.configuration" value="Release" overwrite="false" />
   <property name="msbuild.platform" value="Any CPU" overwrite="false" />
   <property name="version.uppercut" value="0" overwrite="false" />
-  <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="false" />
 
   <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="generate_build_info_file"
           description="Generating Build Information File." />
 
-  <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="generate_build_info_file">
-    <echo message="Generating XML file with some information to possibly get merged in at ${file.build_info}."/>
-    <echo file="${file.build_info}" append="false" failonerror="false">
+    <echo level="Warning" message="Generating XML file with some information to possibly get merged in at ${file.build_info}."/>
+    <echo level="Warning" file="${file.build_info}" append="false" failonerror="false">
       <![CDATA[<?xml version="1.0" ?>
 <buildInfo>
   <projectName>${project.name}</projectName>
@@ -97,15 +72,4 @@
     </echo>
   </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>

data/lib/build/ilmerge.build

@@ -20,6 +20,8 @@
   <property name="log.merge" value="ilmerge.log" />
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
   <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${file.uppercut.assembly}" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
 
   <property name="dirs.merge.from" value="${dirs.drop}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="dirs.merge.to" value="${dirs.drop}${path.separator}merge" overwrite="false" />
@@ -32,53 +34,27 @@
   <property name="args.ilmerge" value="/internalize /target:${merge.target.type} /out:${dirs.merge.to}${path.separator}${file.merge.name} /log:${dirs.merge.log}${path.separator}${log.merge} /xmldocs /ndebug /allowDup ${file.merge.name} " />
   <property name="args.ilmerge" value="/internalize:${path.file.internalize.ignore} /target:${merge.target.type} /out:${dirs.merge.to}${path.separator}${file.merge.name} /log:${dirs.merge.log}${path.separator}${log.merge} /xmldocs /ndebug /allowDup ${file.merge.name} " if="${file::exists(path.file.internalize.ignore)}"/>
 
-  <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.build" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.build" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.build" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
-  <target name="go" depends="load_uppercut_assemblies, allow_powershell_unrestricted, run_tasks" />
+  <target name="go" depends="load_uppercut_assemblies, 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="set_environment_variables, error_check, get_regular_dlls, run_ilmerge, copy_configs, remove_unneeded_assemblies, copy_from_merge, delete_merge_folder"
           description="Running ILMerge with UppercuT default.build." />
 
-  <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="set_environment_variables">
     <property name="dirs.merge.from" value="${environment::get-variable('uc.dirs.merge.from')}" if="${environment::variable-exists('uc.dirs.merge.from')}" />
     <property name="dirs.merge.to" value="${environment::get-variable('uc.dirs.merge.to')}" if="${environment::variable-exists('uc.dirs.merge.to')}" />
@@ -99,7 +75,7 @@
   </target>
 
   <target name="get_regular_dlls">
-    <echo message="Getting output dlls based on name in directory ${path::get-full-path(dirs.merge.from)}." />
+    <echo level="Warning" message="Getting output dlls based on name in directory ${path::get-full-path(dirs.merge.from)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -119,8 +95,8 @@
   </target>
 
   <target name="run_ilmerge">
-    <echo message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}${path.separator}${file.merge.name}. This will fail if all dependencies are not resolved."/>
-    <echo message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
+    <echo level="Warning" message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}${path.separator}${file.merge.name}. This will fail if all dependencies are not resolved."/>
+    <echo level="Warning" message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
     <exec program="${app.ilmerge}"
           workingdir="${dirs.merge.from}"
           commandline="${args.ilmerge}" />
@@ -135,7 +111,7 @@
   </target>
 
   <target name="remove_unneeded_assemblies">
-    <echo message="Removing unneeded assemblies before moving the merged assembly back into ${dirs.merge.from}."/>
+    <echo level="Warning" message="Removing unneeded assemblies before moving the merged assembly back into ${dirs.merge.from}."/>
     <delete>
       <fileset basedir="${dirs.merge.from}" >
         <include name="*.*" />
@@ -155,30 +131,8 @@
     <delete dir="${dirs.merge.to}" 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>
-
   <target name="load_uppercut_assemblies">
     <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
   </target>
-
-  <target name="allow_powershell_unrestricted">
-    <!-- powershell 1.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted" />
-    </exec>
-    <!-- powershell 2.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted -force -scope CurrentUser" />
-    </exec>
-  </target>
   
 </project>

data/lib/build/nugetBuild.step

@@ -46,55 +46,33 @@
   <target name="go" depends="run_tasks" if="${folder.nuget.exists and app.nuget.exists}" />
 
   <target name="run_tasks" if="${folder.nuget.exists}">
-    <echo message="Running ${project::get-name()} tasks." />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <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="build_nugget,remove_nuget_files"
           description="Building nuget." />
 
-  <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="build_nugget">
-    <echo message="Finding and building all nuggets in ${dirs.drop.nuget}."/>
+    <echo level="Warning" message="Finding and building all nuggets in ${dirs.drop.nuget}."/>
     <foreach item="File" property="spec.file">
       <in>
         <items>
-          <include name="${dirs.drop.nuget}${path.separator}*.nuspec" />
+          <include name="${dirs.drop.nuget}${path.separator}**${path.separator}*.nuspec" />
         </items>
       </in>
       <do>
-        <echo message="executing '${app.nuget} pack ${spec.file}'" />
+        <echo level="Warning" message="executing '${app.nuget} pack ${spec.file}'" />
         <exec 
           program="cmd" 
-          workingdir="${dirs.drop.nuget}"
+          workingdir="${directory::get-parent-directory(spec.file)}"
           failonerror="false">
             <arg value="/c ${app.nuget} pack ${spec.file}" />
         </exec>
@@ -105,21 +83,10 @@
   <target name="remove_nuget_files">
     <delete>
       <fileset basedir="${dirs.drop.nuget}" >
-        <exclude name="*.nupkg" />
+        <exclude name="**/*.nupkg" />
         <include name="**/*" />
       </fileset>
     </delete>
   </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>