Skip to content
This repository was archived by the owner on Aug 22, 2025. It is now read-only.

Commit cc80bcc

Browse files
author
dirk
committed
Caching installers (now downloaded from github) and using a new powershell script to install them.
1 parent 5565be0 commit cc80bcc

File tree

5 files changed

+41
-7
lines changed

5 files changed

+41
-7
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Import-Module "C:\ProgramData\chocolatey\helpers\chocolateyInstaller.psm1"
2+
Install-ChocolateyPackage "StrawberryPerl" "msi" "/qn INSTALLDIR=`"C:\Strawberry`"" "file:///C:/Strawberry-x86/strawberry-perl-5.20.1.1-32bit.msi"

AppVeyor/Install-InnoSetup.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Import-Module "C:\ProgramData\chocolatey\helpers\chocolateyInstaller.psm1"
2+
Install-ChocolateyPackage "Ghostscript.app" "exe" "/S /NCRC" "file:///C:/InnoSetup/innosetup-5.5.9-unicode.exe"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Import-Module "C:\ProgramData\chocolatey\helpers\chocolateyInstaller.psm1"
2+
Install-ChocolateyPackage "StrawberryPerl" "msi" "/qn INSTALLDIR=`"C:\Strawberry`"" "file:///C:/Strawberry-x64/strawberry-perl-5.20.1.1-64bit.msi"

AppVeyor/Install.cmd

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,36 @@
33
cd ..
44
call CloneRepositories.cmd https://github.com/ImageMagick shallow
55

6-
if not exist "C:\Program Files (x86)\Inno Setup 5" choco install innosetup -y -version 5.5.2
7-
if %errorlevel% neq 0 exit /b %errorlevel%
6+
set INNOSETUP=C:\InnoSetup
7+
if exist "C:\InnoSetup" goto strawberry
88

9-
set OPTION=
10-
if "%1" == "x86" SET OPTION=-x86
11-
choco install strawberryperl -y %OPTION% -version 5.20.1.1
12-
if %errorlevel% neq 0 exit /b %errorlevel%
9+
mkdir %INNOSETUP%
10+
cd %INNOSETUP%
11+
appveyor DownloadFile https://github.com/ImageMagick/ImageMagick-Windows/releases/download/20160630/innosetup-5.5.9-unicode.exe
12+
cd ..
13+
14+
:strawberry
15+
16+
set STRAWBERRYX86=C:\Strawberry-x86
17+
if exist %STRAWBERRYX86% goto x64
18+
19+
mkdir %STRAWBERRYX86%
20+
cd %STRAWBERRYX86%
21+
appveyor DownloadFile https://github.com/ImageMagick/ImageMagick-Windows/releases/download/20160630/strawberry-perl-5.20.1.1-32bit.msi
22+
cd ..
23+
24+
:x64
25+
26+
set STRAWBERRY64=C:\Strawberry-x64
27+
if exist %STRAWBERRY64% goto install
28+
29+
mkdir %STRAWBERRY64%
30+
cd %STRAWBERRY64%
31+
appveyor DownloadFile https://github.com/ImageMagick/ImageMagick-Windows/releases/download/20160630/strawberry-perl-5.20.1.1-64bit.msi
32+
cd ..
33+
34+
:install
35+
36+
powershell -ExecutionPolicy Unrestricted .\Install-InnoSetup.ps1
37+
if "%1" == "x86" powershell -ExecutionPolicy Unrestricted .\Install-StrawberryPerl-x86.ps1
38+
if "%1" == "x64" powershell -ExecutionPolicy Unrestricted .\Install-StrawberryPerl-x64.ps1

appveyor.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ matrix:
1111
fast_finish: true
1212

1313
cache:
14-
- C:\Program Files (x86)\Inno Setup 5 -> appveyor.yml
14+
- C:\Strawberry-x86 -> AppVeyor\Install.cmd
15+
- C:\Strawberry-x64 -> AppVeyor\Install.cmd
16+
- C:\InnoSetup -> AppVeyor\Install.cmd
1517

1618
environment:
1719

0 commit comments

Comments
 (0)