uppercutbuild 1.4.0.0 → 1.4.1.0

data/lib/build/package.step

@@ -6,15 +6,15 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="package" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
@@ -123,7 +123,7 @@
   <target name="reports">
     <echo level="Warning" message="Packaging reports to ${dirs.drop}${path.separator}${folder.reports}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.reports}">
-      <fileset basedir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.reports}">
+      <fileset basedir="${dirs.current}${path.separator}${folder.reports}">
         <exclude name="**${path.separator}*.template" />
         <include name="**/*.*" />
       </fileset>
@@ -133,7 +133,7 @@
   <target name="file_server">
     <echo level="Warning" message="Packaging file server items to ${dirs.drop}${path.separator}${folder.file_server}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.file_server}">
-      <fileset basedir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.file_server}">
+      <fileset basedir="${dirs.current}${path.separator}${folder.file_server}">
         <exclude name="**${path.separator}*.template" />
         <include name="**/*.*" />
       </fileset>
@@ -159,7 +159,7 @@
   <target name="deployment_scripts">
     <echo level="Warning" message="Packaging deployment scripts to ${dirs.drop}${path.separator}${folder.deployment}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.deployment}">
-      <fileset basedir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.deployment}">
+      <fileset basedir="${dirs.current}${path.separator}${folder.deployment}">
         <exclude name="**${path.separator}*.template" />
         <exclude name="templates${path.separator}**" />
         <include name="**/*.*" />
@@ -170,7 +170,7 @@
   <target name="settings_files">
     <echo level="Warning" message="Packaging settings files to ${dirs.drop}${path.separator}${folder.settings}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.settings}">
-      <fileset basedir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.settings}">
+      <fileset basedir="${dirs.current}${path.separator}${folder.settings}">
         <include name="**/*.settings" />
       </fileset>
     </copy>

data/lib/build/policyChecks.step

@@ -6,13 +6,13 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="policyChecks" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.documentation" value="docs" overwrite="false" />
-  <property name="dirs.docs" value="${path::get-full-path(dirs.current)}${path.separator}${path.to.toplevel}${path.separator}${folder.documentation}" />
+  <property name="dirs.docs" value="${path::get-full-path(dirs.current)}${path.separator}${folder.documentation}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="file.installation_document" value="${dirs.docs}${path.separator}Installation${path.separator}Install.docx" overwrite="false" />
   <property name="fail.if_no_installation_document" value="false" overwrite="false" />

data/lib/build/updateAssemblies.build

@@ -6,18 +6,18 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="updateAssemblies" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${folder.build_scripts_custom}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
-  <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${file.uppercut.assembly}" />
-  <property name="dirs.assemblies" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}assemblies" overwrite="false" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
+  <property name="dirs.assemblies" value="${dirs.current}${path.separator}assemblies" overwrite="false" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
   <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />

data/lib/build/versionBuilder.step

@@ -6,20 +6,20 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="versionBuilder" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="company.name" value="__COMPANY_NAME__" overwrite="false" />
   <property name="path_to_solution" value="." overwrite="false" />
   <property name="language.short" value="cs" overwrite="false" />
   <property name="language.long" value="CSharp" />
   <property name="file.version" value="SolutionVersion.${language.short}" overwrite="false" />
-  <property name="path.file.version" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${path_to_solution}${path.separator}${file.version}" overwrite="false" />
+  <property name="path.file.version" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${file.version}" overwrite="false" />
   <property name="version.use_semanticversioning" value="false" overwrite="false" />
   <property name="version.major" value="1" overwrite="false" />
   <property name="version.minor" value="0" overwrite="false" />
@@ -34,8 +34,8 @@
   <property name="sign.key.use_relative_pathing" value="false" overwrite="false" />
   <property name="sign.key.relative_path_from_projects" value="..${path.separator}..${path.separator}" overwrite="false" />
   <property name="app.strongname" value="C:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin\sn.exe" overwrite="false" />
-  <property name="file.key.name.private" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${project.name}.snk" overwrite="false" />
-  <property name="file.key.name.private" value="${path.to.toplevel}${path.separator}${project.name}.snk" overwrite="false" if="${sign.key.use_relative_pathing}" />
+  <property name="file.key.name.private" value="${dirs.current}${path.separator}${project.name}.snk" overwrite="false" />
+  <property name="file.key.name.private" value="${project.name}.snk" overwrite="false" if="${sign.key.use_relative_pathing}" />
   <property name="file.key.name.public" value="${dirs.build}${path.separator}public.${project.name}.snk" overwrite="false" />
   <property name="obfuscate" value="false" overwrite="false" />
 

