Changeset 42744 in vbox for trunk/src

Timestamp:

Aug 10, 2012 8:21:34 AM (12 years ago)

Author:

vboxsync

Message:

Installer rework, second part.

Location:

trunk/src/VBox/Installer/darwin

Files:

• Makefile.kmk (modified) (9 diffs)
• VirtualBox_mpkg/Conclusion.rtf (added)
• VirtualBox_mpkg/Welcome.rtf (added)
• VirtualBox_mpkg/distribution.dist (modified) (6 diffs)

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

@@ -72 +72 @@
 
 # The location of the productbuild program.
-ifndef VBOX_PKGBUILD
+ifndef VBOX_PRODUCTBUILD
  VBOX_PRODUCTBUILD := productbuild
 endif
@@ -209 +209 @@
                             $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/*.lproj/*) \
                 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \
-                        $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_HTML) \
+                        $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_RTF) \
                         $(VBOX_BRAND_$(f)_REGISTRATIONPANE_INFOPLIST_STRINGS) \
                         $(VBOX_BRAND_$(f)_REGISTRATIONPANE_LOCALIZABLE_STRINGS)) \
@@ -227 +227 @@
                 $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/English.lproj
         @# Do keyword replacement in the package info and description files.
+ifdef VBOX_USE_PACKAGEMAKER
         $(SED) \
                 -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
@@ -247 +248 @@
                 --output $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.desc/Description.plist \
                 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Description.plist
+endif # !VBOX_USE_PACKAGEMAKER
         $(SED) \
                 -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
@@ -255 +257 @@
                 -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
                 -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-                --output $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/English.lproj/Welcome.html \
-                $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Welcome.html
+                --output $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/English.lproj/Welcome.rtf \
+                $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Welcome.rtf
         @# Copy the resources.
-#       $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/ReadMe.html                      $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/English.lproj/ReadMe.html
-        $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Conclusion.html                  $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/English.lproj/Conclusion.html
+        $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Conclusion.rtf                   $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/English.lproj/Conclusion.rtf
         $(SED) \
                 -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
@@ -276 +277 @@
                         -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
                         -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-                        --output $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Welcome.html \
-                        $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_HTML)$(NLTAB) \
-                $(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) \
+                        --output $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Welcome.rtf \
+                        $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_RTF)$(NLTAB) \
+                $(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_VIRTUALBOX_CONCLUSION_RTF)                $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Conclusion.rtf$(NLTAB) \
                 $(SED) \
                         -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
@@ -287 +288 @@
         )
         @# Build the package.
+ifdef VBOX_USE_PACKAGEMAKER
         $(VBOX_PACKAGEMAKER) -build -v \
                 -p $@ \
@@ -319 +321 @@
         )
 endif
+else  # !VBOX_USE_PACKAGEMAKER
+        $(VBOX_PRODUCTBUILD) \
+                --distribution $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution.dist \
+                --package-path $(VBOX_PATH_PACK_TMP)/Packages \
+                --resources $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res \
+                --identifier org.virtualbox.mpkg.virtualbox \
+                --version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+                $@ 
+endif # !VBOX_USE_PACKAGEMAKER
         @# Cleanup.
         sudo rm -Rf \
@@ -325 +336 @@
                 $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res
 
-
+VirtualBox.mpkg: $(VBOX_PATH_PACK_TMP)/DiskImage/VirtualBox.mpkg
 
 #

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist

@@ -2 +2 @@
 <!--
 #
-# Copyright (C) 2008-2010 Oracle Corporation
+# Copyright (C) 2008-2012 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +15 @@
 <installer-gui-script minSpecVersion="1.0">
     <title>VirtualBox_title</title>
-    <options customize="allow" allow-external-scripts="yes" rootVolumeOnly="true"/>
+    <options customize="allow" allow-external-scripts="yes" rootVolumeOnly="true" hostArchitectures="i386"/>
     <installation-check script="checkPrerequisite()"></installation-check>
-    <domains enable_anywhere="true"/>
+    <domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true"/>
     <script>
     /* js:pkmk:start */
@@ -68 +68 @@
     </script>
     <background file="background.tif" alignment="topleft" scaling="none"/>
-    <welcome file="Welcome.html"/>
-    <conclusion file="Conclusion.html"/>
+    <welcome file="Welcome.rtf" mime-type="text/rtf" uti="public.rtf"/>
+    <!-- <conclusion file="Conclusion.rtf" mime-type="text/rtf" uti="public.rtf"/> -- the default conclusion looks better -->
     <choices-outline>
         <line choice="choiceVBoxKEXTs"></line>
@@ -76 +76 @@
         <line choice="choiceVBoxCLI"></line>
     </choices-outline>
-    <choice id="choiceVBoxKEXTs" title="choiceVBoxKEXTs_title" description="choiceVBoxKEXTs_msg" start_selected="true" start_enabled="false" start_visible="true">
+    <choice id="choiceVBoxKEXTs"   title="choiceVBoxKEXTs_title"   description="choiceVBoxKEXTs_msg"   start_selected="true" start_enabled="false" start_visible="true">
         <pkg-ref id="org.virtualbox.pkg.vboxkexts"></pkg-ref>
     </choice>
@@ -82 +82 @@
         <pkg-ref id="org.virtualbox.pkg.vboxstartupitems"></pkg-ref>
     </choice>
-    <choice id="choiceVBox" title="choiceVBox_title" description="choiceVBox_msg" start_selected="true" start_enabled="false" start_visible="true">
+    <choice id="choiceVBox"        title="choiceVBox_title"        description="choiceVBox_msg"        start_selected="true" start_enabled="false" start_visible="true">
         <pkg-ref id="org.virtualbox.pkg.virtualbox"></pkg-ref>
     </choice>
-    <choice id="choiceVBoxCLI" title="choiceVBoxCLI_title" description="choiceVBoxCLI_msg" start_selected="true" start_enabled="true" start_visible="true">
+    <choice id="choiceVBoxCLI"     title="choiceVBoxCLI_title"     description="choiceVBoxCLI_msg"     start_selected="true" start_enabled="true" start_visible="true">
         <pkg-ref id="org.virtualbox.pkg.virtualboxcli"></pkg-ref>
     </choice>
@@ -93 +93 @@
     <pkg-ref id="org.virtualbox.pkg.virtualboxcli" auth="Root">file:./Contents/Packages/VirtualBoxCLI.pkg</pkg-ref>
 </installer-gui-script>
+