Changeset 10161

Timestamp:

07/03/08 17:56:19 (2 months ago)

Author:

vboxsync

Message:

Added rules for building 64-bit additions.

Files:

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

trunk/Makefile.kmk

@@ -565 +565 @@
-        additions-build-linux.x86
-
+VBOX_ADDITIONS_BUILD.amd64 = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 \
+        KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
+        KBUILD_TARGET_ARCH=amd64 BUILD_TARGET_ARCH=amd64 \
+        all packing
+
-VBOX_ADDITIONS_BUILD.x86 = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 \
-        KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
-        KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
-        all packing
+
+additions-build-win.amd64:
+ifeq ($(KBUILD_TARGET),win)
+        + $(KMK) $(VBOX_ADDITIONS_BUILD.amd64)
+else
+        false
+        rsync -av --delete --delete-excluded --exclude .svn/ --exclude out/ --exclude tinderclient.log . 192.168.27.5:/cygdrive/c/vbox
+        ssh vbox@192.168.27.15 " cd /cygdrive/c/vbox && PATH_OUT_BASE=Z:/add/out tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.amd64)"
+#       ssh vbox@192.168.27.15 "cmd.exe /c cd /d z:\\add && set PATH_DEVTOOLS=c:\\vbox\\tools && c:\\vbox\\tools\\env.cmd -KBUILD c:\\vbox\\kBuild && set KMK_DONT_USE_NT_QUERY_INFORMATION_FILE=1 && set USER=vbox && kmk $(VBOX_ADDITIONS_BUILD.amd64)"
+endif
-
-additions-build-win.x86:
@@ -579 +594 @@
-endif
-
+additions-build-solaris.amd64:
+ifeq ($(KBUILD_TARGET),solaris)
+        + $(KMK) $(VBOX_ADDITIONS_BUILD.amd64)
+else
+        ssh vbox@192.168.27.14 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) "
+endif
+
-additions-build-solaris.x86:
-ifeq ($(KBUILD_TARGET),solaris)
@@ -592 +614 @@
-#       ssh vbox@192.168.27.3 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) "
-#endif
+
+additions-build-linux.amd64:
+ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
+        + $(KMK) $(VBOX_ADDITIONS_BUILD.amd64)
+else
+        ssh vbox@192.168.27.12 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) "
+endif
-
-additions-build-linux.x86: