Changeset 40315 in vbox
- Timestamp:
- Mar 1, 2012 8:51:53 PM (13 years ago)
- svn:sync-xref-src-repo-rev:
- 76570
- Location:
- trunk
- Files:
-
- 3 edited
-
Makefile.kmk (modified) (2 diffs)
-
src/VBox/Additions/Makefile.kmk (modified) (6 diffs)
-
src/VBox/Additions/os2/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.kmk
r40138 r40315 824 824 + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux VBOX_ONLY_ADDITIONS=1 825 825 + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=linux BUILD_TARGET_ARCH=x86 BUILD_TARGET=linux VBOX_ONLY_ADDITIONS=1 826 # + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=os2 BUILD_TARGET_ARCH=x86 BUILD_TARGET=os2 VBOX_ONLY_ADDITIONS=1 826 ifdef VBOX_WITH_OS2_ADD_BUILD 827 + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=os2 BUILD_TARGET_ARCH=x86 BUILD_TARGET=os2 VBOX_ONLY_ADDITIONS=1 828 endif 827 829 + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris VBOX_ONLY_ADDITIONS=1 828 830 + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=x86 BUILD_TARGET=solaris VBOX_ONLY_ADDITIONS=1 … … 914 916 endif 915 917 918 ifdef VBOX_WITH_OS2_ADD_BUILD 919 VBOX_BLD_VM_OS2_IP := 192.168.27.3 920 VBOX_BLD_VM_OS2_IP := 10.42.1.148 921 ifeq ($(KBUILD_TARGET),os2) 916 922 additions-build-os2.x86: 917 #ifeq ($(KBUILD_TARGET),os2) 918 # + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK) 919 # + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing 920 #else 921 # $(VBOX_KMK_TIME) ssh [email protected] " cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) " 922 #endif 923 + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK) 924 + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing 925 else 926 additions-build-os2.rsync-into-vm: $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST) 927 $(VBOX_KMK_TIME) rsync -v -v -a --delete --delete-excluded --exclude .svn \ 928 --exclude 'tools/FetchDir/**' \ 929 --exclude 'tinderclient.log' \ 930 --exclude 'tools/freebsd**' \ 931 --exclude 'tools/linux**' \ 932 --exclude 'tools/solaris**' \ 933 --exclude 'tools/win**' \ 934 --exclude 'out/**' \ 935 --exclude 'doc/Devices/**' \ 936 --exclude 'src/VBox/Additions/x11/**' \ 937 --exclude 'src/VBox/Additions/WINNT/**' \ 938 --exclude 'src/VBox/Frontends/**' \ 939 --exclude 'src/VBox/VMM/**' \ 940 $(PATH_ROOT)/. rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) 941 942 additions-build-os2.build-it: additions-build-os2.rsync-into-vm 943 $(call MSG_L1,Building OS/2 additions) 944 $(VBOX_KMK_TIME) rsh -n -l vbox $(VBOX_BLD_VM_OS2_IP) "cd e:\\tinderbox\\$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && e: && kbuild\\bin\\os2.x86\\kmk_ash tools\\env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing" 945 946 additions-build-os2.rsync-out-of-vm: additions-build-os2.build-it 947 $(VBOX_KMK_TIME) rsync -v -v -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 $(PATH_ROOT)/out 948 949 .NOTPARALLEL: additions-build-os2.rsync-out-of-vm additions-build-os2.rsync-into-vm 950 .PHONY: additions-build-os2.rsync-out-of-vm additions-build-os2.rsync-into-vm additions-build-os2.build-it 951 952 additions-build-os2.x86: additions-build-os2.rsync-out-of-vm 953 endif 954 # 955 else 956 additions-build-os2.x86: 957 # Dummy 958 endif 923 959 924 960 additions-build-linux.amd64: $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST) -
trunk/src/VBox/Additions/Makefile.kmk
r39749 r40315 59 59 include $(PATH_SUB_CURRENT)/linux/Makefile.kmk 60 60 endif 61 #ifeq ($(KBUILD_TARGET),os2)62 #include $(PATH_SUB_CURRENT)/os2/Makefile.kmk63 #endif61 ifeq ($(KBUILD_TARGET),os2) 62 include $(PATH_SUB_CURRENT)/os2/Makefile.kmk 63 endif 64 64 ifeq ($(KBUILD_TARGET),solaris) 65 65 include $(PATH_SUB_CURRENT)/solaris/Makefile.kmk … … 170 170 # 171 171 172 # Darwin / Mac OS X 173 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.x86 174 VBOX_PATH_ADDITIONS.darwin.x86 = $(PATH_OUT_BASE)/darwin.x86/$(KBUILD_TYPE)/bin/additions 175 # or dmg? 176 GUESTADDITIONS_FILESPEC.darwin.x86 = \ 177 VBoxDarwinAdditions-x86.run=$(VBOX_PATH_ADDITIONS.darwin.x86)/VBoxDarwinAdditions-x86.run 178 endif 179 180 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.amd64 181 VBOX_PATH_ADDITIONS.darwin.amd64 = $(PATH_OUT_BASE)/darwin.amd64/$(KBUILD_TYPE)/bin/additions 182 GUESTADDITIONS_FILESPEC.darwin.amd64 = \ 183 VBoxDarwinAdditions-amd64.run=$(VBOX_PATH_ADDITIONS.darwin.amd64)/VBoxDarwinAdditions-amd64.run 184 endif 185 186 # FreeBSD 172 187 ifdef VBOX_WITH_ADDITIONS_ISO.freebsd.amd64 173 188 VBOX_PATH_ADDITIONS.freebsd.amd64 = $(PATH_OUT_BASE)/freebsd.amd64/$(KBUILD_TYPE)/bin/additions … … 181 196 endif 182 197 183 198 # GNU/Linux 199 ifdef VBOX_WITH_ADDITIONS_ISO.linux.amd64 200 VBOX_PATH_ADDITIONS.linux.amd64 = $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions 201 ifdef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE 202 VBOX_LNX_ADD_AMD64_RUN_PKG=VBoxLinuxAdditions.run 203 else 204 VBOX_LNX_ADD_AMD64_RUN_PKG=VBoxLinuxAdditions-amd64.run 205 endif 206 GUESTADDITIONS_FILESPEC.linux.amd64 = \ 207 $(VBOX_LNX_ADD_AMD64_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.amd64)/VBoxLinuxAdditions.run 208 endif 209 ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86 210 VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions 211 ## @todo 64-bit additions: rename this package, update docs (?) and tests (?). create wrapper? create gnome/kde autorun app (xplatform) ? 212 ifdef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE 213 VBOX_LNX_ADD_X86_RUN_PKG=VBoxLinuxAdditions.run 214 else 215 VBOX_LNX_ADD_X86_RUN_PKG=VBoxLinuxAdditions-x86.run 216 endif 217 GUESTADDITIONS_FILESPEC.linux.x86 = \ 218 $(VBOX_LNX_ADD_X86_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.x86)/VBoxLinuxAdditions.run \ 219 runasroot.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/runasroot.sh \ 220 autorun.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/autorun.sh 221 endif 222 223 # IBM OS/2 184 224 ifdef VBOX_WITH_ADDITIONS_ISO.os2.x86 185 225 VBOX_PATH_ADDITIONS.os2.x86 = $(PATH_OUT_BASE)/os2.x86/$(KBUILD_TYPE)/bin/additions 186 226 GUESTADDITIONS_FILESPEC.os2.x86 = \ 187 32Bit/OS2/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxGuest.sys \ 188 32Bit/OS2/VBoxService.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxService.exe \ 189 32Bit/OS2/gengradd.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/gengradd.dll \ 190 32Bit/OS2/libc063.dll=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/libc063.dll \ 191 32Bit/OS2/readme.txt=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/readme.txt \ 192 32Bit/OS2/vboxmouse.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/vboxmouse.sys 227 OS2/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxGuest.sys \ 228 OS2/VBoxService.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxService.exe \ 229 OS2/VBoxControl.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxControl.exe \ 230 OS2/gengradd.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/gengradd.dll \ 231 OS2/libc064.dll=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/libc064.dll \ 232 OS2/readme.txt=$(VBOX_PATH_ADDITIONS_SRC)/os2/Bin/readme.txt \ 233 OS2/vboxmouse.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/vboxmouse.sys 193 234 else ifdef VBOX_WITH_OS2_ADDITIONS_BIN 194 235 GUESTADDITIONS_FILESPEC.os2.x86 = \ … … 201 242 endif 202 243 203 204 ifdef VBOX_WITH_ADDITIONS_ISO.linux.amd64 205 VBOX_PATH_ADDITIONS.linux.amd64 = $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions 206 ifdef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE 207 VBOX_LNX_ADD_AMD64_RUN_PKG=VBoxLinuxAdditions.run 208 else 209 VBOX_LNX_ADD_AMD64_RUN_PKG=VBoxLinuxAdditions-amd64.run 210 endif 211 GUESTADDITIONS_FILESPEC.linux.amd64 = \ 212 $(VBOX_LNX_ADD_AMD64_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.amd64)/VBoxLinuxAdditions.run 213 endif 214 ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86 215 VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions 216 ## @todo 64-bit additions: rename this package, update docs (?) and tests (?). create wrapper? create gnome/kde autorun app (xplatform) ? 217 ifdef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE 218 VBOX_LNX_ADD_X86_RUN_PKG=VBoxLinuxAdditions.run 219 else 220 VBOX_LNX_ADD_X86_RUN_PKG=VBoxLinuxAdditions-x86.run 221 endif 222 GUESTADDITIONS_FILESPEC.linux.x86 = \ 223 $(VBOX_LNX_ADD_X86_RUN_PKG)=$(VBOX_PATH_ADDITIONS.linux.x86)/VBoxLinuxAdditions.run \ 224 runasroot.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/runasroot.sh \ 225 autorun.sh=$(VBOX_PATH_ADDITIONS.linux.x86)/autorun.sh 226 endif 227 244 # Oracle Solaris. 228 245 ifdef VBOX_WITH_ADDITIONS_ISO.solaris.amd64 229 246 VBOX_PATH_ADDITIONS.solaris.amd64 = $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions … … 245 262 endif 246 263 264 # Microsoft Windows. 247 265 ifdef VBOX_WITH_ADDITIONS_ISO.win.amd64 248 266 VBOX_PATH_ADDITIONS.win.amd64 = $(PATH_OUT_BASE)/win.amd64/$(KBUILD_TYPE)/bin/additions … … 268 286 endif # win.x86 269 287 270 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.x86271 VBOX_PATH_ADDITIONS.darwin.x86 = $(PATH_OUT_BASE)/darwin.x86/$(KBUILD_TYPE)/bin/additions272 # or dmg?273 GUESTADDITIONS_FILESPEC.darwin.x86 = \274 VBoxDarwinAdditions-x86.run=$(VBOX_PATH_ADDITIONS.darwin.x86)/VBoxDarwinAdditions-x86.run275 endif276 277 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.amd64278 VBOX_PATH_ADDITIONS.darwin.amd64 = $(PATH_OUT_BASE)/darwin.amd64/$(KBUILD_TYPE)/bin/additions279 GUESTADDITIONS_FILESPEC.darwin.amd64 = \280 VBoxDarwinAdditions-amd64.run=$(VBOX_PATH_ADDITIONS.darwin.amd64)/VBoxDarwinAdditions-amd64.run281 endif282 288 283 289 # -
trunk/src/VBox/Additions/os2/Makefile.kmk
r28800 r40315 28 28 # 29 29 ifndef VBOX_OSE 30 include $(PATH_SUB_CURRENT)/VBoxGradd/Makefile.kmk 31 include $(PATH_SUB_CURRENT)/VBoxGrext/Makefile.kmk 30 # include $(PATH_SUB_CURRENT)/VBoxGradd/Makefile.kmk 31 # include $(PATH_SUB_CURRENT)/VBoxGrext/Makefile.kmk 32 include $(PATH_SUB_CURRENT)/Bin/Makefile.kmk 32 33 endif 33 include $(PATH_SUB_CURRENT)/VBoxSF/Makefile.kmk34 #include $(PATH_SUB_CURRENT)/VBoxSF/Makefile.kmk 34 35 35 36 include $(KBUILD_PATH)/subfooter.kmk
Note:
See TracChangeset
for help on using the changeset viewer.
