[Vm-dev] [OpenSmalltalk/opensmalltalk-vm] dab1e5: Merge branch 'Cog' of github.com:OpenSmalltalk/ope...

GitHub noreply at github.com
Thu Oct 20 11:10:07 UTC 2016


  Branch: refs/heads/Cog
  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
  Commit: dab1e5316f88e90cae3c4116d184a92473f49516
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/dab1e5316f88e90cae3c4116d184a92473f49516
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
    M platforms/Cross/vm/sqVirtualMachine.h
    M platforms/iOS/vm/OSX/Newspeak-Info.plist
    M platforms/iOS/vm/OSX/Pharo-Info.plist
    M platforms/iOS/vm/OSX/Squeak-Info.plist
    M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo


  Commit: d378ee21ddd19f03bf70cc3b07eaf4d087f4c578
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d378ee21ddd19f03bf70cc3b07eaf4d087f4c578
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo


  Commit: 5824f7fa428259726ac1a9955e0bd9fea0cddd15
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5824f7fa428259726ac1a9955e0bd9fea0cddd15
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M build.linux32x86/pharo.cog.spur/plugins.ext

  Log Message:
  -----------
  temporary disable SDL2DisplayPlugin


  Commit: 4cd26bcce9d6c28df21cea6d62793612a54c6e3b
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4cd26bcce9d6c28df21cea6d62793612a54c6e3b
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M build.linux32x86/pharo.cog.spur/build/mvm
    A build.linux64x64/pharo.cog.spur/build.assert.itimerheartbeat/mvm
    A build.linux64x64/pharo.cog.spur/build.assert.itimerheartbeat/mvm~
    A build.linux64x64/pharo.cog.spur/build.assert/mvm
    A build.linux64x64/pharo.cog.spur/build.debug.itimerheartbeat/mvm
    A build.linux64x64/pharo.cog.spur/build.debug.itimerheartbeat/mvm~
    A build.linux64x64/pharo.cog.spur/build.debug/mvm
    A build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm
    A build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm~
    A build.linux64x64/pharo.cog.spur/build/mvm
    A build.linux64x64/pharo.cog.spur/makeallclean
    A build.linux64x64/pharo.cog.spur/makealldirty
    A build.linux64x64/pharo.cog.spur/plugins.ext
    A build.linux64x64/pharo.cog.spur/plugins.int

  Log Message:
  -----------
  build for 64bits linux


  Commit: 44b51e3f402594a55916fc9935ccf875c4334aab
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/44b51e3f402594a55916fc9935ccf875c4334aab
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    A build.linux64x64/editpharoinstall.sh

  Log Message:
  -----------
  add missing editpharoinstall.sh


  Commit: e36a403e809f7069c0cc74c94d9ee10cb798770f
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e36a403e809f7069c0cc74c94d9ee10cb798770f
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-09-29 (Thu, 29 Sep 2016)

  Changed paths:
    A platforms/Cross/vm/sqLowcodeFFI-Unsupported.h
    A platforms/Cross/vm/sqLowcodeFFI-i386.h
    A platforms/Cross/vm/sqLowcodeFFI-x86_64.h
    A platforms/Cross/vm/sqLowcodeFFI.h
    M platforms/Cross/vm/sqMemoryAccess.h
    A specs/lowcode.xml

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo


  Commit: ea773aee07cf65b844ecca8b1a33d5c0de6efa34
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ea773aee07cf65b844ecca8b1a33d5c0de6efa34
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
    M scripts/updateSCCSVersions

  Log Message:
  -----------
  update to work also as a submodule


  Commit: 0615a32152fb675f310c4b585b1708eb6f20703f
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0615a32152fb675f310c4b585b1708eb6f20703f
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
    M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m

  Log Message:
  -----------
  add reaction to shift on mac


  Commit: 75c5ac44f921702ecd34c75c4bb311ac010c5117
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/75c5ac44f921702ecd34c75c4bb311ac010c5117
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M README.md
    M build.linux32ARMv6/HowToBuild
    M platforms/unix/vm/sqUnixVMProfile.c
    M scripts/gitci
    M spursrc/vm/cogit.h
    M spursrc/vm/cogitARMv5.c
    M spursrc/vm/cogitIA32.c
    M spursrc/vm/cogitMIPSEL.c
    M spursrc/vm/cogmethod.h
    M spursrc/vm/cointerp.c
    M spursrc/vm/cointerp.h
    M spursrc/vm/gcc3x-cointerp.c
    M spursrc/vm/interp.h
    M spursrc/vm/vmCallback.h
    M src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
    M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c
    M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c
    M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo


  Commit: 95a9c28a662657136a096dffffd4b78d0568043c
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/95a9c28a662657136a096dffffd4b78d0568043c
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M build.linux32x86/pharo.cog.spur/build/mvm

  Log Message:
  -----------
  add formatting


  Commit: a024bfb46d32f4ae11ea4ec0087049442810b86d
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a024bfb46d32f4ae11ea4ec0087049442810b86d
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M platforms/unix/vm-display-X11/sqUnixX11.c

  Log Message:
  -----------
  added XInitThreads() for PharoVM


  Commit: 490c28f057b2c4d425cac8be84c921abc5f14a84
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/490c28f057b2c4d425cac8be84c921abc5f14a84
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M platforms/unix/config/Makefile.in
    A platforms/unix/config/Makefile.in~
    A platforms/unix/vm-display-X11/sqUnixX11.c~
    M platforms/unix/vm/sqUnixMain.c
    A platforms/unix/vm/sqUnixMain.c~

  Log Message:
  -----------
  added Pharo "double dash" options style


  Commit: 8513d009b7d5a943d45dc6b80f2cbef9b5c18982
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8513d009b7d5a943d45dc6b80f2cbef9b5c18982
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M platforms/unix/vm/sqUnixMain.c

  Log Message:
  -----------
  fix bad enclosing quotes


  Commit: e58ade11f45c316a187051183da74ffbae1b711c
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e58ade11f45c316a187051183da74ffbae1b711c
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    R platforms/unix/vm/sqUnixMain.c~

  Log Message:
  -----------
  remove bad commited file


  Commit: 7e06e9763ca766ed99864d24470cd9fcc069657a
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7e06e9763ca766ed99864d24470cd9fcc069657a
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    R build.linux64x64/pharo.cog.spur/build.assert.itimerheartbeat/mvm~
    R build.linux64x64/pharo.cog.spur/build.debug.itimerheartbeat/mvm~
    R build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm~
    R platforms/unix/config/Makefile.in~
    R platforms/unix/vm-display-X11/sqUnixX11.c~

  Log Message:
  -----------
  remove more wrongly commited files


  Commit: 52e51504a9aa3d329ecb32a8e25526400522e7a6
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/52e51504a9aa3d329ecb32a8e25526400522e7a6
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
    M platforms/unix/vm/sqUnixMain.c

  Log Message:
  -----------
  remove a test macro


  Commit: 71bb80cfe5a7a847b866eaaffa18c831d412aa91
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/71bb80cfe5a7a847b866eaaffa18c831d412aa91
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
    M platforms/unix/vm/sqUnixMain.c

  Log Message:
  -----------
  grrr... yet another wrong macro


  Commit: 184a4b54471f962648b2ca4cec4320801cef6911
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/184a4b54471f962648b2ca4cec4320801cef6911
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-04 (Tue, 04 Oct 2016)

  Changed paths:
    M build.linux32ARMv6/pharo.cog.spur/build.assert/mvm
    M build.linux32ARMv6/pharo.cog.spur/build.debug/mvm
    M build.linux32ARMv6/pharo.cog.spur/build/mvm
    M build.linux32ARMv6/squeak.cog.spur/build.assert/mvm
    M build.linux32ARMv6/squeak.cog.spur/build.debug/mvm
    M build.linux32ARMv6/squeak.cog.spur/build/mvm
    M build.linux32ARMv6/squeak.stack.spur/build.assert/mvm
    M build.linux32ARMv6/squeak.stack.spur/build.debug/mvm
    M build.linux32ARMv6/squeak.stack.spur/build/mvm
    M build.linux32ARMv6/squeak.stack.v3/build.assert/mvm
    M build.linux32ARMv6/squeak.stack.v3/build.debug/mvm
    M build.linux32ARMv6/squeak.stack.v3/build/mvm
    M build.linux32x86/pharo.cog.spur/build.assert.itimerheartbeat/mvm
    M build.linux32x86/pharo.cog.spur/build.assert/mvm
    M build.linux32x86/pharo.cog.spur/build.debug.itimerheartbeat/mvm
    M build.linux32x86/pharo.cog.spur/build.debug/mvm
    M build.linux32x86/pharo.cog.spur/build.itimerheartbeat/mvm
    M build.linux32x86/pharo.cog.spur/build/mvm
    M build.linux32x86/pharo.cog.spur/plugins.ext
    M build.linux32x86/squeak.cog.spur.immutability/build.assert/mvm
    M build.linux32x86/squeak.cog.spur.immutability/build.debug/mvm
    M build.linux32x86/squeak.cog.spur.immutability/build/mvm
    M build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm
    M build.linux32x86/squeak.cog.spur/build.assert/mvm
    M build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm
    M build.linux32x86/squeak.cog.spur/build.debug/mvm
    M build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm
    M build.linux32x86/squeak.cog.spur/build/mvm
    M build.linux32x86/squeak.cog.v3/build.assert.itimerheartbeat/mvm
    M build.linux32x86/squeak.cog.v3/build.assert/mvm
    M build.linux32x86/squeak.cog.v3/build.debug.itimerheartbeat/mvm
    M build.linux32x86/squeak.cog.v3/build.debug/mvm
    M build.linux32x86/squeak.cog.v3/build.itimerheartbeat/mvm
    M build.linux32x86/squeak.cog.v3/build/mvm
    M build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm
    M build.linux32x86/squeak.sista.spur/build.assert/mvm
    M build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm
    M build.linux32x86/squeak.sista.spur/build.debug/mvm
    M build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm
    M build.linux32x86/squeak.sista.spur/build/mvm
    M build.linux32x86/squeak.stack.spur/build.assert/mvm
    M build.linux32x86/squeak.stack.spur/build.debug/mvm
    M build.linux32x86/squeak.stack.spur/build/mvm
    M build.linux32x86/squeak.stack.v3/build.assert/mvm
    M build.linux32x86/squeak.stack.v3/build.debug/mvm
    M build.linux32x86/squeak.stack.v3/build/mvm
    M build.linux64x64/squeak.cog.spur.immutability/build.assert/mvm
    M build.linux64x64/squeak.cog.spur.immutability/build.debug/mvm
    M build.linux64x64/squeak.cog.spur.immutability/build/mvm
    M build.linux64x64/squeak.cog.spur/build.assert.itimerheartbeat/mvm
    M build.linux64x64/squeak.cog.spur/build.assert/mvm
    M build.linux64x64/squeak.cog.spur/build.debug.itimerheartbeat/mvm
    M build.linux64x64/squeak.cog.spur/build.debug/mvm
    M build.linux64x64/squeak.cog.spur/build.itimerheartbeat/mvm
    M build.linux64x64/squeak.cog.spur/build/mvm
    M build.linux64x64/squeak.stack.spur/build.assert/mvm
    M build.linux64x64/squeak.stack.spur/build.debug/mvm
    M build.linux64x64/squeak.stack.spur/build/mvm

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo

# Conflicts:
#	build.linux32x86/pharo.cog.spur/plugins.ext


  Commit: 3509c95ffce2083325c89cc217467de20d51fd66
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3509c95ffce2083325c89cc217467de20d51fd66
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
    M build.linux32x86/pharo.cog.spur/build/mvm
    A build.linux32x86/third-party/common/Makefile.lib.extra
    A build.linux32x86/third-party/libgit2/Makefile
    A build.linux32x86/third-party/libgit2/Makefile.lib
    A build.linux32x86/third-party/libgit2/mvm
    A build.linux32x86/third-party/libsdl2/Makefile
    A build.linux32x86/third-party/libsdl2/Makefile.lib
    A build.linux32x86/third-party/libsdl2/mvm
    A build.linux32x86/third-party/libssh2/Makefile
    A build.linux32x86/third-party/libssh2/Makefile.lib
    A build.linux32x86/third-party/libssh2/mvm
    A build.linux32x86/third-party/pkgconfig/Makefile
    A build.linux32x86/third-party/pkgconfig/Makefile.lib

  Log Message:
  -----------
  add a first version of building third-party libraries for linux 32bits


  Commit: 7c3cbd63389025857dd41ff4998507bb02fe9392
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7c3cbd63389025857dd41ff4998507bb02fe9392
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
    M build.linux64x64/pharo.cog.spur/build/mvm
    A build.linux64x64/third-party/common/Makefile.lib.extra
    A build.linux64x64/third-party/libgit2/Makefile
    A build.linux64x64/third-party/libgit2/Makefile.lib
    A build.linux64x64/third-party/libgit2/mvm
    A build.linux64x64/third-party/libsdl2/Makefile
    A build.linux64x64/third-party/libsdl2/Makefile.lib
    A build.linux64x64/third-party/libsdl2/mvm
    A build.linux64x64/third-party/libssh2/Makefile
    A build.linux64x64/third-party/libssh2/Makefile.lib
    A build.linux64x64/third-party/libssh2/mvm

  Log Message:
  -----------
  linux 64bits with dependencies working.


  Commit: 0bde7a033d2dbe027cdc38868ba2f31da699e6fd
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0bde7a033d2dbe027cdc38868ba2f31da699e6fd
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-05 (Wed, 05 Oct 2016)

  Changed paths:
    M build.macos32x86/HowToBuild
    M build.macos32x86/pharo.cog.spur/Makefile
    M build.macos64x64/HowToBuild
    M build.macos64x64/pharo.cog.spur/Makefile

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo


  Commit: 27b727024b7e2bd37f3dae00954d505ce5224f3e
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/27b727024b7e2bd37f3dae00954d505ce5224f3e
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-06 (Thu, 06 Oct 2016)

  Changed paths:
    M build.linux32x86/pharo.cog.spur/build.itimerheartbeat/mvm

  Log Message:
  -----------
  prepared to build linux with itimer


  Commit: 238372815bc433edde1a696f89ad63fa12c350a0
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/238372815bc433edde1a696f89ad63fa12c350a0
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-06 (Thu, 06 Oct 2016)

  Changed paths:
    M build.macos32x86/HowToBuild
    M build.macos32x86/pharo.cog.spur/Makefile
    M build.macos64x64/HowToBuild
    M build.macos64x64/pharo.cog.spur/Makefile

  Log Message:
  -----------
  Merged branch merge-with-pharo into merge-with-pharo


  Commit: ac729089d19e63f1e374a72a3622b0398d7fef5c
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ac729089d19e63f1e374a72a3622b0398d7fef5c
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-06 (Thu, 06 Oct 2016)

  Changed paths:
    M build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm

  Log Message:
  -----------
  prepared to build linux 64bits with itimer


  Commit: 8802ad1333ae28ab12c0ec67f479cb929f672cd5
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8802ad1333ae28ab12c0ec67f479cb929f672cd5
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-06 (Thu, 06 Oct 2016)

  Changed paths:
    M .travis_build.sh

  Log Message:
  -----------
  added HEARTBEAT variable to build also those VMs


  Commit: e2611cbd63771a5e246dfa4a0a8fa0c141180478
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e2611cbd63771a5e246dfa4a0a8fa0c141180478
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-06 (Thu, 06 Oct 2016)

  Changed paths:
    M build.macos64x64/third-party/libgit2/Makefile.lib

  Log Message:
  -----------
  adding OPENSSL_LIBRARIES to try to make it compile.


  Commit: c25314fa625db9369363cfaff7899ff1971b5ffd
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c25314fa625db9369363cfaff7899ff1971b5ffd
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-07 (Fri, 07 Oct 2016)

  Changed paths:
    M .travis_install.sh
    M build.linux32ARMv6/pharo.cog.spur/build/mvm
    A build.linux32ARMv6/third-party/common/Makefile.lib.extra
    A build.linux32ARMv6/third-party/libgit2/Makefile
    A build.linux32ARMv6/third-party/libgit2/Makefile.lib
    A build.linux32ARMv6/third-party/libgit2/mvm
    A build.linux32ARMv6/third-party/libsdl2/Makefile
    A build.linux32ARMv6/third-party/libsdl2/Makefile.lib
    A build.linux32ARMv6/third-party/libsdl2/mvm
    A build.linux32ARMv6/third-party/libssh2/Makefile
    A build.linux32ARMv6/third-party/libssh2/Makefile.lib
    A build.linux32ARMv6/third-party/libssh2/mvm
    M build.linux64x64/third-party/libgit2/Makefile.lib

  Log Message:
  -----------
  add third-party libs for ARMv6


  Commit: c92b6e5db8ce45f611f8ba112077210bfd291193
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c92b6e5db8ce45f611f8ba112077210bfd291193
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-07 (Fri, 07 Oct 2016)

  Changed paths:
    M .travis_build.sh
    M build.macos64x64/third-party/libgit2/Makefile.lib

  Log Message:
  -----------
  Merged branch merge-with-pharo into merge-with-pharo


  Commit: 40321876bca5a68720a363142b48c57b67c36f8b
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/40321876bca5a68720a363142b48c57b67c36f8b
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
    M build.macos32x86/pharo.cog.spur/plugins.ext
    M build.macos32x86/pharo.stack.spur/plugins.ext
    M build.macos32x86/squeak.cog.spur+immutability/plugins.ext
    M build.macos32x86/squeak.cog.spur/plugins.ext
    M build.macos32x86/squeak.cog.v3/plugins.ext
    M build.macos32x86/squeak.sista.spur/plugins.ext
    M build.macos32x86/squeak.stack.spur/plugins.ext
    M build.macos32x86/squeak.stack.v3/plugins.ext
    M build.macos64x64/squeak.cog.spur.immutability/plugins.ext
    M build.macos64x64/squeak.cog.spur/plugins.ext
    M build.macos64x64/squeak.sista.spur/plugins.ext
    M build.macos64x64/squeak.stack.spur/plugins.ext
    M platforms/unix/vm/sqUnixExternalPrims.c
    M platforms/unix/vm/sqUnixVMProfile.c
    M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo-win32


  Commit: f4e7def719da3af182c3d6371ef6a309ce930886
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f4e7def719da3af182c3d6371ef6a309ce930886
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

  Changed paths:
    M build.macos32x86/third-party/libssh2/Makefile.lib

  Log Message:
  -----------
  adding brew openssl directory


  Commit: 6a1fadec45487a13bf337aa36af506d4afc1cd83
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6a1fadec45487a13bf337aa36af506d4afc1cd83
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-13 (Thu, 13 Oct 2016)

  Changed paths:
    M build.macos32x86/third-party/libssh2/Makefile.lib
    M build.macos64x64/third-party/libssh2/Makefile.lib

  Log Message:
  -----------
  trying to use osx standard libssl (it finds it in my machine)


  Commit: 09fb5b8322ddb76805c10b0f449ef1991b0261e1
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/09fb5b8322ddb76805c10b0f449ef1991b0261e1
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-16 (Sun, 16 Oct 2016)

  Changed paths:
    M build.macos32x86/pharo.cog.spur/Makefile
    M build.macos32x86/third-party/cairo/Makefile.lib
    M build.macos32x86/third-party/libgit2/Makefile.lib
    M build.macos32x86/third-party/libssh2/Makefile.lib
    A build.macos32x86/third-party/openssl/Makefile
    A build.macos32x86/third-party/openssl/Makefile.lib

  Log Message:
  -----------
  add openssl dependency
