Changeset 52852 in vbox for trunk

Timestamp:

Sep 25, 2014 9:31:07 AM (10 years ago)

Author:

vboxsync

Message:

Makefile.kmk: more fiddling

File:

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

trunk/Makefile.kmk

@@ -873 +873 @@
         $(call MSG_L1,Rsynced the sources + tools into the VMs.)
 .NOTPARALLEL: additions-build-rsync-into-vms
+.PHONY:       additions-build-rsync-into-vms
 
 
@@ -949 +950 @@
         $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
 
-.NOTPARALLEL: additions-build-solaris.rsync-into-vm
 .PHONY:       additions-build-solaris.rsync-into-vm additions-build-solaris.rsync-out-of-vm additions-build-solaris.build-it
 
@@ -980 +980 @@
         $(VBOX_KMK_TIME) rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 ./out
 
-.NOTPARALLEL: additions-build-os2.rsync-into-vm
 .PHONY:       additions-build-os2.rsync-into-vm additions-build-os2.rsync-out-of-vm additions-build-os2.build-it
 
@@ -1036 +1035 @@
         $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
 
-.NOTPARALLEL: additions-build-linux.rsync-into-vm
 .PHONY:       additions-build-linux.rsync-into-vm additions-build-linux.rsync-out-of-vm additions-build-linux.build-it
 
@@ -1307 +1305 @@
         $(call MSG_L1,Rsynced the sources + tools into the VMs.)
 .NOTPARALLEL: validationkit-build-rsync-into-vms
+.PHONY:       validationkit-build-rsync-into-vms
 
 
@@ -1359 +1358 @@
 else
 validationkit-build-solaris.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
-        $(VBOX_KMK_TIME) rsync -a --delete --delete-excluded --exclude .svn --exclude=FetchDir --exclude=tinderclient.log --exclude=win.amd64 --exclude=win.x86 . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
+        $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) \
+                '--exclude=src/VBox/**' \
+                '--exclude=src/VBox/Frontends/**' \
+                '--exclude=src/VBox/VMM/**' \
+                . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
 
 validationkit-build-solaris.build-it: validationkit-build-solaris.rsync-into-vm
@@ -1373 +1376 @@
         $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
 
-.NOTPARALLEL: validationkit-build-solaris.rsync-into-vm
 .PHONY:       validationkit-build-solaris.rsync-out-of-vm validationkit-build-solaris.rsync-into-vm validationkit-build-solaris.build-it
 
@@ -1387 +1389 @@
 validationkit-build-os2.rsync-into-vm:
         $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,os2,*) \
-                '--exclude=src/VBox/Additions/x11/**' \
-                '--exclude=src/VBox/Additions/WINNT/**' \
+                '--exclude=src/VBox/Additions/**' \
                 '--exclude=src/VBox/Frontends/**' \
                 '--exclude=src/VBox/VMM/**' \
@@ -1401 +1402 @@
         $(VBOX_KMK_TIME) rsync -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out
 
-.NOTPARALLEL: validationkit-build-os2.rsync-into-vm
 .PHONY:       validationkit-build-os2.rsync-into-vm validationkit-build-os2.rsync-out-of-vm validationkit-build-os2.build-it
 
@@ -1417 +1417 @@
 else
 validationkit-build-linux.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
-        $(VBOX_KMK_TIME) rsync -a --delete --delete-excluded --exclude .svn --exclude=FetchDir --exclude=tinderclient.log --exclude=win.amd64 --exclude=win.x86 . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
+        $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) \
+                '--exclude=src/VBox/**' \
+                '--exclude=src/VBox/Frontends/**' \
+                '--exclude=src/VBox/VMM/**' \
+                . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
 
 validationkit-build-linux.build-it: validationkit-build-linux.rsync-into-vm
@@ -1431 +1435 @@
         $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.amd64 out/
 
-.NOTPARALLEL: validationkit-build-linux.rsync-into-vm
 .PHONY:       validationkit-build-linux.rsync-out-of-vm validationkit-build-linux.rsync-into-vm validationkit-build-linux.build-it