data/lib/build/versioners/git.step

@@ -6,11 +6,11 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="git" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom${path.separator}" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="version.hash" value="0" overwrite="false" />
@@ -36,11 +36,11 @@
           description="Generating Assembly File." />
 
   <target name="get_revision">
-    <echo level="Warning" message="Getting revision number from working directory ${directory::get-parent-directory(dirs.current)} or remotely at ${repository.path}."/>
+    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}' or remotely at ${repository.path}."/>
     <!-- try to update the revision -->
     <getVersionFromGit
       gitExecutableWithPath="git"
-      repoDirectory="."
+      repoDirectory="${dirs.current}"
       repoPath="${repository.path}"
       output="_revision.xml"
       failonerror="false"

data/lib/build/versioners/hg.step

@@ -6,11 +6,11 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="hg" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom${path.separator}" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="version.hash" value="0" overwrite="false" />
@@ -36,11 +36,11 @@
           description="Generating Assembly File." />
 
   <target name="get_revision">
-    <echo level="Warning" message="Getting revision number from working directory ${directory::get-parent-directory(dirs.current)} or remotely at ${repository.path}."/>
+    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}' or remotely at ${repository.path}."/>
     <!-- try to update the revision -->
     <getVersionFromMercurial
       hgExecutableWithPath="hg"
-      repoDirectory="."
+      repoDirectory="${dirs.current}"
       repoPath="${repository.path}"
       output="_revision.xml"
       failonerror="false"

data/lib/build/versioners/svn.step

@@ -6,11 +6,11 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="svn" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom${path.separator}" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="is.replaced" value="false" />
@@ -35,11 +35,11 @@
           description="Generating Assembly File." />
 
   <target name="get_revision">
-    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}${path.separator}${path.to.toplevel}${path.separator}' or remotely at ${repository.path}."/>
+    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}' or remotely at ${repository.path}."/>
     <!-- try to update the revision -->
     <exec
       program="svn"
-      workingdir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}"
+      workingdir="${dirs.current}"
       commandline="info .\ --xml"
       output="_revision.xml"
       failonerror="false" />

data/lib/build/versioners/tfs.step

@@ -6,11 +6,11 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="tfs" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom${path.separator}" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="tfs.history.output" value="" overwrite="false" />
@@ -36,9 +36,10 @@
           description="Generating Assembly File." />
 
   <target name="get_revision">
+    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}' or remotely at ${repository.path}."/>
     <exec
        program="tf"
-       workingdir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}"
+       workingdir="${dirs.current}"
        commandline="history .\ /r /noprompt /stopafter:1 /version:W"
        output="_revision.xml"
        failonerror="false"/>

data/lib/build/zip.build

@@ -6,13 +6,13 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="zip" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <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="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="version.use_semanticversioning" value="false" overwrite="false" />
   <property name="version.major" value="1" overwrite="false" />
@@ -23,7 +23,7 @@
   <property name="version.hash" value="${version.revision}" overwrite="false" />
   <property name="version" value="0" />
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
-  <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${file.uppercut.assembly}" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
   <property name="zip.file" value="${dirs.drop}${path.separator}${project.name}.zip" />
   <property name="zip.file.rename" value="${dirs.drop}${path.separator}${project.name}.v${version}.zip" />
   <property name="is.replaced" value="false" />
@@ -84,12 +84,12 @@
   </target>
 
   <target name="get_revision">
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}svn.step" inheritall="true" if="${source_control_type=='svn'}" />
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}tfs.step" inheritall="true" if="${source_control_type=='tfs'}" />
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}git.step" inheritall="true" if="${source_control_type=='git'}" />
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}hg.step" inheritall="true" if="${source_control_type=='hg'}" failonerror="false" />
-    <!--<nant buildfile="${dirs.current}${path.separator}versioners${path.separator}vault.step" inheritall="true" if="${source_control_type=='vault'}" />-->
-    <!--<nant buildfile="${dirs.current}${path.separator}versioners${path.separator}vss.step" inheritall="true" if="${source_control_type=='vss'}" />-->
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}svn.step" inheritall="true" if="${source_control_type=='svn'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}tfs.step" inheritall="true" if="${source_control_type=='tfs'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}git.step" inheritall="true" if="${source_control_type=='git'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}hg.step" inheritall="true" if="${source_control_type=='hg'}" failonerror="false" />
+    <!--<nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}vault.step" inheritall="true" if="${source_control_type=='vault'}" />-->
+    <!--<nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}vss.step" inheritall="true" if="${source_control_type=='vss'}" />-->
 
     <property name="version.revision" value="${environment::get-variable('uc.app.revision')}" if="${environment::variable-exists('uc.app.revision')}" />
     <property name="version.revision" value="${environment::get-variable('BUILD_VCS_NUMBER')}" if="${version.revision == '0' and environment::variable-exists('BUILD_VCS_NUMBER')}" />

