geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject geode-native git commit: GEODE-2741: Update Windows build to use Visual Studio 2015.
Date Mon, 22 May 2017 23:42:13 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop 1658a120a -> 9d840acef


GEODE-2741: Update Windows build to use Visual Studio 2015.


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/9d840ace
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/9d840ace
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/9d840ace

Branch: refs/heads/develop
Commit: 9d840acefd7e2f1122740a4e46f800eeb756873b
Parents: 1658a12
Author: Jacob Barrett <jbarrett@pivotal.io>
Authored: Mon May 22 11:24:48 2017 -0700
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Mon May 22 16:39:42 2017 -0700

----------------------------------------------------------------------
 packer/windows-2012-r2-vs-2015.json          | 70 +++++++++++++++++++
 packer/windows-2012-vs-2015.json             | 12 +++-
 packer/windows/install-vs-2015-community.ps1 |  4 +-
 packer/windows/vs-2015-admin.xml             | 84 +++++++++++++++++++++++
 4 files changed, 165 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/9d840ace/packer/windows-2012-r2-vs-2015.json
----------------------------------------------------------------------
diff --git a/packer/windows-2012-r2-vs-2015.json b/packer/windows-2012-r2-vs-2015.json
new file mode 100644
index 0000000..dc9c4ff
--- /dev/null
+++ b/packer/windows-2012-r2-vs-2015.json
@@ -0,0 +1,70 @@
+{
+  "variables":{
+    "region":"us-west-2",
+    "source_ami":"ami-ac5395cc",
+    "source_image_name":"X.vmx",
+    "image_name":"windows-2012-vs-2015"
+  },
+  "builders":[
+    {
+      "type":"amazon-ebs",
+      "instance_type":"t2.large",
+      "ami_name":"native-{{user `version`}}-{{user `image_name`}} {{timestamp}}",
+      "access_key":"{{user `aws_access_key`}}",
+      "secret_key":"{{user `aws_secret_key`}}",
+      "region":"{{user `region`}}",
+      "source_ami":"{{user `source_ami`}}",
+      "subnet_id":"{{user `subnet_id`}}",
+      "vpc_id":"{{user `vpc_id`}}",
+      "tags":{
+        "team":"native",
+        "version":"{{user `version`}}",
+        "source_ami":"{{user `source_ami`}}"
+      },
+      "communicator":"winrm",
+      "winrm_username":"Administrator",
+      "launch_block_device_mappings":[
+        {
+          "device_name":"/dev/sda1",
+          "delete_on_termination":true,
+          "volume_size":60
+        }
+      ]
+    }
+  ],
+  "provisioners":[
+    {
+      "pause_before":"30s",
+      "type":"file",
+      "source":"windows/Packer.psm1",
+      "destination":"Documents/WindowsPowerShell/Modules/Packer/Packer.psm1"
+    },
+    {
+      "pause_before":"30s",
+      "type":"file",
+      "source":"windows/vs-2015-admin.xml",
+      "destination":"C:/vs-2015-admin.xml"
+    },
+    {
+      "type":"powershell",
+      "scripts":[
+        "windows/install-vs-2015-community.ps1"
+      ]
+    },
+    {
+      "type":"powershell",
+      "scripts":[
+        "windows/cleanup.ps1"
+      ]
+    },
+    {
+      "type":"powershell",
+      "scripts":[
+        "windows/setup-ec2config.ps1"
+      ],
+      "only":[
+        "amazon-ebs"
+      ]
+    }
+  ]
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/9d840ace/packer/windows-2012-vs-2015.json
----------------------------------------------------------------------
diff --git a/packer/windows-2012-vs-2015.json b/packer/windows-2012-vs-2015.json
index da82b94..8a42a17 100644
--- a/packer/windows-2012-vs-2015.json
+++ b/packer/windows-2012-vs-2015.json
@@ -1,9 +1,9 @@
 {
   "variables":{
     "region":"us-west-2",
-    "source_ami":"ami-ac5395cc",
-    "source_image_name":"X.vmx",
-    "image_name":"windows-2012-vs-2015"
+    "source_ami":"",
+    "source_image_name":"",
+    "image_name":"windows-2012-r2-vs-2015"
   },
   "builders":[
     {
@@ -40,6 +40,12 @@
       "destination":"Documents/WindowsPowerShell/Modules/Packer/Packer.psm1"
     },
     {
+      "pause_before":"30s",
+      "type":"file",
+      "source":"windows/vs-2015-admin.xml",
+      "destination":"C:/vs-2015-admin.xml"
+    },
+    {
       "type":"powershell",
       "scripts":[
         "windows/install-vs-2015-community.ps1"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/9d840ace/packer/windows/install-vs-2015-community.ps1
----------------------------------------------------------------------
diff --git a/packer/windows/install-vs-2015-community.ps1 b/packer/windows/install-vs-2015-community.ps1
index d78bf04..d9addda 100644
--- a/packer/windows/install-vs-2015-community.ps1
+++ b/packer/windows/install-vs-2015-community.ps1
@@ -20,7 +20,7 @@ Import-Module Packer
 
 $log = "vs_community.log"
 
-Install-Package https://download.microsoft.com/download/0/B/C/0BC321A4-013F-479C-84E6-4A2F90B11269/vs_community.exe
`
+Install-Package https://download.microsoft.com/download/e/4/c/e4c393a9-8fff-441b-ad3a-3f4040317a1f/vs_community.exe
`
     -Hash ED8D88D0AB88832754302BFC2A374E803B3A21C1590B428092944272F9EA30FE `
-    -ArgumentList @("/quiet", "/log", $log) `
+    -ArgumentList @("/AdminFile", "C:\\vs-2015-admin.xml", "/quiet", "/log", $log) `
     -Log $log -Verbose

http://git-wip-us.apache.org/repos/asf/geode-native/blob/9d840ace/packer/windows/vs-2015-admin.xml
----------------------------------------------------------------------
diff --git a/packer/windows/vs-2015-admin.xml b/packer/windows/vs-2015-admin.xml
new file mode 100644
index 0000000..02c2e9c
--- /dev/null
+++ b/packer/windows/vs-2015-admin.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AdminDeploymentCustomizations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns="http://schemas.microsoft.com/wix/2011/AdminDeployment">
+  <BundleCustomizations TargetDir="C:\Program Files (x86)\Microsoft Visual Studio 14.0"
NoCacheOnlyMode="default" NoWeb="default" NoRefresh="default" SuppressRefreshPrompt="default"
Feed="default" />
+  <SelectableItemCustomizations>
+    <SelectableItemCustomization Id="MicroUpdateV3.5" Selected="yes" FriendlyName="Update
for Microsoft Visual Studio 2015 (KB3165756)" />
+    <SelectableItemCustomization Id="WebToolsV1" Hidden="no" Selected="yes" FriendlyName="Microsoft
Web Developer Tools" />
+    <SelectableItemCustomization Id="JavaScript_HiddenV12" Selected="yes" FriendlyName="JavaScript
Project System for Visual Studio" />
+    <SelectableItemCustomization Id="MDDJSDependencyHiddenV1" Selected="yes" FriendlyName="MDDJSDependencyHidden"
/>
+    <SelectableItemCustomization Id="AppInsightsToolsVisualStudioHiddenVSU3RTMV1" Selected="no"
FriendlyName="Developer Analytics Tools v7.0.2" />
+    <SelectableItemCustomization Id="Silverlight5_DRTHidden" Selected="no" FriendlyName="Silverlight5_DRTHidden"
/>
+    <SelectableItemCustomization Id="BlissHidden" Selected="no" FriendlyName="BlissHidden"
/>
+    <SelectableItemCustomization Id="HelpHidden" Selected="yes" FriendlyName="HelpHidden"
/>
+    <SelectableItemCustomization Id="JavaScript" Selected="yes" FriendlyName="JavascriptHidden"
/>
+    <SelectableItemCustomization Id="NetFX4Hidden" Selected="yes" FriendlyName="NetFX4Hidden"
/>
+    <SelectableItemCustomization Id="NetFX45Hidden" Selected="yes" FriendlyName="NetFX45Hidden"
/>
+    <SelectableItemCustomization Id="NetFX451MTPackHidden" Selected="yes" FriendlyName="NetFX451MTPackHidden"
/>
+    <SelectableItemCustomization Id="NetFX451MTPackCoreHidden" Selected="yes" FriendlyName="NetFX451MTPackCoreHidden"
/>
+    <SelectableItemCustomization Id="NetFX452MTPackHidden" Selected="yes" FriendlyName="NetFX452MTPackHidden"
/>
+    <SelectableItemCustomization Id="NetFX46MTPackHidden" Selected="yes" FriendlyName="NetFX46MTPackHidden"
/>
+    <SelectableItemCustomization Id="PortableDTPHidden" Selected="yes" FriendlyName="PortableDTPHidden"
/>
+    <SelectableItemCustomization Id="PreEmptiveDotfuscatorHidden" Selected="no" FriendlyName="PreEmptiveDotfuscatorHidden"
/>
+    <SelectableItemCustomization Id="PreEmptiveAnalyticsHidden" Selected="no" FriendlyName="PreEmptiveAnalyticsHidden"
/>
+    <SelectableItemCustomization Id="ProfilerHidden" Selected="no" FriendlyName="ProfilerHidden"
/>
+    <SelectableItemCustomization Id="RoslynLanguageServicesHidden" Selected="no" FriendlyName="RoslynLanguageServicesHidden"
/>
+    <SelectableItemCustomization Id="SDKTools3Hidden" Selected="yes" FriendlyName="SDKTools3Hidden"
/>
+    <SelectableItemCustomization Id="SDKTools4Hidden" Selected="yes" FriendlyName="SDKTools4Hidden"
/>
+    <SelectableItemCustomization Id="WCFDataServicesHidden" Selected="no" FriendlyName="WCFDataServicesHidden"
/>
+    <SelectableItemCustomization Id="VSUV1PreReqV1" Selected="no" FriendlyName="Visual
Studio 2015 Update 1 Prerequisite" />
+    <SelectableItemCustomization Id="VSUV3RTMV1" Selected="yes" FriendlyName="Visual Studio
2015 Update 3" />
+    <SelectableItemCustomization Id="NativeLanguageSupport_VCV1" Hidden="no" Selected="yes"
FriendlyName="Common Tools for Visual C++ 2015" />
+    <SelectableItemCustomization Id="NativeLanguageSupport_MFCV1" Hidden="no" Selected="no"
FriendlyName="Microsoft Foundation Classes for C++" />
+    <SelectableItemCustomization Id="NativeLanguageSupport_XPV1" Hidden="no" Selected="no"
FriendlyName="Windows XP Support for C++" />
+    <SelectableItemCustomization Id="Win81SDK_HiddenV1" Hidden="no" Selected="no" FriendlyName="Windows
8.1 SDK and Universal CRT SDK" />
+    <SelectableItemCustomization Id="FSharpV1" Hidden="no" Selected="no" FriendlyName="Visual
F#" />
+    <SelectableItemCustomization Id="PythonToolsForVisualStudioV8" Hidden="no" Selected="no"
FriendlyName="Python Tools for Visual Studio (January 2017)" />
+    <SelectableItemCustomization Id="ClickOnceV1" Hidden="no" Selected="no" FriendlyName="ClickOnce
Publishing Tools" />
+    <SelectableItemCustomization Id="SQLV1" Hidden="no" Selected="no" FriendlyName="Microsoft
SQL Server Data Tools" />
+    <SelectableItemCustomization Id="PowerShellToolsV1" Hidden="no" Selected="no" FriendlyName="PowerShell
Tools for Visual Studio" />
+    <SelectableItemCustomization Id="SilverLight_Developer_KitV1" Hidden="no" Selected="no"
FriendlyName="Silverlight Development Kit" />
+    <SelectableItemCustomization Id="Windows10_ToolsAndSDKV13" Hidden="no" Selected="no"
FriendlyName="Tools (1.4.1) and Windows 10 SDK (10.0.14393)" />
+    <SelectableItemCustomization Id="Win10_EmulatorV1" Selected="no" FriendlyName="Emulators
for Windows 10 Mobile (10.0.10240)" />
+    <SelectableItemCustomization Id="Win10_EmulatorV2" Selected="no" FriendlyName="Emulators
for Windows 10 Mobile (10.0.10586)" />
+    <SelectableItemCustomization Id="Win10_EmulatorV3" Hidden="no" Selected="no" FriendlyName="Emulators
for Windows 10 Mobile (10.0.14393)" />
+    <SelectableItemCustomization Id="XamarinVSCoreV7" Hidden="no" Selected="no" FriendlyName="C#/.NET
(Xamarin v4.2.1)" />
+    <SelectableItemCustomization Id="XamarinPT_V1" Selected="no" FriendlyName="Xamarin
Preparation Tool" />
+    <SelectableItemCustomization Id="MDDJSCoreV11" Hidden="no" Selected="no" FriendlyName="HTML/JavaScript
(Apache Cordova) Update 10" />
+    <SelectableItemCustomization Id="AndroidNDK11C_V1" Hidden="no" Selected="no" FriendlyName="Android
Native Development Kit (R11C, 32 bits)" />
+    <SelectableItemCustomization Id="AndroidNDK11C_32_V1" Hidden="no" Selected="no" FriendlyName="Android
Native Development Kit (R11C, 32 bits)" />
+    <SelectableItemCustomization Id="AndroidNDK11C_64_V1" Hidden="no" Selected="no" FriendlyName="Android
Native Development Kit (R11C, 64 bits)" />
+    <SelectableItemCustomization Id="AndroidNDKV1" Hidden="no" Selected="no" FriendlyName="Android
Native Development Kit (R10E, 32 bits)" />
+    <SelectableItemCustomization Id="AndroidNDK_32_V1" Hidden="no" Selected="no" FriendlyName="Android
Native Development Kit (R10E, 32 bits)" />
+    <SelectableItemCustomization Id="AndroidNDK_64_V1" Hidden="no" Selected="no" FriendlyName="Android
Native Development Kit (R10E, 64 bits)" />
+    <SelectableItemCustomization Id="AndroidSDKV1" Hidden="no" Selected="no" FriendlyName="Android
SDK" />
+    <SelectableItemCustomization Id="AndroidSDK_API1921V1" Hidden="no" Selected="no" FriendlyName="Android
SDK Setup (API Level 19 and 21)" />
+    <SelectableItemCustomization Id="AndroidSDK_API22V1" Hidden="no" Selected="no" FriendlyName="Android
SDK Setup (API Level 22)" />
+    <SelectableItemCustomization Id="AndroidSDK_API23V1" Hidden="no" Selected="no" FriendlyName="Android
SDK Setup (API Level 23)" />
+    <SelectableItemCustomization Id="AntV1" Hidden="no" Selected="no" FriendlyName="Apache
Ant (1.9.3)" />
+    <SelectableItemCustomization Id="L_MDDCPlusPlus_iOS_V7" Hidden="no" Selected="no"
FriendlyName="Visual C++ iOS Development (Update 3)" />
+    <SelectableItemCustomization Id="L_MDDCPlusPlus_Android_V7" Hidden="no" Selected="no"
FriendlyName="Visual C++ Android Development (Update 3)" />
+    <SelectableItemCustomization Id="L_MDDCPlusPlus_ClangC2_V6" Hidden="no" Selected="no"
FriendlyName="Clang with Microsoft CodeGen (July 2016)" />
+    <SelectableItemCustomization Id="L_IncrediBuild_V1" Selected="no" FriendlyName="IncrediBuild"
/>
+    <SelectableItemCustomization Id="JavaJDKV1" Hidden="no" Selected="no" FriendlyName="Java
SE Development Kit (7.0.550.13)" />
+    <SelectableItemCustomization Id="Node.jsV1" Hidden="no" Selected="no" FriendlyName="Joyent
Node.js" />
+    <SelectableItemCustomization Id="VSEmu_AndroidV1.1.622.2" Hidden="no" Selected="no"
FriendlyName="Microsoft Visual Studio Emulator for Android (July 2016)" />
+    <SelectableItemCustomization Id="WebSocket4NetV1" Hidden="no" Selected="no" FriendlyName="WebSocket4Net"
/>
+    <SelectableItemCustomization Id="ToolsForWin81_WP80_WP81V1" Hidden="no" Selected="no"
FriendlyName="Tools and Windows SDKs" />
+    <SelectableItemCustomization Id="WindowsPhone81EmulatorsV1" Hidden="no" Selected="no"
FriendlyName="Emulators for Windows Phone 8.1" />
+    <SelectableItemCustomization Id="GitForWindowsx64V7" Hidden="no" Selected="no" FriendlyName="Git
for Windows" />
+    <SelectableItemCustomization Id="GitForWindowsx86V7" Hidden="no" Selected="no" FriendlyName="Git
for Windows" />
+    <SelectableItemCustomization Id="GitHubVSV1" Hidden="no" Selected="no" FriendlyName="GitHub
Extension for Visual Studio" />
+    <SelectableItemCustomization Id="VS_SDK_GroupV5" Hidden="no" Selected="no" FriendlyName="Visual
Studio Extensibility Tools Update 3" />
+    <SelectableItemCustomization Id="VS_SDK_Breadcrumb_GroupV5" Selected="no" FriendlyName="Visual
Studio Extensibility Tools Update 3" />
+    <SelectableItemCustomization Id="Win10_VSToolsV13" Hidden="no" Selected="no" FriendlyName="Tools
for Universal Windows Apps (1.4.1) and Windows 10 SDK (10.0.14393)" />
+    <SelectableItemCustomization Id="Win10SDK_HiddenV1" Hidden="no" Selected="no" FriendlyName="Windows
10 SDK (10.0.10240)" />
+    <SelectableItemCustomization Id="Win10SDK_HiddenV2" Selected="no" FriendlyName="Windows
10 SDK (10.0.10586)" />
+    <SelectableItemCustomization Id="Win10SDK_HiddenV3" Hidden="no" Selected="no" FriendlyName="Windows
10 SDK (10.0.10586)" />
+    <SelectableItemCustomization Id="Win10SDK_HiddenV4" Selected="no" FriendlyName="Windows
10 SDK (10.0.14393)" />
+    <SelectableItemCustomization Id="Win10SDK_VisibleV1" Hidden="no" Selected="no" FriendlyName="Windows
10 SDK 10.0.10240" />
+    <SelectableItemCustomization Id="UWPPatch_KB3073097_HiddenV3" Selected="no" FriendlyName="KB3073097"
/>
+    <SelectableItemCustomization Id="AppInsightsToolsVSWinExpressHiddenVSU3RTMV1" Selected="no"
FriendlyName="Developer Analytics Tools v7.0.2" />
+    <SelectableItemCustomization Id="AppInsightsToolsVWDExpressHiddenVSU3RTMV1" Selected="no"
FriendlyName="Developer Analytics Tools v7.0.2" />
+    <SelectableItemCustomization Id="UWPStartPageV1" Selected="no" FriendlyName="Tools
for Universal Windows Apps Getting Started Experience" />
+  </SelectableItemCustomizations>
+</AdminDeploymentCustomizations>
\ No newline at end of file


Mime
View raw message