teapot 0.7.3 → 0.7.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTYzMjgzYTc0NDJhNWYyMmVjMWM4ZTBkMWUxM2Y4MDgyNmU1OTI4OA==
+    MmNjNzk5MTgwZmJlNDE4NzEwY2I2MTdkY2U1M2M5MjRlNGUzYjM1Yw==
   data.tar.gz: !binary |-
-    ZDExZGU3NmRmMWMxYjE3MmFlNjY1ZTJkZWUzMmVmZjdlNmRlNjlmYg==
+    NTQ4MTAyMTJjMzk4ZjgzYzEwMDhlYWE2ZjMwNjMxM2FlZjdiMDg2OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWRlNzAwY2Y4YjUwYjY5YmFjOTExNmIzN2RlNjFlOWRkNGQ2MzUxZmQ4OWMx
-    MTFmYzcwODUxZTBlNTI2MDkzMDYzZjEwNWYwMjY0NDFjOWY4MDFjMjcyNjNh
-    NjZlOGQ0NzdlYjBjMWIxZTU3MzM4MDdkYzVhNWU0NDZmNDY4ZTc=
+    NjFjZTI5YjJiY2JmMjk3NGQxMzkwMTg0YjUxMTQ0YjJhYzI2YTUxNDA3ZGI5
+    OWM1MzNmNDRiODNkODJiNzU4NTIyOWYyOWVhMmM3NzE5MDRhZDA4NTFhNzMw
+    ZjliYWE5MGZhZWIyMzAyYmQyOWE4MmI1NGE0ZWU3MjZlZTk2N2M=
   data.tar.gz: !binary |-
-    NGQxYzFiZGVlNDk1NmZhYTI5NWVlNmFjMjczYjlkYTEyM2VmNGE3YjQ4ZjEx
-    Y2UwM2QwYjMzZWExM2JiY2RiNDIzN2VmNTljZGQyMDUxY2Y3NmZiZDVhODlh
-    YjY0MGM0Y2E0NmZkMzg4ODdhYmYxODlkZjMxNjFmNjk2NGUwNGY=
+    Yzk0YWZlNDU1ODQ1OGZjNWI2YzAzYmQ5MzgxZTc3YWE2YWM1N2RjNTg1YTI1
+    N2Q5MWNlZGY5NzFlODczZmVhZmM1YTNkMzRkOTZjYTlkMTJlMGE0OGJiZDM2
+    YjhmMDFkOWVkODIzYjJlOGViMTI3NjlmOWZhNjc2NDdiMzRlNDc=

data/README.md

@@ -57,6 +57,12 @@ For Mac OS X (requires Xcode Command Line Tools):
 
 You need to make sure any basic tools, e.g. compilers, system libraries, are installed correctly before building. Consult the platform and library documentation for any dependencies.
 
+## Dependency Graph
+
+Dependency analysis is an important part of efficiently building a source tree. A dependency graph constructed from a single output file depends on the set of input files and their associated implicit dependencies (e.g. `#include` directives), and additionally the environment and task that is being performed. Specifically, the environment can specify additional header files, libraries, or other dependent input files and needs to be considered explicitly.
+
+Teapot assumes per-environment dependency graphs and in addition, parts of the dependency graph are generated dynamically. The process of extracting implicit dependencies can be found under `teapot/extractors` and is used extensively in the build graph `teapot/build`.
+
 ## Contributing
 
 1. Fork it

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

@@ -33,7 +33,7 @@ module Teapot
 			
 					graph = Build::dependency_graph(environment)
 					
-					if graph.regenerate?(executable_file, objects)
+					if graph.regenerate?(executable_file, objects + dependent_libraries(environment))
 						Commands.run(
 							environment[:cxx],
 							environment[:cxxflags],

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

@@ -24,6 +24,7 @@ require 'teapot/build/targets/files'
 require 'teapot/build/targets/compiler'
 
 require 'teapot/build/graph'
+require 'teapot/extractors/linker_extractor'
 
 require 'fileutils'
 
@@ -47,12 +48,16 @@ module Teapot
 					options[:subdirectory] || "lib"
 				end
 				
+				def dependent_libraries(environment)
+					Extractors::LinkerExtractor.libraries(environment[:ldflags])
+				end
+				
 				def link(environment, objects)
 					library_file = link_prefix!(environment) + "lib#{@name}.a"
 				
 					graph = Build::dependency_graph(environment)
 					
-					if graph.regenerate?(library_file, objects)
+					if graph.regenerate?(library_file, objects + dependent_libraries(environment))
 						Linker.link_static(environment, library_file, objects)
 					end
 					

data/lib/teapot/context.rb

@@ -55,7 +55,6 @@ module Teapot
 			defined = load(root_package)
 
 			# Find the default configuration, if it exists:
-
 			@default_configuration = defined.default_configuration
 
 			if options[:configuration]
@@ -118,7 +117,8 @@ module Teapot
 
 				@generators[definition.name] = definition
 			when Configuration
-				if definition.public?
+				# We define configurations in two cases, if they are public, or if they are part of the root package of this context.
+				if definition.public? or definition.package == @root_package
 					# The root package implicitly defines the default configuration.
 					if definition.name == DEFAULT_CONFIGURATION_NAME
 						raise AlreadyDefinedError.new(definition, root_package)

data/lib/teapot/extractors/linker_extractor.rb

@@ -0,0 +1,57 @@
+# 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
+		module LinkerExtractor
+			# Give back a list of library paths for a specific set of ldflags.
+			def self.libraries(flags)
+				roots = []
+				libraries = []
+				paths = []
+
+				# Extract include directories:
+				flags.each do |option|
+					if option.to_s =~ /^-L(.+)/
+						roots << Pathname($1)
+					elsif option.to_s =~ /^-l(.+)/
+						libraries << Pathname($1)
+					end
+				end
+
+				libraries.each do |name|
+					archive_name = "lib#{name}.a"
+					
+					roots.each do |root|
+						archive_path = root + archive_name
+						
+						paths << archive_path
+						
+						break
+					end
+				end
+				
+				return paths
+			end
+		end
+	end
+end

data/lib/teapot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teapot
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -114,6 +114,7 @@ files:
 - lib/teapot/environment/evaluator.rb
 - lib/teapot/environment/flatten.rb
 - lib/teapot/environment/system.rb
+- lib/teapot/extractors/linker_extractor.rb
 - lib/teapot/extractors/preprocessor_extractor.rb
 - lib/teapot/generator.rb
 - lib/teapot/graph.rb