(build) fix customize to work properly

Annih · Feb 7, 2015 · b475f97 · b475f97
1 parent 83000dd
commit b475f97
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.build/customize.bat b/.build/customize.bat
@@ -1,4 +1,4 @@
-@echo off
+@echo on
 
 ::Project UppercuT - http://uppercut.googlecode.com
 ::No edits to this file are required - http://uppercut.pbwiki.com
@@ -15,19 +15,20 @@ SET step.name=%1
 SET step.type=%2
 
 
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%..\lib\Nant\nant.exe"
-SET build.config.settings="%DIR%..\.uppercut"
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+SET NANT="%DIR%\lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\.uppercut"
 
-%NANT% /f:.\customize.build -D:build.config.settings=%build.config.settings% -D:customize.step.name=%step.name% -D:customize.step.type=%step.type%
+%NANT% /logger:"NAnt.Core.DefaultLogger" /quiet /nologo /f:"%BUILD_DIR%customize.build" -D:build.config.settings=%build.config.settings% -D:customize.step.name=%step.name% -D:customize.step.type=%step.type%
 
 if %ERRORLEVEL% NEQ 0 goto errors
 
 goto finish
 
 :usage
 echo.
-echo Usage: customize.bat stepName customizeType
+echo Usage: .build\customize.bat stepName customizeType
 echo stepName is the name of the item
 echo customizeType is "pre" "post" or "replace"
 echo .
@@ -38,4 +39,4 @@ goto finish
 :errors
 EXIT /B %ERRORLEVEL%
 
-:finish
+:finish
diff --git a/.build/customize.build b/.build/customize.build
@@ -19,7 +19,7 @@
   <property name="path.to.custom_file" value="-1" />
   <property name="path.to.custom_file" value="" if="${file::exists(customize.step.name)}" />
 
-  <target name="go" depends="run_tasks, report_finish_time" />
+  <target name="go" depends="run_normal_tasks, report_finish_time" />
 
   <!-- run_normal_tasks is called from run_tasks unless replace extension exists-->
   <target name="run_normal_tasks"