diff --git a/apache.json b/apache.json index a0d6468aca..de1bcfba33 100644 --- a/apache.json +++ b/apache.json @@ -4,12 +4,24 @@ "license": "Apache 2.0", "architecture": { "64bit": { - "url": "https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.18-win64-VC14.zip", - "hash": "sha256:543aff046b0ea2bf58be76d7d20fcd1fa16eec9ae836ca4639feb1c2a7e09cfa" + "url": [ + "https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.18-win64-VC14.zip", + "https://raw.githubusercontent.com/MPLew-is/scoop-wamp/master/visual-c-redistributables/14/64-bit/vcruntime140.dll" + ], + "hash": [ + "sha256:543aff046b0ea2bf58be76d7d20fcd1fa16eec9ae836ca4639feb1c2a7e09cfa", + "sha256:acf65e565021f2017815fc5ec8a3145cf6c15e75c132cf23a378cc943e68327c" + ] }, "32bit": { - "url": "https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.18-win32-VC14.zip", - "hash": "sha256:2259bea85cbcb4e9e525bfff0863b4ae3eae5f91fddb153191fd310575a04f38" + "url": [ + "https://www.apachelounge.com/download/VC14/binaries/httpd-2.4.18-win32-VC14.zip", + "https://raw.githubusercontent.com/MPLew-is/scoop-wamp/master/visual-c-redistributables/14/32-bit/vcruntime140.dll" + ], + "hash": [ + "sha256:2259bea85cbcb4e9e525bfff0863b4ae3eae5f91fddb153191fd310575a04f38", + "sha256:b7c13f8519340257ba6ae3129afce961f137e394dde3e4e41971b9f912355f5e" + ] } }, "extract_dir": "Apache24", @@ -25,8 +37,10 @@ "bin\\logresolve.exe", "bin\\rotatelogs.exe" ], - "depends": "vc-redist14", "post_install": " +#Copy needed DLL to bin subdirectory +mv \"$dir\\vcruntime140.dll\" \"$dir\\bin\\vcruntime140.dll\" + # set directory in httpd.conf $conf = \"$dir/conf/httpd.conf\" $root=(scoop which httpd | split-path -res -par | split-path -par) -replace '\\\\', '/'; diff --git a/php.json b/php.json index 61705f5d7c..a2441d7e7d 100644 --- a/php.json +++ b/php.json @@ -4,16 +4,27 @@ "license": "http://www.php.net/license/", "architecture": { "64bit": { - "url": "http://windows.php.net/downloads/releases/php-7.0.4-Win32-VC14-x64.zip", - "hash": "sha1:52b0ce7ee7600672383694c65071966ff3a20b92" + "url": [ + "http://windows.php.net/downloads/releases/php-7.0.4-Win32-VC14-x64.zip", + "https://raw.githubusercontent.com/MPLew-is/scoop-wamp/master/visual-c-redistributables/14/64-bit/vcruntime140.dll" + ], + "hash": [ + "sha1:52b0ce7ee7600672383694c65071966ff3a20b92", + "sha256:acf65e565021f2017815fc5ec8a3145cf6c15e75c132cf23a378cc943e68327c" + ] }, "32bit": { - "url": "http://windows.php.net/downloads/releases/php-7.0.4-Win32-VC14-x86.zip", - "hash": "sha1:60569b17d7883c710675d217f3521821f97b4a0d" + "url": [ + "http://windows.php.net/downloads/releases/php-7.0.4-Win32-VC14-x86.zip", + "https://raw.githubusercontent.com/MPLew-is/scoop-wamp/master/visual-c-redistributables/14/32-bit/vcruntime140.dll" + ], + "hash": [ + "sha1:60569b17d7883c710675d217f3521821f97b4a0d", + "sha256:b7c13f8519340257ba6ae3129afce961f137e394dde3e4e41971b9f912355f5e" + ] } }, "bin": "php.exe", - "depends": "vc-redist14", "post_install": "cp \"$dir\\php.ini-production\" \"$dir\\php.ini\"", "checkver": { "url": "http://windows.php.net/download/",