Changeset 34648 in vbox for trunk/Makefile.kmk

Timestamp:

Dec 2, 2010 7:06:07 PM (14 years ago)

Author:

vboxsync

Message:

rsync hacking

File:

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

trunk/Makefile.kmk

@@ -664 +664 @@
 
 #
-# Common rsync excludes.
+# Common rsync bits.
 #
 
 ##
+# The basic rsync invocation for syncing the tree into a VM; the source and
+# target specs are missing.
+#
 # @param    1   os name.
-VBOX_RSYNC_IN_EXCLUDES_FN = \
+# @param    2   arch or *.
+#
+VBOX_RSYNC_IN_FN = rsync -a --delete --delete-excluded --prune-empty-dirs \
         --exclude .svn/ \
         --exclude doc/Devices/ \
@@ -681 +686 @@
         $(foreach os,darwin freebsd linux solaris os2 win,$(if-expr "$(1)" != "$(os)", \
                 --exclude tools/$(os).x86/ \
-                --exclude tools/$(os).amd64/,))
+                --exclude tools/$(os).amd64/,)) \
+        --include 'out/$(1).$(2)/$(KBUILD_TYPE)/'
 
 #
@@ -935 +941 @@
 # Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
 extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-        $(VBOX_KMK_TIME) rsync -a --delete --delete-excluded $(call VBOX_RSYNC_IN_EXCLUDES_FN,solaris) . 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+        $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
 
 extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
@@ -998 +1004 @@
 else
         $(call MSG_L1,Building Darwin/amd64 extension packs)
-        $(VBOX_KMK_TIME) rsync -am -v --delete --delete-excluded $(call VBOX_RSYNC_IN_EXCLUDES_FN,darwin) . 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+        $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
         $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
         $(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
@@ -1008 +1014 @@
 else
         $(call MSG_L1,Building Darwin/x86 extension packs)
-        $(VBOX_KMK_TIME) rsync -am -v --delete --delete-excluded $(call VBOX_RSYNC_IN_EXCLUDES_FN,darwin) . 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+        $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
         $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
         $(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/