[ovs-dev,RFC,v1,2/3] windows, installer: Add a new module file to the installer

Message ID 20181008232654.18608-1-aserdean@ovn.org
State New
Headers show
Series
  • [ovs-dev,RFC,v1,1/3] datapath-windows: Introduce HNS OVS calls
Related show

Commit Message

Alin Gabriel Serdean Oct. 8, 2018, 11:26 p.m.
This patch adds the new powershell module HNSHelper.psm1 to the OVS windows
installer.


Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
---
 windows/automake.mk                       | 1 +
 windows/ovs-windows-installer/Product.wxs | 6 ++++++
 2 files changed, 7 insertions(+)

Patch

diff --git a/windows/automake.mk b/windows/automake.mk
index 80dca1467..79ffe4317 100644
--- a/windows/automake.mk
+++ b/windows/automake.mk
@@ -16,6 +16,7 @@  PTHREAD_TEMP_DIR=`echo "$(PTHREAD_LDFLAGS)" | sed 's|^.\(.*\).$:\1||'`
 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)/datapath-windows/misc/HNSHelper.psm1 windows/ovs-windows-installer/Services/HNSHelper.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
diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs
index ea1bc6896..9742c1773 100644
--- a/windows/ovs-windows-installer/Product.wxs
+++ b/windows/ovs-windows-installer/Product.wxs
@@ -67,6 +67,7 @@ 
       <ComponentRef Id="OvsdbServerService" />
       <ComponentRef Id="OvsVSwitchdService" />
       <ComponentRef Id="OpenvSwitchPSModule" />
+      <ComponentRef Id="HelpersPSModule" />
     </Feature>
 
     <UIRef Id="MyWixUI_FeatureTree" />
@@ -147,6 +148,7 @@ 
           <Directory Id="v1.0" Name="v1.0">
             <Directory Id="Modules" Name="Modules">
               <Directory Id="OVSPSMODULEDIR" Name="OVS" />
+              <Directory Id="CONTAINERSDIR" Name="HNSHelper" />
             </Directory>
           </Directory>
         </Directory>
@@ -156,6 +158,10 @@ 
     <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>
+
+    <Component Id="HelpersPSModule" Directory="CONTAINERSDIR" Guid="{91819E0F-36F9-44C1-DCA3-973AE991E386}" Win64="yes">
+      <File Id="HNSHelper.psm1" Source="Services\HNSHelper.psm1" Checksum="yes" KeyPath="yes" />
+    </Component>
   </Fragment>
 
   <Fragment>