From f5b89e3b07a484299a782ffb6252e8f66571612b Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Sat, 20 Jun 2020 14:53:07 +0200
Subject: [PATCH] Yet another update...

---
 .circleci/config.yml  | 2 +-
 build.ps1             | 2 +-
 chicken.nuspec        | 4 +++-
 chocolateyInstall.ps1 | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5818c5a..031b239 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,7 @@ jobs:
     environment:
       version: '5.2.0'
       binaryversion: '11'
-      build: '5'
+      build: '6'
     steps:
       - checkout
       - run: iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
diff --git a/build.ps1 b/build.ps1
index 6880fc0..e0bb5fa 100644
--- a/build.ps1
+++ b/build.ps1
@@ -19,7 +19,7 @@ $linkerlibdir="chicken\tools\lib"
 New-Item $linkerlibdir -ItemType Directory
 Copy-Item chickenbuild\libchicken.a $linkerlibdir
 Copy-Item chickenbuild\libchicken.dll.a $linkerlibdir
-$extbindir="chicken\tools\lib\chicken\9"
+$extbindir="chicken\tools\lib\chicken\$Env:binaryversion"
 New-Item $extbindir -ItemType Directory
 Copy-Item chickenbuild\*.so $extbindir
 Copy-Item chickenbuild\*.db $extbindir
diff --git a/chicken.nuspec b/chicken.nuspec
index f88691f..696d57f 100644
--- a/chicken.nuspec
+++ b/chicken.nuspec
@@ -11,7 +11,9 @@
     <iconUrl>http://wiki.call-cc.org/chicken-small.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>CHICKEN is a compiler for the Scheme programming language. It produces portable and efficient C and supports the R5RS and R7RS (work in progress) standards, and many extensions. It runs on Linux, OS X, Windows, many Unix flavours, and aims to be
-    free, simple, portable, extensible, well documented and actively supported.</description>
+    free, simple, portable, extensible, well documented and actively supported.
+    
+    This package will install GCC, Make and the binutils in your MSYS2 install, and add the MINGW64 bin directory to your PATH.</description>
     <summary>CHICKEN is a compiler for the Scheme programming language.</summary>
     <tags>chicken admin scheme lisp programming language</tags>
     <projectSourceUrl>https://code.call-cc.org/cgi-bin/gitweb.cgi?p=chicken-core.git;a=summary</projectSourceUrl>
diff --git a/chocolateyInstall.ps1 b/chocolateyInstall.ps1
index a079520..6f929c6 100644
--- a/chocolateyInstall.ps1
+++ b/chocolateyInstall.ps1
@@ -1,5 +1,8 @@
+C:\tools\msys64\usr\bin\env MSYSTEM=MINGW64 /bin/bash -l -c 'pacman -S --needed --noconfirm pactoys'
+C:\tools\msys64\usr\bin\env MSYSTEM=MINGW64 /bin/bash -l -c 'pacboy -Sy --needed --noconfirm binutils:x make:x gcc:x gettext:x readline:x'
 New-Item C:\tools -ItemType Directory
 Move-Item $env:chocolateyPackageFolder\tools C:\tools\chicken -Force
 Install-ChocolateyEnvironmentVariable -VariableName "CHICKEN_PREFIX" -VariableValue "C:\tools\chicken" -VariableType Machine
 Install-ChocolateyPath -PathToInstall "C:\tools\chicken\bin" -PathType Machine
+Install-ChocolateyPath -PathToInstall "C:\tools\msys64\mingw64\bin" -PathType Machine
 Update-SessionEnvironment