data/lib/open.bat

@@ -3,8 +3,9 @@
 ::Project UppercuT - http://uppercut.googlecode.com
 ::No edits to this file are required - http://uppercut.pbwiki.com
 
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
 
-%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:.\build\open.build -D:build.config.settings=%build.config.settings%
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:%BUILD_DIR%build\open.build -D:build.config.settings=%build.config.settings%

data/lib/test.bat

@@ -10,16 +10,17 @@ if '%1' == '-?' goto usage
 if '%1' == '?' goto usage
 if '%1' == '/help' goto usage
 
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
 
-%NANT% /f:.\build\compile.step -D:build.config.settings=%build.config.settings%
+%NANT% /f:%BUILD_DIR%build\compile.step -D:build.config.settings=%build.config.settings%
 
 if %ERRORLEVEL% NEQ 0 goto errors
 
-%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:.\build\analyzers\test.step %1 -D:build.config.settings=%build.config.settings%
-%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:.\build\analyzers\test.step open_results -D:build.config.settings=%build.config.settings%
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:%BUILD_DIR%build\analyzers\test.step %1 -D:build.config.settings=%build.config.settings%
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:%BUILD_DIR%build\analyzers\test.step open_results -D:build.config.settings=%build.config.settings%
 
 if %ERRORLEVEL% NEQ 0 goto errors
 

data/lib/zip.bat

@@ -3,15 +3,17 @@
 ::Project UppercuT - http://uppercut.googlecode.com
 ::No edits to this file are required - http://uppercut.pbwiki.com
 
-SET DIR=%~d0%~p0%
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+
 ::This is gone once teamcity can call multiple files
-call "%DIR%build.bat" %*
+call "%BUILD_DIR%build.bat" %*
 if %ERRORLEVEL% NEQ 0 goto errors
 
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
 
-%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:.\build\zip.build -D:build.config.settings=%build.config.settings% %*
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:%BUILD_DIR%build\zip.build -D:build.config.settings=%build.config.settings% %*
 
 if %ERRORLEVEL% NEQ 0 goto errors
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uppercutbuild
 version: !ruby/object:Gem::Version
-  version: 1.4.0.0
+  version: 1.4.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000 -05:00
+date: 2011-08-19 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &24624480 !ruby/object:Gem::Requirement
+  requirement: &26113380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: 0.13.8
   type: :runtime
   prerelease: false
-  version_requirements: *24624480
+  version_requirements: *26113380
 description: ! "UppercuT is THE conventional build for .NET!  \nUppercuT seeks to
   solve both maintenance concerns and ease of build to help you concentrate on what
   you really want to do: write code. Upgrading the build should take seconds, not
@@ -344,7 +344,6 @@ files:
 - docs/logo/UppercuT_Logo_Small.jpg
 - docs/logo/UppercuT_logo_small.png
 - docs/NOTICE
-- docs/README
 - docs/Samples/CC.NET/ReadMe.txt
 - docs/Samples/CC.NET/server/ccnet.config
 - docs/Samples/CC.NET/webdashboard/dashboard.config

data/docs/README

