removing the dependency on relative paths and defining a difference b…

…etween build relative and present working directory.
chucknorris · Aug 12, 2011 · ed6740b · ed6740b
1 parent 405dbce
commit ed6740b
Show file tree

Hide file tree

Showing 127 changed files with 845 additions and 874 deletions.
diff --git a/ReleaseAssembliesForExternals.bat b/ReleaseAssembliesForExternals.bat
@@ -1,11 +1,25 @@
-@echo off
+@echo off
-
+
-::Project UppercuT - http://uppercut.googlecode.com
+::Project UppercuT - http://uppercut.googlecode.com
-::No edits to this file are required - http://uppercut.pbwiki.com
+::No edits to this file are required - http://uppercut.pbwiki.com
-
+
-SET DIR=%~d0%~p0%
+SET DIR=%cd%
-
+SET BUILD_DIR=%~d0%~p0%
-call "%DIR%build.bat"
+
-
+call "%BUILD_DIR%build.bat" %*
-SET build.config.settings="%DIR%Settings\UppercuT.config"
+if %ERRORLEVEL% NEQ 0 goto errors
-"%DIR%lib\Nant\nant.exe" /f:.\build\updateAssemblies.build -D:build.config.settings=%build.config.settings%
+
+
+SET NANT="%DIR%\lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
+
+%NANT% /f:%BUILD_DIR%build\updateAssemblies.build -D:build.config.settings=%build.config.settings%
+
+if %ERRORLEVEL% NEQ 0 goto errors
+
+goto finish
+
+:errors
+EXIT /B %ERRORLEVEL%
+
+:finish
diff --git a/assemblies/build/analyze.step b/assemblies/build/analyze.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="analyze" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
-  <property name="path.to.toplevel" value=".." />
+  <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="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
@@ -33,12 +33,12 @@
           description="Analyzing project for quality indicators." />
 
   <target name="run_analyzers">
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}test.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${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.file}${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.file}${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.file}${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.file}${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" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}moma.step" inheritall="true" failonerror="false" />
   </target>
 
 </project>
diff --git a/assemblies/build/analyzers/gallio.test.step b/assemblies/build/analyzers/gallio.test.step
@@ -7,13 +7,13 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="gallio.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <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}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <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.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />

diff --git a/assemblies/build/analyzers/mbunit2.test.step b/assemblies/build/analyzers/mbunit2.test.step
@@ -7,13 +7,13 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="mbunit2.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <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}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <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.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />

diff --git a/assemblies/build/analyzers/metrics.step b/assemblies/build/analyzers/metrics.step
@@ -6,21 +6,21 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="metrics" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <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}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <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.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
   <property name="folder.program_files" value="${environment::get-folder-path('ProgramFiles')}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="dirs.metrics_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}metrics" />
   <property name="app.metrics" value="${path::get-full-path(folder.program_files)}${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" />
   <property name="file.metrics_results" value="${project.name}.Metrics.xml" />

diff --git a/assemblies/build/analyzers/moma.step b/assemblies/build/analyzers/moma.step
@@ -7,20 +7,20 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="moma" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <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}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <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.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="dirs.moma_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}monoMigrationAnalyzer" />
   <property name="app.moma" value="${path::get-full-path(dirs.lib)}${path.separator}MoMA${path.separator}MoMA.exe" overwrite="false" />
   <property name="file.moma_results" value="${project.name}.MoMAReport.html" />

diff --git a/assemblies/build/analyzers/ncover.step b/assemblies/build/analyzers/ncover.step
@@ -7,13 +7,13 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="ncover" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <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}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <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.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
@@ -24,7 +24,7 @@
   <property name="number.satisfactory_coverage" value="85" overwrite="false" />
   <property name="fail.if_ncover_fails" value="false" overwrite="false" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="dirs.ncover_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}ncover" />
   <property name="app.ncover.tester" value="${path::get-full-path(dirs.lib)}${path.separator}MbUnit2${path.separator}MbUnit.Cons.exe" overwrite="false" />
   <property name="app.ncover" value="${path::get-full-path(dirs.lib)}${path.separator}NCover${path.separator}NCover.Console.exe" overwrite="false" />

diff --git a/assemblies/build/analyzers/ndepend.step b/assemblies/build/analyzers/ndepend.step
@@ -7,20 +7,20 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="ndepend" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <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}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <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.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
   <property name="app.ndepend" value="C:${path.separator}Program Files${path.separator}NDepend${path.separator}NDepend.Console.exe" overwrite="false" />
   <property name="dirs.ndepend_results" value="${dirs.build_artifacts}${path.separator}ndepend" />
-  <property name="files.ndepend_config" value="${path::get-full-path(dirs.current)}${path.separator}${path.to.toplevel}${path.separator}NDepend.xml" />
+  <property name="files.ndepend_config" value="${path::get-full-path(dirs.current)}${path.separator}NDepend.xml" />
 
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />