check_program: do not fail on Windows for non-existent PATH entries

build tests: use -m instead of -lc for mingw
build tests: do ldc2 tests even if omit_gdc_tests set
2019-08-27 16:14:19 -04:00 · 2019-08-27 12:32:36 -04:00 · 2019-08-27 08:51:56 -04:00 · 2019-08-27 08:50:01 -04:00
236 changed files with 4272 additions and 7807 deletions
@@ -1,38 +0,0 @@
 name: Run RScons Tests
 on:
  push:
    branches:
    - master
  pull_request:
 jobs:
  test:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
        os: [ubuntu-latest, macos-latest]
        ruby-version: ['2.7', '3.0', '3.4']
    steps:
    - name: Install dependencies (Linux)
      if: runner.os == 'Linux'
      run: sudo apt-get update && sudo apt-get install -y gcc gdc ldc clang flex bison
    - name: Install dependencies (macOS)
      if: runner.os == 'macOS'
      run: brew install gcc ldc flex bison
    - name: Checkout repository
      uses: actions/checkout@v4
    - name: Set up Ruby
      uses: ruby/setup-ruby@v1
      with:
        ruby-version: ${{ matrix.ruby-version }}
    - name: Install dependencies
      run: bundle install
    - name: Run tests
      run: rake all
@@ -7,5 +7,5 @@
 /gen/
 /large_project/
 /pkg/
-/test_run/
+/test/
 /yard/
@@ -1,118 +1,3 @@
 ## v3.3.0
 ### New Features
 - Add support for Ruby 3.4.
 - Fix up some macOS test cases.
 - #177 - Remove dependency on base64
 - #175 - Add support for building object files from LLVM assembly sources
 ## v3.2.0
 ### New Features
 - #171 - Place object files next to source files for source files in build directory
 - #170 - Use top-level build directory as environment build directory for unnamed environments
 - #167 - Add upgrading instructions
 - #166 - Replace CFile builder with Yacc and Lex builders
 ### Fixes
 - #172 - Fix configuration checks performed with ldc2 compiler
 - #169 - Output a better error when pkg-config is not found
 - #168 - Cannot output binary to an environment's build root with the same name as the top-level source directory
 - #164 - Improve DSL method documentation
 ## v3.1.0
 ### New Features
 - #162 - Improve configuration error messages
 - #163 - Ruby 3.2 compatibility
 ### Fixes
 - #161 - builder registered during build hooks should increase build step count
 ## v3.0.2
 ### Fixes
 - #159 - Compiler check configure methods should respect :use flag
 - #160 - Configure parameters should not be stored as unscoped construction variables
 ## v3.0.1
 ### Fixes
 - #156 - Avoid running configure operation twice
 - #157 - Load configure task arguments before early configure operations
 - #158 - Do not configure for clean tasks when not yet configured
 ## v3.0.0
 - #136 - Move rsconscache into build directory
 - #140 - Support naming environments
 - #143 - Add Size builder
 - #142 - Add 'sh' script DSL method
 - #144 - Add FileUtils class methods to script DSL
 - #145 - Support environment variable to set rscons build directory
 - #146 - Add ^^/ shortcut to top-level build directory
 - #139 - Add tasks
 - #147 - Add task options
 - #148 - Add license/copyright to distributable script
 - #150 - Add env.expand() shortcut method to expand paths and construction variables
 - #152 - Add download script method
 - #153 - Allow passing spawn options to sh
 - #154 - Record build directory absolute path
 - #149 - Add shortcut method for creating environments
 - #131 - Only configure if necessary
 - #151 - Store configure task parameters in configuration cache data
 - #137 - Add variants
 - #155 - Add build_dir script method
 ## v2.3.0
 ### New Features
 - #125 - Support subsidiary Rsconscript files
 - #126 - Add PATH manipulation methods
 ### Fixes
 - #121 - env.depends() does not work with build-root-relative "^/" paths
 - #130 - Document -f command line option
 - #133 - Clarify failed command error message indicating to run -F
 - #134 - Document CMD_STDOUT variable for Command builder
 - #135 - Write dependency file to build directory when user invokes Object builder directly
 - #141 - Document phony targets
 ## v2.2.0
 ### New Features
 - #120 - improve support for MSYS2
 - #119 - add failure messages for failed configuration checks
 - #118 - compiler checks should support cross-compilers and freestanding compilers
 ## v2.1.0
 ### New Features
 - #117 - ruby 2.7 compatibility
 ## v2.0.2
 ### Fixes
 - #113 - distinguish object files built from multiple sources with the same base name but different extensions
 ## v2.0.1
 ### Fixes
 - #112 - Install builder cannot replace a currently executing binary on Linux
 ## v2.0.0
 - convert rscons from a Ruby gem to a standalone script
@@ -147,7 +32,6 @@
 - various performance improvements
 - wrote a new user guide
 - added new website ([https://holtrop.github.io/rscons/](https://holtrop.github.io/rscons/))
 - added new logo
 ## v1.17.0
@@ -1,14 +0,0 @@
 # Developing
 # Specs
 To run the rscons specs, the following commands must be available:
 * gcc
 * clang
 * g++
 * clang++
 * gdc
 * ldc2
 * flex
 * bison
@@ -1,16 +1,10 @@
 source 'https://rubygems.org'
-gem "base64"
+gem "json"
 gem "rspec"
 gem "rake"
 gem "simplecov"
-gem "openssl"
+gem "yard"
-if RbConfig::CONFIG["host"]["msys"]
+gem "rdoc"
-  gem "json", "2.1.0"
+gem "redcarpet"
-else
+gem "syntax"
  gem "json"
  gem "yard"
  gem "rdoc"
  gem "redcarpet"
  gem "syntax"
 end
@@ -1,54 +1,39 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    base64 (0.3.0)
+    diff-lcs (1.3)
-    date (3.5.1)
+    docile (1.3.2)
-    diff-lcs (1.6.2)
+    json (2.2.0)
-    docile (1.4.1)
+    rake (12.3.2)
-    erb (6.0.1)
+    rdoc (6.1.1)
-    json (2.18.0)
+    redcarpet (3.4.0)
-    openssl (4.0.0)
+    rspec (3.8.0)
-    psych (5.3.1)
+      rspec-core (~> 3.8.0)
-      date
+      rspec-expectations (~> 3.8.0)
-      stringio
+      rspec-mocks (~> 3.8.0)
-    rake (13.3.1)
+    rspec-core (3.8.2)
-    rdoc (7.1.0)
+      rspec-support (~> 3.8.0)
-      erb
+    rspec-expectations (3.8.4)
      psych (>= 4.0.0)
      tsort
    redcarpet (3.6.1)
    rspec (3.13.2)
      rspec-core (~> 3.13.0)
      rspec-expectations (~> 3.13.0)
      rspec-mocks (~> 3.13.0)
    rspec-core (3.13.6)
      rspec-support (~> 3.13.0)
    rspec-expectations (3.13.5)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.8.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.8.1)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
+      rspec-support (~> 3.8.0)
-    rspec-support (3.13.6)
+    rspec-support (3.8.2)
-    simplecov (0.22.0)
+    simplecov (0.15.0)
-      docile (~> 1.1)
+      docile (~> 1.1.0)
-      simplecov-html (~> 0.11)
+      json (>= 1.8, < 3)
-      simplecov_json_formatter (~> 0.1)
+      simplecov-html (~> 0.10.0)
-    simplecov-html (0.13.2)
+    simplecov-html (0.10.2)
    simplecov_json_formatter (0.1.4)
    stringio (3.2.0)
    syntax (1.2.2)
-    tsort (0.2.0)
+    yard (0.9.20)
    yard (0.9.38)
 PLATFORMS
  ruby
  x86-mingw32
 DEPENDENCIES
  base64
  json
  openssl
  rake
  rdoc
  redcarpet
@@ -58,4 +43,4 @@ DEPENDENCIES
  yard
 BUNDLED WITH
-   2.6.2
+   1.17.3
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2025 Josh Holtrop
+Copyright (c) 2013-2019 Josh Holtrop
 MIT License
@@ -1,42 +1,8 @@
 # Rscons
 ![rscons logo](img/rscons_logo_1000.png)
 Rscons (https://github.com/holtrop/rscons) is an open-source build system
 for developers.
 It supports the following features:
-  * multi-threaded job execution
+Rscons is written in Ruby, and is inspired by [SCons](https://scons.org/) and [waf](https://waf.io/).
  * auto-configuration
  * built-in builders for several common operations
  * out-of-the-box support for Assembly, C, C++, D, and LLVM
  * extensibility for other languages or custom builders
  * compatible with Windows, Linux, OS X, and FreeBSD
  * colorized output with build progress
  * build hooks
  * user-defined tasks with dependencies and custom parameters
  * build variants
 At its core, Rscons is mainly an engine to:
  * determine the proper order to perform build steps,
  * determine whether each build target is up to date or in need of rebuild, and
  * schedule those build steps across multiple threads as efficiently as possible.
 Along the way, Rscons provides a concise syntax for specifying common types of
 build steps, but also provides an extensible framework for performing
 custom build operations as well.
 Rscons takes inspiration from:
  * [SCons](https://scons.org/)
  * [waf](https://waf.io/)
  * [rake](https://github.com/ruby/rake)
  * [CMake](https://cmake.org/)
  * [Autoconf](https://www.gnu.org/software/autoconf/)
 Rscons is written in Ruby.
 The only requirement to run Rscons is that the system has a Ruby interpreter
 installed.
 See [https://holtrop.github.io/rscons/index.html](https://holtrop.github.io/rscons/index.html) for User Guide and Installation instructions.
@@ -6,61 +6,42 @@ rescue Bundler::BundlerError => e
 end
 require "rspec/core/rake_task"
 require "yard"
 require "rake/clean"
 require "fileutils"
 require "simplecov"
 require "stringio"
-CLEAN.include %w[build_test_run .yardoc yard coverage test_run]
+CLEAN.include %w[build_test_run .yardoc yard coverage test]
-CLOBBER.include %w[dist gen large_project pkg]
+CLOBBER.include %w[dist pkg]
 task :build_dist do
  sh "ruby rb/build_dist.rb"
 end
 RSpec::Core::RakeTask.new(:spec, :example_string) do |task, args|
  ENV["specs"] = "1"
  if args.example_string
    ENV["partial_specs"] = "1"
    task.rspec_opts = %W[-e "#{args.example_string}" -f documentation]
  end
 end
-task :spec do
+task :spec => :build_dist
  ENV.delete("specs")
 end
 task :spec => :build_tests
 task :spec do
  unless ENV["rscons_dist_specs"]
    original_stdout = $stdout
    sio = StringIO.new
    $stdout = sio
    SimpleCov.collate Dir["coverage/.resultset.json", "coverage/bt*/.resultset.json"]
    $stdout = original_stdout
    sio.string.lines.each do |line|
      $stdout.write(line) unless line =~ /Coverage report generated for/
    end
  end
 end
 task :build_tests do |task, args|
  ENV["specs"] = "1"
  sh "ruby -Ilib build_tests/build_tests.rb"
  ENV.delete("specs")
 end
 # dspec task is useful to test the distributable release script, but is not
 # useful for coverage information.
 desc "Dist Specs"
 task :dspec, [:example_string] => :build_dist do |task, args|
-  FileUtils.rm_rf("test_run")
+  FileUtils.mkdir_p("test")
-  FileUtils.mkdir_p("test_run")
+  FileUtils.cp("dist/rscons", "test/rscons.rb")
-  FileUtils.cp("dist/rscons", "test_run/rscons.rb")
+  ENV["dist_specs"] = "1"
-  ENV["rscons_dist_specs"] = "1"
+  Rake::Task["spec"].invoke(args.example_string)
-  Rake::Task["spec"].execute(args)
+  ENV.delete("dist_specs")
  Rake::Task["build_tests"].execute(args)
  ENV.delete("rscons_dist_specs")
  FileUtils.rm_f(Dir.glob(".rscons-*"))
 end
 YARD::Rake::YardocTask.new do |yard|
  yard.files = ['lib/**/*.rb']
  yard.options = ["-ogen/yard"]
 end
 task :gen_large_project, [:size] => :build_dist do |task, args|
  size = (args.size || 10000).to_i
  FileUtils.rm_rf("large_project")
@@ -97,7 +78,7 @@ task :gen_large_project, [:size] => :build_dist do |task, args|
  end
  File.open("large_project/Rsconscript", "w") do |fh|
    fh.puts <<EOF
-default do
+build do
  Environment.new do |env|
    env.Program("project", glob("src/*.c"))
  end
@@ -107,25 +88,8 @@ EOF
  FileUtils.cp("dist/rscons", "large_project")
 end
-unless RbConfig::CONFIG["host"]["msys"]
+task :user_guide do
-  require "yard"
+  system("ruby", "-Ilib", "rb/gen_user_guide.rb")
  YARD::Rake::YardocTask.new do |yard|
    yard.files = ['lib/**/*.rb']
    yard.options = ["-ogen/yard"]
  end
  desc "Build user guide"
  task :user_guide do
    system("ruby", "-Ilib", "rb/gen_user_guide.rb")
  end
 end
 task :default => :spec
 task :all => [
  :build_dist,
  :spec,
  :dspec,
  :yard,
  :user_guide,
 ]
@@ -1,10 +0,0 @@
 # Upgrading
 ## v3.2.0
 - Replace any calls to `env.CFile()` builder with `env.Lex()` or `env.Yacc()` as required.
 ## v3.0.0
 - Move `build` block contents outside of `build` block and remove `build` call.
 - Replace `Environment.new()` calls with `env()`.
@@ -3,5 +3,5 @@
 require "rscons/cli"
 if __FILE__ == $0
-  Rscons::Cli.new.run(ARGV)
+  Rscons::Cli.run(ARGV)
 end
@@ -0,0 +1,6 @@
 build do
  Environment.new do |env|
    env.CFile("lexer.c", "lexer.l")
    env.CFile("parser.c", "parser.y")
  end
 end
@@ -0,0 +1,5 @@
 build do
  Environment.new do |env|
    env.CFile("file.c", "foo.bar")
  end
 end
@@ -1,10 +1,12 @@
-debug = env("dbg", echo: :command) do |env|
+build do
-  env['CFLAGS'] = '-O2'
+  debug = Environment.new(echo: :command) do |env|
-  env['CPPFLAGS'] = '-DSTRING="Debug Version"'
+    env['CFLAGS'] = '-O2'
-  env.Program('program-debug.exe', Dir['src/*.c'])
+    env['CPPFLAGS'] = '-DSTRING="Debug Version"'
-end
+    env.Program('program-debug.exe', Dir['src/*.c'])
  end
-release = debug.clone("rls") do |env|
+  release = debug.clone do |env|
-  env["CPPFLAGS"] = '-DSTRING="Release Version"'
+    env["CPPFLAGS"] = '-DSTRING="Release Version"'
-  env.Program('program-release.exe', Dir['src/*.c'])
+    env.Program('program-release.exe', Dir['src/*.c'])
  end
 end
@@ -1,14 +1,16 @@
-env1 = env("e1", echo: :command) do |env|
+build do
-  env['CFLAGS'] = '-O2'
+  env1 = Environment.new(echo: :command) do |env|
-  env.add_build_hook do |builder|
+    env['CFLAGS'] = '-O2'
-    builder.vars['CPPFLAGS'] = '-DSTRING="Hello"'
+    env.add_build_hook do |builder|
      builder.vars['CPPFLAGS'] = '-DSTRING="Hello"'
    end
    env.add_post_build_hook do |builder|
      $stdout.puts "post #{builder.target}"
    end
    env.Program('program.exe', Dir['src/*.c'])
  end
  env.add_post_build_hook do |builder|
    $stdout.puts "post #{builder.target}"
  end
  env.Program('program.exe', Dir['src/*.c'])
 end
-env2 = env1.clone("e2") do |env|
+  env2 = env1.clone do |env|
-  env.Program('program2.exe', Dir['src/*.c'])
+    env.Program('program2.exe', Dir['src/*.c'])
  end
 end
@@ -1,4 +1,3 @@
 configure do
  check_c_compiler "nope.nope"
 end
 default
@@ -1,3 +1 @@
 autoconf false
 env do |env|
 end
@@ -3,6 +3,8 @@ configure do
  check_c_header "stdio.h"
 end
-env do |env|
+build do
-  env.Program("simple.exe", "simple.c")
+  Environment.new do |env|
    env.Program("simple.exe", "simple.c")
  end
 end
@@ -1,4 +1,3 @@
 configure do
  check_c_compiler
 end
 default
@@ -1,6 +0,0 @@
 configure do
  check_c_compiler "clang"
 end
 env do |env|
  env.Program("simple.exe", "simple.c")
 end
@@ -1,12 +0,0 @@
 configure do
  check_c_compiler "clang", use: "clang"
  check_c_compiler
 end
 env "t1" do |env|
  env.Program("test_gcc.exe", "simple.c")
 end
 env "t2", use: "clang" do |env|
  env.Program("test_clang.exe", "simple.c")
 end
@@ -3,6 +3,8 @@ configure do
  check_c_header "frobulous.h", check_cpppath: ["./usr2"]
 end
-env do |env|
+build do
-  env.Object("test.o", "test.c")
+  Environment.new do |env|
    env.Object("test.o", "test.c")
  end
 end
@@ -2,6 +2,8 @@ configure do
  check_c_header "not___found.h", set_define: "HAVE_NOT___FOUND_H"
 end
-env(echo: :command) do |env|
+build do
-  env.Object("simple.o", "simple.c")
+  Environment.new(echo: :command) do |env|
    env.Object("simple.o", "simple.c")
  end
 end
@@ -2,6 +2,8 @@ configure do
  check_c_header "string.h", set_define: "HAVE_STRING_H"
 end
-env(echo: :command) do |env|
+build do
-  env.Object("simple.o", "simple.c")
+  Environment.new(echo: :command) do |env|
    env.Object("simple.o", "simple.c")
  end
 end
@@ -2,6 +2,8 @@ configure do
  check_cfg program: "my-config"
 end
-env(echo: :command) do |env|
+build do
-  env.Program("myconfigtest", "simple.c")
+  Environment.new(echo: :command) do |env|
    env.Program("myconfigtest", "simple.c")
  end
 end
@@ -1,5 +0,0 @@
 ENV["PATH"] = ""
 configure do
  check_cfg package: "mypackage"
 end
@@ -2,6 +2,8 @@ configure do
  check_cfg package: "mypackage"
 end
-env(echo: :command) do |env|
+build do
-  env.Program("myconfigtest", "simple.c")
+  Environment.new(echo: :command) do |env|
    env.Program("myconfigtest", "simple.c")
  end
 end
@@ -2,12 +2,14 @@ configure do
  check_cfg package: "mypackage", use: "myp"
 end
-env(echo: :command) do |env|
+build do
-  env.Copy("myconfigtest1.c", "simple.c")
+  Environment.new(echo: :command) do |env|
-  env.Program("myconfigtest1.exe", "myconfigtest1.c")
+    env.Copy("myconfigtest1.c", "simple.c")
-end
+    env.Program("myconfigtest1.exe", "myconfigtest1.c")
  end
-env(echo: :command, use: "myp") do |env|
+  Environment.new(echo: :command, use: "myp") do |env|
-  env.Copy("myconfigtest2.c", "simple.c")
+    env.Copy("myconfigtest2.c", "simple.c")
-  env.Program("myconfigtest2.exe", "myconfigtest2.c")
+    env.Program("myconfigtest2.exe", "myconfigtest2.c")
  end
 end
@@ -1,12 +0,0 @@
 configure do
  check_cxx_compiler "clang++", use: "clang"
  check_cxx_compiler
 end
 env "t1" do |env|
  env.Program("test_gcc.exe", "simple.cc")
 end
 env "t2", use: "clang" do |env|
  env.Program("test_clang.exe", "simple.cc")
 end
@@ -3,6 +3,8 @@ configure do
  check_cxx_header "frobulous.h", check_cpppath: ["./usr2"]
 end
-env do |env|
+build do
-  env.Object("test.o", "test.cc")
+  Environment.new do |env|
    env.Object("test.o", "test.cc")
  end
 end
@@ -1,3 +1,3 @@
 configure do
-  check_d_compiler "gdc", "ldc2", "ldc"
+  check_d_compiler "gdc", "ldc2"
 end
@@ -1,12 +0,0 @@
 configure do
  check_d_compiler "ldc2", use: "ldc2"
  check_d_compiler
 end
 env "t1" do |env|
  env.Program("test_gcc.exe", "simple.d")
 end
 env "t2", use: "ldc2" do |env|
  env.Program("test_ldc2.exe", "simple.d")
 end
@@ -1,9 +1,10 @@
 configure do
  check_d_compiler
  check_d_import "std.stdio", check_d_import_path: ["./usr1"]
  check_d_import "frobulous", check_d_import_path: ["./usr2"]
 end
-env do |env|
+build do
-  env.Object("test.o", "test.d")
+  Environment.new do |env|
    env.Object("test.o", "test.d")
  end
 end
@@ -1,4 +1,3 @@
 configure do
  check_d_compiler
  check_d_import "std.stdio"
 end
@@ -1,3 +1,5 @@
-env(echo: :command) do |env|
+build do
-  env.Library("usr2/libfrobulous.a", "two.c")
+  Environment.new(echo: :command) do |env|
    env.Library("usr2/libfrobulous.a", "two.c")
  end
 end
@@ -3,6 +3,8 @@ configure do
  check_lib "frobulous", check_libpath: ["./usr2"]
 end
-env(echo: :command) do |env|
+build do
-  env.Program("simple.exe", "simple.c")
+  Environment.new(echo: :command) do |env|
    env.Program("simple.exe", "simple.c")
  end
 end
@@ -2,6 +2,8 @@ configure do
  check_lib "m"
 end
-env(echo: :command) do |env|
+build do
-  env.Program("simple.exe", "simple.c")
+  Environment.new(echo: :command) do |env|
    env.Program("simple.exe", "simple.c")
  end
 end
@@ -2,12 +2,14 @@ configure do
  check_lib "m", use: :m
 end
-env(echo: :command) do |env|
+build do
-  env.Copy("test1.c", "simple.c")
+  Environment.new(echo: :command) do |env|
-  env.Program("test2.exe", "test1.c")
+    env.Copy("test1.c", "simple.c")
-end
+    env.Program("test2.exe", "test1.c")
  end
-env(echo: :command, use: %w[m]) do |env|
+  Environment.new(echo: :command, use: %w[m]) do |env|
-  env.Copy("test2.c", "simple.c")
+    env.Copy("test2.c", "simple.c")
-  env.Program("test2.exe", "test2.c")
+    env.Program("test2.exe", "test2.c")
  end
 end
@@ -2,7 +2,9 @@ configure do
  check_lib "m", use: false
 end
-env(echo: :command) do |env|
+build do
-  env.Copy("test1.c", "simple.c")
+  Environment.new(echo: :command) do |env|
-  env.Program("test2.exe", "test1.c")
+    env.Copy("test1.c", "simple.c")
    env.Program("test2.exe", "test1.c")
  end
 end
@@ -1,8 +0,0 @@
 configure do
  check_d_compiler "ldc2"
  check_lib "z"
 end
 env(echo: :command) do |env|
  env.Program("simple.exe", "simple.d")
 end
@@ -1,6 +0,0 @@
 configure do
  check_c_compiler
 end
 env do |env|
  puts "Prefix is #{Task["configure"]["prefix"]}"
 end
@@ -17,12 +17,10 @@ configure do
    end
    op.complete(status, success_message: "good!", fail_message: fail_message, fail: should_fail)
  end
  custom_check("Checking sed -E flag") do |op|
    stdout, stderr, status = op.log_and_test_command(%w[sed -E -e s/ab+/rep/], stdin: "abbbc")
    op.complete(stdout =~ /repc/ ? 0 : 1, success_message: "good", fail_message: "fail")
  end
 end
-env do |env|
+build do
-  puts env["CPPDEFINES"]
+  Environment.new do |env|
    puts env["CPPDEFINES"]
  end
 end
@@ -0,0 +1,3 @@
 Environment.new do |env|
  env.Object("simple.o", "simple.cc")
 end
@@ -3,6 +3,8 @@ configure do
  check_c_header "stdio.h", set_define: "HAVE_STDIO_H"
 end
-env(echo: :command) do |env|
+build do
-  env.Object("simple.o", "simple.c")
+  Environment.new(echo: :command) do |env|
    env.Object("simple.o", "simple.c")
  end
 end
@@ -1,3 +0,0 @@
 default do
  puts "default"
 end
@@ -1,5 +0,0 @@
 configure do
  check_c_compiler "foo123c", fail: false, on_fail: "Install the foo123 package"
  check_d_compiler "foo123d", fail: false
  check_cxx_compiler "foo123cxx", on_fail: lambda {puts "Install the foo123cxx package"}
 end
@@ -1,6 +0,0 @@
 #include <iostream>
 int main(int argc, char *argv[])
 {
    std::cout << "Hi" << std::endl;
 }
@@ -1,7 +0,0 @@
 import std.stdio;
 int main()
 {
    writeln("Hello");
    return 0;
 }
@@ -9,8 +9,10 @@ EOF
  end
 end
-env do |env|
+build do
-  env.add_builder(MySource)
+  Environment.new do |env|
-  env.MySource('inc.h', [])
+    env.add_builder(MySource)
-  env.Program('program.exe', Dir['*.c'])
+    env.MySource('inc.h', [])
    env.Program('program.exe', Dir['*.c'])
  end
 end
@@ -1,11 +1,12 @@
-env do |env|
+build do
-  env.Command("inc.c",
+  Environment.new do |env|
-              [],
+    env.Command("inc.c",
-              "CMD" => %w[ruby gen.rb ${_TARGET}],
+                [],
-              "CMD_DESC" => "Generating")
+                "CMD" => %w[ruby gen.rb ${_TARGET}],
-  env["build_root"] = env.build_root
+                "CMD_DESC" => "Generating")
-  env["inc_c"] = "inc.c"
+    env["build_root"] = env.build_root
-  env.Object("program.o", "program.c")
+    env["inc_c"] = "inc.c"
-  env.build_after("program.o", "${inc_c}")
+    env.build_after("${build_root}/program.o", "${inc_c}")
-  env.Program("program.exe", ["program.o", "inc.c"])
+    env.Program("program.exe", ["program.c", "inc.c"])
  end
 end
@@ -9,10 +9,12 @@ EOF
  end
 end
-env = env do |env|
+build do
-  env["hdr"] = "inc.h"
+  env = Environment.new do |env|
-  env["src"] = "program.c"
+    env["hdr"] = "inc.h"
-  env.add_builder(MySource)
+    env["src"] = "program.c"
-  env.MySource('${hdr}')
+    env.add_builder(MySource)
-  env.Program('program.exe', "${src}")
+    env.MySource('${hdr}')
    env.Program('program.exe', "${src}")
  end
 end
@@ -9,20 +9,22 @@ EOF
  end
 end
-e1 = env do |env|
+build do
-  env.add_builder(MySource)
+  e1 = Environment.new do |env|
-  env["one"] = "5"
+    env.add_builder(MySource)
-  env[:cfg] = {val: "9"}
+    env["one"] = "5"
-  env["two"] = lambda do |args|
+    env[:cfg] = {val: "9"}
-    args[:env][:cfg][:val]
+    env["two"] = lambda do |args|
      args[:env][:cfg][:val]
    end
    env["the_value"] = lambda do |args|
      "${one}${two}78"
    end
  end
  env["the_value"] = lambda do |args|
    "${one}${two}78"
  end
 end
-e1.clone do |env|
+  e1.clone do |env|
-  env[:cfg][:val] = "6"
+    env[:cfg][:val] = "6"
-  env.MySource('inc.h', [])
+    env.MySource('inc.h', [])
-  env.Program('program.exe', Dir['*.c'])
+    env.Program('program.exe', Dir['*.c'])
  end
 end
@@ -1,6 +1,8 @@
-env do |env|
+build do
-  env.add_builder(:MyBuilder) do |options|
+  Environment.new do |env|
-    "hi"
+    env.add_builder(:MyBuilder) do |options|
      "hi"
    end
    env.MyBuilder("foo")
  end
  env.MyBuilder("foo")
 end
@@ -1,6 +1,8 @@
-env do |env|
+build do
-  env.add_builder(:MyBuilder) do |options|
+  Environment.new do |env|
-    wait_for(1)
+    env.add_builder(:MyBuilder) do |options|
      wait_for(1)
    end
    env.MyBuilder("foo")
  end
  env.MyBuilder("foo")
 end
@@ -12,8 +12,10 @@ class CHGen < Rscons::Builder
  end
 end
-env do |env|
+build do
-  env.add_builder(CHGen)
+  Environment.new do |env|
-  env.CHGen("inc.c", ["program.c"])
+    env.add_builder(CHGen)
-  env.Program("program.exe", %w[program.c inc.c])
+    env.CHGen("inc.c", ["program.c"])
    env.Program("program.exe", %w[program.c inc.c])
  end
 end
@@ -1,15 +1,16 @@
-env do |env|
+build do
-  env["build_root"] = env.build_root
+  Environment.new do |env|
-  env["inc_h"] = "inc.h"
+    env["build_root"] = env.build_root
    env["inc_h"] = "inc.h"
-  env.Copy("copy_inc.h", "${inc_h}")
+    env.Copy("copy_inc.h", "${inc_h}")
-  env.depends("program.o", "${inc_h}")
+    env.depends("${build_root}/program.o", "${inc_h}")
-  env.Object("program.o", "program.c")
+    env.Program("program.exe", ["program.c", "inc.c"])
  env.Program("program.exe", ["program.o", "inc.c"])
-  inc_c = env.Command("inc.c",
+    inc_c = env.Command("inc.c",
-                      [],
+                        [],
-                      "CMD" => %w[ruby gen.rb ${_TARGET}],
+                        "CMD" => %w[ruby gen.rb ${_TARGET}],
-                      "CMD_DESC" => "Generating")
+                        "CMD_DESC" => "Generating")
-  inc_c.produces("inc.h")
+    inc_c.produces("inc.h")
  end
 end
@@ -1,15 +1,16 @@
-env do |env|
+build do
-  env["build_root"] = env.build_root
+  Environment.new do |env|
-  env["inc_h"] = "inc.h"
+    env["build_root"] = env.build_root
    env["inc_h"] = "inc.h"
-  env.Copy("copy_inc.h", "${inc_h}")
+    env.Copy("copy_inc.h", "${inc_h}")
-  env.depends("program.o", "${inc_h}")
+    env.depends("${build_root}/program.o", "${inc_h}")
-  env.Object("program.o", "program.c")
+    env.Program("program.exe", ["program.c", "inc.c"])
  env.Program("program.exe", ["program.o", "inc.c"])
-  env.Command("inc.c",
+    env.Command("inc.c",
-              [],
+                [],
-              "CMD" => %w[ruby gen.rb ${_TARGET}],
+                "CMD" => %w[ruby gen.rb ${_TARGET}],
-              "CMD_DESC" => "Generating")
+                "CMD_DESC" => "Generating")
-  env.produces("inc.c", "inc.h")
+    env.produces("inc.c", "inc.h")
  end
 end
@@ -13,7 +13,9 @@ class MyBuilder < Rscons::Builder
  end
 end
-env do |env|
+build do
-  env.add_builder(MyBuilder)
+  Environment.new do |env|
-  env.MyBuilder("foo")
+    env.add_builder(MyBuilder)
    env.MyBuilder("foo")
  end
 end
@@ -2,6 +2,8 @@ configure do
  check_d_compiler "gdc"
 end
-env(echo: :command) do |env|
+build do
-  env.Program("hello-d.exe", glob("*.d"))
+  Environment.new(echo: :command) do |env|
    env.Program("hello-d.exe", glob("*.d"))
  end
 end
@@ -2,6 +2,8 @@ configure do
  check_d_compiler "ldc2"
 end
-env(echo: :command) do |env|
+build do
-  env.Program("hello-d.exe", glob("*.d"))
+  Environment.new(echo: :command) do |env|
    env.Program("hello-d.exe", glob("*.d"))
  end
 end
@@ -1,5 +1,7 @@
-env(echo: :command) do |env|
+build do
-  env.Object("main.o", "main.d")
+  Environment.new(echo: :command) do |env|
-  env.Object("mod.o", "mod.d")
+    env.Object("main.o", "main.d")
-  env.Program("hello-d.exe", ["main.o", "mod.o"])
+    env.Object("mod.o", "mod.d")
    env.Program("hello-d.exe", ["main.o", "mod.o"])
  end
 end
@@ -1,3 +1,5 @@
-env do |env|
+build do
-  env.Program("test.exe", glob("*.c"), direct: true)
+  Environment.new do |env|
    env.Program("test.exe", glob("*.c"), direct: true)
  end
 end
@@ -1,5 +1,7 @@
-env do |env|
+build do
-  lib = env.SharedLibrary("mylib", ["two.c", "three.c"], direct: true)
+  Environment.new do |env|
-  program = env.Program("test.exe", "main.c", "LIBS" => ["mylib"], "LIBPATH" => ["."])
+    lib = env.SharedLibrary("mylib", ["two.c", "three.c"], direct: true)
-  env.depends(program, lib)
+    program = env.Program("test.exe", "main.c", "LIBS" => ["mylib"], "LIBPATH" => ["."])
    env.depends(program, lib)
  end
 end
@@ -1,3 +1,5 @@
-env do |env|
+build do
-  env.Program('header.exe', Dir['*.c'])
+  Environment.new do |env|
    env.Program('header.exe', Dir['*.c'])
  end
 end
@@ -1,16 +1,17 @@
-env do |env|
+build do
-  require 'json'
+  Environment.new do |env|
-  require 'yaml'
+    require 'json'
-  env.add_builder(:JsonToYaml) do |params|
+    require 'yaml'
-    unless @cache.up_to_date?(@target, :JsonToYaml, @sources, @env)
+    env.add_builder(:JsonToYaml) do |params|
-      print_run_message("JsonToYaml #{@target}", nil)
+      unless @cache.up_to_date?(@target, :JsonToYaml, @sources, @env)
-      @cache.mkdir_p(File.dirname(@target))
+        @cache.mkdir_p(File.dirname(@target))
-      File.open(@target, 'w') do |f|
+        File.open(@target, 'w') do |f|
-        f.write(YAML.dump(JSON.load(IO.read(@sources.first))))
+          f.write(YAML.dump(JSON.load(IO.read(@sources.first))))
        end
        @cache.register_build(@target, :JsonToYaml, @sources, @env)
      end
-      @cache.register_build(@target, :JsonToYaml, @sources, @env)
+      true
    end
-    true
+    env.JsonToYaml('foo.yml', 'foo.json')
  end
  env.JsonToYaml('foo.yml', 'foo.json')
 end
@@ -1,4 +0,0 @@
 env do |env|
  env.Lex("lexer.c", "lexer.l")
  env.Yacc("parser.c", "parser.y")
 end
@@ -1,7 +1,6 @@
-env(echo: :command) do |env|
+build do
-  env["LIBS"] << "mylib"
+  Environment.new(echo: :command) do |env|
-  env["LIBPATH"] << "."
+    env.Program('library.exe', ['lib.a', 'three.c'])
-  env.Program("library.exe", "one.c")
+    env.Library("lib.a", ['one.c', 'two.c'], 'CPPFLAGS' => ['-Dmake_lib'])
-  env.depends("library.exe", "libmylib.a")
+  end
  env.Library("libmylib.a", ["two.c", "three.c"], "CPPFLAGS" => ["-Dmake_lib"])
 end
@@ -1,5 +1,7 @@
-env do |env|
+build do
-  env.Program("library.exe", ["lib.a", "three.c"])
+  Environment.new do |env|
-  env.Object("two.o", "two.c")
+    env.Program("library.exe", ["lib.a", "three.c"])
-  env.Library("lib.a", ["one.c", "two.o"], 'CPPFLAGS' => ['-Dmake_lib'])
+    env.Object("two.o", "two.c")
    env.Library("lib.a", ["one.c", "two.o"], 'CPPFLAGS' => ['-Dmake_lib'])
  end
 end
@@ -1,11 +1,8 @@
 #include <stdio.h>
-void two();
+#ifdef make_lib
 void three();
 int main(int argc, char *argv[])
 {
    two();
    printf("Library\n");
    three();
 }
 #endif
@@ -1,4 +1,6 @@
-env(echo: :command) do |env|
+build do
-  env["ARCMD"] = %w[ar rc ${_TARGET} ${_SOURCES}]
+  Environment.new(echo: :command) do |env|
-  env.Library("lib.a", glob("*.c"))
+    env["ARCMD"] = %w[ar rcf ${_TARGET} ${_SOURCES}]
    env.Library("lib.a", glob("*.c"))
  end
 end
@@ -1,3 +0,0 @@
 void three(void)
 {
 }
@@ -1,3 +0,0 @@
 void two(void)
 {
 }
@@ -1,4 +0,0 @@
 env do |env|
  env["LLVMAS_FLAGS"] += %w[-Wno-override-module]
  env.Program("llvmtest.exe", %w[main.c one.ll])
 end
@@ -1,8 +0,0 @@
 configure do
  check_c_compiler "clang"
 end
 env do |env|
  env["LLVMAS_FLAGS"] += %w[-Wno-override-module]
  env.Program("llvmtest.exe", %w[one.ll two.ll main2.c], direct: true)
 end
@@ -1,6 +0,0 @@
 extern int one(void);
 int main(int argc, char * argv[])
 {
    return one();
 }
@@ -1,9 +0,0 @@
 extern int one(void);
 extern int two(void);
 int main(int argc, char * argv[])
 {
    one();
    two();
    return 0;
 }
@@ -1,9 +0,0 @@
@str = private unnamed_addr constant [12 x i8] c"hello world\00"
 declare i32 @puts(ptr nocapture) nounwind
 define i32 @one()
 {
    call i32 @puts(ptr @str)
    ret i32 0
 }
@@ -1,9 +0,0 @@
@str = private unnamed_addr constant [12 x i8] c"hello again\00"
 declare i32 @puts(ptr nocapture) nounwind
 define i32 @two()
 {
    call i32 @puts(ptr @str)
    ret i32 0
 }
@@ -1,3 +0,0 @@
 env do |env|
  env.Program("foo.exe", glob("*.cc", "*.c"))
 end
@@ -1,6 +0,0 @@
 #include <stdio.h>
 void foo(void)
 {
    printf("foo\n");
 }
@@ -1,12 +0,0 @@
 #include <iostream>
 extern "C" {
    void foo(void);
 }
 int main(int argc, char * argv[])
 {
    foo();
    std::cout << "main" << std::endl;
    return 0;
 }
@@ -1,3 +1,5 @@
-env do |env|
+build do
-  env.Preprocess("pp", "foo.h")
+  Environment.new do |env|
    env.Preprocess("pp", "foo.h")
  end
 end
@@ -1,11 +1,13 @@
-env do |env|
+build do
-  env["CPPPATH"] << "src/lib"
+  Environment.new do |env|
-  libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
+    env["CPPPATH"] << "src/lib"
-  env.Program("test-shared.exe",
+    libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
-              glob("src/*.c"),
+    env.Program("test-shared.exe",
-              "LIBPATH" => %w[.],
+                glob("src/*.c"),
-              "LIBS" => %w[mine])
+                "LIBPATH" => %w[.],
-  env.build_after("test-shared.exe", libmine)
+                "LIBS" => %w[mine])
-  env.Program("test-static.exe",
+    env.build_after("test-shared.exe", libmine)
-              glob("src/**/*.c"))
+    env.Program("test-static.exe",
                glob("src/**/*.c"))
  end
 end
@@ -1,6 +1,8 @@
-env do |env|
+build do
-  File.open("foo.xyz", "wb") do |fh|
+  Environment.new do |env|
-    fh.puts("hi")
+    File.open("foo.xyz", "wb") do |fh|
      fh.puts("hi")
    end
    env.SharedObject("foo.o", "foo.xyz")
  end
  env.SharedObject("foo.o", "foo.xyz")
 end
@@ -1,5 +1,7 @@
-env do |env|
+build do
-  env["CPPPATH"] << "src/lib"
+  Environment.new do |env|
-  env.Object("file.S", "src/lib/one.c", "CFLAGS" => env["CFLAGS"] + ["-S"])
+    env["CPPPATH"] << "src/lib"
-  libmine = env.SharedLibrary("mine", "file.S")
+    env.Object("file.S", "src/lib/one.c", "CFLAGS" => env["CFLAGS"] + ["-S"])
    libmine = env.SharedLibrary("mine", "file.S")
  end
 end
@@ -1,11 +1,13 @@
-env do |env|
+build do
-  env["CPPPATH"] << "src/lib"
+  Environment.new do |env|
-  libmine = env.SharedLibrary("mine", glob("src/lib/*.cc"))
+    env["CPPPATH"] << "src/lib"
-  env.Program("test-shared.exe",
+    libmine = env.SharedLibrary("mine", glob("src/lib/*.cc"))
-              glob("src/*.cc"),
+    env.Program("test-shared.exe",
-              "LIBPATH" => %w[.],
+                glob("src/*.cc"),
-              "LIBS" => %w[mine])
+                "LIBPATH" => %w[.],
-  env.build_after("test-shared.exe", libmine)
+                "LIBS" => %w[mine])
-  env.Program("test-static.exe",
+    env.build_after("test-shared.exe", libmine)
-              glob("src/**/*.cc"))
+    env.Program("test-static.exe",
                glob("src/**/*.cc"))
  end
 end
@@ -1,9 +1,11 @@
-env do |env|
+build do
-  env["CPPPATH"] << "src/lib"
+  Environment.new do |env|
-  libmine = env.SharedLibrary("mine", glob("src/lib/*.d"))
+    env["CPPPATH"] << "src/lib"
-  env.Program("test-shared.exe",
+    libmine = env.SharedLibrary("mine", glob("src/lib/*.d"))
-              glob("src/*.c"),
+    env.Program("test-shared.exe",
-              "LIBPATH" => %w[.],
+                glob("src/*.c"),
-              "LIBS" => %w[mine])
+                "LIBPATH" => %w[.],
-  env.build_after("test-shared.exe", libmine)
+                "LIBS" => %w[mine])
    env.build_after("test-shared.exe", libmine)
  end
 end
@@ -1,5 +1,7 @@
-env do |env|
+build do
-  env["CPPPATH"] << "src/lib"
+  Environment.new do |env|
-  env.SharedObject("one.o", "src/lib/one.c")
+    env["CPPPATH"] << "src/lib"
-  libmine = env.SharedLibrary("mine", ["one.o", "src/lib/two.c"])
+    env.SharedObject("one.o", "src/lib/one.c")
    libmine = env.SharedLibrary("mine", ["one.o", "src/lib/two.c"])
  end
 end
@@ -1,12 +1,14 @@
-env do |env|
+build do
-  env["CPPPATH"] << "src/lib"
+  Environment.new do |env|
-  env["SHLD"] = "gcc"
+    env["CPPPATH"] << "src/lib"
-  libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
+    env["SHLD"] = "gcc"
-  env.Program("test-shared.exe",
+    libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
-              glob("src/*.c"),
+    env.Program("test-shared.exe",
-              "LIBPATH" => %w[.],
+                glob("src/*.c"),
-              "LIBS" => %w[mine])
+                "LIBPATH" => %w[.],
-  env.build_after("test-shared.exe", libmine)
+                "LIBS" => %w[mine])
-  env.Program("test-static.exe",
+    env.build_after("test-shared.exe", libmine)
-              glob("src/**/*.c"))
+    env.Program("test-static.exe",
                glob("src/**/*.c"))
  end
 end
@@ -1,3 +1,5 @@
-env do |env|
+build do
-  env.Program('simple.exe', Dir['*.c'])
+  Environment.new do |env|
    env.Program('simple.exe', Dir['*.c'])
  end
 end
@@ -1,13 +1,15 @@
-env(echo: :command) do |env|
+build do
-  tempdir = ENV["TEMP"] || ENV["TMP"] || "/tmp"
+  Environment.new(echo: :command) do |env|
-  source_file = File.join(tempdir, "abs.c")
+    tempdir = ENV["TEMP"] || ENV["TMP"] || "/tmp"
-  File.open(source_file, "w") do |fh|
+    source_file = File.join(tempdir, "abs.c")
-    fh.puts(<<-EOF)
+    File.open(source_file, "w") do |fh|
-    int main()
+      fh.puts(<<-EOF)
-    {
+      int main()
-      return 29;
+      {
-    }
+        return 29;
-    EOF
+      }
      EOF
    end
    env.Program("abs.exe", source_file)
  end
  env.Program("abs.exe", source_file)
 end
@@ -10,13 +10,15 @@ class ThreadedTestBuilder < Rscons::Builder
  end
 end
-env do |env|
+build do
-  env.add_builder(ThreadedTestBuilder)
+  Environment.new do |env|
-  env.ThreadedTestBuilder("T3", [], "delay" => 3)
+    env.add_builder(ThreadedTestBuilder)
-  env.ThreadedTestBuilder("T2", [], "delay" => 1.0)
+    env.ThreadedTestBuilder("T3", [], "delay" => 3)
-  env.ThreadedTestBuilder("T1", [], "delay" => 0.5)
+    env.ThreadedTestBuilder("T2", [], "delay" => 1.0)
-  env.barrier
+    env.ThreadedTestBuilder("T1", [], "delay" => 0.5)
-  env.ThreadedTestBuilder("T6", [], "delay" => 1.5)
+    env.barrier
-  env.ThreadedTestBuilder("T5", [], "delay" => 1.0)
+    env.ThreadedTestBuilder("T6", [], "delay" => 1.5)
-  env.ThreadedTestBuilder("T4", [], "delay" => 0.5)
+    env.ThreadedTestBuilder("T5", [], "delay" => 1.0)
    env.ThreadedTestBuilder("T4", [], "delay" => 0.5)
  end
 end
@@ -1,13 +0,0 @@
 env("e", echo: :command) do |env|
  source_file = "#{env.build_root}/src/foo.c"
  FileUtils.mkdir_p(File.dirname(source_file))
  File.open(source_file, "w") do |fh|
    fh.puts(<<-EOF)
    int main()
    {
      return 29;
    }
    EOF
  end
  env.Program("foo.exe", source_file)
 end
@@ -1,4 +1,6 @@
-env do |env|
+build do
-  object = env.Object("simple.o", "simple.c")
+  Environment.new do |env|
-  env.Program("simple.exe", object)
+    object = env.Object("simple.o", "simple.c")
    env.Program("simple.exe", object)
  end
 end
@@ -3,8 +3,9 @@ class TestBuilder < Rscons::Builder
    true
  end
 end
-
+build do
-env do |env|
+  Environment.new do |env|
-  env.add_builder(TestBuilder)
+    env.add_builder(TestBuilder)
-  env.TestBuilder("file")
+    env.TestBuilder("file")
  end
 end
@@ -1,7 +1,7 @@
 class MyObject < Rscons::Builder
  def run(options)
    if @builder
-      if File.exist?(@target)
+      if File.exists?(@target)
        true
      else
        false
@@ -14,8 +14,10 @@ class MyObject < Rscons::Builder
  end
 end
-env do |env|
+build do
-  env.add_builder(MyObject)
+  Environment.new do |env|
-  env.MyObject("simple.o", "simple.c")
+    env.add_builder(MyObject)
-  env.Program("simple.exe", "simple.o")
+    env.MyObject("simple.o", "simple.c")
    env.Program("simple.exe", "simple.o")
  end
 end
@@ -1,4 +1,6 @@
-env do |env|
+build do
-  env["LIBS"] += ["m"]
+  Environment.new do |env|
-  env.Program('simple.exe', Dir['*.c'])
+    env["LIBS"] += ["m"]
    env.Program('simple.exe', Dir['*.c'])
  end
 end
Author	SHA1	Message	Date
josh	663f4ac04c	check_program: do not fail on Windows for non-existent PATH entries	2019-08-27 16:14:19 -04:00
josh	2c7cc61b30	build tests: use -m instead of -lc for mingw	2019-08-27 12:32:36 -04:00
josh	7c4abe9343	build tests: do ldc2 tests even if omit_gdc_tests set	2019-08-27 08:51:56 -04:00
josh	1a4f1a3608	update build test for gdc fix	2019-08-27 08:50:01 -04:00
`@@ -1,4 +1,4 @@`
	`Copyright (c) 2013-2025 Josh Holtrop`	`Copyright (c) 2013-2019 Josh Holtrop`

	`MIT License`	`MIT License`