(build) upgrade to uc v1.4.5

Clean up the .uppercut file as well.
Annih · Jan 24, 2015 · 14159b1 · 14159b1
1 parent b20acd7
commit 14159b1
Show file tree

Hide file tree

Showing 57 changed files with 1,151 additions and 2,219 deletions.
diff --git a/.build.custom/analyze.replace.step b/.build.custom/analyze.replace.step
diff --git a/.build.custom/default.replace.build b/.build.custom/default.replace.build
diff --git a/.build.custom/ilmerge.post.build b/.build.custom/ilmerge.post.build
@@ -3,36 +3,30 @@
   <!-- Project UppercuT - http://projectuppercut.org -->
   <property name="build.config.settings" value="__NONE__" overwrite="false" />
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
-  <property name="file.current.no_extension" value="ilmerge" />
-  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
+  <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="path.to.toplevel" value=".." />
   <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}\${folder.build_scripts_custom}" />
-  <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}\${folder.code_drop}" overwrite="false" />
-  <property name="folder.app.drop" value="${project.name}" overwrite="false" />
-  <property name="folder.deployment" value="deployment" overwrite="false" />
-  <property name="dirs.deployment" value="${dirs.drop}\${folder.deployment}" />
-  <property name="dirs.app.drop" value="${dirs.drop}\${folder.app.drop}" overwrite="false" />
-  <property name="file.key.path" value="${dirs.current}${path.separator}${project.name}.snk" overwrite="false" />
+  <include buildfile="${dirs.current}${path.separator}${folder.build_scripts}${path.separator}default.build.settings" />
+  <property name="build.step.name" value="${project::get-name()}" />
+  <property name="build.step.path" value="${project::get-buildfile-path()}" />
+  <!-- build step customizations below this -->
+
+  <target name="go" depends="recover_license, merge_the_dll" />
 
-  <target name="go" depends="recover_license,merge_the_dll" />
-
   <target name="recover_license">
     <echo level="Warning" message="Copying back in license.xml after merging." />
     <copy todir="${dirs.drop}${path.separator}${folder.app.drop}">
       <fileset basedir="${dirs.drop}${path.separator}merge_holding">
         <include name="license.*" />
       </fileset>
     </copy>
-       
+
     <delete dir="${dirs.drop}${path.separator}merge_holding" />
   </target>
-    
+
   <target name="merge_the_dll">
     <nant buildfile="${dirs.build_scripts_custom}${path.separator}ilmergeDLL.build" inheritall="true" />
   </target>
- 
-</project>
+
+</project>
diff --git a/.build.custom/ilmerge.pre.build b/.build.custom/ilmerge.pre.build
@@ -3,33 +3,32 @@
   <!-- Project UppercuT - http://projectuppercut.org -->
   <property name="build.config.settings" value="__NONE__" overwrite="false" />
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
-  <property name="file.current.no_extension" value="ilmerge" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
+  <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}\..\${folder.build_scripts_custom}" />
-  <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}\${path.to.toplevel}\${folder.code_drop}" overwrite="false" />
-  <property name="folder.app.drop" value="${project.name}" overwrite="false" />
-
-  <property name="dirs.merge.from" value="${dirs.drop}\${folder.app.drop}" overwrite="false" />
-  <property name="dirs.merge.to" value="${dirs.drop}\merge" overwrite="false" />
+  <include buildfile="${dirs.current}${path.separator}${folder.build_scripts}${path.separator}default.build.settings" />
+  <property name="build.step.name" value="${project::get-name()}" />
+  <property name="build.step.path" value="${project::get-buildfile-path()}" />
+  <!-- build step customizations below this -->
+
+  <property name="dirs.merge.from" value="${dirs.drop}${path.separator}${folder.app.drop}" overwrite="false" />
+  <property name="dirs.merge.to" value="${dirs.drop}${path.separator}merge" overwrite="false" />
   <property name="file.merge.name" value="__REPLACE__" overwrite="false" />
   <!-- exe winexe dll -->
   <property name="merge.target.type" value="__REPLACE__" overwrite="false" />
 
   <target name="go" depends="set_environment_variables, hold_license" />
- 
+
   <target name="set_environment_variables">
-    <property name="dirs.merge.from" value="${dirs.drop}${path.separator}${folder.app.drop}\console" />
+    <property name="dirs.merge.from" value="${dirs.drop}${path.separator}${folder.app.drop}${path.separator}console" />
     <property name="file.merge.name" value="choco.exe" />
     <property name="merge.target.type" value="exe" />
-    <setenv name="uc.dirs.merge.from" value="${dirs.drop}${path.separator}${folder.app.drop}\console"/>
+    <setenv name="uc.dirs.merge.from" value="${dirs.drop}${path.separator}${folder.app.drop}${path.separator}console"/>
     <setenv name="uc.file.merge.name" value="choco.exe"/>
     <setenv name="uc.merge.target.type" value="exe"/>
   </target>
-  
+
   <target name="hold_license">
     <echo level="Warning" message="Copying out license.xml prior to merging." />
     <copy todir="${dirs.drop}${path.separator}merge_holding">
@@ -38,5 +37,5 @@
       </fileset>
     </copy>
   </target>
-  
-</project>
+
+</project>