josh/rscons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add builder construction variables to Environments before the builder is added.

Browse Source
This commit is contained in:
Josh Holtrop 2018-12-29 17:57:41 -05:00
parent 08085f09c4
commit 347d651ab6
12 changed files with 114 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/rscons.rb
View File

@ -12,20 +12,6 @@ require_relative "rscons/util"
require_relative "rscons/varset" require_relative "rscons/varset"
require_relative "rscons/version" require_relative "rscons/version"
# default builders
require_relative "rscons/builders/cfile"
require_relative "rscons/builders/command"
require_relative "rscons/builders/directory"
require_relative "rscons/builders/disassemble"
require_relative "rscons/builders/install"
require_relative "rscons/builders/library"
require_relative "rscons/builders/object"
require_relative "rscons/builders/preprocess"
require_relative "rscons/builders/program"
require_relative "rscons/builders/shared_library"
require_relative "rscons/builders/shared_object"
require_relative "rscons/builders/simple_builder"
# Namespace module for rscons classes # Namespace module for rscons classes
module Rscons module Rscons
@ -177,5 +163,19 @@ module Rscons
end end
# default builders
require_relative "rscons/builders/cfile"
require_relative "rscons/builders/command"
require_relative "rscons/builders/directory"
require_relative "rscons/builders/disassemble"
require_relative "rscons/builders/install"
require_relative "rscons/builders/library"
require_relative "rscons/builders/object"
require_relative "rscons/builders/preprocess"
require_relative "rscons/builders/program"
require_relative "rscons/builders/shared_library"
require_relative "rscons/builders/shared_object"
require_relative "rscons/builders/simple_builder"
# Unbuffer $stdout # Unbuffer $stdout
$stdout.sync = true $stdout.sync = true

6
lib/rscons/application.rb
View File

@ -15,8 +15,14 @@ module Rscons
# Access any variables set on the rscons command-line. # Access any variables set on the rscons command-line.
attr_reader :vars attr_reader :vars
# @return [VarSet]
# The default construction variables provided by builders.
attr_reader :default_varset
# Create Application instance.
def initialize def initialize
@n_threads = determine_n_threads @n_threads = determine_n_threads
@default_varset = VarSet.new
@vars = VarSet.new @vars = VarSet.new
end end

9
lib/rscons/builder.rb
View File

@ -15,15 +15,6 @@ module Rscons
self.class.name.split(":").last self.class.name.split(":").last
end end
# Return a set of default construction variables for the builder.
#
# @param env [Environment] The Environment.
#
# @return [Hash] Default construction variables.
def default_variables(env)
{}
end
# Return a set of build features that this builder provides. # Return a set of build features that this builder provides.
# #
# @return [Array<String>] # @return [Array<String>]

27
lib/rscons/builders/cfile.rb
View File

@ -8,23 +8,16 @@ module Rscons
# env.CFile("lex.yy.cc", "parser.ll") # env.CFile("lex.yy.cc", "parser.ll")
class CFile < Builder class CFile < Builder
# Return default construction variables for the builder. Rscons.application.default_varset.append(
# "YACC" => "bison",
# @param env [Environment] The Environment using the builder. "YACC_FLAGS" => ["-d"],
# "YACC_CMD" => ["${YACC}", "${YACC_FLAGS}", "-o", "${_TARGET}", "${_SOURCES}"],
# @return [Hash] Default construction variables for the builder. "YACCSUFFIX" => [".y", ".yy"],
def default_variables(env) "LEX" => "flex",
{ "LEX_FLAGS" => [],
"YACC" => "bison", "LEX_CMD" => ["${LEX}", "${LEX_FLAGS}", "-o", "${_TARGET}", "${_SOURCES}"],
"YACC_FLAGS" => ["-d"], "LEXSUFFIX" => [".l", ".ll"],
"YACC_CMD" => ["${YACC}", "${YACC_FLAGS}", "-o", "${_TARGET}", "${_SOURCES}"], )
"YACCSUFFIX" => [".y", ".yy"],
"LEX" => "flex",
"LEX_FLAGS" => [],
"LEX_CMD" => ["${LEX}", "${LEX_FLAGS}", "-o", "${_TARGET}", "${_SOURCES}"],
"LEXSUFFIX" => [".l", ".ll"],
}
end
# Run the builder to produce a build target. # Run the builder to produce a build target.
# #

17
lib/rscons/builders/disassemble.rb
View File

@ -3,18 +3,11 @@ module Rscons
# The Disassemble builder produces a disassembly listing of a source file. # The Disassemble builder produces a disassembly listing of a source file.
class Disassemble < Builder class Disassemble < Builder
# Return default construction variables for the builder. Rscons.application.default_varset.append(
# "OBJDUMP" => "objdump",
# @param env [Environment] The Environment using the builder. "DISASM_CMD" => ["${OBJDUMP}", "${DISASM_FLAGS}", "${_SOURCES}"],
# "DISASM_FLAGS" => ["--disassemble", "--source"],
# @return [Hash] Default construction variables for the builder. )
def default_variables(env)
{
"OBJDUMP" => "objdump",
"DISASM_CMD" => ["${OBJDUMP}", "${DISASM_FLAGS}", "${_SOURCES}"],
"DISASM_FLAGS" => ["--disassemble", "--source"],
}
end
# Run the builder to produce a build target. # Run the builder to produce a build target.
# #

19
lib/rscons/builders/library.rb
View File

@ -3,19 +3,12 @@ module Rscons
# A default Rscons builder that produces a static library archive. # A default Rscons builder that produces a static library archive.
class Library < Builder class Library < Builder
# Return default construction variables for the builder. Rscons.application.default_varset.append(
# 'AR' => 'ar',
# @param env [Environment] The Environment using the builder. 'LIBSUFFIX' => '.a',
# 'ARFLAGS' => ['rcs'],
# @return [Hash] Default construction variables for the builder. 'ARCMD' => ['${AR}', '${ARFLAGS}', '${_TARGET}', '${_SOURCES}']
def default_variables(env) )
{
'AR' => 'ar',
'LIBSUFFIX' => '.a',
'ARFLAGS' => ['rcs'],
'ARCMD' => ['${AR}', '${ARFLAGS}', '${_TARGET}', '${_SOURCES}']
}
end
# Set up a build operation using this builder. # Set up a build operation using this builder.
# #

73
lib/rscons/builders/object.rb
View File

@ -12,53 +12,46 @@ module Rscons
"DC" => "DSUFFIX", "DC" => "DSUFFIX",
} }
# Return default construction variables for the builder. Rscons.application.default_varset.append(
# 'OBJSUFFIX' => ['.o'],
# @param env [Environment] The Environment using the builder. 'DEPFILESUFFIX' => '.mf',
#
# @return [Hash] Default construction variables for the builder.
def default_variables(env)
{
'OBJSUFFIX' => ['.o'],
'DEPFILESUFFIX' => '.mf',
'CPPDEFPREFIX' => '-D', 'CPPDEFPREFIX' => '-D',
'INCPREFIX' => '-I', 'INCPREFIX' => '-I',
'AS' => '${CC}', 'AS' => '${CC}',
'ASFLAGS' => [], 'ASFLAGS' => [],
'ASSUFFIX' => ['.S'], 'ASSUFFIX' => ['.S'],
'ASPPPATH' => '${CPPPATH}', 'ASPPPATH' => '${CPPPATH}',
'ASPPFLAGS' => '${CPPFLAGS}', 'ASPPFLAGS' => '${CPPFLAGS}',
'ASDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], 'ASDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'],
'ASCMD' => ['${AS}', '-c', '-o', '${_TARGET}', '${ASDEPGEN}', '${INCPREFIX}${ASPPPATH}', '${ASPPFLAGS}', '${ASFLAGS}', '${_SOURCES}'], 'ASCMD' => ['${AS}', '-c', '-o', '${_TARGET}', '${ASDEPGEN}', '${INCPREFIX}${ASPPPATH}', '${ASPPFLAGS}', '${ASFLAGS}', '${_SOURCES}'],
'CPPFLAGS' => ['${CPPDEFPREFIX}${CPPDEFINES}'], 'CPPFLAGS' => ['${CPPDEFPREFIX}${CPPDEFINES}'],
'CPPDEFINES' => [], 'CPPDEFINES' => [],
'CPPPATH' => [], 'CPPPATH' => [],
'CCFLAGS' => [], 'CCFLAGS' => [],
'CC' => 'gcc', 'CC' => 'gcc',
'CFLAGS' => [], 'CFLAGS' => [],
'CSUFFIX' => ['.c'], 'CSUFFIX' => ['.c'],
'CCDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], 'CCDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'],
'CCCMD' => ['${CC}', '-c', '-o', '${_TARGET}', '${CCDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${CFLAGS}', '${CCFLAGS}', '${_SOURCES}'], 'CCCMD' => ['${CC}', '-c', '-o', '${_TARGET}', '${CCDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${CFLAGS}', '${CCFLAGS}', '${_SOURCES}'],
'CXX' => 'g++', 'CXX' => 'g++',
'CXXFLAGS' => [], 'CXXFLAGS' => [],
'CXXSUFFIX' => ['.cc', '.cpp', '.cxx', '.C'], 'CXXSUFFIX' => ['.cc', '.cpp', '.cxx', '.C'],
'CXXDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], 'CXXDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'],
'CXXCMD' =>['${CXX}', '-c', '-o', '${_TARGET}', '${CXXDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${CXXFLAGS}', '${CCFLAGS}', '${_SOURCES}'], 'CXXCMD' =>['${CXX}', '-c', '-o', '${_TARGET}', '${CXXDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${CXXFLAGS}', '${CCFLAGS}', '${_SOURCES}'],
'DC' => 'gdc', 'DC' => 'gdc',
'DFLAGS' => [], 'DFLAGS' => [],
'DSUFFIX' => ['.d'], 'DSUFFIX' => ['.d'],
'DDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], 'DDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'],
'D_IMPORT_PATH' => [], 'D_IMPORT_PATH' => [],
'DCCMD' => ['${DC}', '-c', '-o', '${_TARGET}', '${DDEPGEN}', '${INCPREFIX}${D_IMPORT_PATH}', '${DFLAGS}', '${_SOURCES}'], 'DCCMD' => ['${DC}', '-c', '-o', '${_TARGET}', '${DDEPGEN}', '${INCPREFIX}${D_IMPORT_PATH}', '${DFLAGS}', '${_SOURCES}'],
} )
end
# Return whether this builder object is capable of producing a given target # Return whether this builder object is capable of producing a given target
# file name from a given source file name. # file name from a given source file name.

17
lib/rscons/builders/preprocess.rb
View File

@ -5,18 +5,11 @@ module Rscons
# The Preprocess builder invokes the C preprocessor # The Preprocess builder invokes the C preprocessor
class Preprocess < Builder class Preprocess < Builder
# Return default construction variables for the builder. Rscons.application.default_varset.append(
# "CPP_CMD" => %w[
# @param env [Environment] The Environment using the builder. ${_PREPROCESS_CC} -E ${_PREPROCESS_DEPGEN}
# -o ${_TARGET} ${INCPREFIX}${CPPPATH} ${CPPFLAGS} ${_SOURCES}],
# @return [Hash] Default construction variables for the builder. )
def default_variables(env)
{
"CPP_CMD" => %w[
${_PREPROCESS_CC} -E ${_PREPROCESS_DEPGEN}
-o ${_TARGET} ${INCPREFIX}${CPPPATH} ${CPPFLAGS} ${_SOURCES}],
}
end
# Run the builder to produce a build target. # Run the builder to produce a build target.
# #

31
lib/rscons/builders/program.rb
View File

@ -4,25 +4,18 @@ module Rscons
# executable program. # executable program.
class Program < Builder class Program < Builder
# Return default construction variables for the builder. Rscons.application.default_varset.append(
# 'OBJSUFFIX' => '.o',
# @param env [Environment] The Environment using the builder. 'PROGSUFFIX' => (Object.const_get("RUBY_PLATFORM") =~ /mingw|cygwin/ ? ".exe" : ""),
# 'LD' => nil,
# @return [Hash] Default construction variables for the builder. 'LIBSUFFIX' => '.a',
def default_variables(env) 'LDFLAGS' => [],
{ 'LIBPATH' => [],
'OBJSUFFIX' => '.o', 'LIBDIRPREFIX' => '-L',
'PROGSUFFIX' => (Object.const_get("RUBY_PLATFORM") =~ /mingw|cygwin/ ? ".exe" : ""), 'LIBLINKPREFIX' => '-l',
'LD' => nil, 'LIBS' => [],
'LIBSUFFIX' => '.a', 'LDCMD' => ['${LD}', '-o', '${_TARGET}', '${LDFLAGS}', '${_SOURCES}', '${LIBDIRPREFIX}${LIBPATH}', '${LIBLINKPREFIX}${LIBS}']
'LDFLAGS' => [], )
'LIBPATH' => [],
'LIBDIRPREFIX' => '-L',
'LIBLINKPREFIX' => '-l',
'LIBS' => [],
'LDCMD' => ['${LD}', '-o', '${_TARGET}', '${LDFLAGS}', '${_SOURCES}', '${LIBDIRPREFIX}${LIBPATH}', '${LIBLINKPREFIX}${LIBS}']
}
end
# Create a BuildTarget object for this build target. # Create a BuildTarget object for this build target.
# #

25
lib/rscons/builders/shared_library.rb
View File

@ -4,22 +4,15 @@ module Rscons
# shared library. # shared library.
class SharedLibrary < Builder class SharedLibrary < Builder
# Return default construction variables for the builder. Rscons.application.default_varset.append(
# 'SHLIBPREFIX' => (RUBY_PLATFORM =~ /mingw/ ? '' : 'lib'),
# @param env [Environment] The Environment using the builder. 'SHLIBSUFFIX' => (RUBY_PLATFORM =~ /mingw/ ? '.dll' : '.so'),
# 'SHLDFLAGS' => ['${LDFLAGS}', '-shared'],
# @return [Hash] Default construction variables for the builder. 'SHLD' => nil,
def default_variables(env) 'SHLIBDIRPREFIX' => '-L',
{ 'SHLIBLINKPREFIX' => '-l',
'SHLIBPREFIX' => (RUBY_PLATFORM =~ /mingw/ ? '' : 'lib'), 'SHLDCMD' => ['${SHLD}', '-o', '${_TARGET}', '${SHLDFLAGS}', '${_SOURCES}', '${SHLIBDIRPREFIX}${LIBPATH}', '${SHLIBLINKPREFIX}${LIBS}']
'SHLIBSUFFIX' => (RUBY_PLATFORM =~ /mingw/ ? '.dll' : '.so'), )
'SHLDFLAGS' => ['${LDFLAGS}', '-shared'],
'SHLD' => nil,
'SHLIBDIRPREFIX' => '-L',
'SHLIBLINKPREFIX' => '-l',
'SHLDCMD' => ['${SHLD}', '-o', '${_TARGET}', '${SHLDFLAGS}', '${_SOURCES}', '${SHLIBDIRPREFIX}${LIBPATH}', '${SHLIBLINKPREFIX}${LIBS}']
}
end
# Return a set of build features that this builder provides. # Return a set of build features that this builder provides.
# #

