Changeset 34639 in vbox

Timestamp:

Dec 2, 2010 6:05:32 PM (14 years ago)

Author:

vboxsync

Message:

rsync hacking

File:

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

trunk/Makefile.kmk

@@ -666 +666 @@
 # Common rsync excludes.
 #
+
+##
+# @param    1   os name.
 VBOX_RSYNC_IN_EXCLUDES_FN = \
         --exclude .svn/ \
@@ -931 +934 @@
 # 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 $(VBOX_RSYNC_IN_EXCLUDES) . 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+        $(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)
 
 extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
@@ -994 +997 @@
 else
         $(call MSG_L1,Building Darwin/amd64 extension packs)
-        $(VBOX_KMK_TIME) rsync -a -v --delete --delete-excluded $(VBOX_RSYNC_IN_EXCLUDES) . 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+        $(VBOX_KMK_TIME) rsync -a -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) 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 -a -v --delete 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
@@ -1004 +1007 @@
 else
         $(call MSG_L1,Building Darwin/x86 extension packs)
-        $(VBOX_KMK_TIME) rsync -a -v --delete --delete-excluded $(VBOX_RSYNC_IN_EXCLUDES) . 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+        $(VBOX_KMK_TIME) rsync -a -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) 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 -a -v --delete 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/