uppercutbuild 0.9.0.334 → 0.9.0.337

data/bin/uppercut/cli.rb

@@ -21,7 +21,20 @@ module Uppercutbuild
   		loc = cl unless cl.nil?
 		
 			Uppercutbuild::Loader.load
-
+      puts "UppercuT has been added to this project. Please look through the lib directory for items you don't need. NAnt is still required at the current time."
+    end
+    
+    desc "upgrade", "upgrades the uppercut 'build' directory"
+	  method_options :location => :string
+    def upgrade(*names)
+		#@proj.ensure_default_config
+		
+  		loc = @proj.get_location
+  		cl = options['location']
+  		loc = cl unless cl.nil?
+		
+			Uppercutbuild::Loader.upgrade
+      puts "The build folder has been updated. Please check the release logs for items outside of this folder that may need to be updated."
     end
 	
   	def self.source_root

data/bin/uppercut/loader.rb

@@ -12,6 +12,20 @@ module Uppercutbuild
       to = get_copy_to()
       puts "Copy To: #{to}"
       
+      FileUtils.copy_entry start_here, to
+	end
+
+	def self.upgrade()
+      @gem_to_copy = 'uppercutbuild'
+      
+      start_here = get_copy_from()
+      start_here = File.join(start_here,"build")
+      puts "Copy From: #{start_here}"
+      
+      to = get_copy_to()
+      to = File.join(to,"build")
+      puts "Copy To: #{to}"
+      
       FileUtils.copy_entry start_here, to
 	end
 	

data/docs/README

@@ -33,7 +33,7 @@ UppercuT is not a build server, but it integrates nicely with CruiseControl.NET,
 If you have Ruby 1.8.6+ (and Gems 1.3.7+) installed, you can get the current release of UppercuT to your machine the fastest!  
   
 1. Type 'gem install uppercutbuild'  
-2. At the top level directory (trunk or branch name) type 'uppercutbuild install'  
+2. At the top level directory (trunk or branch name) type 'uppercutbuild install' for bringing in uppercut for the first time or 'uppercutbuild upgrade' if you already uppercut and are just wanting to upgrade the build folder.   
   
 ### Source
 This is the best way to get to the bleeding edge of what we are doing.
@@ -55,7 +55,9 @@ Donations Accepted - If you enjoy using this product or it has saved you time an
 It helps keep to the product updated, pays for site hosting, etc. https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4410250
 
 # RELEASE NOTES
-=0.9.0.334=  
+=0.9.0.337=  
+* ILMerge is now a step of the build process. Please check the configuration for the new setting. (r337)  
+* UppercuT now has the command 'uppercutbuild upgrade'. (r336)  
 * Zip will not include the gems folder. (r334)  
 * UppercuT (through gems) can copy UppercuT to a solution directory by issuing 'uppercutbuild install' at the top level directory (trunk or branch name). (r333)  
   

data/lib/build/UppercuT.xml

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

data/lib/build/default.build

@@ -23,6 +23,7 @@
   <property name="version.hash" value="${version.revision}" overwrite="false" />
   <property name="version.build" value="0" />
   <property name="allow.powershell.unrestricted" value="false" 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}\${file.uppercut.assembly}" />
   <property name="file.custom.step.before" value="${dirs.build_scripts_custom}\${file.current.no_extension}.pre.build" />
@@ -94,6 +95,7 @@
     <nant buildfile="${dirs.current}\environmentBuilder.step" inheritall="true" />
     <nant buildfile="${dirs.current}\analyze.step" inheritall="true" />
     <nant buildfile="${dirs.current}\package.step" inheritall="true" />
+    <nant buildfile="${dirs.current}\ilmerge.build" inheritall="true" if="${run.ilmerge}" />
     <nant buildfile="${dirs.current}\gemsPrepare.step" inheritall="true" />
     <nant buildfile="${dirs.current}\gemsBuild.step" inheritall="true" />
   </target>

data/lib/build/ilmerge.build

@@ -22,9 +22,9 @@
 
   <property name="dirs.merge.from" value="${dirs.drop}\${folder.app.drop}" overwrite="false" />
   <property name="dirs.merge.to" value="${dirs.drop}\merge" overwrite="false" />
+  
   <property name="file.internalize.ignore" value="ilmerge.internalize.ignore.txt" />
   <property name="path.file.internalize.ignore" value="${dirs.build_scripts_custom}\${file.internalize.ignore}" />
-
   <property name="file.merge.name" value="__REPLACE__" overwrite="false" />
   <!-- exe winexe dll -->
   <property name="merge.target.type" value="__REPLACE__" overwrite="false" />
@@ -50,7 +50,7 @@
   </target>
 
   <target name="run_normal_tasks"
-          depends="error_check, get_regular_dlls, run_ilmerge, copy_configs, remove_unneeded_assemblies, copy_from_merge, delete_merge_folder"
+          depends="set_environment_variables, error_check, get_regular_dlls, run_ilmerge, copy_configs, remove_unneeded_assemblies, copy_from_merge, delete_merge_folder"
           description="Running ILMerge with UppercuT default.build." />
 
   <target name="custom_tasks_before">
@@ -78,8 +78,17 @@
     </exec>
   </target>
 
+  <target name="set_environment_variables">
+    <property name="dirs.merge.from" value="${environment::get-variable('uc.dirs.merge.from')}" if="${environment::variable-exists('uc.dirs.merge.from')}" />
+    <property name="dirs.merge.to" value="${environment::get-variable('uc.dirs.merge.to')}" if="${environment::variable-exists('uc.dirs.merge.to')}" />
+    <property name="file.merge.name" value="${environment::get-variable('uc.file.merge.name')}" if="${environment::variable-exists('uc.file.merge.name')}" />
+    <property name="merge.target.type" value="${environment::get-variable('uc.merge.target.type')}" if="${environment::variable-exists('uc.merge.target.type')}" />
+    <property name="args.ilmerge" value="/internalize /target:${merge.target.type} /out:${dirs.merge.to}\${file.merge.name} /log:${dirs.merge.log}\${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}\${file.merge.name} /log:${dirs.merge.log}\${log.merge} /ndebug /allowDup ${file.merge.name} " if="${file::exists(path.file.internalize.ignore)}"/>
+  </target>
+  
   <target name="error_check">
-    <fail message="You must pass in the file.merge.name and the merge.target.type through the command line calling this build. Please do that and retry the build."
+    <fail message="You must pass in the file.merge.name and the merge.target.type through the command line calling this build. Please do that and retry the build. You can also set up an ilmerge.pre.build and set these environment variables: uc.dirs.merge.from, uc.dirs.merge.to, uc.file.merge.name, and uc.merge.target.type"
       if="${file.merge.name=='__REPLACE__' or merge.target.type=='__REPLACE__'}" />
   </target>
 

data/lib/settings/UppercuT.config

@@ -69,5 +69,6 @@
   <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="allow.powershell.unrestricted" value="false" overwrite="false" />
+  <property name="run.ilmerge" value="false" overwrite="false" />
 
 </project>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: uppercutbuild
 version: !ruby/object:Gem::Version 
-  hash: 667
+  hash: 677
   prerelease: false
   segments: 
   - 0
   - 9
   - 0
-  - 334
-  version: 0.9.0.334
+  - 337
+  version: 0.9.0.337
 platform: ruby
 authors: 
 - Rob "FerventCoder" Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-18 00:00:00 -05:00
+date: 2010-07-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency