This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 846bcbf Fix Packer Windows image build breakage - Doxygen install
failing because Doxygen pushed a new update, and removed their old download
link *again* - Removing use of Chocolatey for Doxygen install, because
Chocolatey package isn't maintained and breaks for several weeks each time
Doxygen does this
846bcbf is described below
commit 846bcbf11872a3b7539eb6097b6d94ceb0012500
Author: Blake Bender <bben...@pivotal.io>
AuthorDate: Fri Aug 16 08:28:30 2019 -0700
Fix Packer Windows image build breakage
- Doxygen install failing because Doxygen pushed a new update, and removed
their old download link *again*
- Removing use of Chocolatey for Doxygen install, because Chocolatey
package isn't maintained and breaks for several weeks each time Doxygen does
this
Co-authored-by: Mike Martell <mmart...@pivotal.io>
---
packer/windows-2016-base.json | 6 ++++++
packer/windows/install-dependencies.ps1 | 1 -
packer/windows/install-doxygen.ps1 | 11 +++++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/packer/windows-2016-base.json b/packer/windows-2016-base.json
index cefb0ad..62492e2 100644
--- a/packer/windows-2016-base.json
+++ b/packer/windows-2016-base.json
@@ -40,6 +40,12 @@
]
},
{
+ "type":"powershell",
+ "scripts":[
+ "windows/install-doxygen.ps1"
+ ]
+ },
+ {
"type":"file",
"source":"windows/init-ssh.ps1",
"destination":"$Env:ProgramData/Amazon/EC2-Windows/Launch/Scripts/init-ssh.ps1"
diff --git a/packer/windows/install-dependencies.ps1
b/packer/windows/install-dependencies.ps1
index f2d73db..6b7ca14 100644
--- a/packer/windows/install-dependencies.ps1
+++ b/packer/windows/install-dependencies.ps1
@@ -17,7 +17,6 @@ choco install adoptopenjdk8 -confirm
choco install cmake.portable -confirm
choco install git.install -confirm
choco install activeperl -confirm
-choco install doxygen.install --allowEmptyChecksums -confirm
choco install dogtail.dotnet3.5sp1 -confirm
choco install nunit.install --version 2.6.4 -confirm
choco install netfx-4.5.2-devpack --allowEmptyChecksums -confirm
diff --git a/packer/windows/install-doxygen.ps1
b/packer/windows/install-doxygen.ps1
new file mode 100644
index 0000000..7afa855
--- /dev/null
+++ b/packer/windows/install-doxygen.ps1
@@ -0,0 +1,11 @@
+$package = 'doxygen.install'
+$url = 'http://doxygen.nl/files/doxygen-1.8.16-setup.exe'
+$sha256 = 'c0d4bb19e87921b4aad2d0962bac1f6664bfb9d0f103658908af76565386c940'
+
+Import-Module C:\ProgramData\chocolatey\helpers\chocolateyInstaller.psm1
+Install-ChocolateyPackage $package 'exe' '/VERYSILENT' $url -Checksum $sha256
-ChecksumType 'sha256'
+
+$oldpath = (Get-ItemProperty -Path
'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session
Manager\Environment' -Name PATH).path
+$newpath = "$oldpath;C:\Program Files\doxygen\bin"
+Set-ItemProperty -Path
'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session
Manager\Environment' -Name PATH -Value $newPath
+$ENV:PATH=$newpath
