Merge branch 'release-0.11.0' into release

ponylang · Mar 11, 2017 · 848b2e1 · 848b2e1
2 parents 1c33065 + 21505d3
commit 848b2e1
Show file tree

Hide file tree

Showing 384 changed files with 23,733 additions and 7,362 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -9,13 +9,13 @@ branches:
 
 environment:
   matrix:
-  - llvm: 3.9.0
+  - llvm: 3.9.1
   - llvm: 3.8.1
   - llvm: 3.7.1
 
 configuration:
-  - Release
-  - Debug
+  - release
+  - debug
 
 clone_depth: 100
 
@@ -27,81 +27,29 @@ install:
       $package_version = (Get-Content "VERSION")
       $package_iteration = "$package_iteration${env:appveyor_build_number}.$package_commit"
       Update-AppveyorBuild -Version "ponyc-${env:appveyor_repo_branch}-$package_version-$package_iteration"
-  - ps: |
-      cd C:\
-      $premakeInstalled = Test-Path C:\premake5.exe
-      $llvmInstalled = Test-Path C:\LLVM-${env:llvm}-pony
-      if(-Not $premakeInstalled)
-      {
-        wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha9/premake-5.0.0-alpha9-windows.zip -OutFile C:\premake5.zip
-        7z x C:\premake5.zip
-        del C:\premake5.zip
-      }
-      if(-Not $llvmInstalled)
-      {
-        wget "https://github.com/ponylang/ponyc-windows-llvm/releases/download/LLVM-Release-VS2015/LLVM-${env:llvm}-Release-VS2015.7z" -OutFile C:\LLVM.7z
-        7z x C:\LLVM.7z
-        ren C:\LLVM-${env:llvm} C:\LLVM-${env:llvm}-pony
-        del C:\LLVM.7z
-      }
-      $env:path += ";C:\LLVM-${env:llvm}-pony\bin"
-  - ps: |
-      cd C:\
-      $libsInstalled = Test-Path C:\ponyc-windows-libs
-      if(-Not $libsInstalled)
-      {
-        md C:\ponyc-windows-libs
-        cd C:\ponyc-windows-libs
-        md lib
-        svn co svn://vcs.exim.org/pcre2/code/tags/pcre2-10.21 pcre2
-        md pcre2.build
-        cd pcre2.build
-        cmake ..\pcre2 -G "Visual Studio 14 2015 Win64"
-        msbuild PCRE2.sln /t:pcre2-8 /p:Configuration=Release
-        copy Release\pcre2-8.lib ..\lib
-        cd ..
-        wget http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.1.4-windows.zip -OutFile libressl-2.1.4-windows.zip
-        unzip -o libressl-2.1.4-windows.zip
-        copy libressl-2.1.4-windows\x64\libssl-32.* lib
-        copy libressl-2.1.4-windows\x64\libcrypto-32.* lib
-      }
-      $env:LIB = "C:\ponyc-windows-libs\lib;" + $env:LIB
-      $env:path += ";C:\ponyc-windows-libs\lib"
-      cd C:\projects\ponyc
-      C:\premake5.exe --with-tests --to=work/vs2015 vs2015
-
-after_build:
+  - cd C:\projects\ponyc
+  - python -x waf configure
+  - python -x waf build --config %configuration% --llvm %llvm%
   - ps: |
       $ponydir = "${env:appveyor_build_version}-win64"
+      cd C:\projects\ponyc
       md "$ponydir"
       md "${ponydir}\ponyc"
       md "${ponydir}\ponyc\bin"
-      copy build\$env:configuration\ponyc.*  "${ponydir}\ponyc\bin"
-      copy build\$env:configuration\ponyrt.* "${ponydir}\ponyc\bin"
+      $builddir = "C:\projects\ponyc\build\${env:configuration}-llvm-${env:llvm}"
+      Write-Output "Build dir is ${builddir}"
+      copy $builddir\ponyc.* "${ponydir}\ponyc\bin"
+      copy $builddir\ponyrt.* "${ponydir}\ponyc\bin"
+      copy $builddir\*.lib "${ponydir}\ponyc\bin"
       copy -recurse packages "${ponydir}\packages"
