Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm…

… into Cog

.appveyor.yml

@@ -13,6 +13,11 @@ environment:
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
+    - FLAVOR: squeak.cog.spur.lowcode
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: squeak.cog.v3
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
@@ -33,6 +38,11 @@ environment:
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
+    - FLAVOR: pharo.cog.spur.lowcode
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: newspeak.cog.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
@@ -90,21 +100,36 @@ install:
   - ps: 'Start-FileDownload "http://cygwin.com/setup-x86_64.exe" -FileName "setup-x86_64.exe"'
   - '%CYG_SETUP% -dgnqNO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_ROOT%\var\cache\setup" -P mingw64-%MINGW_ARCH%-gcc-core,mingw64-%MINGW_ARCH%-gcc-g++,mingw64-%MINGW_ARCH%-headers,mingw64-%MINGW_ARCH%-runtime,zip,mingw64-%MINGW_ARCH%-clang,mingw64-%MINGW_ARCH%-openssl,libiconv-devel,libglib2.0-devel,perl,mingw64-%MINGW_ARCH%-zlib,make,cmake,wget,mingw64-%MINGW_ARCH%-win-iconv'
 
-build: false
-
 # Cygwin build script
 #
 # NOTES:
 #
 # The stdin/stdout file descriptor appears not to be valid for the Appveyor
 # build which causes failures as certain functions attempt to redirect
 # default file handles. Ensure a dummy file descriptor is opened with 'exec'.
-test_script:
+build_script:
   - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_build.sh"'
-on_success:
-  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_deploy.sh"'
-before_deploy:
-  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/deploy/pharo; exec 0</dev/null; exec ./filter-exec.sh pack-vm.sh"'
-  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/deploy/pharo; exec 0</dev/null; exec ./filter-exec.sh deploy-key.sh"'
-deploy_script:
-  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./deploy/pharo/filter-exec.sh deploy-files.pharo.org.sh"'
+
+# Using `after_build` instead of `before_deploy` and `deploy_script`.
+#  `before_deploy` is only invoked if the deployment provider is triggered.
+#  `deploy_script` is mutually exclusive to `deploy`.
+# In addition, the vm needs to be packed before artifacts are collected.
+after_build:
+  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/deploy; exec 0</dev/null; exec ./filter-exec.sh pack-vm.sh"'
+  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/deploy; exec 0</dev/null; exec ./filter-exec.sh bintray.sh"'
+  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER/deploy/pharo; exec 0</dev/null; exec ./filter-exec.sh deploy.sh"'
+
+test: off
+
+artifacts:
+  - path: products\*.zip
+    name: osvm
+
+deploy:
+  provider: GitHub # Deploy stable tags to GitHub releases
+  description: 'Automatic release'
+  auth_token:
+    secure: SOq4LiXFepptbgPZ4w2McefZOsRRAy8u88/+dpNof57BG4gYTvyESV1EB4CXTXjX
+  artifact: osvm
+  on:
+    appveyor_repo_tag: true

.gitignore

@@ -37,6 +37,8 @@ platforms/unix/config/autom4te.cache/
 !makeall
 !makeallclean
 !makealldirty
+!makeclean
+!makeem
 !Makefile
 !Makefile.plugin
 !Makefile.rules
@@ -254,3 +256,5 @@ platforms/unix/config/autom4te.cache/
 
 # /products/debug/
 /products/debug/*
+*.cer
+*.p12

.travis.yml

@@ -1,175 +1,138 @@
 language: c
-osx_image: xcode6.4
+
 sudo: required
+
 cache:
   directories:
   - armchroot
   - .thirdparty-cache
+
 notifications:
   slack:
     secure: gyekIJqPdx7SxqpugvtpY5mZSg54oFkFJ+DKBPILtjyI/sDhcSwT9GwY/zoHoYkoHrPLepDxyPgkAC8JCcTiAcxOazq5zlVva6SoQRjlDnC64oCYvOj/2giuYkXLXnwvj8mIINEgXzEvLdalpHwazsY0fzKNFM1mdrkPolmf2CvaNbKCGkiagsjrxJHEEB4tLcUP4ArqVE6wb+20HXoMKlHccgCFvN67bYJrTXDnuhEgKMooQRFv0yVoimckdRn1amvIgljavPwv2yHX+V1roneyi90e4ri9AT2sROeRprGnaib9Z8p+/mgWIUnTLL7pjbNHhtvZptsj3xjanWy1Bt/4MMewTWN4REE/KKxLp79CQvGNR+Ki7mF2UpgYUtxHYpFNIGNF9VomwnfWAuYdGDAYAGY3S1W12RPo37CC7RP/lPM96L6ypW41FoQKlnhzm+StJV+mlI5C1jQBU2WKoVhaKXJpraX2mUJXyN8ilYDo7PrJe0SRLH6J2WwPM5Z/RdscBDEGAR4RhZnn++1IE7e1gZPJB4NZH/3wLBwDhz8S4kB/GB32/rz3ZaftCf2+XjAZXzF3SroUCZ/MWZPGrwchEkU/3z1Tm8FTbELxZk1rSYpdLwVnXYooo5vggqjgAZvmlTerJuufl5lOkXT44PynZAvE+I+MrD04DpKuH0w=
-matrix:
+
+aliases:
+  - &mac-build
+    os: osx
+    osx_image: xcode7.3
+
+jobs:
   include:
-  - os: linux
+  - stage: "Linux builds"
     env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
-  - os: linux
-    env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
-  - os: linux
-    env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
-  - os: linux
-    env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
-  - os: linux
-    env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
-    before_deploy: (cd deploy/pharo && ./pack-vm.sh && ./deploy-key.sh)
-    deploy:
-    - provider: script
-      skip_cleanup: true
-      script: ./deploy/pharo/deploy-files.pharo.org.sh
-      on:
-        branch: Cog
-        repo: OpenSmalltalk/opensmalltalk-vm
-  - os: linux
-    env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
-    before_deploy: (cd deploy/pharo && ./pack-vm.sh && ./deploy-key.sh)
-    deploy:
-    - provider: script
-      skip_cleanup: true
-      script: ./deploy/pharo/deploy-files.pharo.org.sh
-      on:
-        branch: Cog
-        repo: OpenSmalltalk/opensmalltalk-vm
-  - os: linux
-    env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
-  - os: linux
-    env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
-  - os: linux
-    env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
-  - os: linux
-    env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
-  - os: linux
-    env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
-  - os: linux
-    env: ARCH="linux32x86" FLAVOR="squeak.stack.spur"
-  - os: linux
-    env: ARCH="linux32x86" FLAVOR="squeak.stack.v3"
-  - os: linux
-    env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
-    before_deploy: (cd deploy/pharo && ./pack-vm.sh && ./deploy-key.sh)
-    deploy:
-    - provider: script
-      skip_cleanup: true
-      script: ./deploy/pharo/deploy-files.pharo.org.sh
-      on:
-        branch: Cog
-        repo: OpenSmalltalk/opensmalltalk-vm
-  - os: linux
-    env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
-    before_deploy: (cd deploy/pharo && ./pack-vm.sh && ./deploy-key.sh)
-    deploy:
-    - provider: script
-      skip_cleanup: true
-      script: ./deploy/pharo/deploy-files.pharo.org.sh
-      on:
-        branch: Cog
-        repo: OpenSmalltalk/opensmalltalk-vm
-  - os: osx
+  - env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
+  - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
+  - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
+  - env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
+  - env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
+  - env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
+  - env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
+  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
+  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
+
+  - stage: "Mac builds"
     env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
-  - os: osx
-    env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
-  - os: osx
-    env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
-    before_deploy: (cd deploy/pharo && ./pack-vm.sh && ./deploy-key.sh)
-    deploy:
-    - provider: script
-      skip_cleanup: true
-      script: ./deploy/pharo/deploy-files.pharo.org.sh
-      on:
-        branch: Cog
-        repo: OpenSmalltalk/opensmalltalk-vm
-  - os: osx
-    env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
-  - os: osx
-    env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
-  - os: osx
-    env: ARCH="macos64x64" FLAVOR="pharo.stack.spur.lowcode"
-  - os: osx
-    env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
-  - os: osx
-    env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
-    before_deploy: (cd deploy/pharo && ./pack-vm.sh && ./deploy-key.sh)
-    deploy:
-    - provider: script
-      skip_cleanup: true
-      script: ./deploy/pharo/deploy-files.pharo.org.sh
-      on:
-        branch: Cog
-        repo: OpenSmalltalk/opensmalltalk-vm
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="squeak.stack.spur"
-  - os: osx
-    env: ARCH="macos32x86" FLAVOR="squeak.stack.v3"
-  - os: linux
+    <<: *mac-build
+  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
+    <<: *mac-build
+  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
+    <<: *mac-build
+  - env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"
+    <<: *mac-build
+
+  - stage: "Stack builds"
+    env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
+  - env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
+  - env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
+  - env: ARCH="linux32x86" FLAVOR="squeak.stack.spur"
+  - env: ARCH="linux32x86" FLAVOR="squeak.stack.v3"
+  - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
+    <<: *mac-build
+  - env: ARCH="macos64x64" FLAVOR="pharo.stack.spur.lowcode"
+    <<: *mac-build
+  - env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
+    <<: *mac-build
+  - env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="squeak.stack.spur"
+    <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="squeak.stack.v3"
+    <<: *mac-build
+
+  - stage: "linux32ARMv6 builds"
     env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi
       -- bash -c "
     dist: trusty
     group: edge
-  - os: linux
-    env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi
+  - env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi
       -- bash -c "
     dist: trusty
     group: edge
-  - os: linux
-    env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
+  - env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
       bash -c "
     dist: trusty
     group: edge
-  - os: linux
-    env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi --
+  - env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi --
       bash -c "
     dist: trusty
     group: edge
-    before_deploy: (cd deploy/pharo && ./pack-vm.sh && ./deploy-key.sh)
-    deploy:
-    - provider: script
-      skip_cleanup: true
-      script: ./deploy/pharo/deploy-files.pharo.org.sh
-      on:
-        branch: Cog
-        repo: OpenSmalltalk/opensmalltalk-vm
-  - os: linux
-    env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
+  - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
       -- bash -c "
     dist: trusty
     group: edge
-  - os: linux
-    env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi --
+  - env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi --
       bash -c "
     dist: trusty
     group: edge
-install:
-- ./.travis_install.sh
-script:
-- cd platforms/unix/config/ && make configure
-- cd ../../../
-- $CHROOT ./.travis_build.sh
-- ./.travis_test.sh
-after_success:
-- ./.travis_deploy.sh
+
+install: ./.travis_install.sh
+
+before_script: $CHROOT ./.travis_build.sh
+
+script: ./.travis_test.sh
+
+after_success: (cd deploy && ./filter-exec.sh pack-vm.sh)
+
+deploy:
+  - provider: script # Deploy bleeding edge to Bintray
+    script: (cd deploy && ./bintray.sh)
+    skip_cleanup: true
+    on:
+      repo: OpenSmalltalk/opensmalltalk-vm
+      branch: Cog
+  - provider: script # Deploy to files.pharo.org
+    script: (cd deploy/pharo && ./filter-exec.sh ./deploy.sh)
+    skip_cleanup: true
+    on:
+      repo: OpenSmalltalk/opensmalltalk-vm
+      branch: Cog
+      condition: $FLAVOR == pharo*
+  - provider: releases # Deploy stable tags to GitHub releases
+    api_key:
+      secure: ASzbVm1ootfvzfAYm50rWCfIvwp/O+6N1NMv2lymvswj/sGW7MxmYGHj2UNtLg9OAD+lL9YyElyy94MCpSK496+pD7GrOdRAitilMreWR6jGab0D92pPcujMAsDDSRTPNZsui1kvK1skWGMCN41mXLlwtCxSqWdhQ1viMmjXeK29TJbHykFEdfgZc6RcB97NdMyz6Pp9uqbxXSA656UxeLJzsKX88mXFcd5983pVt1ME8dfeUC9dwTihG5IAEg3Uz6HDxcR3uero0alLXycer5zI1kHLede03aNNvcRcUnVjBa5rNY8ON884DblDC+lcc+8b104MQTAGKWbyibjpm+9b0oWJV/tB20VdJUxZ2MpuktLzUrFBjVFjSrB5NmkITtJ1o+eYmjJOzWZNqFueNIsEkbGItDQJkKhNySBnUZ3/gyxnTBwmulUF2i8dimdwAuZlMiTN5mqpSLzLCE9ZrGWz9zuuCCombvpNIAc2IMsaTlpj391TjQfqGvu+Z88hmJOmDwpdUsGwNHo+Cz1N+KivAfySgj1T+CfE4xnuKOQzVbUK1Aqv/uGl1ieS1MfgyrqfgvRWEcGQh7/35n6yxG5s2z1qrs9Vl0e0rN261GQuK5ElNsQSLVRNH13+PdDwTCEZ/APzo+0uGRGTmGKJtzAofmkeAsrwmgGJPAuip/0=
+    file_glob: true
+    file: "./products/*.{dmg,gz,zip}"
+    skip_cleanup: true
+    on:
+      repo: OpenSmalltalk/opensmalltalk-vm
+      tags: true
+
+after_deploy: (cd deploy && ./filter-exec.sh bintray-cleanup.sh)