updating build components for successful mono run

assemblies/build/compile.step

@@ -81,7 +81,7 @@
           description="Compiling project." />
 
   <target name="error_check">
-    <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
+    <fail message="You must fill out the project.name, repository.path, and company.name settings in the ${build.config.settings} file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__'}" />
   </target>
 

assemblies/build/default.build

@@ -88,7 +88,7 @@
   </target>
 
   <target name="error_check">
-    <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
+    <fail message="You must fill out the project.name, repository.path, and company.name settings in the ${build.config.settings} file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__' or repository.path=='__REPOSITORY_PATH__' or company.name=='__COMPANY_NAME__'}" />
   </target>
 

assemblies/build/nugetPrepare.step

@@ -41,8 +41,8 @@
   <property name="version.use.build_date" value="false" overwrite="false" />
   <property name="pkg.build.date" value="20100801" overwrite="false" />
   <property name="file.nuget.version" value="${dirs.drop.nuget}${path.separator}version.xml" />
-	<property name="nuget.version" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
-	<property name="nuget.version" value="${version.major}.${version.minor}.${version.patch}"  if="${version.use_semanticversioning}" />
+  <property name="nuget.version" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
+  <property name="nuget.version" value="${version.major}.${version.minor}.${version.patch}"  if="${version.use_semanticversioning}" />
 
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />

assemblies/build/obfuscate.step

@@ -64,7 +64,7 @@
           description="Generating Assembly File." />
 
   <target name="error_check">
-    <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
+    <fail message="You must fill out the project.name, repository.path, and company.name settings in the ${build.config.settings} file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__' or company.name=='__COMPANY_NAME__'}" />
   </target>
 

assemblies/build/versionBuilder.step

@@ -62,7 +62,7 @@
 
 
   <target name="error_check">
-    <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
+    <fail message="You must fill out the project.name, repository.path, and company.name settings in the ${build.config.settings} file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__' or company.name=='__COMPANY_NAME__'}" />
   </target>
 

build.sh

@@ -20,11 +20,11 @@ function displayUsage
 
 displayUsage $1
 
-# http://www.michaelruck.de/2010/03/solving-pkg-config-and-mono-35-profile.html
 # http://cloudgen.wordpress.com/2013/03/06/configure-nant-to-run-under-mono-3-06-beta-for-mac-osx/
 export PKG_CONFIG_PATH=/opt/local/lib/pkgconfig:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig
 
-mono ./lib/NAnt/NAnt.exe /logger:"NAnt.Core.DefaultLogger" /nologo /quiet /f:"$(cd $(dirname "$0"); pwd)/build/default.build" /D:build.config.settings="$(cd $(dirname "$0"); pwd)/settings/UppercuT.config" $*
+#mono ./lib/NAnt/NAnt.exe /logger:"NAnt.Core.DefaultLogger" /nologo /quiet /f:"$(cd $(dirname "$0"); pwd)/build/default.build" /D:build.config.settings="$(cd $(dirname "$0"); pwd)/settings/UppercuT.config" /D:microsoft.framework="mono-3.5" $*
+mono --runtime=v4.0.30319 ./lib/NAnt/NAnt.exe /logger:"NAnt.Core.DefaultLogger" /nologo /quiet /f:"$(cd $(dirname "$0"); pwd)/build/default.build" /D:build.config.settings="$(cd $(dirname "$0"); pwd)/settings/UppercuT.config" /D:microsoft.framework="mono-4.0" /D:run.ilmerge="false" $*
 
-#/quiet /nologo /debug  /t:"mono-4.0"
+#/quiet /nologo /debug /verbose /t:"mono-4.0"
 

build/compile.step

@@ -36,7 +36,7 @@
   <property name="solution.path" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${project.name}.sln" />
   <property name="solution.path.windows.mono" value="${string::replace(dirs.current,'\','/')}/${string::replace(path_to_solution,'\','/')}/${project.name}.sln" />
   <property name="solution.path" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${project.name}.vbp" if="${microsoft.framework =='vb6'}" />
-  <property name="nant.settings.currentframework" value="mono-2.0" if="${platform::is-unix()}" />
+  <property name="nant.settings.currentframework" value="mono-4.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.8\bin\xbuild.bat" overwrite="false" if="${platform::is-windows() and file::exists('C:\Program Files (x86)\Mono-2.8\bin\xbuild.bat')}" />
   <property name="app.xbuild" value="C:\Program Files\Mono-2.8\bin\xbuild.bat" overwrite="false" if="${platform::is-windows() and file::exists('C:\Program Files\Mono-2.8\bin\xbuild.bat')}" />
@@ -81,7 +81,7 @@
           description="Compiling project." />
 
   <target name="error_check">
-    <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
+    <fail message="You must fill out the project.name, repository.path, and company.name settings in the ${build.config.settings} file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__'}" />
   </target>
 
@@ -130,28 +130,28 @@
     <mkdir dir="${msbuild.outputpath}" />
     <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 level="Warning" message="Cleaning build..." />
+      <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
       <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" />
+          commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.0'}" />
       <echo level="Warning" 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" />
+          commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /toolsversion:${framework::get-version(microsoft.framework.specific)} /property:Platform='${msbuild.platform}' /property:TargetFrameworkVersion=v${framework::get-version(microsoft.framework.specific)} /l:${msbuild.logger};'${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml'" />
     </if>
     <if test="${platform::is-windows()}">
       <!-- 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}">
           <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 level="Warning" message="Cleaning build..." />
+            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
-                commandline="${solution.path.windows.mono} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
+                commandline="${solution.path.windows.mono} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.0'}" />
             <echo level="Warning" message='Building...by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
@@ -180,11 +180,11 @@
         <if test="${not framework.multitargeting}">
           <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 level="Warning" message="Cleaning build..." />
+            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
-                commandline="${solution.path.windows.mono} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
+                commandline="${solution.path.windows.mono} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.0'}" />
             <echo level="Warning" message='Building without multitargeting by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
@@ -213,11 +213,11 @@
         <if test="${framework.multitargeting}">
           <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 level="Warning" message="Cleaning build..." />
+            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build}"
                 workingdir="${dirs.build}"
-                commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
+                commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.0'}" />
             <echo level="Warning" message="Building..." />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build}"
@@ -244,11 +244,11 @@
         <if test="${not framework.multitargeting}">
           <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 level="Warning" message="Cleaning build..." />
+            <echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.0'}" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
-                commandline="${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
+                commandline="${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.0'}" />
             <echo level="Warning" message="Building...by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"

build/default.build

@@ -88,7 +88,7 @@
   </target>
 
   <target name="error_check">
-    <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
+    <fail message="You must fill out the project.name, repository.path, and company.name settings in the ${build.config.settings} file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__' or repository.path=='__REPOSITORY_PATH__' or company.name=='__COMPANY_NAME__'}" />
   </target>
 
@@ -100,7 +100,7 @@
     <nant buildfile="${dirs.current.file}${path.separator}policyChecks.step" inheritall="true" />
     <nant buildfile="${dirs.current.file}${path.separator}versionBuilder.step" inheritall="true" />
     <nant buildfile="${dirs.current.file}${path.separator}generateBuildInfo.step" inheritall="true" />
-    <nant buildfile="${dirs.current.file}${path.separator}manifestBuilder.step" inheritall="true" />
+    <!--FIX PATHING TO WORK ON *NIX FIRST nant buildfile="${dirs.current.file}${path.separator}manifestBuilder.step" inheritall="true" /-->
     <nant buildfile="${dirs.current.file}${path.separator}compile.step" inheritall="true" />
     <nant buildfile="${dirs.current.file}${path.separator}environmentBuilder.step" inheritall="true" />
     <nant buildfile="${dirs.current.file}${path.separator}analyze.step" inheritall="true" />

build/ilmerge.build

@@ -99,7 +99,10 @@
     <echo level="Warning" message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
     <exec program="${app.ilmerge}"
           workingdir="${dirs.merge.from}"
-          commandline="${args.ilmerge}" />
+          commandline="${args.ilmerge}" if="${platform::is-windows()}" />
+    <exec program="mono"
+          workingdir="${dirs.merge.from}"
+          commandline="'${app.ilmerge}' ${args.ilmerge}" if="${platform::is-unix()}"/>
   </target>
 
   <target name="copy_configs">

build/nugetPrepare.step

@@ -41,8 +41,8 @@
   <property name="version.use.build_date" value="false" overwrite="false" />
   <property name="pkg.build.date" value="20100801" overwrite="false" />
   <property name="file.nuget.version" value="${dirs.drop.nuget}${path.separator}version.xml" />
-	<property name="nuget.version" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
-	<property name="nuget.version" value="${version.major}.${version.minor}.${version.patch}"  if="${version.use_semanticversioning}" />
+  <property name="nuget.version" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
+  <property name="nuget.version" value="${version.major}.${version.minor}.${version.patch}"  if="${version.use_semanticversioning}" />
 
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />

build/obfuscate.step

@@ -64,7 +64,7 @@
           description="Generating Assembly File." />
 
   <target name="error_check">
-    <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
+    <fail message="You must fill out the project.name, repository.path, and company.name settings in the ${build.config.settings} file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__' or company.name=='__COMPANY_NAME__'}" />
   </target>
 

build/versionBuilder.step

@@ -62,7 +62,7 @@
 
 
   <target name="error_check">
-    <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
+    <fail message="You must fill out the project.name, repository.path, and company.name settings in the ${build.config.settings} file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__' or company.name=='__COMPANY_NAME__'}" />
   </target>
 

product/uppercut.build/build.bat

@@ -13,7 +13,7 @@ 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_DIR%build\default.build" -D:build.config.settings=%build.config.settings% %*
+%NANT% /logger:"NAnt.Core.DefaultLogger" /quiet /nologo /f:"%BUILD_DIR%build\default.build" /D:build.config.settings=%build.config.settings% %*
 
 if %ERRORLEVEL% NEQ 0 goto errors
 

product/uppercut.build/build.sh

@@ -20,4 +20,11 @@ function displayUsage
 
 displayUsage $1
 
-mono ./lib/NAnt/NAnt.exe $1 /f:$(cd $(dirname "$0"); pwd)/build/default.build -D:build.config.settings=$(cd $(dirname "$0"); pwd)/Settings/UppercuT.config
+# http://cloudgen.wordpress.com/2013/03/06/configure-nant-to-run-under-mono-3-06-beta-for-mac-osx/
+export PKG_CONFIG_PATH=/opt/local/lib/pkgconfig:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig
+
+#mono ./lib/NAnt/NAnt.exe /logger:"NAnt.Core.DefaultLogger" /nologo /quiet /f:"$(cd $(dirname "$0"); pwd)/build/default.build" /D:build.config.settings="$(cd $(dirname "$0"); pwd)/settings/UppercuT.config" /D:microsoft.framework="mono-3.5" $*
+mono --runtime=v4.0.30319 ./lib/NAnt/NAnt.exe /logger:"NAnt.Core.DefaultLogger" /nologo /quiet /f:"$(cd $(dirname "$0"); pwd)/build/default.build" /D:build.config.settings="$(cd $(dirname "$0"); pwd)/settings/UppercuT.config" /D:microsoft.framework="mono-4.0" /D:run.ilmerge="false" $*
+
+#/quiet /nologo /debug /verbose /t:"mono-4.0"
+