Changeset 25222 in vbox

Timestamp:

Dec 7, 2009 7:57:39 PM (15 years ago)

Author:

vboxsync

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

55727

Message:

/Makefile.kmk: More hacking.

File:

• trunk/Makefile.kmk (modified) (2 diffs)

trunk/Makefile.kmk

@@ -688 +688 @@
 # the order of the windows builds. TODO: Split building and packing for these two VMs.
 additions-build: \
+        additions-build-solaris.amd64 \
+        additions-build-solaris.x86 \
         additions-build-win.x86 \
         additions-build-win.amd64 \
-        additions-build-solaris.amd64 \
-        additions-build-solaris.x86 \
         additions-build-os2.x86 \
         additions-build-linux.amd64 \
@@ -743 +743 @@
 else
 additions-build-solaris.rsync-into-vm:
-        rsync -a --delete --delete-excluded --exclude .svn --exclude FetchDir --exclude tinderclient.log --exclude win.amd64 --exclude win.x86 . 192.168.27.4:/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
-
-additions-build-solaris.rsync-out-of-vm: additions-build-solaris.amd64  additions-build-solaris.x86
-        rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
-
-.NOTPARALLEL: additions-build-solaris.rsync-out-of-vm additions-build-solaris.rsync-into-vm
-.PHONY:       additions-build-solaris.rsync-out-of-vm additions-build-solaris.rsync-into-vm
-
-additions-build-solaris.amd64: additions-build-solaris.rsync-into-vm
+        $(VBOX_KMK_TIME) rsync -a --delete --delete-excluded --exclude .svn --exclude FetchDir --exclude tinderclient.log --exclude win.amd64 --exclude win.x86 . 192.168.27.4:/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
+
+additions-build-solaris.build-it: additions-build-solaris.rsync-into-vm
         $(call MSG_L1,Building Solaris/amd64 additions)
         $(VBOX_KMK_TIME) ssh [email protected] " cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing"
-
-additions-build-solaris.x86: additions-build-solaris.rsync-into-vm additions-build-solaris.amd64
         $(call MSG_L1,Building Solaris/x86 additions)
         $(VBOX_KMK_TIME) ssh [email protected] " cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1"
 
+additions-build-solaris.rsync-out-of-vm: additions-build-solaris.build-it
+        $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
+        $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
+
+.NOTPARALLEL: additions-build-solaris.rsync-out-of-vm additions-build-solaris.rsync-into-vm
+.PHONY:       additions-build-solaris.rsync-out-of-vm additions-build-solaris.rsync-into-vm additions-build-solaris.build-it
+
+additions-build-solaris.amd64: additions-build-solaris.rsync-out-of-vm
+additions-build-solaris.x86: additions-build-solaris.rsync-out-of-vm
 endif