Changeset 48323 in vbox for trunk/src/VBox/Installer

Timestamp:

Sep 5, 2013 7:41:45 PM (11 years ago)

Author:

vboxsync

Message:

Main,Installer: 32-bit on 64-bit COM API support (windows). Currently disabled

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (3 diffs)
• VirtualBox.wxs (modified) (2 diffs)
• VirtualBox_TypeLib.xsl (modified) (3 diffs)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -419 +419 @@
                         $(PATH_SUB_CURRENT)/UserInterface.wxi \
                         $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
+                        $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \
                         $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
                         $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \
@@ -447 +448 @@
                 -E 'VBOX_SIGNING_MODE=$(strip $(if $(VBOX_SIGNING_MODE),$(VBOX_SIGNING_MODE),none))' \
                 -E 'VBOX_GUI_USE_QGL=$(if $(VBOX_GUI_USE_QGL),yes,no)' \
+                -E 'VBOX_WITH_32_ON_64_MAIN_API=$(if $(VBOX_WITH_32_ON_64_MAIN_API),yes,no)' \
                 -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \
                 -E 'VBOX_WITH_COMBINED_PACKAGE=$(if $(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \
@@ -501 +503 @@
         $(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
+$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi: \
+                $(PATH_SUB_CURRENT)/VirtualBox_TypeLib.xsl \
+                $(VBOX_XIDL_FILE) \
+                | $$(dir $$@)
+        $(VBOX_XSLTPROC) --stringparam "a_sTarget" "VBoxClient-x86"  -o [email protected] $< $(VBOX_XIDL_FILE)
+        $(SED) -e 's/VBoxC/VBoxClient_x86/g' --output $@ [email protected]
+        $(RM) -f [email protected]
+
+
 #
 # Construct the list of GUI translations.

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

@@ -334 +334 @@
                         </Component>
                     </Directory>
+
+<?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
+                    <!-- The 32-bit client COM component (see also cp_MainCom below). -->
+                    <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
+                        <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
+                            Source="$(env.PATH_OUT)\bin\VBoxClient-x86.dll" KeyPath="yes">
+                        </File>
+                        <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
+                    </Component>
+<?endif?>
 
                     <!-- COM components have a separate entry mainly because of the KeyPath attribute (that hints the
@@ -696 +706 @@
 <?endif?>
             <ComponentRef Id="cp_NLS" />
+<?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
+            <ComponentRef Id="cp_MainCOM_x86" />
+<?endif?>
             <ComponentRef Id="cp_MainCOM" />
             <ComponentRef Id="cp_MainBinaries" />

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

@@ -27 +27 @@
 <xsl:strip-space elements="*"/>
 
+<xsl:param name="a_sTarget">all</xsl:param>
+
 
 <!--
@@ -46 +48 @@
  *  Source    : src/VBox/Main/idl/VirtualBox.xidl
  *  Generator : src/VBox/Installer/VirtualBox_TypeLib.xsl
+ *  Arguments : a_sTarget=<xsl:value-of select="$a_sTarget"/>
  */
   </xsl:comment>
@@ -67 +70 @@
         <xsl:attribute name="Id"><xsl:value-of select="@appUuid"/></xsl:attribute>
         <xsl:attribute name="Description"><xsl:value-of select="@name"/> Application</xsl:attribute>
-        <xsl:apply-templates select="module/class"/>
+        <xsl:choose>
+          <xsl:when test="$a_sTarget = 'VBoxClient-x86'">
+            <xsl:apply-templates select="module[@name='VBoxC']/class"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates select="module/class"/>
+          </xsl:otherwise>
+        </xsl:choose>
       </AppId>
     </TypeLib>