teapot 0.7.1 → 0.7.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjhkODU0M2VmNzc4OWQwMGQzNGYyZTU4MzM0NTBjMWU1MTMxYmRjNg==
+    ZTQyYjk5NWYwZDFhYTJiMmZjOWEzYmE3MGY2ODM2YTBhM2I5NTU2Ng==
   data.tar.gz: !binary |-
-    MmFiZDE4M2VlNGJkNzgyYWY4MDk4ZDI1YjMzNmJlNjZhZDJjY2Q5Mg==
+    N2NhM2YzMWViNGNjMGVkNWZlMjZmNDMxNzM2NDNhMWU0N2Y5ZmQ4ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2ExNjk4YzUwM2UyM2QxYTYyOWIzZWQ2OTVlOGQyYWU0NTk4MTU3MWNlMDQ4
-    NTczNDgyZTA5YjdmNTljYTQ0MTM4ZTRmMzA1NjAyMzVjY2IzZWRmNGEyODVj
-    MmE3ZjU5ZjAyZDVmNWQwMjc0MmNkNWQzMjE4NzAwODg1NGZlZWY=
+    OTRmYmYzN2M4YzRhYmJmMGE5MTY0ZDdlYmI1MGQyMjRhZWYxMzQ2OTg3ODQx
+    ODg3ZTFhYWE2NDBkNzcwYTYzNzlmODRlNGQ2ZTZkYWJiZGE5OTc0ZWQ4N2Yz
+    Njk0YjYzNzliMjkyZDdmNDE1NGZjZmM1MThmNWZjZmQ3OWRlMjk=
   data.tar.gz: !binary |-
-    ZjRlOTE3MmIxOGYxY2ZiZmI0MTg1N2RjZWRjODM5MzRmMGM2MzMyN2YwZDk5
-    MzYwM2E1YWQ2NjY0ZDg3YjY2MmYxYjEyMDNlNTFiNDkwNjVjMTY0OTQxOTcx
-    ZTRlYmE1ZmVjYzFjNmMxZWRkMjFlMzhjNjg1ZDAyZDE3MGYwN2I=
+    NmNjMGYyNjlkNTY4YmI5YmI5YmI3YmIzYWJiNTRiODFlMzc2M2U0MmYwOWQ2
+    MmI0ZTM2N2M3NTE2ZjFiYWE1NWJmYTlkMzdlZTIyNDUxYTM2MzIwYmFlMThk
+    MzUwYjU0ZDBjMTdkZjMwNDhiMzdmM2E1NzAyNzA1YmJiODAxNmE=

data/lib/teapot/build/component.rb

@@ -59,7 +59,7 @@ module Teapot
 				@parts.each do |path|
 					full_path = @root + path
 			
-					FileUtils.cp_r(full_path.children, source_path.to_s)
+					FileUtils.cp_r(full_path.children, source_path.to_s, :preserve => true)
 				end
 		
 				return source_path

data/lib/teapot/build/file_list.rb

@@ -58,7 +58,7 @@ module Teapot
 						destination_path.dirname.mkpath
 					
 						# Copy the file to the destination:
-						FileUtils.cp path, destination_path
+						FileUtils.cp(path, destination_path, :preserve => true)
 					end
 				end
 			end

data/lib/teapot/build/graph.rb

@@ -0,0 +1,50 @@
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'pathname'
+
+require 'teapot/graph'
+require 'teapot/extractors/preprocessor_extractor'
+
+module Teapot
+	module Build
+		@@graphs = {}
+		
+		def self.dependency_graph(environment)
+			@@graphs.fetch(environment) do
+				graph = Graph.new
+
+				buildflags = environment[:buildflags]
+				roots = Extractors::PreprocessorExtractor.include_directories(buildflags)
+			
+				# At some point, it would be nice if this process could be driven by environment configuration:
+				patterns = [
+					/\.c(c|pp)?$/,
+					/\.h(pp)?$/,
+					/\.mm?/
+				]
+			
+				graph.extractors << Extractors::PreprocessorExtractor.new(patterns, roots)
+				
+				@@graphs[environment] = graph
+			end
+		end
+	end
+end

data/lib/teapot/build/target.rb

@@ -56,21 +56,21 @@ module Teapot
 			
 				return instance
 			end
-		
+
 			def execute(command, environment, *arguments)
 				if @configure
 					environment = environment.merge &@configure
 				end
-				
+
 				# Flatten the environment to a hash:
-				values = environment.flatten
-			
+				flat_environment = environment.flatten
+
 				puts "Performing #{self.class}/#{command} for #{root}...".color(:cyan)
-			
+
 				# Show the environment to the user:
-				Environment::System::dump(values)
-				
-				self.send(command, values, *arguments)
+				Environment::System::dump(flat_environment)
+
+				self.send(command, flat_environment, *arguments)
 			end
 		end
 	end

data/lib/teapot/build/targets/compiler.rb

@@ -20,6 +20,8 @@
 
 require 'pathname'
 
+require 'teapot/build/graph'
+
 module Teapot
 	module Build
 		module Targets
@@ -40,12 +42,13 @@ module Teapot
 					return prefix
 				end
 				
-				def compile(environment, root, source_file, commands)
-					object_file = (build_prefix!(environment) + source_file).sub_ext('.o')
-				
+				def compile!(environment, root, source_file, object_file, commands)
 					# Ensure there is a directory for the output file:
 					object_file.dirname.mkpath
-				
+
+					# Make sure there is no pre-existing object file
+					object_file.rmtree if object_file.exist?
+
 					case source_file.extname
 					when ".cpp", ".mm"
 						commands.run(
@@ -60,8 +63,19 @@ module Teapot
 							"-c", root + source_file, "-o", object_file
 						)
 					end
-			
-					return Array object_file
+				end
+				
+				def compile(environment, root, source_file, commands)
+					object_file = (build_prefix!(environment) + source_file).sub_ext('.o')
+
+					# The graph is recreated once per file. This could be improved.
+					graph = Build::dependency_graph(environment)
+
+					if graph.regenerate?(object_file, root + source_file)
+						compile!(environment, root, source_file, object_file, commands)
+					end
+
+					return object_file
 				end
 			end
 		end

data/lib/teapot/build/targets/executable.rb

@@ -31,13 +31,17 @@ module Teapot
 				def link(environment, objects)
 					executable_file = link_prefix!(environment) + @name
 			
-					Commands.run(
-						environment[:cxx],
-						environment[:cxxflags],
-						"-o", executable_file, objects,
-						environment[:ldflags]
-					)
-			
+					graph = Build::dependency_graph(environment)
+					
+					if graph.regenerate?(executable_file, objects)
+						Commands.run(
+							environment[:cxx],
+							environment[:cxxflags],
+							"-o", executable_file, objects,
+							environment[:ldflags]
+						)
+					end
+					
 					return executable_file
 				end
 			end

data/lib/teapot/build/targets/external.rb

@@ -58,7 +58,7 @@ module Teapot
 					if !build_source_path.exist?
 						build_source_path.mkpath
 						
-						FileUtils.cp_r(source_path.children, build_source_path.to_s)
+						FileUtils.cp_r(source_path.children, build_source_path.to_s, :preserve => true)
 						
 						# Write the environment checksum out to a file:
 						File.write(build_source_checksum_path, checksum(values))

data/lib/teapot/build/targets/library.rb

@@ -23,6 +23,8 @@ require 'teapot/build/targets/directory'
 require 'teapot/build/targets/files'
 require 'teapot/build/targets/compiler'
 
+require 'teapot/build/graph'
+
 require 'fileutils'
 
 module Teapot
@@ -48,8 +50,12 @@ module Teapot
 				def link(environment, objects)
 					library_file = link_prefix!(environment) + "lib#{@name}.a"
 				
-					Linker.link_static(environment, library_file, objects)
-				
+					graph = Build::dependency_graph(environment)
+					
+					if graph.regenerate?(library_file, objects)
+						Linker.link_static(environment, library_file, objects)
+					end
+					
 					return library_file
 				end
 			
@@ -75,7 +81,7 @@ module Teapot
 						destination_path = prefix + file_list.prefix + relative_path
 					
 						destination_path.dirname.mkpath
-						FileUtils.cp path, destination_path
+						FileUtils.cp(path, destination_path, :preserve => true)
 					end
 				end
 			
@@ -87,7 +93,7 @@ module Teapot
 					
 						destination_path.dirname.mkpath
 					
-						FileUtils.cp path, destination_path
+						FileUtils.cp(path, destination_path, :preserve => true)
 					end
 					
 					if self.respond_to? :headers

data/lib/teapot/environment/flatten.rb

@@ -39,7 +39,7 @@ module Teapot
 			if @parent
 				@parent.flatten_to_hash(hash)
 			end
-			
+
 			@values.each do |key, value|
 				previous = hash[key]
 