fixed install_name_tool rewrites for all libraries
(32bits... if this passes, I will do same for 64bits)


  Commit: a3bddc77fd67ac7ba5f61a373b2c62577d18828c
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a3bddc77fd67ac7ba5f61a373b2c62577d18828c
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M build.macos32x86/third-party/libssh2/Makefile.lib
    M build.macos64x64/pharo.cog.spur/Makefile
    M build.macos64x64/third-party/cairo/Makefile.lib
    M build.macos64x64/third-party/libgit2/Makefile.lib
    M build.macos64x64/third-party/libssh2/Makefile.lib
    A build.macos64x64/third-party/openssl/Makefile
    A build.macos64x64/third-party/openssl/Makefile.lib

  Log Message:
  -----------
  prepare macox64x64 to build openssl too


  Commit: 80e5a3ca7c81b5b76bdd94537dcfb924f69f9add
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/80e5a3ca7c81b5b76bdd94537dcfb924f69f9add
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M build.macos32x86/third-party/cairo/Makefile.lib
    M build.macos32x86/third-party/pixman/Makefile.lib
    M build.macos64x64/third-party/cairo/Makefile.lib
    M build.macos64x64/third-party/pixman/Makefile.lib

  Log Message:
  -----------
  update cairo libs (an attempt to fix the build... which I doubt, but worth trying)


  Commit: 93903b24c9c8ec6c7205a9f42cabd16255bb4b5f
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/93903b24c9c8ec6c7205a9f42cabd16255bb4b5f
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M build.linux64x64/squeak.cog.spur/build/mvm
    M build.macos32x86/pharo.cog.spur/plugins.ext
    M build.macos32x86/pharo.stack.spur/plugins.ext
    M build.macos32x86/squeak.cog.spur+immutability/plugins.ext
    M build.macos32x86/squeak.cog.spur/plugins.ext
    M build.macos32x86/squeak.cog.v3/plugins.ext
    M build.macos32x86/squeak.sista.spur/plugins.ext
    M build.macos32x86/squeak.stack.spur/plugins.ext
    M build.macos32x86/squeak.stack.v3/plugins.ext
    M build.macos64x64/squeak.cog.spur.immutability/plugins.ext
    M build.macos64x64/squeak.cog.spur/plugins.ext
    M build.macos64x64/squeak.sista.spur/plugins.ext
    M build.macos64x64/squeak.stack.spur/plugins.ext
    M nsspur64src/vm/cogit.h
    M nsspur64src/vm/cogitX64.c
    M nsspur64src/vm/cointerp.c
    M nsspur64src/vm/cointerp.h
    M nsspur64src/vm/gcc3x-cointerp.c
    M nsspursrc/vm/cogit.h
    M nsspursrc/vm/cogitARMv5.c
    M nsspursrc/vm/cogitIA32.c
    M nsspursrc/vm/cogitMIPSEL.c
    M nsspursrc/vm/cointerp.c
    M nsspursrc/vm/cointerp.h
    M nsspursrc/vm/gcc3x-cointerp.c
    M nsspurstack64src/vm/gcc3x-interp.c
    M nsspurstack64src/vm/interp.c
    M nsspurstacksrc/vm/gcc3x-interp.c
    M nsspurstacksrc/vm/interp.c
    M platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c
    M platforms/unix/config/bin.squeak.sh.in
    M platforms/unix/config/squeak.sh.in
    M platforms/unix/vm/sqUnixExternalPrims.c
    M platforms/unix/vm/sqUnixMain.c
    M platforms/unix/vm/sqUnixVMProfile.c
    M spur64src/vm/cogit.h
    M spur64src/vm/cogitX64.c
    M spur64src/vm/cointerp.c
    M spur64src/vm/cointerp.h
    M spur64src/vm/gcc3x-cointerp.c
    M spur64src/vm/interp.h
    M spursista64src/vm/cogit.h
    M spursista64src/vm/cogitX64.c
    M spursista64src/vm/cointerp.c
    M spursista64src/vm/cointerp.h
    M spursista64src/vm/gcc3x-cointerp.c
    M spursistasrc/vm/cogit.h
    M spursistasrc/vm/cogitARMv5.c
    M spursistasrc/vm/cogitIA32.c
    M spursistasrc/vm/cogitMIPSEL.c
    M spursistasrc/vm/cointerp.c
    M spursistasrc/vm/cointerp.h
    M spursistasrc/vm/gcc3x-cointerp.c
    M spursrc/vm/cogit.h
    M spursrc/vm/cogitARMv5.c
    M spursrc/vm/cogitIA32.c
    M spursrc/vm/cogitMIPSEL.c
    M spursrc/vm/cointerp.c
    M spursrc/vm/cointerp.h
    M spursrc/vm/gcc3x-cointerp.c
    M spurstack64src/vm/gcc3x-interp.c
    M spurstack64src/vm/interp.c
    M spurstack64src/vm/interp.h
    M spurstacksrc/vm/gcc3x-interp.c
    M spurstacksrc/vm/interp.c
    M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
    M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c
    M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
    M src/vm/cogit.h
    M src/vm/cogitARMv5.c
    M src/vm/cogitIA32.c
    M src/vm/cogitMIPSEL.c
    M src/vm/cointerp.c
    M src/vm/cointerp.h
    M src/vm/cointerpmt.c
    M src/vm/cointerpmt.h
    M src/vm/gcc3x-cointerp.c
    M src/vm/gcc3x-cointerpmt.c
    M stacksrc/vm/gcc3x-interp.c
    M stacksrc/vm/interp.c

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo

# Conflicts:
#	scripts/updateSCCSVersions


  Commit: f1aadf1c381ff5e8360ee4f5e50ecc0c8ef0b7c8
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f1aadf1c381ff5e8360ee4f5e50ecc0c8ef0b7c8
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Log Message:
  -----------
  Merge branch 'merge-with-pharo-win32' into merge-with-pharo


  Commit: 2a1b2882e589041755740f7874cf4afdefd6aa6e
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2a1b2882e589041755740f7874cf4afdefd6aa6e
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M .travis_install.sh

  Log Message:
  -----------
  add curl to rpi prerequisites


  Commit: b406924b26f8c3c3a6005b2d70b034845b56d3fb
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b406924b26f8c3c3a6005b2d70b034845b56d3fb
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-17 (Mon, 17 Oct 2016)

  Changed paths:
    M .travis_install.sh

  Log Message:
  -----------
  Merge branch 'merge-with-pharo' of github.com:estebanlm/opensmalltalk-vm into merge-with-pharo


  Commit: f0a76891b2ea40d0e37a702b91da7e079bd0b032
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f0a76891b2ea40d0e37a702b91da7e079bd0b032
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-18 (Tue, 18 Oct 2016)

  Changed paths:
    M build.linux32ARMv6/pharo.cog.spur/build/mvm
    A build.linux32ARMv6/pharo.cog.spur/plugins.ext.all

  Log Message:
  -----------
  making build of dependencies optional for rpi because they take too much time


  Commit: 9f8cb23e328b9b0f9262bf0651313e394e5a9987
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9f8cb23e328b9b0f9262bf0651313e394e5a9987
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-18 (Tue, 18 Oct 2016)

  Log Message:
  -----------
  Merged branch merge-with-pharo into merge-with-pharo


  Commit: 476e473e220069bb36f131d7f495f50952c17b31
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/476e473e220069bb36f131d7f495f50952c17b31
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-18 (Tue, 18 Oct 2016)

  Changed paths:
    M build.linux32ARMv6/pharo.cog.spur/build/mvm

  Log Message:
  -----------
  shifting command arguments (to handle product name as before)


  Commit: f4580a94a8aad9c898217ccd9a6c4d3f2576b683
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f4580a94a8aad9c898217ccd9a6c4d3f2576b683
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-19 (Wed, 19 Oct 2016)

  Changed paths:
    M scripts/gitci
    M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
    M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo


  Commit: fe5c1e7b02ba3fe7cf68115937e7d5ce0abb78d0
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/fe5c1e7b02ba3fe7cf68115937e7d5ce0abb78d0
  Author: Esteban Lorenzano <estebanlm at gmail.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M .travis_build.sh
    M .travis_install.sh
    M build.linux32ARMv6/pharo.cog.spur/build/mvm
    A build.linux32ARMv6/pharo.cog.spur/plugins.ext.all
    A build.linux32ARMv6/third-party/common/Makefile.lib.extra
    A build.linux32ARMv6/third-party/libgit2/Makefile
    A build.linux32ARMv6/third-party/libgit2/Makefile.lib
    A build.linux32ARMv6/third-party/libgit2/mvm
    A build.linux32ARMv6/third-party/libsdl2/Makefile
    A build.linux32ARMv6/third-party/libsdl2/Makefile.lib
    A build.linux32ARMv6/third-party/libsdl2/mvm
    A build.linux32ARMv6/third-party/libssh2/Makefile
    A build.linux32ARMv6/third-party/libssh2/Makefile.lib
    A build.linux32ARMv6/third-party/libssh2/mvm
    M build.linux32x86/pharo.cog.spur/build.itimerheartbeat/mvm
    M build.linux32x86/pharo.cog.spur/build/mvm
    A build.linux32x86/third-party/common/Makefile.lib.extra
    A build.linux32x86/third-party/libgit2/Makefile
    A build.linux32x86/third-party/libgit2/Makefile.lib
    A build.linux32x86/third-party/libgit2/mvm
    A build.linux32x86/third-party/libsdl2/Makefile
    A build.linux32x86/third-party/libsdl2/Makefile.lib
    A build.linux32x86/third-party/libsdl2/mvm
    A build.linux32x86/third-party/libssh2/Makefile
    A build.linux32x86/third-party/libssh2/Makefile.lib
    A build.linux32x86/third-party/libssh2/mvm
    A build.linux32x86/third-party/pkgconfig/Makefile
    A build.linux32x86/third-party/pkgconfig/Makefile.lib
    A build.linux64x64/editpharoinstall.sh
    A build.linux64x64/pharo.cog.spur/build.assert.itimerheartbeat/mvm
    A build.linux64x64/pharo.cog.spur/build.assert/mvm
    A build.linux64x64/pharo.cog.spur/build.debug.itimerheartbeat/mvm
    A build.linux64x64/pharo.cog.spur/build.debug/mvm
    A build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm
    A build.linux64x64/pharo.cog.spur/build/mvm
    A build.linux64x64/pharo.cog.spur/makeallclean
    A build.linux64x64/pharo.cog.spur/makealldirty
    A build.linux64x64/pharo.cog.spur/plugins.ext
    A build.linux64x64/pharo.cog.spur/plugins.int
    A build.linux64x64/third-party/common/Makefile.lib.extra
    A build.linux64x64/third-party/libgit2/Makefile
    A build.linux64x64/third-party/libgit2/Makefile.lib
    A build.linux64x64/third-party/libgit2/mvm
    A build.linux64x64/third-party/libsdl2/Makefile
    A build.linux64x64/third-party/libsdl2/Makefile.lib
    A build.linux64x64/third-party/libsdl2/mvm
    A build.linux64x64/third-party/libssh2/Makefile
    A build.linux64x64/third-party/libssh2/Makefile.lib
    A build.linux64x64/third-party/libssh2/mvm
    M build.macos32x86/pharo.cog.spur/Makefile
    M build.macos32x86/third-party/cairo/Makefile.lib
    M build.macos32x86/third-party/libgit2/Makefile.lib
    M build.macos32x86/third-party/libssh2/Makefile.lib
    A build.macos32x86/third-party/openssl/Makefile
    A build.macos32x86/third-party/openssl/Makefile.lib
    M build.macos32x86/third-party/pixman/Makefile.lib
    M build.macos64x64/pharo.cog.spur/Makefile
    M build.macos64x64/third-party/cairo/Makefile.lib
    M build.macos64x64/third-party/libgit2/Makefile.lib
    M build.macos64x64/third-party/libssh2/Makefile.lib
    A build.macos64x64/third-party/openssl/Makefile
    A build.macos64x64/third-party/openssl/Makefile.lib
    M build.macos64x64/third-party/pixman/Makefile.lib
    M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m
    M platforms/unix/config/Makefile.in
    M platforms/unix/vm-display-X11/sqUnixX11.c
    M platforms/unix/vm/sqUnixMain.c
    M scripts/updateSCCSVersions

  Log Message:
  -----------
  Merge pull request #73 from estebanlm/merge-with-pharo

add pharo 64bits linux and some minor enhancements (2nd attempt)


Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/86a3d484ac2a...fe5c1e7b02ba


More information about the Vm-dev mailing list