You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bb...@apache.org on 2019/11/11 14:04:22 UTC
[geode-native] branch develop updated: GEODE-7429: Install Active
Perl separately (#547)
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 1bb8cf4 GEODE-7429: Install Active Perl separately (#547)
1bb8cf4 is described below
commit 1bb8cf4b296bc09b3fb4ae098be6fb73ff90c61d
Author: M. Oleske <mo...@users.noreply.github.com>
AuthorDate: Mon Nov 11 06:04:11 2019 -0800
GEODE-7429: Install Active Perl separately (#547)
Co-authored-by: Blake Bender <bb...@pivotal.io>
Co-authored-by: Michael Oleske <mo...@pivotal.io>
---
packer/build-windows.json | 6 ++++++
...nstall-dependencies.ps1 => install-activeperl.ps1} | 19 ++++++-------------
packer/windows/install-dependencies.ps1 | 1 -
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/packer/build-windows.json b/packer/build-windows.json
index 6d96e72..46723af 100644
--- a/packer/build-windows.json
+++ b/packer/build-windows.json
@@ -44,6 +44,12 @@
]
},
{
+ "type": "powershell",
+ "scripts": [
+ "windows/install-activeperl.ps1"
+ ]
+ },
+ {
"type": "file",
"source": "{{user `gemfire_archive`}}",
"destination": "gemfire.tar.gz"
diff --git a/packer/windows/install-dependencies.ps1 b/packer/windows/install-activeperl.ps1
similarity index 63%
copy from packer/windows/install-dependencies.ps1
copy to packer/windows/install-activeperl.ps1
index 6b7ca14..0dc4157 100644
--- a/packer/windows/install-dependencies.ps1
+++ b/packer/windows/install-activeperl.ps1
@@ -4,23 +4,16 @@
# 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.
-choco install adoptopenjdk8 -confirm
-choco install cmake.portable -confirm
-choco install git.install -confirm
-choco install activeperl -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
-choco install nsis -confirm
-choco install patch -confirm
-choco install gnuwin32-coreutils.portable -confirm
-choco install nuget.commandline -confirm
+$ErrorActionPreference = "Stop"
+Import-Module Packer -Force
+
+Install-Package http://downloads.activestate.com/ActivePerl/releases/5.28.1.2801/ActivePerl-5.28.1.2801-MSWin32-x64-24563874.exe -ArgumentList "/exenoupdates /quiet"
diff --git a/packer/windows/install-dependencies.ps1 b/packer/windows/install-dependencies.ps1
index 6b7ca14..2485c6e 100644
--- a/packer/windows/install-dependencies.ps1
+++ b/packer/windows/install-dependencies.ps1
@@ -16,7 +16,6 @@
choco install adoptopenjdk8 -confirm
choco install cmake.portable -confirm
choco install git.install -confirm
-choco install activeperl -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