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

…add-minheadless-vm
pharo-project · Sep 5, 2018 · db7ec7b · db7ec7b
2 parents 8c99c8f + d952580
commit db7ec7b
Show file tree

Hide file tree

Showing 222 changed files with 66,011 additions and 33,389 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,95 +1,76 @@
 environment:
-  CYG_MIRROR: http://cygwin.mirror.constant.com
   matrix:
     - FLAVOR: squeak.cog.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
-      CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
     - FLAVOR: squeak.cog.spur
       ARCH: win64x64
       CYG_ROOT: C:\cygwin64
-      CYG_SETUP: setup-x86_64.exe
       MINGW_ARCH: x86_64
     - FLAVOR: pharo.cog.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
-      CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
     - FLAVOR: pharo.cog.spur
       ARCH: win64x64
       CYG_ROOT: C:\cygwin64
-      CYG_SETUP: setup-x86_64.exe
       MINGW_ARCH: x86_64
     - FLAVOR: squeak.sista.spur
       ARCH: win32x86
       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
-      CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
     - FLAVOR: squeak.stack.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
-      CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
     - FLAVOR: squeak.stack.v3
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
-      CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
     - FLAVOR: pharo.sista.spur
       ARCH: win32x86
       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
-      CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
     - FLAVOR: newspeak.stack.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
-      CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
     # - FLAVOR: pharo.sista.spur
     #   ARCH: win64x64
     #   CYG_ROOT: C:\cygwin64
-    #   CYG_SETUP: setup-x86_64.exe
     #   MINGW_ARCH: x86_64
     - FLAVOR: newspeak.cog.spur
       ARCH: win64x64
       CYG_ROOT: C:\cygwin64
-      CYG_SETUP: setup-x86_64.exe
       MINGW_ARCH: x86_64
     - FLAVOR: squeak.stack.spur
       ARCH: win64x64
       CYG_ROOT: C:\cygwin64
-      CYG_SETUP: setup-x86_64.exe
       MINGW_ARCH: x86_64
     - FLAVOR: pharo.stack.spur
       ARCH: win64x64
       CYG_ROOT: C:\cygwin64
-      CYG_SETUP: setup-x86_64.exe
       MINGW_ARCH: x86_64
     - FLAVOR: newspeak.stack.spur
       ARCH: win64x64
       CYG_ROOT: C:\cygwin64
-      CYG_SETUP: setup-x86_64.exe
       MINGW_ARCH: x86_64
 
 
@@ -118,7 +99,7 @@ cache:
 install:
   - 'curl -fsSL --retry 4 -m 600 -o "setup-x86.exe" "http://cygwin.com/setup-x86.exe" '
   - 'curl -fsSL --retry 4 -m 600 -o "setup-x86_64.exe" "http://cygwin.com/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'
+  - 'call scripts/installCygwin.bat %MINGW_ARCH% "%CYG_ROOT%"'
 
 # Cygwin build script
 #
@@ -128,7 +109,7 @@ install:
 # build which causes failures as certain functions attempt to redirect
 # default file handles. Ensure a dummy file descriptor is opened with 'exec'.
 build_script:
-  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_build.sh"'
+  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./scripts/ci/travis_build.sh"'
 
 # Using `after_build` instead of `before_deploy` and `deploy_script`.
 #  `before_deploy` is only invoked if the deployment provider is triggered.

diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,6 @@
 # Bash needs lf even on windows/cygwin
 /scripts/* eol=lf
+/scripts/**/*.bat eol=crlf
 /image/*.st eol=lf
 /image/*.sh eol=lf
 mvm eol=lf

diff --git a/.gitignore b/.gitignore
@@ -91,24 +91,26 @@ platforms/unix/config/autom4te.cache/
 # /image/
 /image/*.sum
 /image/*.tgz
+/image/*.st
 /image/coglinux*
 /image/cogwin
 /image/Cog.app
 /image/cogspurlinux*
+/image/crash.dmp
 /image/sqlinux*
 /image/sqwin*
 /image/cogspurwin
 /image/CogSpur.app
+/image/github-cache/
+/image/package-cache
+/image/pharo-local/
+/image/prefs
+/image/special-dirs
 /image/Squeak*.app
 /image/[sS]queak*.dmg
 /image/Squeak-*-All-in-One.*
-/image/SqueakDebug.log
-/image/Squeak3D.log
 /image/__MACOSX
-/image/crash.dmp
-/image/package-cache
-/image/prefs
-/image/special-dirs
+/image/*.log
 /image/*.zip
 /image/.*history
 

diff --git a/.travis.yml b/.travis.yml
@@ -128,11 +128,11 @@ jobs:
   - env: FLAVOR="squeak.cog.spur.lowcode"
   - env: FLAVOR="pharo.cog.spur.lowcode"
 
-install: ./.travis_install.sh
+install: ./scripts/ci/travis_install.sh
 
-before_script: $CHROOT ./.travis_build.sh
+before_script: $CHROOT ./scripts/ci/travis_build.sh
 
-script: ./.travis_test.sh
+script: ./scripts/ci/travis_test.sh
 
 after_success: (cd deploy && ./filter-exec.sh pack-vm.sh)
 

diff --git a/build.linux32ARMv6/squeak.cog.spur/plugins.ext b/build.linux32ARMv6/squeak.cog.spur/plugins.ext
@@ -1,6 +1,7 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux32ARMv6/squeak.stack.spur/plugins.ext b/build.linux32ARMv6/squeak.stack.spur/plugins.ext
@@ -1,5 +1,6 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
+FileAttributesPlugin \
 LocalePlugin \
 SqueakFFIPrims \
 SqueakSSL \

diff --git a/build.linux32ARMv6/squeak.stack.v3/plugins.ext b/build.linux32ARMv6/squeak.stack.v3/plugins.ext
@@ -1,5 +1,6 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
+FileAttributesPlugin \
 LocalePlugin \
 SqueakFFIPrims \
 SqueakSSL \

diff --git a/build.linux32x86/squeak.cog.spur.immutability/plugins.ext b/build.linux32x86/squeak.cog.spur.immutability/plugins.ext
@@ -4,6 +4,7 @@ B3DAcceleratorPlugin \
 BochsIA32Plugin \
 BochsX64Plugin \
 GdbARMPlugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux32x86/squeak.cog.spur/plugins.ext b/build.linux32x86/squeak.cog.spur/plugins.ext
@@ -4,6 +4,7 @@ B3DAcceleratorPlugin \
 BochsIA32Plugin \
 BochsX64Plugin \
 GdbARMPlugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux32x86/squeak.cog.v3/plugins.ext b/build.linux32x86/squeak.cog.v3/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
 BochsIA32Plugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux32x86/squeak.sista.spur/plugins.ext b/build.linux32x86/squeak.sista.spur/plugins.ext
@@ -2,6 +2,7 @@
 EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
 BochsIA32Plugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux32x86/squeak.stack.spur/plugins.ext b/build.linux32x86/squeak.stack.spur/plugins.ext
@@ -1,6 +1,7 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux32x86/squeak.stack.v3/plugins.ext b/build.linux32x86/squeak.stack.v3/plugins.ext
@@ -1,6 +1,7 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux32x86/third-party/Makefile.pkgconfig b/build.linux32x86/third-party/Makefile.pkgconfig
@@ -32,3 +32,7 @@ $(PKGCONFIGBIN): $(PKGCONFIGARCHIVE)
 		&& make install
 
 pkgconfig: $(PKGCONFIGBIN)
+
+all: $(THIRDPARTYOUTDIR) $(THIRDPARTYINSTALLDIR) $(THIRDPARTYCACHEDIR) pkgconfig
+
+install:
diff --git a/build.linux64x64/newspeak.cog.spur/plugins.int b/build.linux64x64/newspeak.cog.spur/plugins.int
@@ -11,7 +11,7 @@ FileCopyPlugin \
 FilePlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
-# HostWindowPlugin \
+HostWindowPlugin \
 ZipPlugin \
 JPEGReadWriter2Plugin \
 JPEGReaderPlugin \

diff --git a/build.linux64x64/newspeak.sista.spur/plugins.int b/build.linux64x64/newspeak.sista.spur/plugins.int
@@ -11,7 +11,7 @@ FileCopyPlugin \
 FilePlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
-# HostWindowPlugin \
+HostWindowPlugin \
 ZipPlugin \
 JPEGReadWriter2Plugin \
 JPEGReaderPlugin \

diff --git a/build.linux64x64/newspeak.stack.spur/plugins.int b/build.linux64x64/newspeak.stack.spur/plugins.int
@@ -11,7 +11,7 @@ FileCopyPlugin \
 FilePlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
-# HostWindowPlugin \
+HostWindowPlugin \
 ZipPlugin \
 JPEGReadWriter2Plugin \
 JPEGReaderPlugin \

diff --git a/build.linux64x64/nsnac.cog.spur/plugins.int b/build.linux64x64/nsnac.cog.spur/plugins.int
@@ -11,7 +11,7 @@ FileCopyPlugin \
 FilePlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
-# HostWindowPlugin \
+HostWindowPlugin \
 ZipPlugin \
 JPEGReadWriter2Plugin \
 JPEGReaderPlugin \

diff --git a/build.linux64x64/squeak.cog.spur.immutability/plugins.ext b/build.linux64x64/squeak.cog.spur.immutability/plugins.ext
@@ -1,6 +1,7 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux64x64/squeak.cog.spur.immutability/plugins.int b/build.linux64x64/squeak.cog.spur.immutability/plugins.int
@@ -7,7 +7,7 @@ B2DPlugin \
 BitBltPlugin \
 BMPReadWriterPlugin \
 CroquetPlugin \
-# HostWindowPlugin \
+HostWindowPlugin \
 ZipPlugin \
 DropPlugin \
 DSAPrims \

diff --git a/build.linux64x64/squeak.cog.spur/plugins.ext b/build.linux64x64/squeak.cog.spur/plugins.ext
@@ -1,6 +1,7 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux64x64/squeak.cog.spur/plugins.int b/build.linux64x64/squeak.cog.spur/plugins.int
@@ -7,7 +7,7 @@ B2DPlugin \
 BitBltPlugin \
 BMPReadWriterPlugin \
 CroquetPlugin \
-# HostWindowPlugin \
+HostWindowPlugin \
 ZipPlugin \
 DropPlugin \
 DSAPrims \

diff --git a/build.linux64x64/squeak.stack.spur/plugins.ext b/build.linux64x64/squeak.stack.spur/plugins.ext
@@ -1,6 +1,7 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
 B3DAcceleratorPlugin \
+FileAttributesPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

diff --git a/build.linux64x64/squeak.stack.spur/plugins.int b/build.linux64x64/squeak.stack.spur/plugins.int
@@ -7,7 +7,7 @@ B2DPlugin \
 BitBltPlugin \
 BMPReadWriterPlugin \
 CroquetPlugin \
-# HostWindowPlugin \
+HostWindowPlugin \
 ZipPlugin \
 DropPlugin \
 DSAPrims \

diff --git a/build.macos32x86/common/Makefile.app b/build.macos32x86/common/Makefile.app
@@ -102,8 +102,10 @@ $(APP):	cleanbundles $(THIRDPARTYPREREQS) $(VMEXE) $(VMBUNDLES) $(VMPLUGINDYLIBS
 # to do this we must both delete the bundles and touch any ignore files, upon
 # which the bundle build depends.
 cleanbundles:
-	-rm -rf $(APP)/Contents/Resources/*.bundle
-	-touch $(OBJDIR)/*.ignore
+	-rm -rf $(wildcard $(APP)/Contents/Resources/*.bundle)
+ifneq ($(wildcard $(OBJDIR)/*.ignore),)
+	-touch $(wildcard $(OBJDIR)/*.ignore)
+endif
 
 $(VMEXE): $(OBJDIR)/$(VM)
 	@mkdir -p $(APP)/Contents/MacOS

diff --git a/build.macos32x86/pharo.cog.spur.lowcode/plugins.ext b/build.macos32x86/pharo.cog.spur.lowcode/plugins.ext
@@ -17,7 +17,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # could work, but I don't know if relevant:
 # TestOSAPlugin \
 # not working (because of Cocoa vs Carbon):

diff --git a/build.macos32x86/pharo.cog.spur.lowcode/plugins.int b/build.macos32x86/pharo.cog.spur.lowcode/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \

diff --git a/build.macos32x86/pharo.cog.spur/plugins.ext b/build.macos32x86/pharo.cog.spur/plugins.ext
@@ -17,7 +17,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # TEMPORARY REMOVE
 # B3DAcceleratorPlugin \
 # could work, but I don't know if relevant:

diff --git a/build.macos32x86/pharo.cog.spur/plugins.int b/build.macos32x86/pharo.cog.spur/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \

diff --git a/build.macos32x86/pharo.sista.spur/plugins.ext b/build.macos32x86/pharo.sista.spur/plugins.ext
@@ -17,7 +17,6 @@ SerialPlugin \
 ObjectiveCPlugin \
 SDL2DisplayPlugin \
 EventsHandlerPlugin \
-FileAttributesPlugin \
 # TEMPORARY REMOVE
 # B3DAcceleratorPlugin \
 # could work, but I don't know if relevant:

diff --git a/build.macos32x86/pharo.sista.spur/plugins.int b/build.macos32x86/pharo.sista.spur/plugins.int
@@ -10,6 +10,7 @@ DSAPrims \
 DropPlugin \
 FFTPlugin \
 FilePlugin \
+FileAttributesPlugin \
 FloatArrayPlugin \
 GeniePlugin \
 HostWindowPlugin \