Merge branch 'release-0.11.1' into release

.appveyor.yml

@@ -1,73 +1,74 @@
-version: "{build}"
-
-image: Visual Studio 2015
-
-branches:
-  only:
-    - master
-    - release
-
-environment:
-  matrix:
-  - llvm: 3.9.1
-  - llvm: 3.8.1
-  - llvm: 3.7.1
-
-configuration:
-  - release
-  - debug
-
-clone_depth: 100
-
-clone_folder: C:\projects\ponyc
-
-install:
-  - ps: |
-      $package_commit = git rev-parse --short --verify "HEAD^{commit}"
-      $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"
-  - 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"
-      $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 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-release
-    version: $(appveyor_build_version)
-    on:
-        branch: release
-        llvm: 3.9.1
-        configuration: release
-    publish: true
-
-build:
-  none
-
-test_script:
-  - ps: |
-      cd C:\projects\ponyc
-      python -x waf test --config $env:configuration --llvm $env:llvm
+version: "{build}"
+
+image: Visual Studio 2015
+
+branches:
+  only:
+    - master
+    - release
+
+environment:
+  matrix:
+  - llvm: 3.9.1
+  - llvm: 3.8.1
+  - llvm: 3.7.1
+
+configuration:
+  - release
+  - debug
+
+clone_depth: 100
+skip_tags: true
+
+clone_folder: C:\projects\ponyc
+
+install:
+  - ps: |
+      $package_commit = git rev-parse --short --verify "HEAD^{commit}"
+      $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"
+  - 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"
+      $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 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-release
+    version: $(appveyor_build_version)
+    on:
+        branch: release
+        llvm: 3.9.1
+        configuration: release
+    publish: true
+
+build:
+  none
+
+test_script:
+  - ps: |
+      cd C:\projects\ponyc
+      python -x waf test --config $env:configuration --llvm $env:llvm

.gitattributes

@@ -1,9 +1,15 @@
 [attr]pony text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=2
+[attr]win  text eol=crlf whitespace=tab-in-indent,trailing-space,tabwidth=2
 
 *.c pony
 *.cc pony
 *.h pony
 *.pony pony
+*.yml pony
+.sh pony
+.bash pony
+
+.bat win
 
 pony.g export-ignore
 .gitattributes export-ignore

.travis.yml

@@ -230,7 +230,7 @@ after_success:
           PACKAGE_CONFLICTS="ponyc-release";
       fi;
       PACKAGE_ITERATION="${PACKAGE_ITERATION}${TRAVIS_BUILD_NUMBER}.`git rev-parse --short --verify HEAD^{commit}`";
-      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;
+      make verbose=1 arch= 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 release release build with the latest stable LLVM, upload docs.