-
       7z a -tzip "C:\projects\ponyc\${ponydir}.zip" "${ponydir}"
 
 artifacts:
   - path: 'ponyc-*.zip'
 
 deploy:
-  # On branches `master` and `release`, deploy (and publish) artifacts
+  # On branche `release`, deploy (and publish) artifacts
   # to the ponyc-win projects on Bintray.
-  - provider: BinTray
-    username: pony-buildbot-2
-    api_key:
-        secure: 4KgdDQLp2kX816XH27d5xdJBPlKGhYXN6ttdHTSt5qe1MVIF+/VResUstg0zuJ6m
-    subject: pony-language
-    repo: ponyc-win
-    package: ponyc-master
-    version: $(appveyor_build_version)
-    on:
-        branch: master
-        llvm: 3.9.0
-        configuration: Release
-    publish: true
-
   - provider: BinTray
     username: pony-buildbot-2
     api_key:
@@ -112,29 +60,14 @@ deploy:
     version: $(appveyor_build_version)
     on:
         branch: release
-        llvm: 3.9.0
-        configuration: Release
+        llvm: 3.9.1
+        configuration: release
     publish: true
 
-# cache:
-#   - 'C:\LLVM-%llvm%-pony\ -> .appveyor.yml'
-#   - C:\premake5.exe -> .appveyor.yml
-#   - C:\ponyc-windows-libs\ -> .appveyor.yml
-
 build:
-  project: work\vs2015\ponyc.sln
-  verbosity: minimal
+  none
 
 test_script:
-  - C:\projects\ponyc\build\%CONFIGURATION%\testc.exe
-  - C:\projects\ponyc\build\%CONFIGURATION%\testrt.exe
-  - CALL "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\vcvars64.bat"
-  - C:\projects\ponyc\build\%CONFIGURATION%\ponyc.exe -V 3 -o C:\projects\ponyc\ -d -s --verify packages/stdlib
-  - stdlib.exe --sequential
-  - del stdlib.exe
-  - C:\projects\ponyc\build\%CONFIGURATION%\ponyc.exe -V 3 -o C:\projects\ponyc\ --verify packages/stdlib
-  - stdlib.exe --sequential
-  - del stdlib.exe
-  - C:\projects\ponyc\build\%CONFIGURATION%\ponyc.exe -V 3 -o C:\projects\ponyc\ -d -s --verify examples
-  - examples.exe
-  - del examples.exe
+  - ps: |
+      cd C:\projects\ponyc
+      python -x waf test --config $env:configuration --llvm $env:llvm
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,12 @@ tags
 *.sublime*
 .*.swp
 *.dSYM/
+waf-*
+waf3-*
+.lock-waf*
+tmp.eof
+src/.vs
+CppProperties.json
 build/
 work/
 output/

diff --git a/.travis.yml b/.travis.yml
@@ -10,32 +10,6 @@ sudo: required
 
 matrix:
   include:
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      env:
-        - LLVM_VERSION="3.6.2"
-        - LLVM_CONFIG="llvm-config-3.6"
-        - config=debug
-        - CC1=gcc-5
-        - CXX1=g++-5
-    - os: linux
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-5
-      env:
-        - LLVM_VERSION="3.6.2"
-        - LLVM_CONFIG="llvm-config-3.6"
-        - config=release
-        - CC1=gcc-5
-        - CXX1=g++-5
     - os: linux
       addons:
         apt:
@@ -96,7 +70,7 @@ matrix:
           packages:
             - g++-5
       env:
-        - LLVM_VERSION="3.9.0"
+        - LLVM_VERSION="3.9.1"
         - LLVM_CONFIG="llvm-config-3.9"
         - config=debug
         - CC1=gcc-5
@@ -109,26 +83,11 @@ matrix:
           packages:
             - g++-5
       env:
