Changeset 69407 in vbox for trunk/src/VBox

Timestamp:

Oct 27, 2017 12:27:44 AM (7 years ago)

Author:

vboxsync

Message:

Installer/win: scm updates

Location:

trunk/src/VBox/Installer

Files:

• .scm-settings (modified) (1 diff)
• win/NLS/de_DE.wxl (modified) (2 props)
• win/NLS/en_US.wxl (modified) (2 props)
• win/NLS/fr_FR.wxl (modified) (2 props)
• win/NLS/zh_TW.wxl (modified) (2 props)
• win/VBoxKey.wxi (modified) (1 prop)
• win/VBoxMergeApp.wxi (modified) (2 diffs)
• win/VBoxMergeApp.wxs (modified) (1 diff)
• win/VBoxMergeNetAdp.wxs (modified) (2 diffs)
• win/VBoxMergeNetAdp6.wxs (modified) (1 diff)
• win/VBoxMergeNetFlt.wxs (modified) (1 diff)
• win/VBoxMergeNetLwf.wxs (modified) (1 diff)
• win/VirtualBox.wxs (modified) (2 diffs)
• win/VirtualBox_TypeLib.xsl (modified) (2 diffs)
• win/VirtualBox_TypeLibWithInterfaces.xsl (modified) (3 diffs)

trunk/src/VBox/Installer/.scm-settings

@@ -86 +86 @@
 --filter-out-files /solaris/virtualbox.mime
 
