VirtualBox

Changeset 49537 in vbox for trunk


Ignore:
Timestamp:
Nov 18, 2013 4:19:01 PM (11 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
90716
Message:

Main/VBoxClient-x86: attempt to fix packaging, needs VBoxRT-x86.dll, and has to move to a separate directory to allow having 32 bit msvc*.dll in the same directory

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.kmk

    r49155 r49537  
    114114        $(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
    115115        $(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
     116 ifdef VBOX_WITH_32_ON_64_MAIN_API
     117  VBOX_PATH_VCC_REDIST_CRT_X86 = $(VBOX_PATH_VCC_REDIST)/x86/Microsoft.VC100.CRT
     118  VBOX_PATH_VCC_REDIST_CRT_DBG_X86 = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/x86/Microsoft.VC100.DebugCRT
     119  InstallExternalLibs_SOURCES += \
     120        $(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     121        $(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
     122 endif
    116123 ifeq ($(VBOX_VCC_CRT_TYPE),d)
     124  InstallExternalLibs_SOURCES += \
    117125        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
    118126        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
    119127        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
    120128        $(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
     129  ifdef VBOX_WITH_32_ON_64_MAIN_API
     130  InstallExternalLibs_SOURCES += \
     131        $(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     132        $(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
     133  endif
    121134 endif
    122135endif

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

    r49536 r49537  
    337337
    338338<?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
    339                     <!-- The 32-bit client COM component (see also cp_MainCom below). -->
    340                     <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
    341                         <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
    342                             Source="$(env.PATH_OUT)\bin\VBoxClient-x86.dll" KeyPath="yes">
    343                         </File>
    344                         <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
    345                     </Component>
     339                    <Directory Id="dir_X86" Name="x86">
     340                        <!-- The 32-bit client COM component (see also cp_MainCom below). -->
     341                        <Component Id="cp_MainCOM_x86" Guid="B600824E-4A25-2EB3-4B44-3D8CB7F9B92D" Win64="no">
     342                            <File Id="VBoxClient_x86" Name="VBoxClient-x86.dll"
     343                                Source="$(env.PATH_OUT)\bin\x86\VBoxClient-x86.dll" KeyPath="yes">
     344                            </File>
     345                            <File Id="VBoxRT_x86" Name="VBoxRT-x86.dll"
     346                                Source="$(env.PATH_OUT)\bin\x86\VBoxRT-x86.dll">
     347                            </File>
     348                            <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
     349<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>
     350                            <!-- MS C/C++ v10.0 32 bit Runtime DLL files. -->
     351                            <File Id="file_msvcr100.dll_x86" Name="msvcr100.dll"
     352                                  Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll" />
     353                            <File Id="file_msvcp100.dll_x86" Name="msvcp100.dll"
     354                                  Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll" />
     355<?endif?>
     356<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
     357                            <!-- MS C/C++ v11.0 Runtime DLL files. -->
     358                            <File Id="file_msvcr110.dll_x86" Name="msvcr110.dll"
     359                                  Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll" />
     360                            <File Id="file_msvcp110.dll_x86" Name="msvcp110.dll"
     361                                  Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll" />
     362<?endif?>
     363                        </Component>
     364                    </Directory>
    346365<?endif?>
    347366
    … …  
    449468                        <File Id="file_VBoxNetDHCP.exe" Name="VBoxNetDHCP.exe"
    450469                              Source="$(env.PATH_OUT)\bin\VBoxNetDHCP.exe"/>
    451                         <File Id="file_VBoxNetNAT.exe" Name="VBoxNetNAT.exe"
     470                        <File Id="file_VBoxNetNAT.exe" Name="VBoxNetNAT.exe"
    452471                              Source="$(env.PATH_OUT)\bin\VBoxNetNAT.exe"/>
    453472<?if $(env.VBOX_WITH_EXTPACK) = "yes" ?>

  • trunk/src/VBox/Main/Makefile.kmk

    r49202 r49537  
    768768 VBoxClient-x86_EXTENDS  = VBoxC
    769769 VBoxClient-x86_DEFS = VBOX_COM_INPROC_API_CLIENT $(VBoxC_DEFS)
     770 VBoxClient-x86_INST = $(INST_DLL)x86/
    770771 VBoxClient-x86_INCS.win = \
    771772        $(VBoxClient-x86_0_OUTDIR) \

  • trunk/src/VBox/Main/src-all/win/comregister.cmd

    r48323 r49537  
    2525REM
    2626
    27 REM Determin the current directory.
     27REM Determine the current directory.
    2828set _SCRIPT_CURDIR=%CD%
    2929for /f "tokens=*" %%d in ('cd') do set _SCRIPT_CURDIR=%%d
    3030
    31 REM Determin a correct self - by %0.
     31REM Determine a correct self - by %0.
    3232set _SCRIPT_SELF=%0
    3333if exist "%_SCRIPT_SELF%" goto found_self
    … …  
    3535if exist "%_SCRIPT_SELF%" goto found_self
    3636
    37 REM Determin a correct self - by current working directory.
     37REM Determine a correct self - by current working directory.
    3838set _SCRIPT_SELF=%_SCRIPT_CURDIR%\comregister.cmd
    3939if exist "%_SCRIPT_SELF%" goto found_self
    4040
    41 REM Determin a correct self - by the PATH
     41REM Determine a correct self - by the PATH
    4242REM This is very verbose because nested for loops didn't work out.
    4343for /f "tokens=1  delims=;" %%d in ("%PATH%") do set _SCRIPT_SELF=%%d\comregister.cmd
    … …  
    112112@echo on
    113113%_VBOX_DIR%VBoxSVC.exe /UnregServer
    114 %windir%\syswow64\regsvr32 /s /u %_VBOX_DIR%VBoxClient-x86.dll
     114%windir%\syswow64\regsvr32 /s /u %_VBOX_DIR%x86\VBoxClient-x86.dll
    115115%windir%\system32\regsvr32 /s /u %_VBOX_DIR%VBoxC.dll
    116116@if "%1" == "-u" goto end
    117117%_VBOX_DIR%VBoxSVC.exe /RegServer
    118118%windir%\system32\regsvr32 /s    %_VBOX_DIR%VBoxC.dll
    119 %windir%\syswow64\regsvr32 /s    %_VBOX_DIR%VBoxClient-x86.dll
     119%windir%\syswow64\regsvr32 /s    %_VBOX_DIR%x86\VBoxClient-x86.dll
    120120@echo off
    121121

  • trunk/src/VBox/Runtime/Makefile.kmk

    r49329 r49537  
    14351435VBoxRT-x86_EXTENDS = VBoxRT
    14361436VBoxRT-x86_TEMPLATE = VBoxR3Dll-x86
     1437VBoxRT-x86_INST = $(INST_DLL)x86/
    14371438VBoxRT-x86_SDKS  = VBOX_LIBXML2
    14381439ifdef VBOX_WITH_LIBCURL
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette