uppercutbuild 0.9.0.340 → 0.9.0.345.20100805

data/docs/README

@@ -41,9 +41,9 @@ This is the best way to get to the bleeding edge of what we are doing.
 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 true` to set line endings to auto convert for this repository  
+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).
+5. Run `build.bat`. NOTE: You must have git on the path (open a regular command line and type git).  
   
   
 # REQUIREMENTS
@@ -55,7 +55,9 @@ Donations Accepted - If you enjoy using this product or it has saved you time an
 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
-=0.9.0.x=  
+=0.9.0.345=  
+* Fixed general compile issues related to multi-targeting changes from last release (r345)  
+* 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)  
   

data/lib/build/UppercuT.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
 <uppercut>
-  <version>0.9.0.340</version>
+  <version>0.9.0.345</version>
 </uppercut>
 

data/lib/build/analyzers/mbunit2.test.step

@@ -25,17 +25,19 @@
   <property name="fail.build.on.error" value="true" />
 
   <assemblyfileset id="assemblies.assemblyfileset.testing" basedir="${dirs.build.code}\" >
-    <exclude name="*Database*dll" />
-    <exclude name="*.Integration*dll" />
-    <exclude name="TestFu.dll" />
-    <include name="*Test*dll" />
-    <include name="*.Spec*dll" />
+    <exclude name="lib\**" />
+    <exclude name="**\*Database*dll" />
+    <exclude name="**\*.Integration*dll" />
+    <exclude name="**\TestFu.dll" />
+    <include name="**\*Test*dll" />
+    <include name="**\*.Spec*dll" />
   </assemblyfileset>
 
   <assemblyfileset id="assemblies.assemblyfileset.testing.all" basedir="${dirs.build.code}\" >
-    <exclude name="TestFu.dll" />
-    <include name="*Test*dll" />
-    <include name="*.Spec*dll" />
+    <exclude name="lib\**" />
+    <exclude name="**\TestFu.dll" />
+    <include name="**\*Test*dll" />
+    <include name="**\*.Spec*dll" />
   </assemblyfileset>
 
   <target name="go" depends="run_tasks" />

data/lib/build/analyzers/ncover.step

@@ -34,7 +34,8 @@
   <property name="tests.excluded_categories.comma_separated" value="Database,Integration,Slow,NotWorking" overwrite="false" />
   <property name="test.args" value="" />
   <property name="test.args" value="/rt:Text /rnf:mbUnit /rf:&quot;${dirs.ncover_results}&quot; /ec:${tests.excluded_categories.comma_separated}" if="${test.framework=='mbunit2'}" />
-  <property name="test.args" value="/xml:&quot;${dirs.ncover_results}\nunit-results.xml&quot; /nologo /framework=${microsoft.framework} /exclude:${tests.excluded_categories.comma_separated}" if="${test.framework=='nunit'}" />
+  <property name="test.args" value="/xml:&quot;${dirs.ncover_results}\nunit-results.xml&quot; /nologo /exclude:${tests.excluded_categories.comma_separated}" if="${test.framework=='nunit'}" />
+  <!--property name="test.args" value="/xml:&quot;${dirs.ncover_results}\nunit-results.xml&quot; /nologo /framework=${microsoft.framework} /exclude:${tests.excluded_categories.comma_separated}" if="${test.framework=='nunit'}" /-->
   <property name="file.custom.step.before" value="${dirs.build_scripts_custom}\${file.current.no_extension}.pre.step" />
   <property name="file.custom.step.after" value="${dirs.build_scripts_custom}\${file.current.no_extension}.post.step" />
   <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}\${file.current.no_extension}.replace.step" />
@@ -94,15 +95,16 @@
     <foreach item="File" property="dll.filename">
       <in>
         <items>
-          <exclude name="${dirs.build.code}\*Database*dll" />
-          <exclude name="${dirs.build.code}\*.Integration*dll" />
-          <exclude name="${dirs.build.code}\TestFu.dll" />
-          <include name="${dirs.build.code}\*Test*dll" />
-          <include name="${dirs.build.code}\*Spec*dll" />
+          <exclude name="${dirs.build.code}\lib\**" />
+          <exclude name="${dirs.build.code}\**\*Database*dll" />
+          <exclude name="${dirs.build.code}\**\*.Integration*dll" />
+          <exclude name="${dirs.build.code}\**\TestFu.dll" />
+          <include name="${dirs.build.code}\**\*Test*dll" />
+          <include name="${dirs.build.code}\**\*Spec*dll" />
         </items>
       </in>
       <do>
-        <property name="dll.names" value="${dll.names + ' ' + path::get-file-name(dll.filename)}" />
+        <property name="dll.names" value="${dll.names + ' ' + string::replace(dll.filename,path::get-full-path(dirs.build.code) + '\','') + ''}" />
       </do>
     </foreach>
 
@@ -125,10 +127,10 @@
         failonerror="false"
         verbose="true">
       <assemblies basedir="${dirs.build.code}">
-        <exclude name="${dirs.build.code}\TestFu.dll" />
-        <exclude name="${dirs.build.code}\*Test*dll" />
-        <exclude name="${dirs.build.code}\*Spec*dll" />
-        <include name="${dirs.build.code}\${project.name}*.dll" />
+        <exclude name="${dirs.build.code}\**\TestFu.dll" />
+        <exclude name="${dirs.build.code}\**\*Test*dll" />
+        <exclude name="${dirs.build.code}\**\*Spec*dll" />
+        <include name="${dirs.build.code}\**\${project.name}*.dll" />
       </assemblies>
     </ncover>
   </target>

data/lib/build/analyzers/nunit.test.step

@@ -22,9 +22,13 @@
   <property name="dirs.test_results" value="${dirs.build_artifacts}\nunit" overwrite="false" />
   <property name="file.test_results" value="index" overwrite="false" />
   <property name="tests.excluded_categories.comma_separated" value="Database,Integration,Slow,NotWorking,Ignore,database,integration,slow,notworking,ignore" overwrite="false" />
-  <property name="test.args" value="/xml=&quot;${dirs.test_results}\nunit-results.xml&quot; /nologo /framework=${microsoft.framework}" />
+  <property name="test.args" value="/xml=&quot;${dirs.test_results}\nunit-results.xml&quot; /nologo" />
+  <!--property name="test.args" value="/xml=&quot;${dirs.test_results}\nunit-results.xml&quot; /nologo /framework=${microsoft.framework}" /-->
   <property name="test.args.exclude" value="/exclude=&quot;${tests.excluded_categories.comma_separated}&quot;" />
   <property name="app.nunit.console" value="${path::get-full-path(dirs.lib)}\NUnit\nunit-console.exe" overwrite="false" />
+  <property name="dlls.test" value="" />
+  <property name="tests.ran" value="false" />
+  
   <property name="file.custom.step.before" value="${dirs.build_scripts_custom}\${file.current.no_extension}.pre.step" />
   <property name="file.custom.step.after" value="${dirs.build_scripts_custom}\${file.current.no_extension}.post.step" />
   <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}\${file.current.no_extension}.replace.step" />
@@ -89,20 +93,21 @@
     <foreach item="File" property="dll.filename">
       <in>
         <items>
-          <exclude name="${dirs.build.code}\*Database*dll" />
-          <exclude name="${dirs.build.code}\*.Integration*dll" />
-          <exclude name="${dirs.build.code}\TestFu.dll" />
-          <include name="${dirs.build.code}\*Test*dll" />
-          <include name="${dirs.build.code}\*Spec*dll" />
+          <exclude name="${dirs.build.code}\lib\**" />
+          <exclude name="${dirs.build.code}\**\*Database*dll" />
+          <exclude name="${dirs.build.code}\**\*.Integration*dll" />
+          <exclude name="${dirs.build.code}\**\TestFu.dll" />
+          <include name="${dirs.build.code}\**\*Test*dll" />
+          <include name="${dirs.build.code}\**\*Spec*dll" />
         </items>
       </in>
       <do>
-        <property name="dll.names" value="${dll.names + ' ' + path::get-file-name(dll.filename)}" />
+        <property name="dll.names" value="${dll.names + ' ' + string::replace(dll.filename,path::get-full-path(dirs.build.code) + '\','') + ''}" />
       </do>
     </foreach>
 
     <property name="dlls.test" value="${dll.names}" />
-    <echo message="Running NCover against these test dlls - ${dlls.test}." />
+    <echo message="Running NUnit against these test dlls - ${dlls.test}." />
 
     <property name="args.test_runner" value="${dlls.test} ${test.args} ${test.args.exclude}" />
   </target>
@@ -113,39 +118,51 @@
     <foreach item="File" property="dll.filename">
       <in>
         <items>
-          <exclude name="${dirs.build.code}\TestFu.dll" />
-          <include name="${dirs.build.code}\*Test*dll" />
-          <include name="${dirs.build.code}\*Spec*dll" />
+          <exclude name="${dirs.build.code}\lib\**" />
+          <exclude name="${dirs.build.code}\**\TestFu.dll" />
+          <include name="${dirs.build.code}\**\*Test*dll" />
+          <include name="${dirs.build.code}\**\*Spec*dll" />
         </items>
       </in>
       <do>
-        <property name="dll.names" value="${dll.names + ' ' + path::get-file-name(dll.filename)}" />
+        <property name="dll.names" value="${dll.names + ' ' + string::replace(dll.filename,path::get-full-path(dirs.build.code) + '\','') + ''}" />
       </do>
     </foreach>
 
     <property name="dlls.test" value="${dll.names}" />
-    <echo message="Running NCover against these test dlls - ${dlls.test}." />
+    <echo message="Running NUnit against these test dlls - ${dlls.test}." />
 
     <property name="args.test_runner" value="${dlls.test} ${test.args}" />
   </target>
   
   <target name="run_tests" depends="prepare" description="Running Unit Tests">
-    <echo message="Running tests using NUnit and putting results in ${dirs.test_results}."/>
-
-    <exec 
-        program="${app.nunit.console}" 
-        workingdir="${dirs.build.code}"
-        failonerror="true">
-      <arg value="${args.test_runner}" />
-    </exec>
+  
+    <if test="${dlls.test !=''}">
+      <echo message="Running tests using NUnit and putting results in ${dirs.test_results}."/>
+
+      <exec 
+          program="${app.nunit.console}" 
+          workingdir="${dirs.build.code}"
+          failonerror="true">
+        <arg value="${args.test_runner}" />
+      </exec>
+      <property name="tests.ran" value="true" />
+      
+    </if>
+    <if test="${dlls.test ==''}">
+      <echo message="No test dlls to run against" />
+    </if>
+   
   </target>
 
   <target name="generate_report">
-    <nunit2report todir="${dirs.test_results}" failonerror="false" >
-      <fileset>
-        <include name="${dirs.test_results}\*-results.xml"/>
-      </fileset>
-    </nunit2report>
+    <if test="${tests.ran}">
+      <nunit2report todir="${dirs.test_results}" failonerror="false" >
+        <fileset>
+          <include name="${dirs.test_results}\*-results.xml"/>
+        </fileset>
+      </nunit2report>
+    </if>
   </target>
 
   <target name="open_results">

data/lib/build/compile.step

@@ -40,7 +40,7 @@
   <target name="run_tasks">
     <echo message="Running ${project::get-name()} tasks." />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="check_for_multitargeting_and_set_nant_framework_to_last" if="${target::exists('check_for_multitargeting_and_set_nant_framework_to_last')}" />
+    <call target="check_for_multitargeting" if="${target::exists('check_for_multitargeting')}" />
     <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
     <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
     <call target="run_normal_tasks" if="${not is.replaced}" />
@@ -81,22 +81,16 @@
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__'}" />
   </target>
 
-  <target name="check_for_multitargeting_and_set_nant_framework_to_last">
+  <target name="check_for_multitargeting">
     <if test="${string::contains(microsoft.framework,',')}">
       <echo message="You want to multi target, eh? You passed a comma into the framework: ${microsoft.framework}" />
       <property name="framework.multitargeting" value="true" />
       <property name="framework.multitargeting.delimiter" value="," />
-      <foreach item="String" in="${microsoft.framework}" delim="," property="framework.to.use">
-        <property name="nant.settings.currentframework" value="${string::trim(framework.to.use)}" />
-      </foreach>
     </if>
     <if test="${string::contains(microsoft.framework,';')}">
       <echo message="You want to multi target, eh? You passed a semicolon into the framework: ${microsoft.framework}" />
       <property name="framework.multitargeting" value="true" />
       <property name="framework.multitargeting.delimiter" value=";" />
-      <foreach item="String" in="${microsoft.framework}" delim=";" property="framework.to.use">
-        <property name="nant.settings.currentframework" value="${string::trim(framework.to.use)}" />
-      </foreach>
     </if>
   </target>
   
@@ -122,6 +116,7 @@
   
   <target name="build_dotNet_code_framework">
     <echo message="Building on ${framework::get-version(microsoft.framework.specific)}" />
+    <property name="nant.settings.currentframework" value="${string::trim(microsoft.framework.specific)}" />
     <!-- nant is retarded - I had to have two of these instead of throwing an if on the outputpath -->
     <if test="${msbuild.override_output_path}">
       <msbuild project="${solution.path}" verbosity="minimal">
@@ -129,7 +124,6 @@
         <property name="OutputPath" value="${msbuild.outputpath}" />
         <property name="Platform" value="${msbuild.platform}" />
         <property name="TargetFrameworkVersion" value="v${framework::get-version(microsoft.framework.specific)}" />
-        <property name="ToolsVersion" value="${framework::get-version(microsoft.framework.specific)}" />
       </msbuild>
     </if>
     <if test="${not msbuild.override_output_path}">
@@ -137,7 +131,6 @@
         <property name="Configuration" value="${msbuild.configuration}" />
         <property name="Platform" value="${msbuild.platform}" />
         <property name="TargetFrameworkVersion" value="v${framework::get-version(microsoft.framework.specific)}" />
-        <property name="ToolsVersion" value="${framework::get-version(microsoft.framework.specific)}" />
       </msbuild>
     </if>
   </target>

data/lib/build/gemsPrepare.step

@@ -32,6 +32,7 @@
   <property name="version.build" value="0" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
+  <property name="gem.build.date" value="20100801" overwrite="false" />
   <property name="file.gems.version" value="${dirs.drop.gems}\VERSION" />
   
   
@@ -52,7 +53,7 @@
   </target>
 
   <target name="run_normal_tasks"
-          depends="prepare, copy_gems_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, generate_version_file"
+          depends="prepare, copy_gems_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, update_gem_build_date, generate_version_file"
           description="Packaging gems." />
 
   <target name="prepare">
@@ -125,9 +126,21 @@
     </copy>
   </target>
 
+  <target name="update_gem_build_date">
+    <property name="gem.current.date" value="${datetime::now()}" />
+    <property name="gem.current.date.year" value="${datetime::get-year(gem.current.date)}" />
+    <property name="gem.current.date.month" value="${datetime::get-month(gem.current.date)}" />
+    <property name="gem.current.date.month" value="${'0' + gem.current.date.month}" if="${string::get-length(gem.current.date.month) == 1}" />
+    <property name="gem.current.date.month" value="${'0' + gem.current.date.month}" if="${string::get-length(gem.current.date.month) == 1}" />
+    <property name="gem.current.date.day" value="${datetime::get-day(gem.current.date)}" />
+    <property name="gem.current.date.day" value="${'0' + gem.current.date.day}" if="${string::get-length(gem.current.date.day) == 1}" />
+    <property name="gem.build.date" value="${'' + gem.current.date.year + gem.current.date.month + gem.current.date.day}" />
+  </target>
+  
   <target name="generate_version_file">
-  <echo message="Generating ${file.gems.version} with ${assembly.version.full} for the version" />
-  <echo file="${file.gems.version}" append="false" failonerror="false">${assembly.version.full}</echo>
+  
+  <echo message="Generating ${file.gems.version} with ${assembly.version.full} and ${gem.build.date} for the version" />
+  <echo file="${file.gems.version}" append="false" failonerror="false">${assembly.version.full}.${gem.build.date}</echo>
   </target>
   
   <target name="custom_tasks_after">

data/lib/gems/__RENAME__.gemspec.rename

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
 #  spec.bindir = 'bin'
 #  spec.executables << '__REPLACE__'
 
-#  spec.add_dependency('log4net','= 1.2.10')
+#  spec.add_dependency('log4net','= 1.2.10.0')
 
   spec.summary     = '__REPLACE__'
   spec.description = <<-EOF 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: uppercutbuild
 version: !ruby/object:Gem::Version 
-  hash: 687
+  hash: 40200385
   prerelease: false
   segments: 
   - 0
   - 9
   - 0
-  - 340
-  version: 0.9.0.340
+  - 345
+  - 20100805
+  version: 0.9.0.345.20100805
 platform: ruby
 authors: 
 - Rob "FerventCoder" Reynolds
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -05:00
+date: 2010-08-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +38,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: |
-  UppercuT is THE conventional build for .NET! 
+  UppercuT is THE conventional build for .NET!  
   UppercuT 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.