teapot 0.3.2 → 0.5.0

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

@@ -0,0 +1,69 @@
+# 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'
+
+module Teapot
+	module Build
+		module Targets
+			module Compiler
+				def build_prefix!(environment)
+					build_prefix = Pathname.new(environment[:build_prefix]) + "compiled"
+				
+					build_prefix.mkpath
+				
+					return build_prefix
+				end
+			
+				def link_prefix!(environment)
+					prefix = Pathname.new(environment[:build_prefix]) + "linked"
+				
+					prefix.mkpath
+				
+					return prefix
+				end
+				
+				def compile(environment, root, source_file, commands)
+					object_file = (build_prefix!(environment) + source_file).sub_ext('.o')
+				
+					# Ensure there is a directory for the output file:
+					object_file.dirname.mkpath
+				
+					case source_file.extname
+					when ".cpp", ".mm"
+						commands.run(
+							environment[:cxx],
+							environment[:cxxflags],
+							"-c", root + source_file, "-o", object_file
+						)
+					when ".c", ".m"
+						commands.run(
+							environment[:cc],
+							environment[:cflags],
+							"-c", root + source_file, "-o", object_file
+						)
+					end
+			
+					return Array object_file
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,63 @@
+# 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/build/target'
+
+module Teapot
+	module Build
+		module Targets
+			class Directory < Build::Target
+				BUILD_FILE = "build.rb"
+				
+				def initialize(parent, root = nil)
+					super parent
+					
+					@root = root
+					@targets = []
+				end
+				
+				def root
+					@root || @parent.root
+				end
+				
+				attr :tasks
+				
+				def << (target)
+					@targets << target
+				end
+				
+				def add_directory(path)
+					directory = Directory.target(self, @root + path)
+			
+					build_path = (directory.root + BUILD_FILE).to_s
+					directory.instance_eval(File.read(build_path), build_path)
+			
+					self << directory
+				end
+				
+				def execute(command, *arguments)
+					@targets.each do |target|
+						target.execute(command, *arguments)
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,52 @@
+# 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/build/targets/library'
+
+module Teapot
+	module Build
+		module Targets
+			class Executable < Library
+				def subdirectory
+					options[:subdirectory] || "bin"
+				end
+			
+				def link(environment, objects)
+					executable_file = link_prefix!(environment) + @name
+			
+					Commands.run(
+						environment[:cxx],
+						environment[:cxxflags],
+						"-o", executable_file, objects,
+						environment[:ldflags]
+					)
+			
+					return executable_file
+				end
+			end
+			
+			class Directory
+				def compile_executable(*args, &block)
+					self << Executable.target(self, *args, &block)
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,82 @@
+# 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/build/target'
+require 'teapot/build/targets/directory'
+require 'teapot/build/targets/compiler'
+
+require 'fileutils'
+
+module Teapot
+	module Build
+		module Targets
+			module Installation
+				def install_prefix!(environment)
+					install_prefix = Pathname.new(environment[:install_prefix])
+				
+					install_prefix.mkpath
+				
+					return install_prefix
+				end
+			end
+			
+			class Files < Build::Target
+				include Installation
+				
+				def initialize(parent, options = {})
+					super parent
+					@options = options
+				end
+				
+				attr :options
+				
+				def subdirectory
+					options[:subdirectory] || "./"
+				end
+				
+				def install(environment)
+					prefix = install_prefix!(environment)
+					
+					if self.respond_to? :source_files
+						file_list = self.source_files(environment)
+						
+						file_list.copy(prefix + subdirectory)
+					end
+				end
+			end
+			
+			class Headers < Files
+				def subdirectory
+					super + "include/"
+				end
+			end
+			
+			class Directory
+				def copy_files(*args, &block)
+					self << Files.target(self, *args, &block)
+				end
+				
+				def copy_headers(*args, &block)
+					self << Headers.target(self, *args, &block)
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,106 @@
+# 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/build/target'
+require 'teapot/build/targets/directory'
+require 'teapot/build/targets/files'
+require 'teapot/build/targets/compiler'
+
+require 'fileutils'
+
+module Teapot
+	module Build
+		module Targets
+			class Library < Build::Target
+				include Compiler
+				include Installation
+
+				def initialize(parent, name, options = {})
+					super parent
+			
+					@name = name
+					@options = options
+				end
+				
+				attr :options
+				
+				def subdirectory
+					options[:subdirectory] || "lib"
+				end
+				
+				def link(environment, objects)
+					library_file = link_prefix!(environment) + "lib#{@name}.a"
+				
+					Linker.link_static(environment, library_file, objects)
+				
+					return library_file
+				end
+			
+				def build(environment)
+					file_list = self.source_files(environment)
+				
+					pool = Commands::Pool.new
+				
+					objects = file_list.collect do |source_file|
+						relative_path = source_file.relative_path_from(file_list.root)
+					
+						compile(environment, file_list.root, relative_path, pool)
+					end
+				
+					pool.wait
+				
+					return Array link(environment, objects)
+				end
+			
+				def install_file_list(file_list, prefix)
+					file_list.each do |path|
+						relative_path = path.relative_path_from(file_list.root)
+						destination_path = prefix + file_list.prefix + relative_path
+					
+						destination_path.dirname.mkpath
+						FileUtils.cp path, destination_path
+					end
+				end
+			
+				def install(environment)
+					prefix = install_prefix!(environment)
+					
+					build(environment).each do |path|
+						destination_path = prefix + subdirectory + path.basename
+					
+						destination_path.dirname.mkpath
+					
+						FileUtils.cp path, destination_path
+					end
+					
+					if self.respond_to? :headers
+						install_file_list(self.headers(environment), prefix + "include")
+					end
+				end
+			end
+			
+			class Directory
+				def compile_library(*args, &block)
+					self << Library.target(self, *args, &block)
+				end
+			end
+		end
+	end
+end