@@ -57,6 +57,5 @@ module Teapot
 				end
 			end
 		end
-
 	end
 end

data/lib/teapot/extractors/preprocessor_extractor.rb

@@ -0,0 +1,62 @@
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'teapot/graph'
+
+module Teapot
+	module Extractors
+		class PreprocessorExtractor < Graph::Extractor
+			def self.include_directories(flags)
+				roots = []
+
+				# Extract include directories:
+				flags.each do |option|
+					if option.to_s =~ /^-I(.+)/
+						roots << Pathname($1)
+					end
+				end
+
+				return roots
+			end
+		
+			def initialize(patterns, roots = [])
+				super patterns
+				
+				@roots = roots
+			end
+
+			def extract(path)
+				local_root = Pathname(path).dirname
+
+				File.open(path).each do |line|
+					if line =~ /\#(?:include|import) "(.*?)"/
+						path = local_root + $1
+		
+						yield path if path.exist?
+					elsif line =~ /\#(?:include|import) \<(.*?)\>/
+						path = @roots.collect{|root| root+$1}.find{|path| path.exist?}
+		
+						yield path if path
+					end
+				end
+			end
+		end
+	end
+end

data/lib/teapot/graph.rb

@@ -0,0 +1,134 @@
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'set'
+require 'pathname'
+
+module Teapot
+	class Graph
+		def initialize
+			@nodes = {}
+			
+			@extractors = []
+		end
+
+		attr :root
+		attr :nodes
+		attr :extractors
+
+		def << node
+			@nodes[node.path] = node
+		end
+
+		def regenerate?(output_path, input_paths)
+			return true unless output_path.exist?
+
+			output_modified_time = output_path.mtime
+
+			Array(input_paths).each do |path|
+				node = fetch(path)
+
+				return true if node.changed_since?(output_modified_time)
+			end
+
+			return false
+		end
+
+		def extract(source_path)
+			dependencies = Set.new
+
+			@extractors.each do |extractor|
+				extractor.call(source_path) do |path|
+					dependencies << path
+				end
+			end
+
+			nodes = dependencies.map{|path| fetch(path)}
+		end
+
+		def fetch(path)
+			@nodes.fetch(path) do
+				node = @nodes[path] = Node.new(self, path)
+				node.extract_dependencies!
+				
+				node
+			end
+		end
+
+		class Node
+			def initialize(graph, path)
+				@graph = graph
+
+				@path = Pathname(path)
+
+				@dependencies = []
+
+				@changed = nil
+			end
+
+			attr :path
+			attr :dependencies
+
+			def changed_since?(modified_time)
+				if @changed == nil
+					# If the file was modified in the future relative to old modified_time:
+					if @path.mtime > modified_time
+						puts "Changed: #{path.to_s.inspect}"
+						return @changed = true
+					else
+						@changed = false
+					end
+
+					# If any of the file's dependencies have changed relative to the old modified_time:
+					@dependencies.each do |dependency|
+						if dependency.changed_since?(modified_time)
+							return @changed = true
+						end
+					end
+				end
+
+				return @changed
+			end
+
+			def extract_dependencies!
+				@dependencies = @graph.extract(path)
+			end
+		end
+
+		class Extractor
+			def initialize(patterns = [])
+				@patterns = Array(patterns)
+			end
+
+			def extract(path)
+			end
+
+			def call(path, &block)
+				return unless path.exist?
+				
+				basename = path.basename.to_s
+
+				if @patterns.find{|pattern| pattern.match(basename)}
+					extract(path, &block)
+				end
+			end
+		end
+	end
+end

data/lib/teapot/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Teapot
-	VERSION = "0.7.1"
+	VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -86,6 +86,7 @@ files:
 - lib/teapot/build.rb
 - lib/teapot/build/component.rb
 - lib/teapot/build/file_list.rb
+- lib/teapot/build/graph.rb
 - lib/teapot/build/linker.rb
 - lib/teapot/build/target.rb
 - lib/teapot/build/targets/application.rb
@@ -113,7 +114,9 @@ files:
 - lib/teapot/environment/evaluator.rb
 - lib/teapot/environment/flatten.rb
 - lib/teapot/environment/system.rb
+- lib/teapot/extractors/preprocessor_extractor.rb
 - lib/teapot/generator.rb
+- lib/teapot/graph.rb
 - lib/teapot/loader.rb
 - lib/teapot/name.rb
 - lib/teapot/package.rb