uppercutbuild 1.0.3.0.20100818 → 1.0.4.0

data/docs/README

@@ -59,6 +59,11 @@ It helps keep to the product updated, pays for site hosting, etc. https://www.pa
 * Adding in support for xUnit.  
 * Adding in support for StorEvil.  
   
+=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)  

data/lib/build/UppercuT.xml

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

data/lib/build/compile.step

@@ -25,11 +25,12 @@
   <property name="msbuild.platform" value="Any CPU" overwrite="false" />
   <property name="msbuild.override_output_path" value="true" overwrite="false" />
   <property name="msbuild.outputpath" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
-  <property name="xbuild.outputpath" value=".${path.separator}${folder.code_build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="solution.path" value="${directory::get-parent-directory(dirs.current)}${path.separator}${path_to_solution}${path.separator}${project.name}.sln" />
   <property name="solution.path" value="${directory::get-parent-directory(dirs.current)}${path.separator}${path_to_solution}${path.separator}${project.name}.vbp" if="${microsoft.framework =='vb6'}" />
   <property name="nant.settings.currentframework" value="mono-1.0" if="${platform::is-unix()}" />
   <property name="nant.settings.currentframework" value="net-3.5" if="${microsoft.framework !='vb6' and platform::is-windows()}" />
+  <property name="app.xbuild" value="C:\Program Files (x86)\Mono-2.6.7\bin\xbuild.bat" overwrite="false" if="${platform::is-windows()}" />
+  <property name="app.xbuild" value="xbuild" overwrite="false" if="${platform::is-unix()}" />
   <property name="framework.multitargeting" value="false" />
   <property name="framework.multitargeting.delimiter" value="," />
   <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
@@ -107,7 +108,6 @@
     <if test="${framework.multitargeting}">
       <foreach item="String" in="${microsoft.framework}" delim="${framework.multitargeting.delimiter}" property="framework.specific">
         <property name="msbuild.outputpath" value="${dirs.build}${path.separator}${folder.app.drop}${path.separator}${framework.specific}" />
-        <property name="xbuild.outputpath" value=".${path.separator}${folder.code_build}${path.separator}${folder.app.drop}${path.separator}${framework.specific}" />
         <property name="microsoft.framework.specific" value="${string::trim(framework.specific)}" />
         <call target="build_dotNet_code_framework" />
       </foreach>
@@ -125,12 +125,12 @@
     <if test="${platform::is-unix()}">
       <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
       <echo message="Cleaning build..." />
-      <exec program="xbuild"
+      <exec program="${app.xbuild}"
           basedir="/usr/bin"
           workingdir="${dirs.build}"
           commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
-        <echo message="Building..." />
-      <exec program="xbuild"
+      <echo message="Building..." />
+      <exec program="${app.xbuild}"
           basedir="/usr/bin"
           workingdir="${dirs.build}"
           commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger" />
@@ -139,37 +139,97 @@
       <!-- nant is retarded - I had to have four of these instead of throwing an if on the outputpath and targets -->
       <if test="${msbuild.override_output_path}">
         <if test="${framework.multitargeting}">
-          <msbuild project="${solution.path}" verbosity="minimal">
-            <property name="Configuration" value="${msbuild.configuration}" />
-            <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 test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
+            <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
+            <echo message="Cleaning build..." />
+            <exec program="${app.xbuild}"
+                basedir="${dirs.build}"
+                workingdir="${dirs.build}"
+                commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
+            <echo message="Building..." />
+            <exec program="${app.xbuild}"
+                basedir="${dirs.build}"
+                workingdir="${dirs.build}"
+                commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger" />
+          </if>
+          <if test="${framework::get-family(microsoft.framework.specific) != 'mono'}" >
+            <msbuild project="${solution.path}" verbosity="minimal">
+              <property name="Configuration" value="${msbuild.configuration}" />
+              <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>
         <if test="${not framework.multitargeting}">
-          <msbuild project="${solution.path}" verbosity="minimal">
-            <property name="Configuration" value="${msbuild.configuration}" />
-            <property name="OutputPath" value="${msbuild.outputpath}" />
-            <property name="Platform" value="${msbuild.platform}" />
-          </msbuild>
+          <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
+            <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
+            <echo message="Cleaning build..." />
+            <exec program="${app.xbuild}"
+                basedir="${dirs.build}"
+                workingdir="${dirs.build}"
+                commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
+            <echo message="Building..." />
+            <exec program="${app.xbuild}"
+                basedir="${dirs.build}"
+                workingdir="${dirs.build}"
+                commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger" />
+          </if>
+          <if test="${framework::get-family(microsoft.framework.specific) != 'mono'}" >
+            <msbuild project="${solution.path}" verbosity="minimal">
+              <property name="Configuration" value="${msbuild.configuration}" />
+              <property name="OutputPath" value="${msbuild.outputpath}" />
+              <property name="Platform" value="${msbuild.platform}" />
+            </msbuild>
+          </if>
         </if>
       </if>
       <if test="${not msbuild.override_output_path}">
         <if test="${framework.multitargeting}">
-          <msbuild project="${solution.path}" verbosity="minimal">
-            <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 test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
+            <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
+            <echo message="Cleaning build..." />
+            <exec program="${app.xbuild}"
+                basedir="${dirs.build}"
+                workingdir="${dirs.build}"
+                commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
+            <echo message="Building..." />
+            <exec program="${app.xbuild}"
+                basedir="${dirs.build}"
+                workingdir="${dirs.build}"
+                commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger" />
+          </if>
+          <if test="${framework::get-family(microsoft.framework.specific) != 'mono'}" >
+            <msbuild project="${solution.path}" verbosity="minimal">
+              <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>
         </if>
         <if test="${not framework.multitargeting}">
       </if>
-          <msbuild project="${solution.path}" verbosity="minimal">
-            <property name="Configuration" value="${msbuild.configuration}" />
-            <property name="Platform" value="${msbuild.platform}" />
-          </msbuild>
+          <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
+            <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
+            <echo message="Cleaning build..." />
+            <exec program="${app.xbuild}"
+                basedir="${dirs.build}"
+                workingdir="${dirs.build}"
+                commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
+            <echo message="Building..." />
+            <exec program="${app.xbuild}"
+                basedir="${dirs.build}"
+                workingdir="${dirs.build}"
+                commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger" />
+          </if>
+          <if test="${framework::get-family(microsoft.framework.specific) != 'mono'}" >
+            <msbuild project="${solution.path}" verbosity="minimal">
+              <property name="Configuration" value="${msbuild.configuration}" />
+              <property name="Platform" value="${msbuild.platform}" />
+            </msbuild>
+          </if>
         </if>
     </if>
   </target>

data/lib/build/gemsPrepare.step

@@ -36,6 +36,8 @@
   <property name="version.revision" value="0" overwrite="false" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.patch}.0"  if="${version.use_semanticversioning}" />
+  <property name="version.gem.suffix" value="" overwrite="false" />
+  <property name="use.gem.build_date" value="false" overwrite="false" />
   <property name="gem.build.date" value="20100801" overwrite="false" />
   <property name="file.gems.version" value="${dirs.drop.gems}${path.separator}VERSION" />
   
@@ -142,8 +144,10 @@
   </target>
   
   <target name="generate_version_file">
-    <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>
+    <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>
   </target>
   
   <target name="custom_tasks_after">

data/lib/build/ilmerge.build

@@ -29,8 +29,8 @@
   <property name="file.merge.name" value="__REPLACE__" overwrite="false" />
   <!-- exe winexe dll -->
   <property name="merge.target.type" value="__REPLACE__" overwrite="false" />
-  <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} /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} /ndebug /allowDup ${file.merge.name} " if="${file::exists(path.file.internalize.ignore)}"/>
+  <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" />

data/lib/settings/UppercuT.config

@@ -24,7 +24,7 @@
   <property name="folder.file_server" value="file.server" overwrite="false" />
 
   <!-- FRAMEWORKS -->
-  <!-- microsoft.framework: vb6, net-1.1, net-2.0, net-3.5, net-4.0 (Enter multiple ones with a "," to take advantage of multitargeting) -->
+  <!-- microsoft.framework: vb6, net-1.0, net-1.1, net-2.0, net-3.5, net-4.0, netcf-1.0, netcf-2.0, silverlight-2.0, mono-1.0, mono-2.0, mono-3.5, moonlight-2.0 (Enter multiple ones with a "," to take advantage of multitargeting) -->
   <property name="microsoft.framework" value="net-3.5" overwrite="false" />
   <!-- language.short: vb,cs -->
   <property name="language.short" value="cs" overwrite="false" />
@@ -41,6 +41,8 @@
   <property name="version.major" value="0" overwrite="false" />
   <property name="version.minor" value="0" overwrite="false" />
   <property name="version.patch" value="0" overwrite="false" />
+  <property name="version.gem.suffix" value="" overwrite="false" />
+  <property name="use.gem.build_date" value="false" overwrite="false" />
   <property name="assembly.description" value="${project.name} is a product of ${company.name} - ${repository.path}." overwrite="false" />
   <property name="assembly.clscompliant" value="true" overwrite="false" />
   <!-- partially trusted callers doesn't set correctly with assembly generator - Leave false for now-->
@@ -74,6 +76,7 @@
   <property name="app.ndepend" value="C:\Program Files\NDepend\NDepend.Console.exe" overwrite="false" />
   <property name="app.moma" value="..\..\${folder.references}\MoMA\MoMA.exe" overwrite="false" />
   <property name="app.nitriq" value="C:\Program Files (x86)\NimblePros\Nitriq Console + Pro\Nitriq.Console.exe" overwrite="false" />
+  <property name="app.xbuild" value="C:\Program Files (x86)\Mono-2.6.7\bin\xbuild.bat" overwrite="false" />
   <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
   <property name="run.ilmerge" value="false" overwrite="false" />
 </project>

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: uppercutbuild
 version: !ruby/object:Gem::Version 
-  hash: 40201507
+  hash: 79
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
+  - 4
   - 0
-  - 20100818
-  version: 1.0.3.0.20100818
+  version: 1.0.4.0
 platform: ruby
 authors: 
 - Rob "FerventCoder" Reynolds
@@ -18,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -05:00
+date: 2010-08-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency