Renamed system from builder to Meson.

pull/15/head
Jussi Pakkanen 12 years ago
parent baaa988291
commit 9418ece26a
  1. 2
      environment.py
  2. 4
      meson.py
  3. 12
      readme.txt
  4. 2
      run_tests.py
  5. 0
      test cases/1 trivial/meson.build
  6. 0
      test cases/10 man install/meson.build
  7. 0
      test cases/11 subdir/meson.build
  8. 0
      test cases/11 subdir/subdir/meson.build
  9. 0
      test cases/12 data/meson.build
  10. 0
      test cases/13 pch/meson.build
  11. 0
      test cases/14 cxx pch/meson.build
  12. 0
      test cases/15 mixed pch/meson.build
  13. 0
      test cases/16 configure file/meson.build
  14. 0
      test cases/17 if/meson.build
  15. 0
      test cases/18 else/meson.build
  16. 0
      test cases/19 comparison/meson.build
  17. 0
      test cases/2 cxx/meson.build
  18. 0
      test cases/20 array/meson.build
  19. 0
      test cases/21 includedir/meson.build
  20. 0
      test cases/21 includedir/src/meson.build
  21. 0
      test cases/22 header in file list/meson.build
  22. 0
      test cases/23 global arg/meson.build
  23. 0
      test cases/24 target arg/meson.build
  24. 0
      test cases/25 numbers/meson.build
  25. 0
      test cases/26 endian/meson.build
  26. 0
      test cases/27 library versions/meson.build
  27. 0
      test cases/28 config subdir/include/meson.build
  28. 0
      test cases/28 config subdir/meson.build
  29. 0
      test cases/28 config subdir/src/meson.build
  30. 0
      test cases/29 external dep/meson.build
  31. 0
      test cases/3 static/meson.build
  32. 0
      test cases/4 shared/meson.build
  33. 0
      test cases/5 linkstatic/meson.build
  34. 0
      test cases/6 linkshared/meson.build
  35. 0
      test cases/7 mixed/meson.build
  36. 0
      test cases/8 install/meson.build
  37. 0
      test cases/9 header install/meson.build

@ -16,7 +16,7 @@
import subprocess, os.path
builder_filename = 'builder.txt'
builder_filename = 'meson.build'
class EnvironmentException(Exception):
def __init(self, *args, **kwargs):

@ -79,11 +79,11 @@ class BuilderApp():
raise RuntimeError('Source and build directories must not be the same. Create a pristine build directory.')
if self.has_builder_file(ndir1):
if self.has_builder_file(ndir2):
raise RuntimeError('Both directories contain a builder file %s.' % environment.builder_filename)
raise RuntimeError('Both directories contain a build file %s.' % environment.builder_filename)
return (ndir1, ndir2)
if self.has_builder_file(ndir2):
return (ndir2, ndir1)
raise RuntimeError('Neither directory contains a builder file %s.' % environment.builder_filename)
raise RuntimeError('Neither directory contains a build file %s.' % environment.builder_filename)
def generate(self):
env = environment.Environment(self.source_dir, self.build_dir, self.builder_script_file, options)

@ -6,17 +6,17 @@ Dependencies: Python3 and Python-Ply
Running:
Builder requires that you have a source directory and a build directory
Meson requires that you have a source directory and a build directory
and that these two are different. In your source root must exist a file
called 'builder.txt'. To generate the build system run this command:
called 'meson.build'. To generate the build system run this command:
builder.py <source directory> <build directory>
meson.py <source directory> <build directory>
You can omit either of the two directories, and Builder will substitute
You can omit either of the two directories, and Meson will substitute
the current directory and autodetect what you mean. This mean that you
can do things like this:
cd source_root; mkdir build; cd build; builder ..
cd source_root; mkdir build; builder build
cd source_root; mkdir build; cd build; meson.py ..
cd source_root; mkdir build; meson.py build
For questions contact jpakkane@gmail.com.

@ -20,7 +20,7 @@ import os, subprocess, shutil, sys
test_build_dir = 'work area'
install_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'install dir')
use_shell = len(sys.argv) > 1
builder_command = './builder.py'
builder_command = './meson.py'
if use_shell:
generator_flags = ['--generator', 'shell']
compile_commands = ['compile.sh']

Loading…
Cancel
Save