Changeset 64339 in vbox for trunk/src/VBox
- Timestamp:
- Oct 20, 2016 5:27:55 PM (8 years ago)
- Location:
- trunk/src/VBox/Installer/win
- Files:
-
- 4 edited
-
Makefile.kmk (modified) (1 diff)
-
VBoxMergeCOM32On64.wxs (modified) (1 diff)
-
VirtualBox_TypeLib.xsl (modified) (1 diff)
-
VirtualBox_TypeLibWithInterfaces.xsl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/win/Makefile.kmk
r64027 r64339 644 644 -E 'VBOX_MIDL_PROXY_CLSID=$(VBOX_MIDL_PROXY_CLSID)' \ 645 645 -E 'VBOX_WINDOWS_ICON_FILE=$(subst /,\,$(VBOX_WINDOWS_ICON_FILE))' \ 646 -E 'VBOX_QT_INFIX=$(VBOX_QT_INFIX)' \ 646 647 -E 'VBOX_WITH_32_ON_64_MAIN_API=$(if $(VBOX_WITH_32_ON_64_MAIN_API),yes,no)' \ 647 648 -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \ -
trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxs
r58599 r64339 38 38 <!-- Here comes the file/directory list --> 39 39 <Directory Id="TARGETDIR" Name="SourceDir"> 40 <Directory Id=" MergeRedirectFolder" FileSource=".">40 <Directory Id="msm_VBoxApplicationFolder" FileSource="."> 41 41 42 42 <?include VBoxMergeCOM32On64.wxi ?> 43 43 44 </Directory> <!-- MergeRedirectFolder -->44 </Directory> <!-- msm_VBoxApplicationFolder --> 45 45 </Directory> <!-- TARGETDIR --> 46 46 -
trunk/src/VBox/Installer/win/VirtualBox_TypeLib.xsl
r62539 r64339 67 67 <xsl:attribute name="Language">0</xsl:attribute> 68 68 <xsl:attribute name="Description"><xsl:value-of select="@desc"/></xsl:attribute> 69 <xsl:attribute name="HelpDirectory"><xsl:text> INSTALLDIR</xsl:text></xsl:attribute>69 <xsl:attribute name="HelpDirectory"><xsl:text>msm_VBoxApplicationFolder</xsl:text></xsl:attribute> 70 70 <AppId> 71 71 <xsl:attribute name="Id"><xsl:value-of select="@appUuid"/></xsl:attribute> -
trunk/src/VBox/Installer/win/VirtualBox_TypeLibWithInterfaces.xsl
r59395 r64339 76 76 <xsl:attribute name="Language">0</xsl:attribute> 77 77 <xsl:attribute name="Description"><xsl:value-of select="@desc"/></xsl:attribute> 78 <xsl:attribute name="HelpDirectory"><xsl:text> INSTALLDIR</xsl:text></xsl:attribute>78 <xsl:attribute name="HelpDirectory"><xsl:text>msm_VBoxApplicationFolder</xsl:text></xsl:attribute> 79 79 <AppId> 80 80 <xsl:attribute name="Id"><xsl:value-of select="@appUuid"/></xsl:attribute>
Note:
See TracChangeset
for help on using the changeset viewer.
