Switch to AMBuild 2.2.

Author: dvander

.appveyor/build.bat

@@ -4,4 +4,4 @@ mkdir opt32 && cd opt32
 C:\python27\python.exe ..\configure.py --enable-optimize
 ambuild
 cd ..
-opt32\tests\testrunner\testrunner.exe
+opt32\dist\testrunner.exe

.travis.yml

@@ -73,10 +73,10 @@ script:
   - mkdir build-opt && cd build-opt
   - python ../configure.py --enable-optimize
   - ambuild
-  - ./tests/testrunner/testrunner
+  - ./dist/testrunner
   - cd ..
 
   - mkdir build-debug && cd build-debug
   - python ../configure.py --enable-debug
   - ambuild
-  - ./tests/testrunner/testrunner
+  - ./dist/testrunner

AMBuildScript

@@ -9,8 +9,11 @@ class KEConfig(object):
   def configure(self):
     cxx = builder.DetectCxx()
 
+    builder.cxx = cxx
+    builder.dist_folder = builder.AddFolder('dist')
+
     if cxx.like('gcc'):
-      if builder.target.platform != 'windows':
+      if cxx.target.platform != 'windows':
         if cxx.version >= 'gcc-8.0' or cxx.version >= 'clang-5.0':
             cxx.cxxflags += ['-std=c++17']
         else:
@@ -23,7 +26,7 @@ class KEConfig(object):
           '_vsnprintf=vsnprintf',
         ]
         cxx.linkflags += ['-lpthread']
-        if builder.target.platform != 'mac':
+        if cxx.target.platform != 'mac':
           cxx.linkflags += ['-lrt']
       else:
         cxx.cxxflags += [
@@ -111,13 +114,13 @@ class KEConfig(object):
       cxx.cflags += ['/Oy-']
 
     # Platform-specifics
-    if builder.target.platform == 'linux':
+    if cxx.target.platform == 'linux':
       cxx.defines += ['_LINUX', 'POSIX']
       if cxx.like('gcc'):
         cxx.linkflags += ['-static-libgcc']
       elif cxx.like('clang'):
         cxx.linkflags += ['-lgcc_eh']
-    elif builder.target.platform == 'mac':
+    elif cxx.target.platform == 'mac':
       cxx.defines += ['OSX', '_OSX', 'POSIX']
       cxx.cflags += ['-mmacosx-version-min=10.7']
       cxx.linkflags += [
@@ -126,7 +129,7 @@ class KEConfig(object):
         '-stdlib=libc++',
       ]
       cxx.cxxflags += ['-stdlib=libc++']
-    elif builder.target.platform == 'windows':
+    elif cxx.target.platform == 'windows':
       cxx.defines += ['WIN32', '_WINDOWS']
 
   def Program(self, context, name):

configure.py

@@ -12,10 +12,16 @@
 		sys.stderr.write('http://www.alliedmods.net/ambuild\n')
 	sys.exit(1)
 
-parser = run.BuildParser(sourcePath=sys.path[0], api='2.1')
-parser.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
-                          help='Enable debugging symbols')
-parser.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
-                          help='Enable optimization')
-parser.options.add_option('--std', type=str, default=None, help='Override C++ standard')
+# Hack to show a decent upgrade message, which wasn't done until 2.2.
+ambuild_version = getattr(run, 'CURRENT_API', '2.1')
+if ambuild_version.startswith('2.1'):
+	sys.stderr.write("AMBuild 2.2 or higher is required; please update\n")
+	sys.exit(1)
+
+parser = run.BuildParser(sourcePath=sys.path[0], api='2.2')
+parser.options.add_argument('--enable-debug', action='store_const', const='1', dest='debug',
+                            help='Enable debugging symbols')
+parser.options.add_argument('--enable-optimize', action='store_const', const='1', dest='opt',
+                            help='Enable optimization')
+parser.options.add_argument('--std', type=str, default=None, help='Override C++ standard')
 parser.Configure()

tests/AMBuild.tests

@@ -37,7 +37,7 @@ compiler.includes += [
 
 if compiler.like('msvc'):
   compiler.linkflags.append('/SUBSYSTEM:CONSOLE')
-if builder.target.platform == 'linux':
+if builder.cxx.target.platform == 'linux':
   compiler.linkflags.append('-ldl')
 compiler.linkflags.append(libgtest.binary)
 compiler.linkflags.append(KE.libamtl)
@@ -61,4 +61,5 @@ binary.sources += [
   'test-vector.cpp',
 ]
 
-builder.Add(binary)
+node = builder.Add(binary)
+builder.AddCopy(node.binary, builder.dist_folder)