lib/build/default.build in uppercutbuild-1.4.0.0 vs lib/build/default.build in uppercutbuild-1.4.1.0
- old
+ new
@@ -4,19 +4,19 @@
<!-- DO NOT EDIT THIS FILE - Add custom tasks in BuildTasks.Custom folder with file by the same name - find out more at http://uppercut.pbwiki.com -->
<property name="build.config.settings" value="__NONE__" overwrite="false" />
<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="default" />
- <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="log.build" value="${dirs.build}${path.separator}build.log" />
<property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
<property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
<property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
<property name="company.name" value="__COMPANY_NAME__" overwrite="false" />
@@ -28,11 +28,11 @@
<property name="version.build" value="0" />
<property name="version.revision" value="0" />
<property name="version.hash" value="${version.revision}" overwrite="false" />
<property name="run.ilmerge" value="false" 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="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
<property name="obfuscate" value="false" overwrite="false" />
<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" />
<property name="is.replaced" value="false" />
@@ -74,12 +74,18 @@
depends="error_check, build"
description="Building with UppercuT default.build." />
<target name="prepare">
<echo level="Warning" message="Removing and adding ${dirs.build}."/>
- <delete dir="${dirs.build}" failonerror="false" />
<mkdir dir="${dirs.build}" failonerror="false" />
+ <delete dir="${dirs.build}\build_artifacts" failonerror="false" />
+ <delete dir="${dirs.build}\${folder.documentation}" failonerror="false" />
+ <delete dir="${dirs.build}\${folder.environment_files}" failonerror="false" />
+ <delete dir="${dirs.build}\${folder.database}" failonerror="false" />
+ <delete dir="${dirs.build}\${folder.reports}" failonerror="false" />
+ <delete dir="${dirs.build}\${folder.file_server}" failonerror="false" />
+ <delete dir="${dirs.build}\${folder.app.drop}" failonerror="false" />
</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."
if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__' or repository.path=='__REPOSITORY_PATH__' or company.name=='__COMPANY_NAME__'}" />
@@ -88,31 +94,31 @@
<target name="build">
<call target="get_revision" />
<call target="get_build_number" />
<call target="get_drop_directory" />
- <nant buildfile="${dirs.current}${path.separator}policyChecks.step" inheritall="true" />
- <nant buildfile="${dirs.current}${path.separator}versionBuilder.step" inheritall="true" />
- <nant buildfile="${dirs.current}${path.separator}generateBuildInfo.step" inheritall="true" />
- <nant buildfile="${dirs.current}${path.separator}compile.step" inheritall="true" />
- <nant buildfile="${dirs.current}${path.separator}environmentBuilder.step" inheritall="true" />
- <nant buildfile="${dirs.current}${path.separator}analyze.step" inheritall="true" />
- <nant buildfile="${dirs.current}${path.separator}obfuscate.step" inheritall="true" if="${obfuscate}" />
- <nant buildfile="${dirs.current}${path.separator}package.step" inheritall="true" />
- <nant buildfile="${dirs.current}${path.separator}ilmerge.build" inheritall="true" if="${run.ilmerge}" />
- <nant buildfile="${dirs.current}${path.separator}gemsPrepare.step" inheritall="true" failonerror="false" />
- <nant buildfile="${dirs.current}${path.separator}gemsBuild.step" inheritall="true" failonerror="false" />
- <nant buildfile="${dirs.current}${path.separator}nugetPrepare.step" inheritall="true" failonerror="false" />
- <nant buildfile="${dirs.current}${path.separator}nugetBuild.step" inheritall="true" failonerror="false" />
+ <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}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" />
+ <nant buildfile="${dirs.current.file}${path.separator}obfuscate.step" inheritall="true" if="${obfuscate}" />
+ <nant buildfile="${dirs.current.file}${path.separator}package.step" inheritall="true" />
+ <nant buildfile="${dirs.current.file}${path.separator}ilmerge.build" inheritall="true" if="${run.ilmerge}" />
+ <nant buildfile="${dirs.current.file}${path.separator}gemsPrepare.step" inheritall="true" failonerror="false" />
+ <nant buildfile="${dirs.current.file}${path.separator}gemsBuild.step" inheritall="true" failonerror="false" />
+ <nant buildfile="${dirs.current.file}${path.separator}nugetPrepare.step" inheritall="true" failonerror="false" />
+ <nant buildfile="${dirs.current.file}${path.separator}nugetBuild.step" inheritall="true" failonerror="false" />
</target>
<target name="get_revision">
- <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}svn.step" inheritall="true" if="${source_control_type=='svn'}" failonerror="false" />
- <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}tfs.step" inheritall="true" if="${source_control_type=='tfs'}" failonerror="false" />
- <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}git.step" inheritall="true" if="${source_control_type=='git'}" failonerror="false" />
- <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'}" failonerror="false" />
+ <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}tfs.step" inheritall="true" if="${source_control_type=='tfs'}" failonerror="false" />
+ <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}git.step" inheritall="true" if="${source_control_type=='git'}" failonerror="false" />
+ <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.hash" value="${environment::get-variable('uc.app.revision.hash')}" if="${environment::variable-exists('uc.app.revision.hash')}" />
<property name="version.hash" value="${version.revision}" if="${version.hash == '0'}" />
<echo level="Warning" message="Using revision number: ${version.revision} and hash: ${version.hash}." />
\ No newline at end of file