@@ -1,187 +0,0 @@
-Project UppercuT - Builds in Seconds, Not Days
-=======
-  
-![UppercuT](https://github.com/chucknorris/uppercut/raw/master/docs/logo/UppercuT_Logo_Small.jpg "UppercuT - insanely easy. Insanely.")  
-  
-# LICENSE
-Apache 2.0 - see docs/legal (just LEGAL in the zip folder)  
-  
-# IMPORTANT
-NOTE: If you are looking at the source - please run build.bat before opening the solution. It creates the SolutionVersion.cs file that is necessary for a successful build.  
-  
-# INFO
-## Overview
-UppercuT is a conventional automated .NET build framework (templated NAnt). UppercuT is the insanely easy to use build framework.  
-  
-It seeks to solve both maintenance concerns and ease of build to help you concentrate on what you really want to do: write code. Upgrading the build should take seconds, not hours. And that is where UppercuT will beat any other automated build system hands down.  
-  
-UppercuT uses conventions and has a simple configuration file for you to edit. Getting from zero to build takes literally less than five minutes. If you are still writing your own build scripts, you are working too hard.  
-  
-UppercuT is extremely powerful because it is customizable and extendable. Every step of the build process is customizable with a pre, post and replace hook.  
-  
-UppercuT is not a build server, but it integrates nicely with CruiseControl.NET, TeamCity, Hudson, etc.  
-  
-## Join the mailing list
- Ask questions - get answers - [http://groups.google.com/group/chucknorrisframework](http://groups.google.com/group/chucknorrisframework)  
-  
-## Getting started with UppercuT
-### Downloads
- You can download UppercuT from [http://code.google.com/p/uppercut/downloads/list](http://code.google.com/p/uppercut/downloads/list)
-  
- You can also obtain a copy from the build server at [http://teamcity.codebetter.com](http://teamcity.codebetter.com).
-  
-### Gems  
-If you have Ruby 1.8.6+ (and Gems 1.3.7+) installed, you can get the current release of UppercuT to your machine the fastest!  
-  
-1. Type 'gem install uppercutbuild'  
-2. At the top level directory (trunk or branch name) type 'uppercutbuild init' for bringing in uppercut for the first time or 'uppercutbuild upgrade' if you already uppercut and are just wanting to upgrade the build folder.   
-  
-### Source
-This is the best way to get to the bleeding edge of the code.  
-  
-1. Clone the source down to your machine.  
-  `git clone git://github.com/chucknorris/uppercut.git`  
-2. Type `cd uppercut`  
-3. Type `git config core.autocrlf false` to set line endings to auto convert for this repository  
-4. Type `git status`. You should not see any files to change.  
-5. Run `build.bat`. NOTE: You must have git on the path (open a regular command line and type git).  
-  
-# REQUIREMENTS
-* .NET Framework 3.5  
-* Source control on the command line and in PATH environment variable - svn for Subversion / tf for TFS / git for Git  
-
-# DONATE
-Donations Accepted - If you enjoy using this product or it has saved you time and money in some way, please consider making a donation.  
-It helps keep to the product updated, pays for site hosting, etc. https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4410250
-
-# RELEASE NOTES
-=1.x.x.x=  
-* Adding in support for StorEvil.  
-  
-==1.4.0.0==  
-* FIX: Issue 33 - Cannot build .NET 1.0 and 1.1 Solutions - see http://code.google.com/p/uppercut/issues/detail?id=33 for details. (412)  
-* Issue 37 - Enhancement: Add support for Microsoft's built-in code metrics. New settings have been added to the uppercut.config: <property name="app.metric" value="C:${path.separator}Program Files (x86)${path.separator}Microsoft Visual Studio 10.0${path.separator}Team Tools${path.separator}Static Analysis Tools${path.separator}FxCop${path.separator}Metrics.exe" overwrite="false" /> - see http://code.google.com/p/uppercut/issues/detail?id=37 for details. (410)  
-* Issue 34 - Enhancement: MSBuild output is logged for CC.NET to merge in - see http://code.google.com/p/uppercut/issues/detail?id=34 for details. (410)  
-* Issue 36 - Enhancement: Open creates SolutionVersion if missing - see http://code.google.com/p/uppercut/issues/detail?id=36 for details. (407)  
-* FIX: Issue 35 - Open fails on Windows platform when VSLauncher.exe is missing - see http://code.google.com/p/uppercut/issues/detail?id=35 for details. (407)  
-* Issue 28 - Enhancement: Allow setting of Ruby and PowerShell path via variable - see http://code.google.com/p/uppercut/issues/detail?id=28 for details. (405)  
-* Issue 38 - Enhancement - Pass properties to ruby/powershell extensions. New settings have been added to the uppercut.config: <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" /> and this setting has been removed: <property name="allow.powershell.unrestricted" value="false" overwrite="false" /> - see http://code.google.com/p/uppercut/issues/detail?id=38 for details. (404)  
-* Console Logging is very reduced with all detail to build.log. (400)  
-* Issue 32: Upgrade to NAnt 0.91 Alpha 2 - see http://code.google.com/p/uppercut/issues/detail?id=32 for details. (400)  
-* FIX: Settings file values should be able to have more than one other settings value token - see https://github.com/chucknorris/uppercut/issues/3 for details. (400)  
-* FIX : Nunit now generates a report when the tests fail. (399)  
-* FIX: Issue 31 - Log file copied to code_drop directory before build is complete - see http://code.google.com/p/uppercut/issues/detail?id=31 for details. (396)  
-* Issue 29 - Handle Readonly Files during build - allows you to build against source controls that mark files readonly (looking at you TFS) - see http://code.google.com/p/uppercut/issues/detail?id=29 for details. (396)  
-* FIX: Obfuscation should find files that are versioning with SemVer. (395)  
-* Allowing arguments to be passed into the build.bat file as pass through to nant. (389)  
-* NuGet support enhancements to allow subdirectories for building multiple nuget packages in a single solution. (388)  
-* Adding in _PublishedApplications known folder. - see http://code.google.com/p/uppercut/issues/detail?id=27 for details. (386)  
-  
-==1.3.0.0==  
-* Fix for spaces in the path when trying to resolve the revision for SVN - see http://code.google.com/p/uppercut/issues/detail?id=25 for details. (385)  
-* xUnit Support for automated testing. Will handle multiple test assemblies for you. (384)  
-  
-=1.2.0.0=  
-* NuGet Support. New settings have been added to the uppercut.config: <property name="app.nuget" value="..${path.separator}${folder.references}${path.separator}NuGet${path.separator}NuGet.exe" overwrite="false" /> and a tool that goes under the lib folder: NuGet  - see http://code.google.com/p/uppercut/issues/detail?id=20 for details. (378)  
-  
-=1.1.1.0=  
-* Including Eazfuscator in the output (375)  
-* Adding a build.log to the output of the build  - see http://code.google.com/p/uppercut/issues/detail?id=22 for details. (373)  
-  
-=1.1.0.0=  
-* Added support for obfuscation. New settings have been added to the uppercut.config: <property name="obfuscation" value="false" overwrite="false" /> <property name="app.eazfuscator" value="..${path.separator}${folder.references}${path.separator}Eazfuscator.NET${path.separator}Eazfuscator.NET.exe" overwrite="false" /> and a tool that goes under the lib folder: Eazfuscator.NET  - see http://code.google.com/p/uppercut/issues/detail?id=21 for details. (372)  
-  
-=1.0.6.0=  
-* Updating xbuild for use with 32bit windows machines. (369)  
-* Gallio NAnt tasks were not being loaded - see http://code.google.com/p/uppercut/issues/detail?id=17 for details. (368)  
-  
-=1.0.5.0=  
-* Now builds mono correctly on windows. (366)  
-  
-=1.0.4.0=  
-* Gems builds default to not using the build date as part of the version. A new setting has been added to the uppercut.config: <property name="use.gem.build_date" value="false" overwrite="false" /> (364)  
-* Gems builds now include a version suffix so you can be in prerelease mode or dev mode when using semantic versioning. A new setting has been added to the uppercut.config: <property name="version.gem.suffix" value="" overwrite="false" /> (364)  
-* ILMerge step now merges the xml documents together. (363)  
-  
-=1.0.3.0=  
-* Fixed a bug with path to solution no longer being respected at v1 after Linux patch. (361)  
-* Upgraded Mono Migration Analyzer to v2.6 (360)  
-  
-=1.0.2.0=  
-* Default versioning follows the old scheme. Semantic versioning is accomplished by adding this to your config file: <property name="version.use_semanticversioning" value="true" overwrite="false" /> (r357)  
-* Gem building failure will not fail the build. (r357)  
-* UppercuT reported version fix. (r357)  
-  
-=1.0.1.0=  
-* UppercuT has an option to use the old versioning as well. You need to add this to your config file: <property name="version.use_semanticversioning" value="false" overwrite="false" /> (r354)  
-* Linux fixes for opening items (from Svein Ackenhausen) (r355)  
-  
-=1.0.0.0=  
-* UppercuT now uses semantic versioning See http://SemVer.org for details. You need to add this to your config file: <property name="version.patch" value="0" overwrite="false" /> (r351)  
-* UppercuT now builds on Linux (patch from Svein Ackenhausen). (r350)  
-* Non multi targeting now works like it did before any of this multitargeting started. (r348)  
-  
-=0.9.0.346=  
-* Fixed general compile issues related to multi-targeting changes from last release (r346)  
-* Gems by default are now versioned with datestamp on the end (YYYYMMDD) (r342)  
-* Changed the default test framework to NUnit. (r340)  
-* Changed 'uppercutbuild install to 'uppercutbuild init' (r339)  
-  
-=0.9.0.337=  
-* ILMerge is now a step of the build process. Please check the configuration for the new setting. (r337)  
-* UppercuT now has the command 'uppercutbuild upgrade'. (r336)  
-* Zip will not include the gems folder. (r334)  
-* UppercuT (through gems) can copy UppercuT to a solution directory by issuing 'uppercutbuild install' at the top level directory (trunk or branch name). (r333)  
-  
-=0.9.0.328=  
-* Now supports building gems - see http://code.google.com/p/uppercut/issues/detail?id=16 for details.  (r328)  
-* The version hash for SVN and TFS should just use version.revision. (r321)  
-* General fix - when a step of the build process fails the build, any extensions or custom tasks related to it should also fail the build. (r319)  
-  
-=0.9.0.318=  
-* Nitriq support. Please check for a new setting in the config. (r317)  
-* OutputPath is configurable not to be overridden by UppercuT - see http://code.google.com/p/uppercut/issues/detail?id=15 for details.   Please check for a new setting in the config. (r316)  
-* Multi-targeting for building your product on several frameworks at once  - see http://code.google.com/p/uppercut/issues/detail?id=14 for details. (r316)  
-* Zip uses the version hash (which is only different if you are git or mercurial). (r313)  
-  
-=0.9.0.306=  
-* Added a framework switch for NUnit - handling .NET 4.0 Support (r305)  
-* Zip.build handles HG versioning (r304)  
-* Nitriq support. Please check for a new setting in the config. (r302)  
-* NUnit default is now 2.5.5. (r300)  
-* CLS Compliance is now an opt in setting. Please check for a new setting in the config. (r299)  
-  
-=0.9.0.297=  
-* .NET 4.0 Support (r296)  
-* Fixed a bug with property setting in tfs.step (r293)  
-* Uppercut now houses it's assemblies in the build folder. Please ensure you compare your NAnt folder and remove the assemblies that are no longer there if upgrading (r292)  
-  
-=0.9.0.286=  
-* NUnit tester now runs console version. This fixes a TestFixtureSetup issue - see http://code.google.com/p/uppercut/issues/detail?id=10 for details (r285)  
-  
-=0.9.0.282=  
-* Mercurial (HG) support for versioning (r282)  
-  
-=0.9.0.273=  
-* Enhanced Git Versioning to better work with Hudson (r272)  
-  
-=0.9.0.266=  
-* Adding the ability to use PowerShell to write custom tasks. To run powershell - you need to set unrestricted if you are not going to sign the scripts. Because this possibly exposes a possible security hole, it is turned off by default. There is a property (allow.powershell.unrestricted) you can set to true in the Uppercut.config file. Look in the external tools section for the setting. (r266)  
-* Adding the ability to use Ruby to write custom tasks. (r265)  
-* Enhanced support of Git versioning on TeamCity. (r263)  
-* Fixed a small bug in NAnt related to running .NET 4.0. (r262)  
-* DocBuilder will do both .template and .xml now. (r247)  
-  
-=0.9.0.246=  
-* Fixed - Git versioning had an issue with creating the initial tag for versioning - see http://code.google.com/p/uppercut/issues/detail?id=9 for details (r243)  
-* Zip nows versions the zip file name by default. Check your zip.post.build. You may need to remove or change zip.post.build. (r240)  
-* Support for .NET 4.0 beta2 has been added. (r238)  
-  
-=0.9.0.235=  
-* UppercuT supports Git for versioning - The numbering system is branch specific.  
-* Added ILMERGE tasks to the samples  
-* Code is now built to a folder under build_output. This is the same folder it goes to under code_drop, so in the case of uppercut, build_output\UppercuT\ instead of just build_output.  
-  * BREAKING CHANGE: For your custom tasks, you may need to make changes.  
-
-# CREDITS
-see docs/legal/CREDITS (just LEGAL/Credits in the zip folder)