data/lib/teapot/build.rb

@@ -18,227 +18,24 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'teapot/commands'
-require 'teapot/environment'
-
-require 'pathname'
-require 'rainbow'
-require 'shellwords'
-
-require 'teapot/build/linker'
+require 'teapot/build/targets/directory'
+require 'teapot/build/targets/files'
+require 'teapot/build/targets/library'
+require 'teapot/build/targets/executable'
+require 'teapot/build/targets/application'
 
 module Teapot
 	module Build
-		class UnsupportedPlatform < StandardError
-		end
-		
-		class Task
-			def initialize(inputs, outputs)
-				@inputs = inputs
-				@outputs = outputs
-			end
-		end
-	
-		class Target
-			def initialize(parent)
-				@parent = parent
-				@tasks = []
-				
-				@configure = nil
-			end
-		
-			def root
-				@parent.root
-			end
-		
-			def configure(&block)
-				@configure = Proc.new &block
-			end
-		
-			def self.target(*args, &block)
-				instance = self.new(*args)
-			
-				if block_given?
-					instance.instance_eval(&block)
-				end
-			
-				return instance
-			end
-		
-			def execute(command, environment, *arguments)
-				if @configure
-					environment = environment.merge &@configure
-				end
-				
-				# Flatten the environment to a hash:
-				values = environment.flatten
-			
-				puts "Executing command #{command} for #{root}...".color(:cyan)
-			
-				# Show the environment to the user:
-				Environment::System::dump(values)
-				
-				self.send(command, values, *arguments)
-			end
-		end
-	
-		class CompilerTarget < Target
-			def initialize(parent, name, options = {})
-				super parent
-			
-				@name = name
-				@options = options
-			end
-			
-			def build_prefix!(environment)
-				build_prefix = Pathname.new(environment[:build_prefix]) + @name
-				
-				build_prefix.mkpath
-				
-				return build_prefix
-			end
-			
-			def install_prefix!(environment)
-				install_prefix = Pathname.new(environment[:install_prefix])
-				
-				install_prefix.mkpath
-				
-				return install_prefix
-			end
-			
-			def compile(environment, source_file)
-				object_file = (build_prefix!(environment) + source_file.basename).sub_ext('.o')
-			
-				case source_file.extname
-				when ".cpp"
-					Commands.run(
-						environment[:cxx],
-						environment[:cxxflags],
-						"-c", source_file, "-o", object_file
-					)
-				when ".c"
-					Commands.run(
-						environment[:cc],
-						environment[:cflags],
-						"-c", source_file, "-o", object_file
-					)
-				end
-			
-				return Array object_file
-			end
-		end
-	
-		class Library < CompilerTarget
-			def subdirectory
-				"lib"
-			end
-			
-			def link(environment, objects)
-				library_file = build_prefix!(environment) + "lib#{@name}.a"
-				
-				Linker.link_static(environment, library_file, objects)
-				
-				return library_file
-			end
-			
-			def build(environment)
-				files = sources
-			
-				objects = sources.collect do |file|
-					compile(environment, file)
-				end
-			
-				return Array link(environment, objects)
-			end
-		
-			def install(environment)
-				prefix = install_prefix!(environment)
-				
-				build(environment).each do |path|
-					destination_path = prefix + subdirectory + path.basename
-					
-					destination_path.dirname.mkpath
-					FileUtils.cp path, destination_path
-				end
-				
-				if defined? headers
-					headers.each do |path|
-						relative_path = path.relative_path_from(root)
-						destination_path = prefix + "include" + relative_path
-					
-						destination_path.dirname.mkpath
-						FileUtils.cp path, destination_path
-					end
-				end
-				
-				if defined? files
-					files.each do |path|
-						relative_path = path.relative_path_from(root)
-						destination_path = prefix + relative_path
-					
-						destination_path.dirname.mkpath
-						FileUtils.cp path, destination_path
-					end
-				end
-			end
-		end
-	
-		class Executable < Library
-			def subdirectory
-				"bin"
-			end
-			
-			def link(environment, objects)
-				executable_file = build_prefix!(environment) + "#{@name}"
-			
-				Commands.run(
-					environment[:cxx],
-					environment[:cxxflags],
-					"-o", executable_file, objects,
-					environment[:ldflags]
-				)
-			
-				return executable_file
-			end
+		def self.top(path)
+			Targets::Directory.target(nil, path)
 		end
-	
-		class Directory < Target
-			def initialize(parent, root)
-				@root = root
-				@targets = []
-			end
 		
-			attr :root
-			attr :tasks
+		def self.install_directory(root, directory, *args)
+			target = top(root)
 		
-			def add_library(*args, &block)
-				@targets << Library.target(self, *args, &block)
-			end
+			target.add_directory(directory)
 		
-			def add_executable(*args, &block)
-				@targets << Executable.target(self, *args, &block)
-			end
-		
-			def add_directory(path)
-				directory = Directory.target(self, @root + path)
-			
-				$stderr.puts "Loading #{directory.root}..."
-				build_path = (directory.root + "build.rb").to_s
-				directory.instance_eval(File.read(build_path), build_path)
-			
-				@targets << directory
-			end
-		
-			def execute(command, *arguments)
-				$stderr.puts "Executing #{command} for #{@root}"
-				@targets.each do |target|
-					target.execute(command, *arguments)
-				end
-			end
-		end
-	
-		def self.top(path)
-			Directory.target(nil, path)
+			target.execute(:install, *args)
 		end
 	end
 end

data/lib/teapot/commands.rb

@@ -18,6 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'set'
 require 'rainbow'
 require 'shellwords'
 
@@ -41,5 +42,67 @@ module Teapot
 				raise CommandError.new("Non-zero exit status")
 			end
 		end
+		
+		def self.run!(*args)
+			run(*args)
+		rescue CommandError
+			false
+		end
+		
+		def wait
+			# No parallel execution supported by default.
+		end
+		
+		class Pool
+			def initialize(options = {})
+				@commands = []
+				@limit = options[:limit] || 16
+				
+				@running = Set.new
+			end
+			
+			def run(*args)
+				args = args.flatten.collect &:to_s
+			
+				puts args.join(' ').color(:blue)
+				
+				@commands << args
+				
+				schedule!
+			end
+			
+			def schedule!
+				while @running.size < @limit and @commands.size > 0
+					command = @commands.shift
+					
+					pid = Process.fork do
+						exec(*command)
+						
+						exit!(0)
+					end
+					
+					@running << pid
+				end
+			end
+			
+			def wait
+				while @running.size > 0
+					pid = Process.wait(0)
+					@running.delete(pid)
+					
+					schedule!
+				end
+			end
+		end
+		
+		def self.pipeline(parallel = false)
+			if parallel == false
+				# Non-parallel execution pipeline
+				Commands
+			else
+				# Pool based parallel execution pipeline
+				Pool.new(parallel == true ? {} : parallel)
+			end
+		end
 	end
 end