Windows support was deprecated in 3.7, it's time to remove it. Rmoving the installer.
Signed-off-by: Ilya Maximets <[email protected]> --- Documentation/intro/install/windows.rst | 21 +- Makefile.am | 1 - windows/.gitignore | 191 ------------ windows/README.rst | 76 ----- windows/automake.mk | 59 ---- windows/ovs-windows-installer.sln | 21 -- .../Actions/OVSActions.js | 258 ---------------- .../ovs-windows-installer/Binaries/.gitignore | 3 - .../ovs-windows-installer/CustomActions.wxs | 78 ----- .../Dialogs/BeginningDialog.wxs | 49 --- .../Dialogs/MyEndDialog.wxs | 44 --- .../Dialogs/MyTroubleshootDialog.wxs | 42 --- .../Dialogs/UserFinishDialog.wxs | 44 --- .../ovs-windows-installer/Driver/.gitignore | 6 - .../Driver/Win10/.gitignore | 3 - .../Driver/Win8.1/.gitignore | 3 - .../Driver/Win8/.gitignore | 3 - windows/ovs-windows-installer/License.rtf | 209 ------------- windows/ovs-windows-installer/Product.wxs | 282 ------------------ .../ovs-windows-installer/Redist/.gitignore | 3 - .../ovs-windows-installer/Services/.gitignore | 3 - .../ovs-windows-installer/Symbols/.gitignore | 3 - windows/ovs-windows-installer/UI.wxs | 72 ----- .../ovs-windows-installer/images/bannrbmp.bmp | Bin 134958 -> 0 bytes .../ovs-windows-installer/images/dlgbmp.bmp | Bin 460568 -> 0 bytes .../ovs-windows-installer.wixproj | 85 ------ 26 files changed, 2 insertions(+), 1557 deletions(-) delete mode 100644 windows/.gitignore delete mode 100644 windows/README.rst delete mode 100644 windows/automake.mk delete mode 100644 windows/ovs-windows-installer.sln delete mode 100644 windows/ovs-windows-installer/Actions/OVSActions.js delete mode 100644 windows/ovs-windows-installer/Binaries/.gitignore delete mode 100644 windows/ovs-windows-installer/CustomActions.wxs delete mode 100644 windows/ovs-windows-installer/Dialogs/BeginningDialog.wxs delete mode 100644 windows/ovs-windows-installer/Dialogs/MyEndDialog.wxs delete mode 100644 windows/ovs-windows-installer/Dialogs/MyTroubleshootDialog.wxs delete mode 100644 windows/ovs-windows-installer/Dialogs/UserFinishDialog.wxs delete mode 100644 windows/ovs-windows-installer/Driver/.gitignore delete mode 100644 windows/ovs-windows-installer/Driver/Win10/.gitignore delete mode 100644 windows/ovs-windows-installer/Driver/Win8.1/.gitignore delete mode 100644 windows/ovs-windows-installer/Driver/Win8/.gitignore delete mode 100644 windows/ovs-windows-installer/License.rtf delete mode 100644 windows/ovs-windows-installer/Product.wxs delete mode 100644 windows/ovs-windows-installer/Redist/.gitignore delete mode 100644 windows/ovs-windows-installer/Services/.gitignore delete mode 100644 windows/ovs-windows-installer/Symbols/.gitignore delete mode 100644 windows/ovs-windows-installer/UI.wxs delete mode 100644 windows/ovs-windows-installer/images/bannrbmp.bmp delete mode 100644 windows/ovs-windows-installer/images/dlgbmp.bmp delete mode 100644 windows/ovs-windows-installer/ovs-windows-installer.wixproj diff --git a/Documentation/intro/install/windows.rst b/Documentation/intro/install/windows.rst index ef398e583..165d807bf 100644 --- a/Documentation/intro/install/windows.rst +++ b/Documentation/intro/install/windows.rst @@ -72,9 +72,8 @@ The following explains the steps in some detail. You will need at least Visual Studio 2013 (update 4) to compile userspace binaries. In addition to that, if you want to compile the kernel module you will also need to install Windows Driver Kit (WDK) 8.1 Update or later. - To generate the Windows installer you need - `WiX Toolset <https://wixtoolset.org/>`__ and also be able to build the - kernel module. + To be able to build the kernel module you need + `WiX Toolset <https://wixtoolset.org/>`__ . We recommend using the latest Visual Studio version together with the latest WDK installed. @@ -325,22 +324,6 @@ An alternative way to do the same is to run the following command: seconds has been observed for the change to be reflected in the UI. This is not a bug in Open vSwitch. -Generate the Windows installer -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -To generate the Windows installler run the following command from the top -source directory: - -:: - - $ make windows_installer - -.. note:: - - This will generate the Windows installer in the following location (relative - to the top source directory): - windows/ovs-windows-installer/bin/Release/OpenvSwitch.msi - Starting -------- diff --git a/Makefile.am b/Makefile.am index e6ac79c51..13ffc9e28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -486,6 +486,5 @@ include tutorial/automake.mk include vtep/automake.mk include datapath-windows/automake.mk include datapath-windows/include/automake.mk -include windows/automake.mk include selinux/automake.mk include build-aux/automake.mk diff --git a/windows/.gitignore b/windows/.gitignore deleted file mode 100644 index 1cc9b1a65..000000000 --- a/windows/.gitignore +++ /dev/null @@ -1,191 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -ovs-windows-installer/Binaries.wxs -ovs-windows-installer/Symbols.wxs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -x64/ -build/ -bld/ -[Bb]in/ -[Oo]bj/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -#NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding addin-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -*.ncrunch* -_NCrunch_* -.*crunch*.local.xml - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml - -# NuGet Packages Directory -packages/* -## TODO: If the tool you use requires repositories.config uncomment the next line -#!packages/repositories.config - -# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets -# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented) -!packages/build/ - -# Windows Azure Build Output -csx/ -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -sql/ -*.Cache -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# ========================= -# Windows detritus -# ========================= - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ diff --git a/windows/README.rst b/windows/README.rst deleted file mode 100644 index bdf063acc..000000000 --- a/windows/README.rst +++ /dev/null @@ -1,76 +0,0 @@ -.. - Licensed 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. - - Convention for heading levels in Open vSwitch documentation: - - ======= Heading 0 (reserved for the title in a document) - ------- Heading 1 - ~~~~~~~ Heading 2 - +++++++ Heading 3 - ''''''' Heading 4 - - Avoid deeper levels because they do not render well. - -============== -Windows README -============== - -This directory contains tooling to generate an MSI installer for Open vSwitch -on Windows, including CLI executables, services and the Hyper-V vswitch -forwarding extension. - -Requirements ------------- - -* Visual Studio 2013 - - Community, Professional, Premium or Ultimate editions can be used. - - Visual Studio Community 2013 is freely available from `visualstudio.com - <https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx>`__ - -* WiX Toolset 3.9 - - Download and install from `wixtoolset.org - <http://wixtoolset.org/releases/v3.9/stable>`__ - -* ``Microsoft_VC120_CRT_x86.msm`` - - This Windows merge module is available with Visual Studio and contains the - Visual C++ 2013 x86 runtime redistributables files. Copy the file in the - ``Redist`` directory. - -Open vSwitch installer ----------------------- - -The installer will be generated under the following path:: - - windows\ovs-windows-installer\bin\Release\OpenvSwitch.msi - -.. note:: - - The kernel driver needs to be signed. - -Build Instructions ------------------- - -Build the solution in the Visual Studio IDE or via command line:: - - msbuild ovs-windows-installer.sln /p:Platform=x86 /p:Configuration=Release - -Silent installation -------------------- - -:: - - msiexec /i OpenvSwitch.msi ADDLOCAL=OpenvSwitchCLI,OpenvSwitchDriver /l*v log.txt diff --git a/windows/automake.mk b/windows/automake.mk deleted file mode 100644 index 489343028..000000000 --- a/windows/automake.mk +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2015 Cloudbase Solutions Srl -# -# Licensed 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. - -windows_installer: all -#Userspace files needed for the installer - cp -f $(top_srcdir)/datapath-windows/misc/OVS.psm1 windows/ovs-windows-installer/Services/OVS.psm1 - cp -f $(top_srcdir)/vswitchd/vswitch.ovsschema windows/ovs-windows-installer/Services/vswitch.ovsschema - cp -f $(top_srcdir)/vswitchd/ovs-vswitchd.exe windows/ovs-windows-installer/Services/ovs-vswitchd.exe - cp -f $(top_srcdir)/ovsdb/ovsdb-server.exe windows/ovs-windows-installer/Services/ovsdb-server.exe - cp -f $(top_srcdir)/utilities/*.exe windows/ovs-windows-installer/Binaries/ - cp -f $(top_srcdir)/utilities/*.pdb windows/ovs-windows-installer/Symbols/ - cp -f $(top_srcdir)/ovsdb/ovsdb-client.exe windows/ovs-windows-installer/Binaries/ovsdb-client.exe - cp -f $(top_srcdir)/ovsdb/ovsdb-tool.exe windows/ovs-windows-installer/Binaries/ovsdb-tool.exe - cp -f $(top_srcdir)/ovsdb/ovsdb-client.pdb windows/ovs-windows-installer/Symbols/ - cp -f $(top_srcdir)/ovsdb/ovsdb-tool.pdb windows/ovs-windows-installer/Symbols/ -#Third party files needed by the installer - cp -f $(PTHREAD_WIN32_DIR_DLL_WIN_FORM)/*.dll windows/ovs-windows-installer/Binaries/ - cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC140_CRT_x86.msm" windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x86.msm - cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC140_CRT_x64.msm" windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x64.msm -#Forwarding extension files needed for the installer - cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8/ovsext.cat - cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8/ovsext.inf - cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/OVSExt.sys windows/ovs-windows-installer/Driver/Win8/ovsext.sys - cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8.1/ovsext.cat - cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8.1/ovsext.inf - cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.sys windows/ovs-windows-installer/Driver/Win8.1/ovsext.sys - cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win10/ovsext.cat - cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win10/ovsext.inf - cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/package/ovsext.sys windows/ovs-windows-installer/Driver/Win10/ovsext.sys - MSBuild.exe windows/ovs-windows-installer.sln //nologo //target:Build //p:Configuration="Release" //p:Version="$(PACKAGE_VERSION)" //p:Platform=$(PLATFORM) - -EXTRA_DIST += \ - windows/automake.mk \ - windows/README.rst \ - windows/ovs-windows-installer.sln \ - windows/ovs-windows-installer/Actions/OVSActions.js \ - windows/ovs-windows-installer/CustomActions.wxs \ - windows/ovs-windows-installer/Dialogs/BeginningDialog.wxs \ - windows/ovs-windows-installer/Dialogs/MyEndDialog.wxs \ - windows/ovs-windows-installer/Dialogs/MyTroubleshootDialog.wxs \ - windows/ovs-windows-installer/Dialogs/UserFinishDialog.wxs \ - windows/ovs-windows-installer/License.rtf \ - windows/ovs-windows-installer/Product.wxs \ - windows/ovs-windows-installer/UI.wxs \ - windows/ovs-windows-installer/images/bannrbmp.bmp \ - windows/ovs-windows-installer/images/dlgbmp.bmp \ - windows/ovs-windows-installer/ovs-windows-installer.wixproj - diff --git a/windows/ovs-windows-installer.sln b/windows/ovs-windows-installer.sln deleted file mode 100644 index f5634381b..000000000 --- a/windows/ovs-windows-installer.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ovs-windows-installer", "ovs-windows-installer\ovs-windows-installer.wixproj", "{259905A2-7434-4190-8A33-8FBA67171DD6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.ActiveCfg = Release|x64 - {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.Build.0 = Release|x64 - {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.ActiveCfg = Release|x86 - {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/windows/ovs-windows-installer/Actions/OVSActions.js b/windows/ovs-windows-installer/Actions/OVSActions.js deleted file mode 100644 index d686e6b58..000000000 --- a/windows/ovs-windows-installer/Actions/OVSActions.js +++ /dev/null @@ -1,258 +0,0 @@ -/* -Copyright 2015 Cloudbase Solutions Srl -All Rights Reserved. - - Licensed 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. -*/ - -// http://msdn.microsoft.com/en-us/library/sfw6660x(VS.85).aspx -var Buttons = -{ - OkOnly: 0, - OkCancel: 1, - AbortRetryIgnore: 2, - YesNoCancel: 3 -}; - -var Icons = -{ - Critical: 16, - Question: 32, - Exclamation: 48, - Information: 64 -} - -var MsgKind = -{ - Error: 0x01000000, - Warning: 0x02000000, - User: 0x03000000, - Log: 0x04000000 -}; - -// http://msdn.microsoft.com/en-us/library/aa371254(VS.85).aspx -var MsiActionStatus = -{ - None: 0, - Ok: 1, // success - Cancel: 2, - Abort: 3, - Retry: 4, // aka suspend? - Ignore: 5 // skip remaining actions; this is not an error. -}; - -var ServiceStartAction = { - Stop: "Stop", - Start: "Start", - Restart: "Restart" -}; - -var ServiceStartMode = { - Boot: "Boot", - System: "System", - Auto: "Auto", - Manual: "Manual", - Disabled: "Disabled" -}; - -function throwException(num, msg) { - throw { - number: num, - message: msg - }; -} - -function decimalToHexString(number) { - if (number < 0) - number = 0xFFFFFFFF + number + 1; - return number.toString(16).toUpperCase(); -} - -function logMessage(msg) { - var record = Session.Installer.CreateRecord(0); - record.StringData(0) = "CustomActions: " + msg; - Session.Message(MsgKind.Log, record); -} - -function logMessageEx(msg, type) { - var record = Session.Installer.CreateRecord(0); - record.StringData(0) = msg; - Session.Message(type, record); -} - -function logException(exc) { - var record = Session.Installer.CreateRecord(0); - record.StringData(0) = exc.message == "" ? "An exception occurred: 0x" + decimalToHexString(exc.number) : exc.message; - Session.Message(MsgKind.Error + Icons.Critical + Buttons.OkOnly, record); - - // Log the full exception as well - record.StringData(0) = "CustomAction exception details: 0x" + decimalToHexString(exc.number) + " : " + exc.message; - Session.Message(MsgKind.Log, record); -} - -function runCommand(cmd, expectedReturnValue, envVars, windowStyle, waitOnReturn, workingDir) { - var shell = new ActiveXObject("WScript.Shell"); - logMessage("Running command: " + cmd); - - if (envVars) { - var env = shell.Environment("Process"); - for (var k in envVars) - env(k) = envVars[k]; - } - - if (typeof windowStyle == 'undefined') - windowStyle = 0; - - if (typeof waitOnReturn == 'undefined') - waitOnReturn = true; - - if (typeof workingDir == 'undefined') - workingDir = null; - - if (workingDir) { - shell.CurrentDirectory = workingDir; - } - - var retVal = shell.run(cmd, windowStyle, waitOnReturn); - - if (waitOnReturn && expectedReturnValue != undefined && expectedReturnValue != null && retVal != expectedReturnValue) - throwException(-1, "Command failed. Return value: " + retVal.toString()); - - logMessage("Command completed. Return value: " + retVal); - - return retVal; -} - -function getWmiCimV2Svc() { - return GetObject("winmgmts:\\\\.\\root\\cimv2"); -} - -function getSafeArray(jsArr) { - var dict = new ActiveXObject("Scripting.Dictionary"); - for (var i = 0; i < jsArr.length; i++) - dict.add(i, jsArr[i]); - return dict.Items(); -} - -function invokeWMIMethod(svc, methodName, inParamsValues, wmiSvc, jobOutParamName) { - logMessage("Invoking " + methodName); - - var inParams = null; - if (inParamsValues) { - for (var k in inParamsValues) { - if (!inParams) - inParams = svc.Methods_(methodName).InParameters.SpawnInstance_(); - var val = inParamsValues[k]; - if (val instanceof Array) - inParams[k] = getSafeArray(val); - else - inParams[k] = val; - } - } - - var outParams = svc.ExecMethod_(methodName, inParams); - if (outParams.ReturnValue == 4096) { - var job = wmiSvc.Get(outParams[jobOutParamName]); - waitForJob(wmiSvc, job); - } - else if (outParams.ReturnValue != 0) - throwException(-1, methodName + " failed. Return value: " + outParams.ReturnValue.toString()); - - return outParams; -} - -function sleep(interval) { - // WScript.Sleep is not supported in MSI's WSH. Here's a workaround for the moment. - - // interval is ignored - var numPings = 2; - cmd = "ping -n " + numPings + " 127.0.0.1"; - - var shell = new ActiveXObject("WScript.Shell"); - shell.run(cmd, 0, true); -} - -function getService(serviceName) { - var wmiSvc = getWmiCimV2Svc(); - return wmiSvc.ExecQuery("SELECT * FROM Win32_Service WHERE Name='" + serviceName + "'").ItemIndex(0); -} - -function changeService(serviceName, startMode, startAction) { - var svc = getService(serviceName); - - if ((startAction == ServiceStartAction.Stop || startAction == ServiceStartAction.Restart) && svc.Started) - invokeWMIMethod(svc, "StopService"); - - if (startMode && svc.StartMode != startMode) - invokeWMIMethod(svc, "ChangeStartMode", - { - "StartMode": (startMode == ServiceStartMode.Auto ? "Automatic" : startMode) - }); - - if (startAction == ServiceStartAction.Restart && svc.Started) { - var wmiSvc = getWmiCimV2Svc(); - do { - sleep(200); - svc = wmiSvc.Get(svc.Path_); - } while (svc.Started); - } - - if ((startAction == ServiceStartAction.Start || startAction == ServiceStartAction.Restart) && !svc.Started) - invokeWMIMethod(svc, "StartService"); -} - -function runCommandAction() { - var exceptionMsg = null; - - try { - var data = Session.Property("CustomActionData").split('|'); - var i = 0; - var cmd = data[i++]; - var expectedRetValue = data.length > i ? data[i++] : 0; - var exceptionMsg = data.length > i ? data[i++] : null; - var workingDir = data.length > i ? data[i++] : null; - - runCommand(cmd, expectedRetValue, null, 0, true, workingDir); - return MsiActionStatus.Ok; - } - catch (ex) { - if (exceptionMsg) { - logMessageEx(exceptionMsg, MsgKind.Error + Icons.Critical + Buttons.OkOnly); - // log also the original exception - logMessage(ex.message); - } - else - logException(ex); - - return MsiActionStatus.Abort; - } -} - -function changeServiceAction() { - try { - var data = Session.Property("CustomActionData").split('|'); - var serviceName = data[0]; - var startMode = data[1]; - var startAction = data[2]; - - logMessage("Changing service " + serviceName + ", startMode: " + startMode + ", startAction: " + startAction); - - changeService(serviceName, startMode, startAction); - - return MsiActionStatus.Ok; - } - catch (ex) { - logMessage(ex.message); - return MsiActionStatus.Abort; - } -} \ No newline at end of file diff --git a/windows/ovs-windows-installer/Binaries/.gitignore b/windows/ovs-windows-installer/Binaries/.gitignore deleted file mode 100644 index cec9082b6..000000000 --- a/windows/ovs-windows-installer/Binaries/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* - -!.gitignore diff --git a/windows/ovs-windows-installer/CustomActions.wxs b/windows/ovs-windows-installer/CustomActions.wxs deleted file mode 100644 index cc1b80eff..000000000 --- a/windows/ovs-windows-installer/CustomActions.wxs +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - <copyright company="Cloudbase Solutions Srl"> - Copyright 2015 Cloudbase Solutions Srl - - Licensed 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. - </copyright> ---> -<?if $(var.Platform) = x64 ?> - <?define NetcfgFolder = "[System64Folder]" ?> -<?else ?> - <?define NetcfgFolder = "[WindowsFolder]Sysnative" ?> -<?endif ?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";> - <Fragment> - <Binary Id="OVSActions" SourceFile="Actions\OVSActions.js" /> - - <CustomAction Id="GenerateConfDB_Prop" Property="GenerateConfDB" - Value='"[BINARIESDIR]ovsdb-tool.exe" create "[CONFDIR]conf.db" "[CONFDIR]vswitch.ovsschema"|0|ovsdb-tool failed to create the conf.db database' - Execute="immediate" /> - <CustomAction Id="GenerateConfDB" - BinaryKey="OVSActions" - JScriptCall="runCommandAction" Execute="deferred" Return="check" Impersonate="no" /> - - <CustomAction Id="InitializeDB_Prop" Property="InitializeDB" - Value='"[BINARIESDIR]ovs-vsctl.exe" --no-wait --db=unix:"[APPDATADIR]db.sock" init|0|ovs-vsctl failed to initialize the database' - Execute="immediate" /> - <CustomAction Id="InitializeDB" - BinaryKey="OVSActions" - JScriptCall="runCommandAction" Execute="deferred" Return="check" Impersonate="no" /> - - <CustomAction Id="InstallOpenVSwitchDriver_Prop" Property="InstallOpenVSwitchDriver" - Value='"$(var.NetcfgFolder)\netcfg.exe" -l "[DRIVERDIR]\ovsext.inf" -c s -i ovsext|0|netcfg failed to install the Open vSwitch Hyper-V switch extension' - Execute="immediate" /> - <CustomAction Id="InstallOpenVSwitchDriver" - BinaryKey="OVSActions" - JScriptCall="runCommandAction" Execute="deferred" Return="check" Impersonate="no" /> - - <CustomAction Id="UninstallOpenVSwitchDriver_Prop" Property="UninstallOpenVSwitchDriver" - Value='"$(var.NetcfgFolder)\netcfg.exe" -u ovsext|0|netcfg failed to uninstall the Open vSwitch Hyper-V switch extension' - Execute="immediate" /> - <CustomAction Id="UninstallOpenVSwitchDriver" - BinaryKey="OVSActions" - JScriptCall="runCommandAction" Execute="deferred" Return="check" Impersonate="no" /> - - <CustomAction Id="RestartOvsdbServerService_Prop" Return="check" Property="ChangeOvsdbServerService" - Value="ovsdb-server||Restart" /> - <CustomAction Id="StartOvsdbServerService_Prop" Return="check" Property="ChangeOvsdbServerService" - Value="ovsdb-server||Start" /> - <CustomAction Id="ChangeOvsdbServerService" - BinaryKey="OVSActions" - JScriptCall="changeServiceAction" Execute="deferred" Return="check" Impersonate="no" /> - - <CustomAction Id="RestartOvsVSwitchdService_Prop" Return="check" Property="ChangeOvsVSwitchdService" - Value="ovs-vswitchd||Restart" /> - <CustomAction Id="StartOvsVSwitchdService_Prop" Return="check" Property="ChangeOvsVSwitchdService" - Value="ovs-vswitchd||Start" /> - <CustomAction Id="ChangeOvsVSwitchdService" - BinaryKey="OVSActions" - JScriptCall="changeServiceAction" Execute="deferred" Return="check" Impersonate="no" /> - <CustomAction Id="AddTriggerToOvsVswitchdService_Prop" Property="AddTriggerToOvsVswitchdService" - Value='"[System64Folder]sc.exe" triggerinfo ovs-vswitchd "start/strcustom/6066F867-7CA1-4418-85FD-36E3F9C0600C/VmmsWmiEventProvider"|0|failed to add triggerinfo to ovs-vswitchd service' - Execute="immediate" /> - <CustomAction Id="AddTriggerToOvsVswitchdService" - BinaryKey="OVSActions" - JScriptCall="runCommandAction" Execute="deferred" Return="check" Impersonate="no" /> - </Fragment> -</Wix> diff --git a/windows/ovs-windows-installer/Dialogs/BeginningDialog.wxs b/windows/ovs-windows-installer/Dialogs/BeginningDialog.wxs deleted file mode 100644 index ca1780ff7..000000000 --- a/windows/ovs-windows-installer/Dialogs/BeginningDialog.wxs +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - <copyright company="Cloudbase Solutions Srl"> - Copyright 2015 Cloudbase Solutions Srl - - Licensed 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. - </copyright> ---> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";> - <Fragment> - <UI> - <Dialog Id="BeginningDialog" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)"> - <Control Id="Title" Type="Text" X="135" Y="20" Width="212" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" /> - <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> - <Control Id="Description" Type="Text" X="135" Y="80" Width="212" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)"> - <Condition Action="show">NOT Installed OR NOT PATCH</Condition> - <Condition Action="hide">Installed AND PATCH</Condition> - </Control> - <Control Id="PatchDescription" Type="Text" X="135" Y="80" Width="212" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeUpdateDlgDescriptionUpdate)"> - <Condition Action="show">Installed AND PATCH</Condition> - <Condition Action="hide">NOT Installed OR NOT PATCH</Condition> - </Control> - <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" /> - <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> - <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)"> - <Publish Property="WixUI_InstallMode" Value="Update">Installed AND PATCH</Publish> - </Control> - <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> - <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> - </Control> - </Dialog> - - <InstallUISequence> - <Show Dialog="BeginningDialog" Before="ProgressDlg" Overridable="yes">NOT Installed OR PATCH</Show> - </InstallUISequence> - - </UI> - </Fragment> -</Wix> \ No newline at end of file diff --git a/windows/ovs-windows-installer/Dialogs/MyEndDialog.wxs b/windows/ovs-windows-installer/Dialogs/MyEndDialog.wxs deleted file mode 100644 index 064ccc5b0..000000000 --- a/windows/ovs-windows-installer/Dialogs/MyEndDialog.wxs +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - <copyright company="Cloudbase Solutions Srl"> - Copyright 2015 Cloudbase Solutions Srl - - Licensed 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. - </copyright> ---> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";> - <Fragment> - <UI> - <Dialog Id="MyEndDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)"> - <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" /> - <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> - <Control Id="Description" Type="Text" X="135" Y="70" Width="212" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" /> - <Control Id="OptionalText" Type="Text" X="135" Y="110" Width="212" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]" /> - <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="212" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]" /> - <Control Id="Title" Type="Text" X="135" Y="20" Width="212" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" /> - <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" /> - <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" /> - <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> - </Dialog> - - <AdminUISequence> - <Show Dialog="MyEndDialog" OnExit="success" Overridable="yes" /> - </AdminUISequence> - - <InstallUISequence> - <Show Dialog="MyEndDialog" OnExit="success" Overridable="yes" /> - </InstallUISequence> - - </UI> - </Fragment> -</Wix> diff --git a/windows/ovs-windows-installer/Dialogs/MyTroubleshootDialog.wxs b/windows/ovs-windows-installer/Dialogs/MyTroubleshootDialog.wxs deleted file mode 100644 index f567ba6a8..000000000 --- a/windows/ovs-windows-installer/Dialogs/MyTroubleshootDialog.wxs +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - <copyright company="Cloudbase Solutions Srl"> - Copyright 2015 Cloudbase Solutions Srl - - Licensed 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. - </copyright> ---> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";> - <Fragment> - <UI> - <Dialog Id="MyTroubleshootDialog" Width="370" Height="270" Title="!(loc.MaintenanceWelcomeDlg_Title)"> - <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)"> - <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> - </Control> - <Control Id="Description" Type="Text" X="135" Y="70" Width="210" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceWelcomeDlgDescription)" /> - <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.MaintenanceWelcomeDlgBitmap)" /> - <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)"> - <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish> - </Control> - <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> - <Control Id="Title" Type="Text" X="135" Y="20" Width="210" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.MaintenanceWelcomeDlgTitle)" /> - <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> - </Dialog> - - <InstallUISequence> - <Show Dialog="MyTroubleshootDialog" Before="ProgressDlg" Overridable="yes">Installed AND NOT RESUME AND NOT Preselected AND NOT PATCH</Show> - </InstallUISequence> - - </UI> - </Fragment> -</Wix> diff --git a/windows/ovs-windows-installer/Dialogs/UserFinishDialog.wxs b/windows/ovs-windows-installer/Dialogs/UserFinishDialog.wxs deleted file mode 100644 index 397ee04b4..000000000 --- a/windows/ovs-windows-installer/Dialogs/UserFinishDialog.wxs +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - <copyright company="Cloudbase Solutions Srl"> - Copyright 2015 Cloudbase Solutions Srl - - Licensed 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. - </copyright> ---> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";> - <Fragment> - <UI> - <Dialog Id="UserFinishDialog" Width="370" Height="270" Title="!(loc.UserExit_Title)"> - <Control Id="Title" Type="Text" X="135" Y="20" Width="210" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.UserExitTitle)" /> - <Control Id="Description" Type="Text" X="135" Y="80" Width="210" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.UserExitDescription1) !(loc.UserExitDescription2)" /> - <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.UserExitBitmap)" /> - <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" /> - <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> - <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> - <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)"> - <Publish Event="EndDialog" Value="Exit">1</Publish> - </Control> - </Dialog> - - <AdminUISequence> - <Show Dialog="UserFinishDialog" OnExit="cancel" Overridable="yes" /> - </AdminUISequence> - - <InstallUISequence> - <Show Dialog="UserFinishDialog" OnExit="cancel" Overridable="yes" /> - </InstallUISequence> - - </UI> - </Fragment> -</Wix> \ No newline at end of file diff --git a/windows/ovs-windows-installer/Driver/.gitignore b/windows/ovs-windows-installer/Driver/.gitignore deleted file mode 100644 index 3de517016..000000000 --- a/windows/ovs-windows-installer/Driver/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -* - -!.gitignore -!Win8 -!Win8.1 -!Win10 diff --git a/windows/ovs-windows-installer/Driver/Win10/.gitignore b/windows/ovs-windows-installer/Driver/Win10/.gitignore deleted file mode 100644 index cec9082b6..000000000 --- a/windows/ovs-windows-installer/Driver/Win10/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* - -!.gitignore diff --git a/windows/ovs-windows-installer/Driver/Win8.1/.gitignore b/windows/ovs-windows-installer/Driver/Win8.1/.gitignore deleted file mode 100644 index cec9082b6..000000000 --- a/windows/ovs-windows-installer/Driver/Win8.1/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* - -!.gitignore diff --git a/windows/ovs-windows-installer/Driver/Win8/.gitignore b/windows/ovs-windows-installer/Driver/Win8/.gitignore deleted file mode 100644 index cec9082b6..000000000 --- a/windows/ovs-windows-installer/Driver/Win8/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* - -!.gitignore diff --git a/windows/ovs-windows-installer/License.rtf b/windows/ovs-windows-installer/License.rtf deleted file mode 100644 index 727e7cea0..000000000 --- a/windows/ovs-windows-installer/License.rtf +++ /dev/null @@ -1,209 +0,0 @@ -{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;} -{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;} -{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;} -{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f39\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f40\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\f42\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f43\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f44\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f45\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\f46\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f47\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f49\fbidi \fswiss\fcharset238\fprq2 Arial CE;}{\f50\fbidi \fswiss\fcharset204\fprq2 Arial Cyr;} -{\f52\fbidi \fswiss\fcharset161\fprq2 Arial Greek;}{\f53\fbidi \fswiss\fcharset162\fprq2 Arial Tur;}{\f54\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f55\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);} -{\f56\fbidi \fswiss\fcharset186\fprq2 Arial Baltic;}{\f57\fbidi \fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f379\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f380\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} -{\f382\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f383\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f386\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f387\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} -{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} -{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} -{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;} -{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;} -{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} -{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} -{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} -{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} -{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} -{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} -{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} -{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}} -{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0; -\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\upr{\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 -\ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* -\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused -Normal Table;}}{\*\ud\uc0{\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 -\fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* -\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused -Normal Table;}}}}{\*\rsidtbl \rsid2365717\rsid7145912\rsid7612545}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\operator alin.cloudbase} -{\creatim\yr2015\mo4\dy2\hr16\min46}{\revtim\yr2015\mo5\dy25\hr20\min39}{\version3}{\edmins0}{\nofpages1}{\nofwords86}{\nofchars492}{\nofcharsws577}{\vern57439}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}} -\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect -\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701 -\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot7145912 \nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1 -\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5 -\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang -{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\qj \li0\ri0\nowidctlpar\tx959\tx1918\tx2877\tx3836\tx4795\tx5754\tx6713\tx7672\tx8631\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 -\af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid2365717 \hich\af1\dbch\af31505\loch\f1 -Licensed under the Apache License, Version 2.0 (the "License"); -\par \hich\af1\dbch\af31505\loch\f1 you may not use this file except in compliance with the License. -\par \hich\af1\dbch\af31505\loch\f1 You may obtain a copy of the License at -\par -\par }{\field{\*\fldinst {\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid2365717 \hich\af1\dbch\af31505\loch\f1 HYPERLINK http://www.apache.org/licenses/LICENSE-2.0 }{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid7145912 {\*\datafield -00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b6e00000068007400740070003a002f002f007700770077002e006100700061006300680065002e006f00720067002f006c006900630065006e007300650073002f004c004900430045004e00530045002d0032002e00 -30000000795881f43b1d7f48af2c825dc485276300000000a5ab000069}}}{\fldrslt {\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid2365717 \hich\af1\dbch\af31505\loch\f1 http://www.apache.org/licenses/LICENSE-2.0}}}\sectd \ltrsect\linex0\sectdefaultcl\sftnbj { -\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid2365717 -\par -\par \hich\af1\dbch\af31505\loch\f1 Un\hich\af1\dbch\af31505\loch\f1 less required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, -\par \hich\af1\dbch\af31505\loch\f1 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -\par \hich\af1\dbch\af31505\loch\f1 See the License for the specific language governing\hich\af1\dbch\af31505\loch\f1 permissions and -\par \hich\af1\dbch\af31505\loch\f1 limitations under the License. -\par }\pard \ltrpar\qj \li0\ri0\sa200\sl276\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\lang16\langfe1033\langnp16\insrsid2365717 -\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a -9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad -5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 -b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 -0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 -a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f -c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 -0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 -a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 -6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b -4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b -4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100e67505bed10600008b1a0000160000007468656d652f7468656d652f -7468656d65312e786d6cec59cf8b1b3714be17fa3f0c7377fc6bc63f9638c11edb499b6c1262272547d9963dca6a466624efc68440498e8542695a7a68a0b71e -4adb4002bda4b7fe276953da14fa2ff449331e4bb6dcdd2c292c256b58c6f2f79e3ebdf7e67b9ad1f98bf722ea1ce2841316b7dcf2b992ebe078cc26249eb5dc -5bc37ea1e13a5ca07882288b71cb5d62ee5ebcf0fe7be7d19e0871841db08ff91e6ab9a110f3bd62918f6118f1736c8e63f86dca920809f89acc8a93041d81df -88162ba552ad182112bb4e8c22703bc4d12f8f9cebd3291963f7c2ca798fc20cb1e072604c9381748d330b0d3b39284b045ff28026ce21a22d17e699b0a321be -275c87222ee087965b527f6ef1c2f922dacb8ca8d861abd9f5d55f6697194c0e2a6ace6436ca27f53cdfabb573ff0a40c536ae57efd57ab5dc9f02a0f118569a -72d17dfa9d66a7eb67580d945e5a7c77ebdd6ad9c06bfeab5b9cdbbefc1878054afd7b5bf87e3f80281a78054af1fe16def3ea95c033f00a94e26b5bf87aa9dd -f5ea065e81424ae2832d74c9af5583d56a73c894d1cb5678d3f7faf54ae67c8d826ac8ab4b4e3165b1d8556b11bacb923e002490224162472ce7788ac650c501 -a2649410e72a998550787314330ec3a54aa95faac27ff9f1d4958a08dac348b396bc8009df1a927c1c3e4ec85cb4dc0fc1abab41fe7ef1fddf2f9e392f1f3e7f -f9f0a7978f1ebd7cf863eac8b0ba8ce2996ef5fadbcffe7af2b1f3e7b36f5e3ffec28ee73afeb71f3ef9f5e7cfed4058e93a04afbe7cfafbf3a7afbefaf48fef -1e5be0ed048d74f89044983bd7f091739345b030150293391e256f66310c11d12ddaf18ca318c9592cfe7b2234d0d79688220bae83cd08de4e40626cc04b8bbb -06e141982c04b178bc124606709f31da6189350a57e45c5a98878b78669f3c59e8b89b081ddae60e506ce4b7b79883b6129bcb20c406cd1b14c502cd708c8523 -7f6307185b5677871023aefb649c30cea6c2b9439c0e22d6900cc9c8a8a6b5d16512415e963682906f2336fbb79d0ea3b65577f1a18984bb02510bf921a64618 -2fa1854091cde51045540ff85524421bc9c13219ebb81e1790e919a6cce94d30e7369beb09ac574bfa1590177bdaf7e9323291892007369f5711633ab2cb0e82 -1045731b7640e250c77ec00fa044917383091b7c9f997788fc0e7940f1ce74df26d848f7f16a700b9455a7b42e10f9cb22b1e4f2126646fd0e96748ab0921a10 -7e43cf23121f2bee1bb2eeffb7b20e42faeaeb2796559d55416f27c47a475dde90f15db84df10e583221675fbbbb6811dfc070bb6c37b077d2fd4ebaddffbd74 -efba9fdfbe60af351ae45b6e15d3adbadab8473bf7ed5342e9402c29becad5d69d43679af46150daa967569c3fc7cd43b89477324c60e0660952364ec2c44744 -848310cd617f5f76a59319cf5ccfb833671cb6fd6ad8ea5be2e922da6793f471b55c968fa6a9787024d6e3253f1f87470d91a26bf5f52358ee5eb19da947e515 -0169fb2624b4c94c12550b89fa6a5006493d9843d02c24d4cade0a8ba6854543ba5fa56a8b0550cbb3025b2707365c2dd7f7c0048ce0890a513c91794a53bdca -ae4ae6dbccf4ae601a1500fb885505ac33dd945c772e4fae2e2db51364da20a1959b49424546f5301ea209ceaa538e9e84c69be6bab94ea9414f8642cd07a5b5 -a6516ffc1b8bd3e61aec36b581c6ba52d0d8396ab9b5aa0f253346f3963b85c77eb88ce6503b5c6e79119dc1bbb3b148d21bfe34ca324fb8e8221ea60157a293 -aa4144044e1c4aa2962b979fa781c64a4314b7720504e1cc926b82ac9c3572907433c9783ac563a1a75d1b91914ebf82c2a75a61fd55999f1e2c2dd902d23d08 -2747ce882e929b084accaf9765002784c3db9f721acd0981d799b990adeb6fa33165b2abbf4f5435948e233a0f51d65174314fe14aca733aea5b1e03ed5bb666 -08a81692ac118e66b2c1ea4135ba69de35520e3bbbeef14632729a68ae7ba6a12ab26bda55cc9861d506366279ba26afb15a8518344deff0a9746f4a6e73a575 -1bfb84bc4b40c0f3f859baee091a82466d3d99414d32de9661a9d9d9a8d93b560b3c86da499a84a6fab595db8db8e53dc23a1d0c9eaaf383dd66d5c2d074b5af -549156e71efad1041bdd05f1e8c24be005155ca5120e1e12041ba281da93a4b201b7c83d91dd1a70e52c12d272ef97fcb61754fca0506af8bd8257f54a8586df -ae16dabe5f2df7fc72a9dba93c80c622c2a8eca7672e7d78154597d9c98b1adf3a7d89566fdbce8d595464ea5ca5a888abd39772c5387d49cf529ca13c5e711d -02a273bf56e937abcd4eadd0acb6fb05afdb69149a41ad53e8d6827ab7df0dfc46b3ffc0750e15d86b5703afd66b146ae5202878b592a4df6816ea5ea5d2f6ea -ed46cf6b3fc8b631b0f2543eb258407815af0bff000000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f74 -68656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f24 -51eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198 -720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528 -a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c0200001300000000000000000000000000 -000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b000000000000000000000000 -00300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000190200007468 -656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100e67505bed10600008b1a000016000000000000000000 -00000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b010000270000000000 -0000000000000000db0900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000d60a00000000} -{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d -617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 -6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 -656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} -{\*\latentstyles\lsdstimax371\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; -\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; -\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; -\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; -\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; -\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; -\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; -\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1; -\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid; -\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid; -\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2; -\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1; -\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1; -\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1; -\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2; -\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3; -\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4; -\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; -\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; -\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; -\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; -\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; -\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; -\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; -\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; -\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; -\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; -\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; -\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; -\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; -\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; -\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; -\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; -\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; -\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; -\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; -\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; -\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; -\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; -\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; -\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; -\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; -\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; -\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; -\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; -\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; -\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; -\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;}}{\*\datastore 010500000200000018000000 -4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 -d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000000ca -63ca1197d001feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs deleted file mode 100644 index 61289da6b..000000000 --- a/windows/ovs-windows-installer/Product.wxs +++ /dev/null @@ -1,282 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - <copyright company="Cloudbase Solutions Srl"> - Copyright 2015 Cloudbase Solutions Srl - - Licensed 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. - </copyright> ---> -<!-- - Predefined variables with regards of the platform we are building for ---> -<?if $(var.Platform) = x64 ?> - <?define Win64 = "yes" ?> - <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?> -<?else ?> - <?define Win64 = "no" ?> - <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?> -<?endif ?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"; - xmlns:util="http://schemas.microsoft.com/wix/UtilExtension";> - <Product Id="{0DF60ED5-6C22-49A0-913E-77412D35C400}" Name="Open vSwitch for Hyper-V" Language="1033" Version="$(var.Version)" - Manufacturer="The Linux Foundation©" UpgradeCode="da802b12-433d-4742-a7ae-783aa0c48222"> - <Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine" InstallPrivileges="elevated" Platform="x64" /> - - <Property Id="Description" Value="Open vSwitch Extension" /> - <Property Id="DriverID" Value="{583CC151-73EC-4A6A-8B47-578297AD7623}" /> - <Property Id="DriverVersion" Value="$(var.Version)" /> - <Property Id="ExtensionType" Value="Forwarding" /> - <Property Id="BUILDNUMBER" Secure="yes"> - <RegistrySearch Id="Test" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuild" Type="raw" /> - </Property> - - <Condition Message="This application is only supported on Windows 2012 or higher."> - <![CDATA[Installed OR (VersionNT >= 602)]]> - </Condition> - - <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> - <MediaTemplate EmbedCab="yes" CompressionLevel="mszip" /> - - <Feature Id="OpenvSwitchCLI" Title="Open vSwitch CLI" Level="1" Absent="disallow" InstallDefault="local" TypicalDefault="install" AllowAdvertise="no" - Description="Installs the Open vSwitch command line tools." - ConfigurableDirectory="INSTALLDIR" Display="expand"> - <ComponentGroupRef Id="BinariesComponentGroup" /> - <ComponentGroupRef Id="SymbolsComponentGroup" /> - <ComponentRef Id="OpenvSwitchEnvVars" /> - - <Feature Id="VC140Redistx86" Title="Visual C++ 14 Runtime x86" AllowAdvertise="no" Display="hidden" Level="1" - Absent="disallow" InstallDefault="followParent" TypicalDefault="install"> - <MergeRef Id="VC140Redistx86" /> - </Feature> - <Feature Id="VC140Redistx64" Title="Visual C++ 14 Runtime x64" AllowAdvertise="no" Display="hidden" Level="1" - Absent="disallow" InstallDefault="followParent" TypicalDefault="install"> - <MergeRef Id="VC140Redistx64" /> - </Feature> - </Feature> - - <Feature Id="OpenvSwitchDriver" Title="Open vSwitch Hyper-V driver" Level="1" Absent="allow" InstallDefault="local" TypicalDefault="install" AllowAdvertise="no" - Description="Installs the Open vSwitch Hyper-V switch extension driver." Display="expand"> - <ComponentRef Id="OpenvSwitchDriver_Win8" /> - <ComponentRef Id="OpenvSwitchDriver_Win8.1" /> - <ComponentRef Id="OpenvSwitchDriver_Win10" /> - <ComponentRef Id="ConfDir" /> - <ComponentRef Id="LogsDir" /> - <ComponentRef Id="AppDataDir" /> - <ComponentRef Id="OvsdbServerService" /> - <ComponentRef Id="OvsVSwitchdService" /> - <ComponentRef Id="OpenvSwitchPSModule" /> - </Feature> - - <UIRef Id="MyWixUI_FeatureTree" /> - <UIRef Id="WixUI_ErrorProgressText" /> - - <WixVariable Id="WixUIBannerBmp" Value="images\bannrbmp.bmp" /> - <WixVariable Id="WixUIDialogBmp" Value="images\dlgbmp.bmp" /> - <WixVariable Id="WixUILicenseRtf" Value="License.rtf" /> - - <InstallExecuteSequence> - <Custom Action="InstallOpenVSwitchDriver_Prop" After="CostFinalize"><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - <Custom Action="InstallOpenVSwitchDriver" Before="ChangeOvsVSwitchdService" ><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - - <Custom Action="UninstallOpenVSwitchDriver_Prop" After="CostFinalize"><![CDATA[(&OpenvSwitchDriver=2) AND (!OpenvSwitchDriver=3)]]></Custom> - <Custom Action="UninstallOpenVSwitchDriver" Before="InstallFinalize" ><![CDATA[(&OpenvSwitchDriver=2) AND (!OpenvSwitchDriver=3)]]></Custom> - - <Custom Action="GenerateConfDB_Prop" After="CostFinalize"><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - <Custom Action="GenerateConfDB" Before="ChangeOvsdbServerService" ><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - - <Custom Action="StartOvsdbServerService_Prop" After="CostFinalize"><![CDATA[NOT Installed AND (&OpenvSwitchDriver = 3)]]></Custom> - <Custom Action="RestartOvsdbServerService_Prop" After="CostFinalize"><![CDATA[Installed AND REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - <Custom Action="ChangeOvsdbServerService" Before="ChangeOvsVSwitchdService"><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - - <Custom Action="InitializeDB_Prop" After="CostFinalize"><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - <Custom Action="InitializeDB" After="ChangeOvsdbServerService" ><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - - <Custom Action="AddTriggerToOvsVswitchdService_Prop" After="CostFinalize"><![CDATA[NOT Installed AND (&OpenvSwitchDriver = 3)]]></Custom> - <Custom Action="AddTriggerToOvsVswitchdService" Before="ChangeOvsVSwitchdService"><![CDATA[NOT Installed AND (&OpenvSwitchDriver = 3)]]></Custom> - <Custom Action="StartOvsVSwitchdService_Prop" After="CostFinalize"><![CDATA[NOT Installed AND (&OpenvSwitchDriver = 3)]]></Custom> - <Custom Action="RestartOvsVSwitchdService_Prop" After="CostFinalize"><![CDATA[Installed AND REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - <Custom Action="ChangeOvsVSwitchdService" Before="InstallFinalize"><![CDATA[REMOVE <> "ALL" AND (&OpenvSwitchDriver = 3)]]></Custom> - </InstallExecuteSequence> - </Product> - - <Fragment> - <Directory Id="TARGETDIR" Name="SourceDir"> - <Directory Id="$(var.PlatformProgramFilesFolder)"> - <Directory Id="INSTALLDIR" Name="Open vSwitch" /> - </Directory> - <Directory Id="CommonAppDataFolder"> - <Directory Id="APPDATADIR" Name="openvswitch"> - <Component Id="AppDataDir" Guid="{9FAA3CD1-2234-4D6E-A974-D3D48A40773F}"> - <CreateFolder /> - </Component> - </Directory> - </Directory> - </Directory> - - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="BINARIESDIR" Name="bin" /> - </DirectoryRef> - - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="SYMBOLSDIR" Name="symbols" /> - </DirectoryRef> - - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="DRIVERDIR" Name="driver" /> - </DirectoryRef> - - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="LOGSDIR" Name="logs"> - <Component Id="LogsDir" Guid="{CA78C399-6E2C-4D39-88FB-1F58AC9DF8AC}"> - <CreateFolder /> - </Component> - </Directory> - </DirectoryRef> - - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="CONFDIR" Name="conf" /> - </DirectoryRef> - </Fragment> - - <Fragment> - <DirectoryRef Id="TARGETDIR"> - <Directory Id="System64Folder" Name="System64Folder"> - <Directory Id="WindowsPowerShell" Name="WindowsPowerShell"> - <Directory Id="v1.0" Name="v1.0"> - <Directory Id="Modules" Name="Modules"> - <Directory Id="OVSPSMODULEDIR" Name="OVS" /> - </Directory> - </Directory> - </Directory> - </Directory> - </DirectoryRef> - - <Component Id="OpenvSwitchPSModule" Directory="OVSPSMODULEDIR" Guid="{91819E0F-36F9-44C1-BCA3-973AE991E386}" Win64="yes"> - <File Id="OVS.psm1" Source="Services\OVS.psm1" Checksum="yes" KeyPath="yes" /> - </Component> - </Fragment> - - <Fragment> - <DirectoryRef Id="TARGETDIR"> - <Component Id="OpenvSwitchEnvVars" Guid="{4FCCA9D3-77BE-4283-815E-E3E63D4BF763}"> - <Environment Id="PATH" Name="PATH" Value="[BINARIESDIR]" Permanent="no" Part="last" Action="set" System="yes" /> - <Environment Id="OVS_RUNDIR" Name="OVS_RUNDIR" Value="[APPDATADIR]" Permanent="no" Part="all" Action="set" System="yes" /> - <Environment Id="OVS_PKGDATADIR" Name="OVS_PKGDATADIR" Value="[DRIVERDIR]" Permanent="no" Part="all" Action="set" System="yes" /> - <Environment Id="OVS_LOGDIR" Name="OVS_LOGDIR" Value="[LOGSDIR]" Permanent="no" Part="all" Action="set" System="yes" /> - <Environment Id="OVS_SYSCONFDIR" Name="OVS_SYSCONFDIR" Value="[CONFDIR]" Permanent="no" Part="all" Action="set" System="yes" /> - <Environment Id="OVS_BINDIR" Name="OVS_BINDIR" Value="[BINARIESDIR]" Permanent="no" Part="all" Action="set" System="yes" /> - </Component> - </DirectoryRef> - </Fragment> - - <Fragment> - <Component Id="ConfDir" Directory="CONFDIR" Guid="{6DB7BC99-FF12-41E2-9EAA-A98A579BE27B}"> - <File Id="vswitch.ovsschema" Source="Services\vswitch.ovsschema" Checksum="yes" KeyPath="yes" /> - <RemoveFile Id="removeConfDb" Name="conf.db" On="install" /> - <RemoveFile Id="removeConfDbLock" Name=".conf.db.~lock~" On="install" /> - </Component> - - <Component Id="OvsdbServerService" Directory="BINARIESDIR" Guid="{280201D5-35E7-45D6-83B9-293F1A4F7F0E}"> - <File Id="ovsdbserver.exe" Source="Services\ovsdb-server.exe" Checksum="yes" /> - <ServiceInstall - Arguments='--log-file="[LOGSDIR]ovsdb-server.log" --pidfile --service --service-monitor --unixctl="[APPDATADIR]ovsdb-server.ctl" --remote=punix:"[APPDATADIR]db.sock" "[CONFDIR]conf.db"' - Id="OvsdbServerServiceInstaller" - Type="ownProcess" - Vital="yes" - Name="ovsdb-server" - DisplayName="Open vSwitch DB Service" - Description="Open vSwitch DB Service" - Start="auto" - Account="LocalSystem" - ErrorControl="ignore" - Interactive="no"> - <ServiceDependency Id="vmms" /> - </ServiceInstall> - <!-- Start service at the end of the setup, not here --> - <ServiceControl - Id="OvsdbServerServiceStartService" - Stop="both" - Remove="uninstall" - Name="ovsdb-server" - Wait="yes" /> - <util:ServiceConfig - ServiceName="ovsdb-server" - FirstFailureActionType="restart" - SecondFailureActionType="restart" - ThirdFailureActionType="restart" - RestartServiceDelayInSeconds="1" /> - </Component> - - <Component Id="OvsVSwitchdService" Directory="BINARIESDIR" Guid="{A2ED5531-B2D7-4CD3-8ADE-B525A8BEB957}"> - <File Id="ovsvswitchd.exe" Source="Services\ovs-vswitchd.exe" Checksum="yes" /> - <ServiceInstall - Arguments='--log-file="[LOGSDIR]ovs-vswitchd.log" unix:"[APPDATADIR]db.sock" --unixctl="[APPDATADIR]ovs-vswitchd.ctl" --pidfile --service --service-monitor' - Id="OvsVSwitchdServiceServiceInstaller" - Type="ownProcess" - Vital="yes" - Name="ovs-vswitchd" - DisplayName="Open vSwitch Service" - Description="Open vSwitch Service" - Start="demand" - Account="LocalSystem" - ErrorControl="ignore" - Interactive="no"> - <ServiceDependency Id="ovsdb-server" /> - </ServiceInstall> - <!-- Start service at the end of the setup, not here --> - <ServiceControl - Id="OvsVSwitchdServiceServiceStartService" - Stop="both" - Remove="uninstall" - Name="ovs-vswitchd" - Wait="yes" /> - <util:ServiceConfig - ServiceName="ovs-vswitchd" - FirstFailureActionType="restart" - SecondFailureActionType="restart" - ThirdFailureActionType="restart" - RestartServiceDelayInSeconds="1" /> - </Component> - </Fragment> - - <Fragment> - <DirectoryRef Id="DRIVERDIR"> - <Component Id='OpenvSwitchDriver_Win8' Guid='{7A1E2446-8196-4738-8362-5CFD55896A7B}'> - <Condition><![CDATA[VersionNT = "602"]]></Condition> - <File Id='win8_ovsext.sys' Name='ovsext.sys' DiskId='1' Source='Driver\Win8\ovsext.sys' Checksum='yes' KeyPath='yes' /> - <File Id='win8_ovsext.inf' Name='ovsext.inf' DiskId='1' Source='Driver\Win8\ovsext.inf' Checksum='yes' /> - <File Id='win8_ovsext.cat' Name='ovsext.cat' DiskId='1' Source='Driver\Win8\ovsext.cat' Checksum='yes' /> - </Component> - <Component Id='OpenvSwitchDriver_Win8.1' Guid='{7A1E2446-8196-4738-8362-5CFD55896A7C}'> - <Condition><![CDATA[(VersionNT = "603") AND (BUILDNUMBER < 10000)]]></Condition> - <File Id='win81_ovsext.sys' Name='ovsext.sys' DiskId='1' Source='Driver\Win8.1\ovsext.sys' Checksum='yes' KeyPath='yes'/> - <File Id='win81_ovsext.inf' Name='ovsext.inf' DiskId='1' Source='Driver\Win8.1\ovsext.inf' Checksum='yes' /> - <File Id='win81_ovsext.cat' Name='ovsext.cat' DiskId='1' Source='Driver\Win8.1\ovsext.cat' Checksum='yes' /> - </Component> - <Component Id='OpenvSwitchDriver_Win10' Guid='{7A1E2446-8196-4738-8362-5CFD55896A7D}'> - <Condition><![CDATA[BUILDNUMBER > 10000]]></Condition> - <File Id='win10_ovsext.sys' Name='ovsext.sys' DiskId='1' Source='Driver\Win10\ovsext.sys' Checksum='yes' KeyPath='yes'/> - <File Id='win10_ovsext.inf' Name='ovsext.inf' DiskId='1' Source='Driver\Win10\ovsext.inf' Checksum='yes' /> - <File Id='win10_ovsext.cat' Name='ovsext.cat' DiskId='1' Source='Driver\Win10\ovsext.cat' Checksum='yes' /> - </Component> - </DirectoryRef> - </Fragment> - - <Fragment> - <DirectoryRef Id="TARGETDIR"> - <Merge Id="VC140Redistx86" SourceFile="Redist\Microsoft_VC140_CRT_x86.msm" DiskId="1" Language="0" /> - <Merge Id="VC140Redistx64" SourceFile="Redist\Microsoft_VC140_CRT_x64.msm" DiskId="1" Language="0" /> - </DirectoryRef> - </Fragment> - -</Wix> diff --git a/windows/ovs-windows-installer/Redist/.gitignore b/windows/ovs-windows-installer/Redist/.gitignore deleted file mode 100644 index cec9082b6..000000000 --- a/windows/ovs-windows-installer/Redist/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* - -!.gitignore diff --git a/windows/ovs-windows-installer/Services/.gitignore b/windows/ovs-windows-installer/Services/.gitignore deleted file mode 100644 index cec9082b6..000000000 --- a/windows/ovs-windows-installer/Services/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* - -!.gitignore diff --git a/windows/ovs-windows-installer/Symbols/.gitignore b/windows/ovs-windows-installer/Symbols/.gitignore deleted file mode 100644 index cec9082b6..000000000 --- a/windows/ovs-windows-installer/Symbols/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* - -!.gitignore diff --git a/windows/ovs-windows-installer/UI.wxs b/windows/ovs-windows-installer/UI.wxs deleted file mode 100644 index 5df4f4f59..000000000 --- a/windows/ovs-windows-installer/UI.wxs +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - <copyright company="Cloudbase Solutions Srl"> - Copyright 2015 Cloudbase Solutions Srl - - Licensed 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. - </copyright> ---> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";> - <Fragment> - <UI Id="MyWixUI_FeatureTree"> - <TextStyle Id="WixUI_Font_Normal" FaceName="Arial" Size="8" /> - <TextStyle Id="WixUI_Font_Bigger" FaceName="Arial" Size="12" Bold="yes" /> - <TextStyle Id="WixUI_Font_Title" FaceName="Arial" Size="9" Bold="yes" /> - - <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> - <Property Id="WixUI_Mode" Value="FeatureTree" /> - - <DialogRef Id="ErrorDlg" /> - <DialogRef Id="FatalError" /> - <DialogRef Id="FilesInUse" /> - <DialogRef Id="MsiRMFilesInUse" /> - <DialogRef Id="PrepareDlg" /> - <DialogRef Id="ProgressDlg" /> - <DialogRef Id="ResumeDlg" /> - <DialogRef Id="UserFinishDialog" /> - - <Publish Dialog="MyEndDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> - - <Publish Dialog="BeginningDialog" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish> - <Publish Dialog="BeginningDialog" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish> - - <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="BeginningDialog">1</Publish> - <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg">LicenseAccepted = "1"</Publish> - - <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish> - <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish> - <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="BeginningDialog" Order="3">Installed AND PATCH</Publish> - - <Publish Dialog="MyTroubleshootDialog" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> - - <!-- Force elevation during change for product customization--> - <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Property="REINSTALL" Value="ALL">1</Publish> - <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Property="REINSTALLMODE" Value="vamus">1</Publish> - <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Property="REBOOT" Value="ReallySuppress">1</Publish> - - <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> - <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> - <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> - <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MyTroubleshootDialog">1</Publish> - - <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">Installed</Publish> - <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed</Publish> - - <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="1">1</Publish> - <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">1</Publish> - <UIRef Id="WixUI_ErrorProgressText" /> - - <UIRef Id="WixUI_Common" /> - </UI> - </Fragment> -</Wix> diff --git a/windows/ovs-windows-installer/images/bannrbmp.bmp b/windows/ovs-windows-installer/images/bannrbmp.bmp deleted file mode 100644 index 0d0baf328b338b7baa533d1a5e8c5655f924830d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134958 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 s0000000000000000000000000000000000000000000000KnArKTA|$r~m)} diff --git a/windows/ovs-windows-installer/images/dlgbmp.bmp b/windows/ovs-windows-installer/images/dlgbmp.bmp deleted file mode 100644 index e79e3ebba4071023650cc123309ec213b6bc6ebe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460568 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 zlr!#4CR12g*vy$Tw{PEm^XAPSb^!nY00000000000000000000000000000000000 z00000000000000000000000000000000000000000000000000000000000000000 z00000000000000000000000000000000000000000000000000000000000000000 z00000000000000000000000000000000000000000000000000000000000000000 z00000000000000000000000000000000000000000000000000000000000000000 z00000000000000000000000000000000000000000000000000000000000000000 z00000000000000000000000000000000000000000000000000000000000000000 z00000000000000000000000000000000000000000000000000000000000000000 z00000000000000000000000000000000000000000000000000000000000000000 z0000000000000000000000000000000000000000000000000000000fbWF(Kka;= Au>b%7 diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj b/windows/ovs-windows-installer/ovs-windows-installer.wixproj deleted file mode 100644 index 241d605b5..000000000 --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">x86</Platform> - <ProductVersion>3.8</ProductVersion> - <ProjectGuid>259905a2-7434-4190-8a33-8fba67171dd6</ProjectGuid> - <SchemaVersion>2.0</SchemaVersion> - <OutputName>OpenvSwitch</OutputName> - <OutputType>Package</OutputType> - <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> - <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> - <Version Condition=" '$(Version)' == '' ">1.0.0.0</Version> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> - <TestOutOfProccess Condition=" '$(PROCESSOR_ARCHITECTURE)'!='x86' ">true</TestOutOfProccess> - <OutputPath>bin\$(Configuration)\</OutputPath> - <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version)</DefineConstants> - <SuppressAllWarnings>False</SuppressAllWarnings> - <Pedantic>False</Pedantic> - <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> - <TestOutOfProccess Condition=" '$(PROCESSOR_ARCHITECTURE)'!='x86' ">true</TestOutOfProccess> - <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version)</DefineConstants> - <SuppressAllWarnings>False</SuppressAllWarnings> - <Pedantic>False</Pedantic> - <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> - <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> - <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> - </PropertyGroup> - <ItemGroup> - <Compile Include="Binaries.wxs" /> - <Compile Include="CustomActions.wxs" /> - <Compile Include="Dialogs\MyEndDialog.wxs" /> - <Compile Include="Dialogs\MyTroubleshootDialog.wxs" /> - <Compile Include="Dialogs\UserFinishDialog.wxs" /> - <Compile Include="Dialogs\BeginningDialog.wxs" /> - <Compile Include="Product.wxs" /> - <Compile Include="Symbols.wxs" /> - <Compile Include="UI.wxs" /> - </ItemGroup> - <ItemGroup> - <Folder Include="Binaries\" /> - <Folder Include="Dialogs\" /> - <Folder Include="images\" /> - <Folder Include="Actions" /> - <Folder Include="Driver" /> - <Folder Include="Services" /> - <Folder Include="Redist" /> - <Folder Include="Symbols" /> - </ItemGroup> - <ItemGroup> - <Content Include="Actions\OVSActions.js" /> - <Content Include="images\bannrbmp.bmp" /> - <Content Include="images\dlgbmp.bmp" /> - <Content Include="License.rtf" /> - </ItemGroup> - <ItemGroup> - <WixExtension Include="WixUtilExtension"> - <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath> - <Name>WixUtilExtension</Name> - </WixExtension> - <WixExtension Include="WixUIExtension"> - <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath> - <Name>WixUIExtension</Name> - </WixExtension> - </ItemGroup> - <Import Project="$(WixTargetsPath)" /> - <Target Name="BeforeBuild"> - <HeatDirectory RunAsSeparateProcess="$(TestOutOfProccess)" DirectoryRefId="BINARIESDIR" OutputFile="Binaries.wxs" Directory="Binaries" ComponentGroupName="BinariesComponentGroup" ToolPath="$(WixToolPath)" PreprocessorVariable="var.BinariesPath" GenerateGuidsNow="true" SuppressCom="true" SuppressRegistry="true" KeepEmptyDirectories="true" SuppressRootDirectory="true"> - </HeatDirectory> - <HeatDirectory RunAsSeparateProcess="$(TestOutOfProccess)" DirectoryRefId="SYMBOLSDIR" OutputFile="Symbols.wxs" Directory="Symbols" ComponentGroupName="SymbolsComponentGroup" ToolPath="$(WixToolPath)" PreprocessorVariable="var.SymbolsPath" GenerateGuidsNow="true" SuppressCom="true" SuppressRegistry="true" KeepEmptyDirectories="true" SuppressRootDirectory="true"> - </HeatDirectory> - </Target> - <!-- - To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Wix.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project> -- 2.53.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
