Changeset 42575 in vbox

Timestamp:

Aug 3, 2012 11:15:07 AM (12 years ago)

Author:

vboxsync

Message:

Backed out r79739 for now.

File:

• trunk/src/VBox/Installer/darwin/Makefile.kmk (modified) (6 diffs)

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

@@ -659 +659 @@
         Resources/vmstarter.app/Contents/Info.plist \
         Resources/vmstarter.app/Contents/PkgInfo \
+        Info.plist \
+        PkgInfo \
         Resources/virtualbox.icns \
         Resources/virtualbox.png \
@@ -669 +671 @@
         Resources/virtualbox-vhd.icns \
         Resources/virtualbox-hdd.icns \
-        Info.plist \
-        PkgInfo \
         MacOS/components/VBoxXPCOMBase.xpt \
         MacOS/components/VirtualBox_XPCOM.xpt
@@ -697 +697 @@
 VBOX_DI_VBAPP_SYMLINKS = \
         Resources/VirtualBoxVM.app/Contents/MacOS=>../../../MacOS/ \
-        Resources/VirtualBoxVM.app/Contents/Resources/virtualbox.icns=>../../../virtualbox.icns \
+        Resources/VirtualBoxVM.app/Contents/Resources=>../../../Resources/ \
         Resources/vmstarter.app/Contents/MacOS=>../../../MacOS/ \
-        Resources/vmstarter.app/Contents/Resources/virtualbox.icns=>../../../virtualbox.icns \
+        Resources/vmstarter.app/Contents/Resources=>../../../Resources/ \
         $(foreach qtmod, $(VBOX_QT4_MOD_NAMES), Frameworks/$(qtmod).framework/$(qtmod)=>Versions/4/$(qtmod))
 ifdef VBOX_WITH_COCOA_QT
@@ -785 +785 @@
                 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/VirtualBoxVM.app \
                 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/VirtualBoxVM.app/Contents \
-                $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/VirtualBoxVM.app/Contents/Resources \
                 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/vmstarter.app \
                 $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/vmstarter.app/Contents \
-                $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/vmstarter.app/Contents/Resources \
                 $(if-expr defined(VBOX_WITH_PYTHON), \
                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/sdk \
@@ -809 +807 @@
         @# Create the .lproj language directories
         $(MKDIR) -p -m 0755 \
-                $(addprefix $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/,$(VBOX_INSTALL_LANG_LPROJ)) \
-                $(addprefix $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/VirtualBoxVM.app/Contents/Resources/,$(VBOX_INSTALL_LANG_LPROJ))
+                $(addprefix $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/,$(VBOX_INSTALL_LANG_LPROJ))
         @# Install all supported language files
         $(foreach f, $(VBOX_INSTALL_LANG_FILES) \
@@ -838 +835 @@
                 ,$(INSTALL) -m 0644 $(VBOX_PATH_DIST_64)/VirtualBox.app/Contents/$(f)           $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/$(f)$(NLTAB) )
 endif
-        $(INSTALL) -m 644 $(VBOX_BRAND_LICENSE_TXT)                                             $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/LICENSE
-        $(INSTALL) -m 644 $(VBOX_BRAND_LICENSE_TXT)                                             $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/VirtualBoxVM.app/Contents/Resources/LICENSE
+        $(INSTALL) -m 644 $(VBOX_BRAND_LICENSE_TXT)                                                     $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/Resources/LICENSE
 ifdef VBOX_WITH_DOCS_PACKING
         $(foreach f,$(VBOX_ADD_MANUALS) \