- Timestamp:
- May 22, 2020 11:17:09 AM (5 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 7 edited
-
Installer/freebsd/Makefile.kmk (modified) (1 diff)
-
Installer/freebsd/pkg_plist (modified) (2 diffs)
-
Installer/linux/debian/lintian-override.in (modified) (4 diffs)
-
Installer/win/Makefile.kmk (modified) (3 diffs)
-
Installer/win/VBoxMergeApp.wxi (modified) (2 diffs)
-
Installer/win/VBoxMergeCOM32On64.wxi (modified) (1 diff)
-
Main/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/freebsd/Makefile.kmk
r84448 r84449 311 311 $(call MSG_INST_FILE,$<,$@) 312 312 $(QUIET)$(INSTALL) -d $(dir $@) 313 $(QUIET)$(CP) -- "$<" "$@" 313 $(QUIET)$(SED) \ 314 -e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \ 315 -e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \ 316 --output $@ \ 317 $< 314 318 ifdef VBOX_WITH_DTRACE 315 319 $(QUIET)$(APPEND) -n "$@" "@mode 644" \ -
trunk/src/VBox/Installer/freebsd/pkg_plist
r84448 r84449 15 15 lib/virtualbox/VBoxNetDHCP.so 16 16 lib/virtualbox/VBoxPython.so 17 lib/virtualbox/VBoxREM.so 17 18 lib/virtualbox/VBoxRT.so 18 19 lib/virtualbox/VBoxSDL.so … … 31 32 lib/virtualbox/rdesktop-vrdp 32 33 lib/virtualbox/VBoxTestOGL 34 _VBOX_REM_32BIT_MODULE_ 35 _VBOX_REM_64BIT_MODULE_ 33 36 @mode 4755 34 37 lib/virtualbox/VBoxSDL -
trunk/src/VBox/Installer/linux/debian/lintian-override.in
r84448 r84449 6 6 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSettings.so 7 7 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVMM.so 8 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM.so 8 9 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxXPCOM.so 9 10 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxXPCOMC.so … … 22 23 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxHeadless.so 23 24 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxPython.so 25 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM32.so 26 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM64.so 24 27 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSDL.so 25 28 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VirtualBox.so … … 55 58 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxSettings.so 56 59 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxVMM.so 60 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxREM.so 57 61 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxXPCOM.so 58 62 %VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxSharedFolders.so … … 78 82 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxManage /usr/lib/virtualbox 79 83 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxPython.so /usr/lib/virtualbox 84 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxREM.so /usr/lib/virtualbox 85 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxREM32.so /usr/lib/virtualbox 86 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxREM64.so /usr/lib/virtualbox 80 87 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxRT.so /usr/lib/virtualbox 81 88 %VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSDL /usr/lib/virtualbox -
trunk/src/VBox/Installer/win/Makefile.kmk
r84448 r84449 609 609 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \ 610 610 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \ 611 $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi \612 $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi \613 611 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \ 614 612 $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \ … … 767 765 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \ 768 766 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \ 769 $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi \770 $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi \771 767 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \ 772 768 $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \ … … 949 945 950 946 # 951 # Generate the list of CRT DLLs.952 #953 ifndef TOOL_$(VBOX_VCC_TOOL)954 include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL).kmk955 endif956 $(call KB_FN_AUTO_CMD_DEPS,$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi)957 $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi: | $$(dir $$@)958 $(APPEND) -t -n $@ \959 '<?xml version="1.0" ?>' \960 '<Include>' \961 $(foreach dll \962 ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC110",msvcr100.dll msvcp100.dll \963 ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC111",msvcr110.dll msvcp110.dll \964 ,$(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS))) \965 ,'<File Id="file_$(dll)" Name="$(dll)" Source="$$(env.PATH_OUT)\bin\$(dll)" />') \966 '</Include>'967 968 #969 # Generate the list of 32-bit CRT DLLs.970 #971 ifndef TOOL_$(VBOX_VCC_TOOL_STEM)X86972 include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL_STEM)X86.kmk973 endif974 $(call KB_FN_AUTO_CMD_DEPS,$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi)975 $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi: | $$(dir $$@)976 $(APPEND) -t -n $@ \977 '<?xml version="1.0" ?>' \978 '<Include>' \979 $(foreach dll \980 ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC110",msvcr100.dll msvcp100.dll \981 ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC111",msvcr110.dll msvcp110.dll \982 ,$(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS))) \983 ,'<File Id="file_$(dll)_x86" Name="$(dll)" Source="$$(env.PATH_OUT)\bin\x86\$(dll)" disk="$$(var.Property_DiskIdCommon)" />') \984 '</Include>'985 #986 947 # Generate the list of unattended template script files. 987 948 # -
trunk/src/VBox/Installer/win/VBoxMergeApp.wxi
r84448 r84449 356 356 <?endif?> 357 357 358 <!-- Include CRT Dlls (specific to the compiler). --> 359 <?include $(env.PATH_TARGET)\VBoxCrtDlls.wxi ?> 358 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?> 359 <!-- MS C/C++ v10.0 Runtime DLL files --> 360 <File Id="file_msvcr100.dll" Name="msvcr100.dll" 361 Source="$(env.PATH_OUT)\bin\msvcr100.dll" /> 362 <File Id="file_msvcp100.dll" Name="msvcp100.dll" 363 Source="$(env.PATH_OUT)\bin\msvcp100.dll" /> 364 <?endif?> 365 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?> 366 <!-- MS C/C++ v11.0 Runtime DLL files --> 367 <File Id="file_msvcr110.dll" Name="msvcr110.dll" 368 Source="$(env.PATH_OUT)\bin\msvcr110.dll" /> 369 <File Id="file_msvcp110.dll" Name="msvcp110.dll" 370 Source="$(env.PATH_OUT)\bin\msvcp110.dll" /> 371 <?endif?> 360 372 361 373 <!-- EFI firmware --> … … 377 389 <?endif ?> 378 390 <?endif ?> 379 <!-- Include registrykey for VBox version -->391 <!-- Include key for VBox version --> 380 392 <?include $(env.PATH_TARGET)\VBoxKey.wxi ?> 381 393 -
trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi
r84448 r84449 45 45 </File> 46 46 <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?> 47 48 <!-- Include CRT Dlls (specific to the compiler). --> 49 <?include $(env.PATH_TARGET)\VBoxCrtDlls32.wxi ?> 47 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?> 48 <!-- MS C/C++ v10.0 32 bit Runtime DLL files --> 49 <File Id="file_msvcr100_x86" Name="msvcr100.dll" 50 Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll" 51 DiskId="$(var.Property_DiskIdCommon)" /> 52 <File Id="file_msvcp100_x86" Name="msvcp100.dll" 53 Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll" 54 DiskId="$(var.Property_DiskIdCommon)" /> 55 <?endif?> 56 <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?> 57 <!-- MS C/C++ v11.0 Runtime DLL files --> 58 <File Id="file_msvcr110_x86" Name="msvcr110.dll" 59 Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll" 60 DiskId="$(var.Property_DiskIdCommon)" /> 61 <File Id="file_msvcp110_x86" Name="msvcp110.dll" 62 Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll" 63 DiskId="$(var.Property_DiskIdCommon)" /> 64 <?endif?> 50 65 </Component> 51 66 </Directory> -
trunk/src/VBox/Main/Makefile.kmk
r84448 r84449 1292 1292 VBoxMain-hardening-inst_SYMLINKS = \ 1293 1293 VBoxDDU.so=>../VBoxDDU.so \ 1294 VBoxREM.so=>../VBoxREM.so \ 1294 1295 VBoxRT.so=>../VBoxRT.so \ 1295 1296 VBoxVMM.so=>../VBoxVMM.so \
Note:
See TracChangeset
for help on using the changeset viewer.
