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

Timestamp:

Aug 9, 2012 7:59:32 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79939

Message:

Mac OS X: Don't create two cyclic symlinks in the Resources of the VirtualBox.app.

Location:

trunk/src/VBox/Installer/darwin

Files:

• Makefile.kmk (modified) (3 diffs)
• VirtualBox/Info.plist (modified) (1 diff)

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

@@ -654 +654 @@
         MacOS/VBoxDD2GC.gc
 
-VBOX_DI_VBAPP_MISC_FILES = \
-        Resources/VirtualBoxVM.app/Contents/Info.plist \
-        Resources/VirtualBoxVM.app/Contents/PkgInfo \
-        Resources/vmstarter.app/Contents/Info.plist \
-        Resources/vmstarter.app/Contents/PkgInfo \
-        Info.plist \
-        PkgInfo \
+VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES = \
         Resources/virtualbox.icns \
         Resources/virtualbox.png \
@@ -670 +664 @@
         Resources/virtualbox-vmdk.icns \
         Resources/virtualbox-vhd.icns \
-        Resources/virtualbox-hdd.icns \
+        Resources/virtualbox-hdd.icns
+
+VBOX_DI_VBAPP_MISC_FILES = \
+        Info.plist \
+        PkgInfo \
+       $(VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES) \
         MacOS/components/VBoxXPCOMBase.xpt \
-        MacOS/components/VirtualBox_XPCOM.xpt
+        MacOS/components/VirtualBox_XPCOM.xpt \
+        Resources/VirtualBoxVM.app/Contents/Info.plist \
+        Resources/VirtualBoxVM.app/Contents/PkgInfo \
+       $(addprefix Resources/VirtualBoxVM.app/Contents/,$(VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES)) \
+        Resources/vmstarter.app/Contents/Info.plist \
+        Resources/vmstarter.app/Contents/PkgInfo \
+       $(addprefix Resources/vmstarter.app/Contents/,$(VBOX_DI_VBAPP_DUPLICATED_RESOURCE_FILES))
 ifdef VBOX_WITH_DOCS_PACKING
 VBOX_DI_VBAPP_MISC_FILES += \
@@ -697 +702 @@
 VBOX_DI_VBAPP_SYMLINKS = \
         Resources/VirtualBoxVM.app/Contents/MacOS=>../../../MacOS/ \
-        Resources/VirtualBoxVM.app/Contents/Resources=>../../../Resources/ \
         Resources/vmstarter.app/Contents/MacOS=>../../../MacOS/ \
-        Resources/vmstarter.app/Contents/Resources=>../../../Resources/ \
         $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod))
 ifdef VBOX_WITH_COCOA_QT

trunk/src/VBox/Installer/darwin/VirtualBox/Info.plist

@@ -20 +20 @@
         <key>IFPkgFormatVersion</key>                   <real>0.10000000149011612</real>
         <key>IFPkgFlagOverwritePermissions</key>        <false/>
+        <key>IFPkgFlagFollowLinks</key>                 <false/>
 </dict>
 </plist>