Changeset 34631 in vbox
- Timestamp:
- Dec 2, 2010 5:17:35 PM (14 years ago)
- Location:
- trunk/src/VBox/Installer/darwin
- Files:
-
- 2 edited
-
Makefile.kmk (modified) (17 diffs)
-
VirtualBox_mpkg/distribution.dist (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/darwin/Makefile.kmk
r34585 r34631 198 198 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \ 199 199 $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_HTML) \ 200 $(VBOX_BRAND_$(f)_LICENSE_RTF) \201 200 $(VBOX_BRAND_$(f)_REGISTRATIONPANE_INFOPLIST_STRINGS) \ 202 201 $(VBOX_BRAND_$(f)_REGISTRATIONPANE_LOCALIZABLE_STRINGS)) \ … … 255 254 --output $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/English.lproj/Localizable.strings \ 256 255 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Localizable.strings 257 $(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/English.lproj/License.rtf258 256 $(INSTALL) -m 0644 $(VBOX_BRAND_DARWIN_INSTALLER_BG) $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/background.tif 259 257 $(INSTALL) -m 0766 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/checkforrunningvms $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/checkforrunningvms … … 268 266 --output $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Welcome.html \ 269 267 $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_HTML)$(NLTAB) \ 270 $(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/License.rtf$(NLTAB) \271 268 $(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_VIRTUALBOX_CONCLUSION_HTML) $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Conclusion.html$(NLTAB) \ 272 269 $(SED) \ … … 332 329 $(VBOX_BRAND_$(f)_VBOXKEXTS_DESCRIPTION_PLIST) \ 333 330 $(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML) \ 334 $(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS) \ 335 $(VBOX_BRAND_$(f)_LICENSE_RTF)) \ 331 $(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)) \ 336 332 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) 337 333 $(call MSG_TOOL,PackageMaker,,,$@) … … 406 402 $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/InstallationCheck $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/ 407 403 $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/postflight $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/ 408 $(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/English.lproj/License.rtf409 404 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \ 410 405 $(MKDIR) -p \ … … 427 422 $(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML)$(NLTAB) \ 428 423 $(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS) $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/InstallationCheck.strings$(NLTAB) \ 429 $(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/License.rtf$(NLTAB) \430 424 ) 431 425 $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/English.lproj/InstallationCheck.strings $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/English.lproj/ … … 453 447 $(VBOX_PATH_DI_SRC)/VBoxStartupItems/*.lproj/*) \ 454 448 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \ 455 $(VBOX_BRAND_$(f)_VBOXSTARTUPITEMS_DESCRIPTION_PLIST) \ 456 $(VBOX_BRAND_$(f)_LICENSE_RTF)) \ 449 $(VBOX_BRAND_$(f)_VBOXSTARTUPITEMS_DESCRIPTION_PLIST)) \ 457 450 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) 458 451 $(call MSG_TOOL,PackageMaker,,,$@) … … 504 497 $(VBOX_PATH_DI_SRC)/VBoxStartupItems/Description.plist 505 498 @# Copy the resources. 506 $(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.res/English.lproj/License.rtf507 499 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \ 508 500 $(MKDIR) -p \ … … 518 510 --output $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Description.plist \ 519 511 $(VBOX_BRAND_$(f)_VBOXSTARTUPITEMS_DESCRIPTION_PLIST)$(NLTAB) \ 520 $(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/License.rtf$(NLTAB) \521 512 ) 522 513 @# Build the package. … … 722 713 $(VBOX_PATH_PACK_TMP)/Packages/VirtualBox.pkg: \ 723 714 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \ 724 $(VBOX_BRAND_$(f)_VIRTUALBOX_DESCRIPTION_PLIST) \ 725 $(VBOX_BRAND_$(f)_LICENSE_RTF)) \ 715 $(VBOX_BRAND_$(f)_VIRTUALBOX_DESCRIPTION_PLIST)) \ 726 716 $(foreach f, $(VBOX_DI_VBAPP_DYLIBS) $(VBOX_DI_VBAPP_OTHER_UNIVERSAL_BINS) $(VBOX_DI_VBAPP_OTHER_BINS) $(VBOX_DI_VBAPP_PROGS) $(VBOX_DI_VBAPP_MISC_FILES)\ 727 717 ,$(call VBOX_DI_FN_DEP_BOTH,VirtualBox.app/Contents/$(f)) ) \ … … 732 722 \ 733 723 $(if $(VBOX_WITH_DOCS_PACKING),$(VBOX_ADD_MANUALS),) \ 724 $(VBOX_BRAND_LICENSE_TXT) \ 734 725 $(wildcard $(VBOX_PATH_DI_SRC)/VirtualBox/*) \ 735 726 $(wildcard $(VBOX_PATH_DI_SRC)/VirtualBox/*.lproj/*) \ … … 825 816 ,$(INSTALL) -m 0644 $(VBOX_PATH_DIST_64)/VirtualBox.app/Contents/$(f) $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(f)$(NLTAB) ) 826 817 endif 818 $(INSTALL) -m 644 $(VBOX_BRAND_LICENSE_TXT) $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/LICENSE 827 819 ifdef VBOX_WITH_DOCS_PACKING 828 820 $(foreach f,$(VBOX_ADD_MANUALS) \ … … 965 957 $(VBOX_PATH_DI_SRC)/VirtualBox/Description.plist 966 958 @# Copy the resources. 967 $(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/English.lproj/License.rtf968 959 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES) \ 969 960 ,$(MKDIR) -p \ … … 979 970 --output $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Description.plist \ 980 971 $(VBOX_BRAND_$(f)_VIRTUALBOX_DESCRIPTION_PLIST)$(NLTAB) \ 981 $(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/License.rtf$(NLTAB) \982 972 ) 983 973 $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VirtualBox/postflight $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/ … … 1002 992 $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/*.lproj/*) \ 1003 993 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES) \ 1004 ,$(VBOX_BRAND_$(f)_VIRTUALBOXCLI_DESCRIPTION_PLIST) \ 1005 $(VBOX_BRAND_$(f)_LICENSE_RTF)) \ 994 ,$(VBOX_BRAND_$(f)_VIRTUALBOXCLI_DESCRIPTION_PLIST)) \ 1006 995 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) 1007 996 $(call MSG_TOOL,PackageMaker,,,$@) … … 1060 1049 $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/Description.plist 1061 1050 @# Copy the resources. 1062 $(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.res/English.lproj/License.rtf1063 1051 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES) \ 1064 1052 ,$(MKDIR) -p \ … … 1074 1062 --output $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Description.plist \ 1075 1063 $(VBOX_BRAND_$(f)_VIRTUALBOXCLI_DESCRIPTION_PLIST)$(NLTAB) \ 1076 $(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_LICENSE_RTF) $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/License.rtf$(NLTAB) \1077 1064 ) 1078 1065 @# Build the package. -
trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist
r31673 r34631 69 69 <background file="background.tif" alignment="topleft" scaling="none"/> 70 70 <welcome file="Welcome.html"/> 71 <license file="License.rtf"/>72 71 <conclusion file="Conclusion.html"/> 73 72 <choices-outline>
Note:
See TracChangeset
for help on using the changeset viewer.
