Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: e67f8dc97fc56c3d7346f37eebb86bc17220e2aa https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e67f8dc97fc56c3d734... Author: Tobias Pape tobias@netshed.de Date: 2017-01-31 (Tue, 31 Jan 2017)

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

Log Message: ----------- Cope for a special XCode argument

Commit: b076561abada1884750d75a7b144f1450acb949e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b076561abada1884750... Author: Tobias Pape tobias@netshed.de Date: 2017-03-22 (Wed, 22 Mar 2017)

Changed paths: M .appveyor.yml M .travis.yml M .travis_build.sh M .travis_install.sh M build.linux32ARMv6/editpharoinstall.sh R build.linux32ARMv6/mkNamedPrims.sh 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/pharo.cog.spur/prepare-rpi.sh R build.linux32ARMv7/mkNamedPrims.sh M build.linux32x86/editpharoinstall.sh R build.linux32x86/mkNamedPrims.sh A build.linux32x86/pharo.cog.spur.lowcode/build.assert.itimerheartbeat/mvm A build.linux32x86/pharo.cog.spur.lowcode/build.assert/mvm A build.linux32x86/pharo.cog.spur.lowcode/build.debug.itimerheartbeat/mvm A build.linux32x86/pharo.cog.spur.lowcode/build.debug/mvm A build.linux32x86/pharo.cog.spur.lowcode/build.itimerheartbeat/mvm A build.linux32x86/pharo.cog.spur.lowcode/build/mvm A build.linux32x86/pharo.cog.spur.lowcode/makeallclean A build.linux32x86/pharo.cog.spur.lowcode/makealldirty A build.linux32x86/pharo.cog.spur.lowcode/plugins.ext A build.linux32x86/pharo.cog.spur.lowcode/plugins.int 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 A build.linux32x86/pharo.stack.spur.lowcode/build.assert.itimerheartbeat/mvm A build.linux32x86/pharo.stack.spur.lowcode/build.assert/mvm A build.linux32x86/pharo.stack.spur.lowcode/build.debug.itimerheartbeat/mvm A build.linux32x86/pharo.stack.spur.lowcode/build.debug/mvm A build.linux32x86/pharo.stack.spur.lowcode/build.itimerheartbeat/mvm A build.linux32x86/pharo.stack.spur.lowcode/build/mvm A build.linux32x86/pharo.stack.spur.lowcode/makeallclean A build.linux32x86/pharo.stack.spur.lowcode/makealldirty A build.linux32x86/pharo.stack.spur.lowcode/plugins.ext A build.linux32x86/pharo.stack.spur.lowcode/plugins.int M build.linux32x86/third-party/Makefile.libgit2 M build.linux32x86/third-party/Makefile.libssh2 A build.linux32x86/third-party/Makefile.openssl M build.linux64x64/editpharoinstall.sh R build.linux64x64/mkNamedPrims.sh M build.linux64x64/pharo.cog.spur/build.assert.itimerheartbeat/mvm M build.linux64x64/pharo.cog.spur/build.assert/mvm M build.linux64x64/pharo.cog.spur/build.debug.itimerheartbeat/mvm M build.linux64x64/pharo.cog.spur/build.debug/mvm M build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm M build.linux64x64/pharo.cog.spur/build/mvm A build.linux64x64/third-party/Makefile.openssl A build.macos32x86/pharo.cog.spur.lowcode/Makefile A build.macos32x86/pharo.cog.spur.lowcode/mvm A build.macos32x86/pharo.cog.spur.lowcode/plugins.ext A build.macos32x86/pharo.cog.spur.lowcode/plugins.int A build.macos32x86/pharo.stack.spur.lowcode/Makefile A build.macos32x86/pharo.stack.spur.lowcode/mvm A build.macos32x86/pharo.stack.spur.lowcode/plugins.ext A build.macos32x86/pharo.stack.spur.lowcode/plugins.int M build.macos32x86/pharo.stack.spur/Makefile A build.macos64x64/pharo.cog.spur.lowcode/Makefile A build.macos64x64/pharo.cog.spur.lowcode/mvm A build.macos64x64/pharo.cog.spur.lowcode/plugins.ext A build.macos64x64/pharo.cog.spur.lowcode/plugins.int A build.macos64x64/pharo.stack.spur.lowcode/Makefile A build.macos64x64/pharo.stack.spur.lowcode/mvm A build.macos64x64/pharo.stack.spur.lowcode/plugins.ext A build.macos64x64/pharo.stack.spur.lowcode/plugins.int A build.macos64x64/pharo.stack.spur/Makefile A build.macos64x64/pharo.stack.spur/mvm A build.macos64x64/pharo.stack.spur/plugins.ext A build.macos64x64/pharo.stack.spur/plugins.int M build.win32x86/common/Makefile.lib.extra A build.win32x86/pharo.cog.spur.lowcode/Makefile A build.win32x86/pharo.cog.spur.lowcode/Pharo.def.in A build.win32x86/pharo.cog.spur.lowcode/Pharo.exe.manifest A build.win32x86/pharo.cog.spur.lowcode/Pharo.ico A build.win32x86/pharo.cog.spur.lowcode/Pharo.rc A build.win32x86/pharo.cog.spur.lowcode/mvm A build.win32x86/pharo.cog.spur.lowcode/plugins.ext A build.win32x86/pharo.cog.spur.lowcode/plugins.int M build.win32x86/pharo.cog.spur/Makefile M build.win32x86/pharo.cog.spur/Pharo.exe.manifest M build.win32x86/pharo.cog.spur/Pharo.rc M build.win32x86/pharo.cog.spur/mvm A build.win32x86/squeak.cog.spur.lowcode/Croquet.def.in A build.win32x86/squeak.cog.spur.lowcode/Croquet.exe.manifest A build.win32x86/squeak.cog.spur.lowcode/Croquet.ico A build.win32x86/squeak.cog.spur.lowcode/Croquet.rc A build.win32x86/squeak.cog.spur.lowcode/GreenCogSqueak.ico A build.win32x86/squeak.cog.spur.lowcode/Makefile A build.win32x86/squeak.cog.spur.lowcode/Squeak.def.in A build.win32x86/squeak.cog.spur.lowcode/Squeak.exe.manifest A build.win32x86/squeak.cog.spur.lowcode/Squeak.rc A build.win32x86/squeak.cog.spur.lowcode/mvm A build.win32x86/squeak.cog.spur.lowcode/plugins.ext A build.win32x86/squeak.cog.spur.lowcode/plugins.int A build.win32x86/squeak.cog.spur.lowcode/squeak.ico M build.win32x86/third-party/Makefile.cairo M build.win32x86/third-party/Makefile.freetype2 M build.win32x86/third-party/Makefile.libgcc M build.win32x86/third-party/Makefile.libgit2 M build.win32x86/third-party/Makefile.libpng M build.win32x86/third-party/Makefile.libsdl2 M build.win32x86/third-party/Makefile.libssh2 M build.win32x86/third-party/Makefile.openssl M build.win32x86/third-party/Makefile.pixman M build.win32x86/third-party/Makefile.pkgconfig M build.win32x86/third-party/Makefile.zlib A build.win32x86/third-party/Toolchain-cross-mingw32-cygwin.cmake M build.win64x64/common/Makefile A build.win64x64/common/Makefile.lib.extra M build.win64x64/common/Makefile.tools A build.win64x64/pharo.stack.spur/Makefile A build.win64x64/pharo.stack.spur/Pharo.def.in A build.win64x64/pharo.stack.spur/Pharo.exe.manifest A build.win64x64/pharo.stack.spur/Pharo.ico A build.win64x64/pharo.stack.spur/Pharo.rc A build.win64x64/pharo.stack.spur/mvm A build.win64x64/pharo.stack.spur/plugins.ext A build.win64x64/pharo.stack.spur/plugins.int A build.win64x64/third-party/Makefile.cairo A build.win64x64/third-party/Makefile.freetype2 A build.win64x64/third-party/Makefile.libgcc A build.win64x64/third-party/Makefile.libgit2 A build.win64x64/third-party/Makefile.libpng A build.win64x64/third-party/Makefile.libsdl2 A build.win64x64/third-party/Makefile.libssh2 A build.win64x64/third-party/Makefile.openssl A build.win64x64/third-party/Makefile.pixman A build.win64x64/third-party/Makefile.pkgconfig A build.win64x64/third-party/Makefile.zlib A build.win64x64/third-party/Toolchain-cross-mingw32-cygwin.cmake M nsspur64src/vm/cogit.c M nsspur64src/vm/cogit.h R nsspur64src/vm/cogitX64.c A nsspur64src/vm/cogitX64SysV.c A nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cogmethod.h M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspur64src/vm/interp.h M nsspur64src/vm/vmCallback.h M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cogmethod.h M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspursrc/vm/interp.h M nsspursrc/vm/vmCallback.h M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstack64src/vm/interp.h M nsspurstack64src/vm/vmCallback.h M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M nsspurstacksrc/vm/interp.h M nsspurstacksrc/vm/vmCallback.h A platforms/Cross/plugins/IA32ABI/arm32abicc.c R platforms/Cross/plugins/IA32ABI/arm32ia32abicc.c M platforms/Cross/plugins/IA32ABI/ia32abicc.c M platforms/Cross/plugins/IA32ABI/ppc32abicc.c R platforms/Cross/plugins/IA32ABI/x64ia32abicc.c A platforms/Cross/plugins/IA32ABI/x64sysvabicc.c A platforms/Cross/plugins/IA32ABI/x64win64abicc.c R platforms/Cross/plugins/IA32ABI/x64win64ia32abicc.c M platforms/Cross/plugins/IA32ABI/xabicc.c M platforms/Cross/plugins/JPEGReadWriter2Plugin/Error.c M platforms/Cross/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.h A platforms/Cross/plugins/JPEGReadWriter2Plugin/README A platforms/Cross/plugins/JPEGReadWriter2Plugin/README.6b2 M platforms/Cross/plugins/JPEGReadWriter2Plugin/jdmarker.c M platforms/Cross/plugins/JPEGReadWriter2Plugin/sqJPEGReadWriter2Plugin.c M platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.c M platforms/Cross/vm/sq.h M platforms/Cross/vm/sqLowcodeFFI-i386.h M platforms/Cross/vm/sqLowcodeFFI-x86_64.h M platforms/Cross/vm/sqMemoryAccess.h M platforms/Cross/vm/sqVirtualMachine.c M platforms/Cross/vm/sqVirtualMachine.h M platforms/Mac OS/plugins/SecurityPlugin/sqMacSecurity.c M platforms/RiscOS/plugins/SecurityPlugin/sqRPCSecurity.c M platforms/iOS/plugins/CameraPlugin/AVFoundationVideoGrabber.m M platforms/iOS/plugins/SecurityPlugin/sqMacSecurity.c M platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m M platforms/iOS/vm/OSX/SqueakOSXAppDelegate.m M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m M platforms/unix/config/Makefile M platforms/unix/config/Makefile.in M platforms/unix/config/acinclude.m4 M platforms/unix/config/configure.ac M platforms/unix/config/ltmain.sh M platforms/unix/plugins/MIDIPlugin/acinclude.m4 M platforms/unix/plugins/MIDIPlugin/sqUnixMIDI.c M platforms/unix/plugins/PseudoTTYPlugin/acinclude.m4 M platforms/unix/plugins/SecurityPlugin/sqUnixSecurity.c M platforms/unix/plugins/UnixOSProcessPlugin/acinclude.m4 M platforms/unix/plugins/XDisplayControlPlugin/Makefile.inc M platforms/unix/vm-display-Quartz/acinclude.m4 M platforms/unix/vm-display-X11/Makefile.in M platforms/unix/vm-display-X11/acinclude.m4 M platforms/unix/vm-sound-Sun/acinclude.m4 M platforms/unix/vm/Makefile.in M platforms/unix/vm/acinclude.m4 M platforms/unix/vm/aio.c M platforms/unix/vm/sqConfig.h M platforms/unix/vm/sqUnixHeartbeat.c M platforms/win32/plugins/Mpeg3Plugin/Makefile.win32 M platforms/win32/plugins/SecurityPlugin/sqWin32Security.c M platforms/win32/plugins/SqueakSSL/Makefile M platforms/win32/plugins/SqueakSSL/Makefile.plugin M platforms/win32/vm/sqWin32Window.c M scripts/gitci M scripts/gitrevert M specs/lowcode.xml M spur64src/vm/cogit.c M spur64src/vm/cogit.h R spur64src/vm/cogitX64.c A spur64src/vm/cogitX64SysV.c A spur64src/vm/cogitX64WIN64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/interp.h M spur64src/vm/vmCallback.h A spurlowcode64src/examplePlugins.ext A spurlowcode64src/examplePlugins.int A spurlowcode64src/vm/cogit.c A spurlowcode64src/vm/cogit.h A spurlowcode64src/vm/cogitX64SysV.c A spurlowcode64src/vm/cogitX64WIN64.c A spurlowcode64src/vm/cogmethod.h A spurlowcode64src/vm/cointerp.c A spurlowcode64src/vm/cointerp.h A spurlowcode64src/vm/exampleSqNamedPrims.h A spurlowcode64src/vm/gcc3x-cointerp.c A spurlowcode64src/vm/interp.h A spurlowcode64src/vm/vmCallback.h A spurlowcodesrc/examplePlugins.ext A spurlowcodesrc/examplePlugins.int A spurlowcodesrc/vm/cogit.c A spurlowcodesrc/vm/cogit.h A spurlowcodesrc/vm/cogitARMv5.c A spurlowcodesrc/vm/cogitIA32.c A spurlowcodesrc/vm/cogitMIPSEL.c A spurlowcodesrc/vm/cogmethod.h A spurlowcodesrc/vm/cointerp.c A spurlowcodesrc/vm/cointerp.h A spurlowcodesrc/vm/exampleSqNamedPrims.h A spurlowcodesrc/vm/gcc3x-cointerp.c A spurlowcodesrc/vm/interp.h A spurlowcodesrc/vm/vmCallback.h A spurlowcodestack64src/examplePlugins.ext A spurlowcodestack64src/examplePlugins.int A spurlowcodestack64src/vm/exampleSqNamedPrims.h A spurlowcodestack64src/vm/gcc3x-interp.c A spurlowcodestack64src/vm/interp.c A spurlowcodestack64src/vm/interp.h A spurlowcodestack64src/vm/vmCallback.h A spurlowcodestacksrc/examplePlugins.ext A spurlowcodestacksrc/examplePlugins.int A spurlowcodestacksrc/vm/exampleSqNamedPrims.h A spurlowcodestacksrc/vm/gcc3x-interp.c A spurlowcodestacksrc/vm/interp.c A spurlowcodestacksrc/vm/interp.h A spurlowcodestacksrc/vm/vmCallback.h M spursista64src/vm/cogit.c M spursista64src/vm/cogit.h R spursista64src/vm/cogitX64.c A spursista64src/vm/cogitX64SysV.c A spursista64src/vm/cogitX64WIN64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursista64src/vm/interp.h M spursista64src/vm/vmCallback.h 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 spursistasrc/vm/interp.h M spursistasrc/vm/vmCallback.h A spursistastacksrc/examplePlugins.ext A spursistastacksrc/examplePlugins.int A spursistastacksrc/vm/exampleSqNamedPrims.h A spursistastacksrc/vm/gcc3x-interp.c A spursistastacksrc/vm/interp.c A spursistastacksrc/vm/interp.h A spursistastacksrc/vm/vmCallback.h 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 spursrc/vm/interp.h M spursrc/vm/vmCallback.h M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/interp.h M spurstack64src/vm/vmCallback.h M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/interp.h M spurstacksrc/vm/vmCallback.h M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/IA32ABI/IA32ABI.c M src/plugins/SecurityPlugin/SecurityPlugin.c M src/plugins/ZipPlugin/ZipPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cogmethod.h 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 src/vm/interp.h M src/vm/vmCallback.h M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c M stacksrc/vm/interp.h M stacksrc/vm/vmCallback.h M third-party/cairo.spec M third-party/freetype2.spec M third-party/libpng.spec.win M third-party/libsdl2.spec M third-party/libssh2.spec M third-party/openssl.spec M third-party/zlib.spec