-        - LLVM_VERSION="3.9.0"
+        - LLVM_VERSION="3.9.1"
         - LLVM_CONFIG="llvm-config-3.9"
         - config=release
         - CC1=gcc-5
         - CXX1=g++-5
-    - os: osx
-      env:
-        - LLVM_VERSION="3.6.2"
-        - LLVM_CONFIG="llvm-config-3.6"
-        - config=debug
-        - CC1=clang-3.6
-        - CXX1=clang++-3.6
-    - os: osx
-      env:
-        - LLVM_VERSION="3.6.2"
-        - LLVM_CONFIG="llvm-config-3.6"
-        - config=release
-        - lto=no
-        - CC1=clang-3.6
-        - CXX1=clang++-3.6
     - os: osx
       env:
         - LLVM_VERSION="3.7.1"
@@ -161,14 +120,14 @@ matrix:
         - CXX1=clang++-3.8
     - os: osx
       env:
-        - LLVM_VERSION="3.9.0"
+        - LLVM_VERSION="3.9.1"
         - LLVM_CONFIG="llvm-config-3.9"
         - config=debug
         - CC1=clang-3.9
         - CXX1=clang++-3.9
     - os: osx
       env:
-        - LLVM_VERSION="3.9.0"
+        - LLVM_VERSION="3.9.1"
         - LLVM_CONFIG="llvm-config-3.9"
         - config=release
         - lto=no
@@ -184,7 +143,7 @@ install:
   # prepare to deploy artifacts.
   - if [[
         "$TRAVIS_REPO_SLUG" == "ponylang/ponyc" &&
-        "$LLVM_VERSION" == "3.9.0" &&
+        "$LLVM_VERSION" == "3.9.1" &&
         "$config" == "release" &&
         "$TRAVIS_OS_NAME" == "linux" &&
         "$TRAVIS_PULL_REQUEST" == "false"
@@ -202,7 +161,12 @@ install:
 
   - if [ "${TRAVIS_OS_NAME}" = "linux" ];
     then
-      wget "http://llvm.org/releases/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04.tar.xz";
+      if [ "${LLVM_VERSION}" = "3.6.2" ];
+      then
+        wget "http://llvm.org/releases/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04.tar.xz";
+      else
+        wget "http://llvm.org/releases/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-debian8.tar.xz";
+      fi;
       tar -xvf clang+llvm*;
       cd clang+llvm* && sudo mkdir /tmp/llvm && sudo cp -r * /tmp/llvm/;
       sudo ln -s /tmp/llvm/bin/llvm-config /usr/local/bin/${LLVM_CONFIG};
@@ -216,10 +180,6 @@ install:
     then
       brew update;
       brew install gmp; brew link --overwrite gmp;
-      if [ "${LLVM_VERSION}" = "3.6.2" ];
-      then
-        brew install llvm36;
-      fi;
       if [ "${LLVM_VERSION}" = "3.7.1" ];
       then
         brew install llvm37;
@@ -228,7 +188,7 @@ install:
       then
         brew install llvm38;
       fi;
-      if [ "${LLVM_VERSION}" = "3.9.0" ];
+      if [ "${LLVM_VERSION}" = "3.9.1" ];
       then
         brew install llvm;
         brew link --overwrite --force llvm;
@@ -273,14 +233,14 @@ after_success:
       make verbose=1 config=release package_name="$PACKAGE_NAME" package_conflicts="$PACKAGE_CONFLICTS" package_base_version="`cat VERSION`" package_iteration="$PACKAGE_ITERATION" deploy && export UPLOAD=yes;
     fi;
 
-  # For a master release build with the latest stable LLVM, upload docs.
+  # For a release release build with the latest stable LLVM, upload docs.
   - if [[
         "$TRAVIS_REPO_SLUG" == "ponylang/ponyc" &&
-        "$LLVM_VERSION" == "3.9.0" &&
+        "$LLVM_VERSION" == "3.9.1" &&
         "$config" == "release" &&
         "$TRAVIS_OS_NAME" == "linux" &&
         "$TRAVIS_PULL_REQUEST" == "false" &&
-        "$TRAVIS_BRANCH" == "master"
+        "$TRAVIS_BRANCH" == "release"
     ]];
     then
       git remote add gh-token "https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}";
@@ -294,32 +254,32 @@ after_success:
     fi;
 
 deploy:
-  - provider: bintray
-    user: pony-buildbot-2
-    file: /home/travis/build/ponylang/ponyc/bintray_debian.yml
-    on:
-      branch: master
-      condition: "$UPLOAD = yes"
-    key:
-      secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
+  # - provider: bintray
+  #   user: pony-buildbot-2
+  #   file: /home/travis/build/ponylang/ponyc/bintray_debian.yml
+  #   on:
+  #     branch: master
+  #     condition: "$UPLOAD = yes"
+  #   key:
+  #     secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
 
-  - provider: bintray
-    user: pony-buildbot-2
-    file: /home/travis/build/ponylang/ponyc/bintray_rpm.yml
-    on:
-      branch: master
-      condition: "$UPLOAD = yes"
-    key:
-      secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
+  # - provider: bintray
+  #   user: pony-buildbot-2
+  #   file: /home/travis/build/ponylang/ponyc/bintray_rpm.yml
+  #   on:
+  #     branch: master
+  #     condition: "$UPLOAD = yes"
+  #   key:
+  #     secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
 
-  - provider: bintray
-    user: pony-buildbot-2
-    file: /home/travis/build/ponylang/ponyc/bintray_source.yml
-    on:
-      branch: master
-      condition: "$UPLOAD = yes"
-    key:
-      secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
+  # - provider: bintray
+  #   user: pony-buildbot-2
+  #   file: /home/travis/build/ponylang/ponyc/bintray_source.yml
+  #   on:
+  #     branch: master
+  #     condition: "$UPLOAD = yes"
+  #   key:
+  #     secure: "GGDPvrwx0nY09smgUP0ocbBCIdvl1r96bzM7NYxxS9l9d6xGegaSFzUF6B19mdIRT4A+mR9fxpc2eQpxC6iduWVOWGwXGqtYtWzKz/C1I3s/UICPWDl2f4wsO8KGqcO2+M87aw3bwUKC4GgzKa956HKm8BVeCWhbwyFSf0c4UyST8Lkv2vAFWeRDmu/fzUwwFFpiHwlE7W1rlJhQV2xiY8pwVntgxAmTL5ssSOYdk+t65H1fIfjF3k+dU0KkARa8y2JaVhtYHlisHjCki2V3hhKenGcoK22WnNckaCM9sn/ppCm6KRhqcbtGrbEYu8XAA/xXnw3xtgZWVHhcLdTXDl13rxCGchdF1f2rtEZCfI9BSJeQlLBRrf8lF9rEdLgfUqOKSq47KKrENa5PclhGiby9iICBuzRMJxbKUvXo8dcCvFP+/Q8ekIMyAItIK/AJBX9Gx4Yv25g8n5XZDzgfNlOEou27emo7zv1/nCEZkwKQyfHAEbnpz56y0JaR+eMotBdLIHsDNZSAh+/tWNiUYBaKfZydawrnHlWxiX8diMEOqZWHhlIHRljCmt2NUxAevht2mzzoZ+NBZxfyaDcw0dt8A1cGpigZh995Pj+LaFidPK7lvIwJGJ1956Iaj+wnZxJCkCOHuTLtO5KYDTIlgbmd7vVQfX5wm9uKsrsifF8="
 
   - provider: bintray
     user: pony-buildbot-2
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,12 @@ tags @@
     *.sublime*
     .*.swp
     *.dSYM/
+    waf-*
+    waf3-*
+    .lock-waf*
+    tmp.eof
+    src/.vs
+    CppProperties.json
     build/
     work/
     output/
@@ Expand Down @@