Changeset 48187 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 30, 2013 11:42:03 AM (11 years ago)

Author:

vboxsync

Message:

Additions: first attempt to add automatic build for OS X GAs.

Location:

trunk/src/VBox/Additions

Files:

• Makefile.kmk (modified) (1 diff)
• darwin/Installer/Makefile.kmk (modified) (3 diffs)
• darwin/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/Makefile.kmk

@@ -177 +177 @@
 # the VBOX_WITH_COMBINED_DARWIN_GUEST_PACKAGE macro.
 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.x86
- VBOX_PATH_ADDITIONS.darwin.x86 = $(PATH_OUT_BASE)/darwin.x86/$(KBUILD_TYPE)/dist/additions
+ VBOX_PATH_ADDITIONS.darwin.x86 = $(PATH_OUT_BASE)/darwin.x86/$(KBUILD_TYPE)/dist
  GUESTADDITIONS_FILESPEC.darwin.x86 = \
-        VBoxDarwinAdditions-x86.run=$(VBOX_PATH_ADDITIONS.darwin.x86)/VBoxDarwinAdditions-x86.run
+        VBoxDarwinAdditions-x86.dmg=$(VBOX_PATH_ADDITIONS.darwin.x86)/VBoxDarwinAdditions.dmg
 endif
 
 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.amd64
- VBOX_PATH_ADDITIONS.darwin.amd64 = $(PATH_OUT_BASE)/darwin.amd64/$(KBUILD_TYPE)/dist/additions
+ VBOX_PATH_ADDITIONS.darwin.amd64 = $(PATH_OUT_BASE)/darwin.amd64/$(KBUILD_TYPE)/dist
  GUESTADDITIONS_FILESPEC.darwin.amd64 = \
-        VBoxDarwinAdditions-amd64.run=$(VBOX_PATH_ADDITIONS.darwin.amd64)/VBoxDarwinAdditions-amd64.run
+        VBoxDarwinAdditions-amd64.dmg=$(VBOX_PATH_ADDITIONS.darwin.amd64)/VBoxDarwinAdditions.dmg
 endif
 

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

@@ -82 +82 @@
 # The packing.
 #
-PACKING += $(VBOX_PATH_DIST)/VBoxDarwinAdditions-$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)-r$(VBOX_SVN_REV).dmg
+PACKING += $(VBOX_PATH_DIST)/VBoxDarwinAdditions.dmg
 #OTHER_CLEAN = TODO
 
@@ -109 +109 @@
 # The disk image.
 #
-$(VBOX_PATH_DIST)/VBoxDarwinAdditions-$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)-r$(VBOX_SVN_REV).dmg: \
+$(VBOX_PATH_DIST)/VBoxDarwinAdditions.dmg: \
                 $(VBOX_PATH_PACK_TMP)/DiskImage/VBoxGuestAdditions.pkg \
                 $(VBOX_BRAND_DARWIN_DISKIMAGE_BG) \
@@ -237 +237 @@
 $(VBOX_PATH_PACK_TMP)/Packages/VBoxGuestAdditionsKEXTs.pkg: \
                 $(foreach kext,$(VBOX_DI_KEXTS_UNIVERSAL), $(call VBOX_DI_FN_DEP_BOTH,$(kext).kext/Contents/MacOS/$(kext))) \
-                $(foreach kext,$(VBOX_DI_KEXTS), $(VBOX_PATH_DIST)/additions//$(kext).kext/Contents/Info.plist) \
+                $(foreach kext,$(VBOX_DI_KEXTS), $(VBOX_PATH_DIST)/additions/$(kext).kext/Contents/Info.plist) \
                 $$(wildcard $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/* \
                             $(VBOX_PATH_DI_SRC)/VBoxGuestAdditionsKEXTs/*.lproj/*) \

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

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-$(VBOX_PATH_ADDITIONS)/VBoxDarwinAdditions-x86.run:
-        touch $@
-
-$(VBOX_PATH_ADDITIONS)/VBoxDarwinAdditions-amd64.run:
-        touch $@
+include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
+include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk
 
 include $(FILE_KBUILD_SUB_FOOTER)