Changeset 25223 in vbox

Timestamp:

Dec 7, 2009 8:04:18 PM (15 years ago)

Author:

vboxsync

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

55728

Message:

/Makefile.kmk: More hacking.

File:

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

trunk/Makefile.kmk

@@ -719 +719 @@
 else
         $(call MSG_L1,Building Windows/amd64 additions)
-        $(VBOX_KMK_TIME) ssh [email protected] "cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing "
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing "
 endif
 
@@ -728 +728 @@
 else
         $(call MSG_L1,Building Windows/x86 additions)
-        $(VBOX_KMK_TIME) ssh [email protected] " cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.x86) all packing"
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.x86) all packing"
 endif
 
@@ -745 +745 @@
         $(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
+# trying to weed out who is locking files so that windows cannot open them...
+additions-build-solaris.build-it: additions-build-solaris.rsync-into-vm   additions-build-win.x86 additions-build-win.amd64
         $(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"
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing"
         $(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"
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@/x86   && 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
@@ -776 +777 @@
 else
         $(call MSG_L1,Building Linux/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"
+        $(VBOX_KMK_TIME) ssh [email protected] " echo $@ && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing"
 endif
 
@@ -785 +786 @@
 else
         $(call MSG_L1,Building Linux/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_KMK_TIME) ssh [email protected] " echo $@ && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing"
 endif