-
-
+# Windows
+/win/MsiHack/MsiHackExtension.cs:               --treat-as .c
+--filter-out-files /win/Stub/VBoxStub.manifest
+/win/NLS/*.wxl:                                 --no-convert-tabs

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -82 +82 @@
         <?include $(env.PATH_TARGET)\VirtualBox_TypeLib.wxi ?>
 <?endif?>
-        
+
 <?if $(env.VBOX_WITH_SDS) = "yes" ?>
         <File Id="VBoxSDS" Name="VBoxSDS.exe"
@@ -124 +124 @@
     <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40"
                Win64="$(var.Property_Win64)" KeyPath="yes">
-               
+
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
             <Condition><![CDATA[(local_VBOX_REGISTERFILEEXTENSIONS="1")]]></Condition>

trunk/src/VBox/Installer/win/VBoxMergeApp.wxs

@@ -52 +52 @@
 
 
-        <Property Id="local_VBOX_REGISTERFILEEXTENSIONS" Value="Empty" /> 
-        <Configuration Name="argRegesterExtensions" Format="Text" DefaultValue="Not passed"/> 
-        <Substitution Table="CustomAction" Row="registerExtensions" Column="Target" Value="[=argRegesterExtensions]"/> 
-        <CustomAction Id="registerExtensions" Property="local_VBOX_REGISTERFILEEXTENSIONS" Value="[local_VBOX_REGISTERFILEEXTENSIONS]" Execute="immediate" /> 
+        <Property Id="local_VBOX_REGISTERFILEEXTENSIONS" Value="Empty" />
+        <Configuration Name="argRegesterExtensions" Format="Text" DefaultValue="Not passed"/>
+        <Substitution Table="CustomAction" Row="registerExtensions" Column="Target" Value="[=argRegesterExtensions]"/>
+        <CustomAction Id="registerExtensions" Property="local_VBOX_REGISTERFILEEXTENSIONS" Value="[local_VBOX_REGISTERFILEEXTENSIONS]" Execute="immediate" />
 
         <!-- Here comes the file/directory list -->

trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs

@@ -38 +38 @@
 
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-        <Property Id="localMSMNetworkType" Value="Empty" /> 
-        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/> 
-        <Substitution Table="CustomAction" Row="setNetworkTypeADP" Column="Target" Value="[=passedNetworkType]"/> 
-        <CustomAction Id="setNetworkTypeADP" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" /> 
+        <Property Id="localMSMNetworkType" Value="Empty" />
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/>
+        <Substitution Table="CustomAction" Row="setNetworkTypeADP" Column="Target" Value="[=passedNetworkType]"/>
+        <CustomAction Id="setNetworkTypeADP" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
         <CustomAction Id="correctNetworkTypeADP" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
 <?endif ?>
@@ -57 +57 @@
         <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
         <?include VBoxMergeNetAdpCA.wxi ?>
-        
+
         <InstallExecuteSequence>
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>

trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs

@@ -38 +38 @@
 
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-        <Property Id="localMSMNetworkType" Value="NDIS6" /> 
-        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/> 
-        <Substitution Table="CustomAction" Row="setNetworkTypeADP6" Column="Target" Value="[=passedNetworkType]"/> 
-        <CustomAction Id="setNetworkTypeADP6" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" /> 
+        <Property Id="localMSMNetworkType" Value="NDIS6" />
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/>
+        <Substitution Table="CustomAction" Row="setNetworkTypeADP6" Column="Target" Value="[=passedNetworkType]"/>
+        <CustomAction Id="setNetworkTypeADP6" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
         <CustomAction Id="correctNetworkTypeADP6" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
 <?endif ?>

trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs

@@ -38 +38 @@
 
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-        <Property Id="localMSMNetworkType" Value="Empty" /> 
-        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/> 
-        <Substitution Table="CustomAction" Row="setNetworkTypeFLT" Column="Target" Value="[=passedNetworkType]"/> 
-        <CustomAction Id="setNetworkTypeFLT" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" /> 
+        <Property Id="localMSMNetworkType" Value="Empty" />
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/>
+        <Substitution Table="CustomAction" Row="setNetworkTypeFLT" Column="Target" Value="[=passedNetworkType]"/>
+        <CustomAction Id="setNetworkTypeFLT" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
         <CustomAction Id="correctNetworkTypeFLT" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
 <?endif ?>

trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs

@@ -38 +38 @@
 
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-        <Property Id="localMSMNetworkType" Value="NDIS6" /> 
-        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/> 
-        <Substitution Table="CustomAction" Row="setNetworkTypeLWF" Column="Target" Value="[=passedNetworkType]"/> 
-        <CustomAction Id="setNetworkTypeLWF" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" /> 
+        <Property Id="localMSMNetworkType" Value="NDIS6" />
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/>
+        <Substitution Table="CustomAction" Row="setNetworkTypeLWF" Column="Target" Value="[=passedNetworkType]"/>
+        <CustomAction Id="setNetworkTypeLWF" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" />
         <CustomAction Id="correctNetworkTypeLWF" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
 <?endif ?>

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -238 +238 @@
     <CustomAction Id="ca_UninstallVBoxSDS" Directory="INSTALLDIR" ExeCommand='"[INSTALLDIR]\VBoxSDS.exe" --unregservice' Return="check" Impersonate="no" />
 <?endif?>
-        
+
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
     <?include VBoxMergeAppCA.wxi ?>
@@ -570 +570 @@
         <!-- Check + unininstall old TAP instances - we  don't need them anymore -->
         <Custom Action="ca_UninstallTAPInstances" Before="InstallFiles" >1</Custom>
-        
+
         <Custom Action="ca_InstallBrandingArgs" Before="ca_InstallBranding" ><![CDATA[NOT REMOVE]]></Custom>
         <Custom Action="ca_InstallBranding" Before="InstallFinalize" ><![CDATA[NOT REMOVE]]></Custom>

trunk/src/VBox/Installer/win/VirtualBox_TypeLib.xsl

@@ -83 +83 @@
         </xsl:if>
     </xsl:template>
-    
+
     <!--
     * applications
@@ -105 +105 @@
         </AppId>
     </xsl:template>
-    
+
 
 <!--

trunk/src/VBox/Installer/win/VirtualBox_TypeLibWithInterfaces.xsl

@@ -90 +90 @@
 </xsl:template>
 
-<!-- 
+<!--
 Applications.
 -->
@@ -179 +179 @@
 </xsl:template>
 
- 
+
 <!--
   Interfaces.
@@ -197 +197 @@
 </xsl:template>
 
-    
+
 
 <!--