33
lib/rscons/builders/shared_object.rb
View File

@ -13,29 +13,22 @@ module Rscons
"SHDC" => "DSUFFIX", "SHDC" => "DSUFFIX",
} }
# Return default construction variables for the builder. pic_flags = (RUBY_PLATFORM =~ /mingw/ ? [] : ['-fPIC'])
# Rscons.application.default_varset.append(
# @param env [Environment] The Environment using the builder. 'SHCCFLAGS' => ['${CCFLAGS}'] + pic_flags,
#
# @return [Hash] Default construction variables for the builder.
def default_variables(env)
pic_flags = (RUBY_PLATFORM =~ /mingw/ ? [] : ['-fPIC'])
{
'SHCCFLAGS' => ['${CCFLAGS}'] + pic_flags,
'SHCC' => '${CC}', 'SHCC' => '${CC}',
'SHCFLAGS' => ['${CFLAGS}'], 'SHCFLAGS' => ['${CFLAGS}'],
'SHCCCMD' => ['${SHCC}', '-c', '-o', '${_TARGET}', '${CCDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${SHCFLAGS}', '${SHCCFLAGS}', '${_SOURCES}'], 'SHCCCMD' => ['${SHCC}', '-c', '-o', '${_TARGET}', '${CCDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${SHCFLAGS}', '${SHCCFLAGS}', '${_SOURCES}'],
'SHCXX' => '${CXX}', 'SHCXX' => '${CXX}',
'SHCXXFLAGS' => ['${CXXFLAGS}'], 'SHCXXFLAGS' => ['${CXXFLAGS}'],
'SHCXXCMD' => ['${SHCXX}', '-c', '-o', '${_TARGET}', '${CXXDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${SHCXXFLAGS}', '${SHCCFLAGS}', '${_SOURCES}'], 'SHCXXCMD' => ['${SHCXX}', '-c', '-o', '${_TARGET}', '${CXXDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${SHCXXFLAGS}', '${SHCCFLAGS}', '${_SOURCES}'],
'SHDC' => 'gdc', 'SHDC' => 'gdc',
'SHDFLAGS' => ['${DFLAGS}'] + pic_flags, 'SHDFLAGS' => ['${DFLAGS}'] + pic_flags,
'SHDCCMD' => ['${SHDC}', '-c', '-o', '${_TARGET}', '${INCPREFIX}${D_IMPORT_PATH}', '${SHDFLAGS}', '${_SOURCES}'], 'SHDCCMD' => ['${SHDC}', '-c', '-o', '${_TARGET}', '${INCPREFIX}${D_IMPORT_PATH}', '${SHDFLAGS}', '${_SOURCES}'],
} )
end
# Return a set of build features that this builder provides. # Return a set of build features that this builder provides.
# #

8
lib/rscons/environment.rb
View File

@ -69,7 +69,7 @@ module Rscons
@threaded_commands = Set.new @threaded_commands = Set.new
@registered_build_dependencies = {} @registered_build_dependencies = {}
@side_effects = {} @side_effects = {}
@varset = VarSet.new @varset = VarSet.new(Rscons.application.default_varset)
@job_set = JobSet.new(@registered_build_dependencies, @side_effects) @job_set = JobSet.new(@registered_build_dependencies, @side_effects)
@user_deps = {} @user_deps = {}
@builders = {} @builders = {}
@ -169,12 +169,6 @@ module Rscons
builder = Rscons::Builders::SimpleBuilder.new(builder, &action) builder = Rscons::Builders::SimpleBuilder.new(builder, &action)
end end
@builders[builder.name] = builder @builders[builder.name] = builder
var_defs = builder.default_variables(self)
if var_defs
var_defs.each_pair do |var, val|
@varset[var] ||= val
end
end
end end
# Add a build hook to the Environment. # Add a build hook to the Environment.