Log Message: ----------- Merge remote-tracking branch 'refs/remotes/origin/Cog' into Cog

* refs/remotes/origin/Cog: (136 commits) Revert "Linux (& unix/Mac OS X):" Revert "unix config fix: there should be no space after -L option" unix config fix: there should be no space after -L option CogVM source as per VMMaker.oscog-eem.2175 Linux (& unix/Mac OS X): Fix the build of the XDisplayControlPlugin on linuxes where .so is not appended to shared objects. Fix the language in sqUnixHeartbeat.c and add more information. Make the code exclusive to linux, and use exeName instead of a hardwired name. If pthread_setschedparam fails, issue the existing warning to stderr but do not exit the VM. Fix aio.c for linux CogVM source as per VMMaker.oscog-eem.2174 CogVM source as per VMMaker.oscog-eem.2174 addIdleUsecs must be defined local to aio.h to avoid conflicts with the sq.h define in other fils that include sqaio.h. More care needed to declare addIdleUsecs in sqaio.h And delare addIdleUsecs. CogVM source as per VMMaker.oscog-eem.2167 Don't hardcode an obsolete i486 arch for mpeg3 plugin Exclude SqueakSSL from plugins in win64 Take the specified COGDEFS into account fix some “return return” errors Correct 64bits reference for libgcc dll Merge commit '1f817751ec059623860466136ba917c76704f9fe' CogVM source as per VMMaker.oscog-eem.2166 ...

Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/ce673d0a6a7c...b07...