You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/05/24 19:54:07 UTC
geode-native git commit: GEODE-2741: Fixes dependency installs.
Repository: geode-native
Updated Branches:
refs/heads/develop d1710133a -> 7eea00248
GEODE-2741: Fixes dependency installs.
- Fixes .NET 3.5 install.
- Fixes ActivePerl install.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/7eea0024
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/7eea0024
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/7eea0024
Branch: refs/heads/develop
Commit: 7eea002484ea49f5690e68b57ea53a629745beba
Parents: d171013
Author: Jacob Barrett <jb...@pivotal.io>
Authored: Wed May 24 12:53:42 2017 -0700
Committer: Jacob Barrett <jb...@pivotal.io>
Committed: Wed May 24 12:53:42 2017 -0700
----------------------------------------------------------------------
packer/build-windows.json | 10 +++++++---
packer/windows/install-perl.ps1 | 20 --------------------
2 files changed, 7 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/7eea0024/packer/build-windows.json
----------------------------------------------------------------------
diff --git a/packer/build-windows.json b/packer/build-windows.json
index a35e0f7..8acd8b4 100644
--- a/packer/build-windows.json
+++ b/packer/build-windows.json
@@ -43,12 +43,17 @@
{
"type":"powershell",
"inline":[
+ "Install-WindowsFeature -name NET-Framework-Core"
+ ]
+ },
+ {
+ "type":"powershell",
+ "inline":[
"choco install jdk8 -confirm",
"choco install cmake.portable -confirm",
"choco install git.install -confirm",
- "# broken choco install activeperl -confirm",
+ "choco install activeperl -confirm",
"choco install doxygen.install --allowEmptyChecksums -confirm",
- "choco install dotnet3.5 --confirm",
"choco install nunit.install --version 2.6.4 -confirm",
"choco install netfx-4.5.2-devpack --allowEmptyChecksums -confirm",
"choco install nsis -confirm"
@@ -62,7 +67,6 @@
{
"type":"powershell",
"scripts":[
- "windows/install-perl.ps1",
"windows/install-gnuwin.ps1",
"windows/install-gemfire.ps1"
]
http://git-wip-us.apache.org/repos/asf/geode-native/blob/7eea0024/packer/windows/install-perl.ps1
----------------------------------------------------------------------
diff --git a/packer/windows/install-perl.ps1 b/packer/windows/install-perl.ps1
deleted file mode 100644
index 3d18c11..0000000
--- a/packer/windows/install-perl.ps1
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-$ErrorActionPreference = "Stop"
-Import-Module Packer
-
-Install-Package http://downloads.activestate.com/ActivePerl/releases/5.22.3.2204/ActivePerl-5.22.3.2204-MSWin32-x64-401627.exe `
- -Hash 214083166032FBF61F20BB4C65B0610508B90101910F3293B67BD56619E6444D `
- -ArgumentList @("/qn", "/norestart", "PERL_PATH=Yes", "PERL_EXT=Yes")