Merge 92574fe into 07c6dc3

Author: jecisc

.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/ci/installCygwin.bat %MINGW_ARCH% "%CYG_ROOT%"'
 
 # Cygwin build script
 #

.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

build.win32x86/HowToBuild

@@ -71,7 +71,8 @@ Building out of the box
 - Install cygwin from www.cygwin.com.
 Make sure you install the MinGW support, which is in the list of packages called
 "mingw64-i686-gcc-core,mingw64-i686-gcc-g++,mingw64-i686-headers,mingw64-i686-runtime".
-Note that the .appveyor.yml file may be used as example to automate installation of these tools
+Note that the .appveyor.yml file may be used as example to automate installation of these tools.
+.appveyor.yml calls scripts/ci/installCygwin.bat that you can use to build your own cygwin.
 
 Alternatively, an installation of mingw32 and msys may work, but has not been tested.
 

build.win64x64/HowToBuild

@@ -70,6 +70,8 @@ Building out of the box
 - Install
   either cygwin 64bits version from www.cygwin.com.
   either mingw 64bits version and msys from www.mingw.com.
+Note that the .appveyor.yml file may be used as example to automate installation of these tools.
+.appveyor.yml calls scripts/ci/installCygwin.bat that you can use to build your own cygwin.
 
 Then cd to the build directory of your choice, e.g.
 	build.win64x64/squeak.stack.spur/

scripts/ci/installCygwin.bat

@@ -0,0 +1,71 @@
+@echo off
+
+REM This script can takes up to 4 parameters:
+REM        - The architecture of the vm to build. Can be: i686 or x86_64. By default is i686.
+REM        - The directory where to install Cygwin. By default "C:\cygwin" or "C:\cygwin64" depending on the architecture.
+REM        - The path to the cygwin setup. By defaul "setup-x86.exe" or "setup-x86_64.exe" depending on the architecture.
+REM        - The mirror from where download cygwin. By default http://cygwin.mirror.constant.com.
+
+REM The architecture can either be i686 or x86_64. By default, if no argument is passed, it will be i686.
+SET CYG_INSTALL_ARCH=%1
+IF "%CYG_INSTALL_ARCH%"=="" (SET CYG_INSTALL_ARCH=i686)
+
+REM Check that the value is a valid architecture
+IF NOT "%CYG_INSTALL_ARCH%"=="i686" (
+    IF NOT "%CYG_INSTALL_ARCH%"=="x86_64" (
+        echo ERROR: Architecture can either be i686 or x86_64. Got %CYG_INSTALL_ARCH% && exit /b
+    )
+)
+
+REM The CYG_INSTALL_ROOT is the locations where to install cygwin. If there is no argument to the command line, the default value is "C:\cygwin" if the architecture is i686 and "C:\cygwin64" if the architecture is x86_64.
+SET CYG_INSTALL_ROOT=%2
+IF "%CYG_INSTALL_ROOT%"=="" (
+    IF "%CYG_INSTALL_ARCH%"=="i686" (
+        SET CYG_INSTALL_ROOT="C:\cygwin"
+    ) ELSE (
+        IF "%CYG_INSTALL_ARCH%"=="x86_64" (SET CYG_INSTALL_ROOT="C:\cygwin64")
+    )
+)
+
+REM The CYG_INSTALL_SETUP is the executable to use to install the vm. By default, it will be "setup-x86.exe" for i686 architecture and "setup-x86_64.exe" for x86_64.
+SET CYG_INSTALL_SETUP=%3
+IF "%CYG_INSTALL_SETUP%"=="" (
+    IF "%CYG_INSTALL_ARCH%"=="i686" (
+        SET CYG_INSTALL_SETUP="setup-x86.exe"
+    ) ELSE (
+        IF "%CYG_INSTALL_ARCH%"=="x86_64" (SET CYG_INSTALL_SETUP="setup-x86_64.exe")
+    )
+) 
+
+SET CYG_INSTALL_MIRROR=%4
+IF "%CYG_INSTALL_MIRROR%"=="" (SET CYG_INSTALL_MIRROR=http://cygwin.mirror.constant.com)
+
+echo Installing cygwin for architecture %CYG_INSTALL_ARCH% at %CYG_INSTALL_ROOT% using setup %CYG_INSTALL_SETUP% from mirror %CYG_INSTALL_MIRROR%
+
+%CYG_INSTALL_SETUP% -dgnqNO -R "%CYG_INSTALL_ROOT%" -s "%CYG_INSTALL_MIRROR%" -l "%CYG_INSTALL_ROOT%\var\cache\setup"^
+    -P gcc-core^
+    -P gcc-g++^
+    -P binutils^
+    -P libtool^
+    -P libiconv^
+    -P automake^
+    -P autoconf^
+    -P make^
+    -P cmake^
+    -P wget^
+    -P curl^
+    -P mingw64-%CYG_INSTALL_ARCH%-gcc-core^
+    -P mingw64-%CYG_INSTALL_ARCH%-gcc-g++^
+    -P mingw64-%CYG_INSTALL_ARCH%-headers^
+    -P mingw64-%CYG_INSTALL_ARCH%-runtime^
+    -P zip^
+    -P mingw64-%CYG_INSTALL_ARCH%-clang^
+    -P mingw64-%CYG_INSTALL_ARCH%-openssl^
+    -P libiconv-devel^
+    -P libglib2.0-devel^
+    -P perl^
+    -P mingw64-%CYG_INSTALL_ARCH%-zlib^
+    -P mingw64-%CYG_INSTALL_ARCH%-win-iconv^
+    -P unzip
+
+REM unzip and curl are not needed for the VM build but is needed for the VMMaker image building. Thus I add it in this script so that people can use it when building VMMaker on their computer.