VirtualBox

Changeset 9639

Show
Ignore:
Timestamp:
06/12/08 02:20:23 (6 months ago)
Author:
vboxsync
Message:

Removed VBOX_WITH_LINUX_ADDITIONS, VBOX_WITH_WIN32_ADDITIONS, VBOX_ADDITIONS_LINUX_ONLY, VBOX_ADDITIONS_WIN32_ONLY and some other obsolete bits from ssh crossbuilding days.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Config.kmk

    r9636 r9639  
    135135# This indicates that additions (of some kind or another) is being _built_. 
    136136# VBOX_WITHOUT_ADDITIONS overrides it. 
    137 if1of ($(KBUILD_TARGET),l4 linux os2 solaris win) 
    138  VBOX_WITH_ADDITIONS = 1 
    139 else ifdef VBOX_WITH_WIN32_ADDITIONS # for ssh cross builds -remove later! 
    140  VBOX_WITH_ADDITIONS = 1 
    141 else ifdef VBOX_WITH_LINUX_ADDITIONS # for ssh cross builds - remove later! 
     137#if1of ($(KBUILD_TARGET), freebsd linux os2 solaris win) 
     138if1of ($(KBUILD_TARGET), linux solaris win) 
    142139 VBOX_WITH_ADDITIONS = 1 
    143140endif 
    …… 
    145142# (Ignored ifndef VBOX_WITH_ADDITIONS. Hack for 32/64 linux issues.) 
    146143VBOX_WITH_ADDITION_DRIVERS = 1 
    147 # Build windows additions. 
    148 # Note! VBOX_WITH_WIN32_ADDITIONS will be removed later. 
    149 if1of ($(KBUILD_TARGET), win) 
    150  VBOX_WITH_WIN32_ADDITIONS = 1 
    151 endif 
    152 # Build linux additions. 
    153 # Note! VBOX_WITH_LINUX_ADDITIONS will be removed later. 
    154 if1of ($(KBUILD_TARGET),l4 linux) 
    155  VBOX_WITH_LINUX_ADDITIONS = 1 
    156 endif 
    157144# Build X11 additions. Can be disabled separately. 
    158 ifndef VBOX_WITH_X11_ADDITIONS 
    159  ifdef VBOX_WITH_LINUX_ADDITIONS 
    160   VBOX_WITH_X11_ADDITIONS = 1 
    161  endif 
    162  if1of ($(KBUILD_TARGET), solaris) 
    163   VBOX_WITH_X11_ADDITIONS = 1 
    164  endif 
     145if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd solaris) 
     146 VBOX_WITH_X11_ADDITIONS = 1 
    165147endif 
    166148# Enable the building of shared folders in the windows additions. 
    …… 
    460442 # Zap anything that could be contradicting this. 
    461443 VBOX_WITH_ADDITIONS := 
    462  VBOX_WITH_WIN32_ADDITIONS := 
    463  VBOX_WITH_LINUX_ADDITIONS := 
    464444endif 
    465445 
    …… 
    622602   VBOX_GCC_TOOL := GXX32 
    623603   VBOX_WITH_VBOXDRV= 
    624    VBOX_WITH_LINUX_ADDITIONS= 
    625    VBOX_WITH_WIN32_ADDITIONS= 
    626604  else ifeq ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH),amd64.x86) 
    627605   VBOX_GCC_TOOL := GXX64 
    628606   VBOX_WITH_VBOXDRV= 
    629    VBOX_WITH_LINUX_ADDITIONS= 
    630    VBOX_WITH_WIN32_ADDITIONS= 
    631607  endif 
    632608 endif 

  • trunk/Makefile.kmk

    r9265 r9639  
    548548additions-build-win.x86: 
    549549ifeq ($(KBUILD_TARGET),win) 
    550         + $(KMK) VBOX_ADDITIONS_WIN32_ONLY=1 $(VBOX_ADDITIONS_BUILD.x86) 
     550        + $(KMK) $(VBOX_ADDITIONS_BUILD.x86) 
    551551else 
    552552        rsync -av --delete --delete-excluded --exclude .svn/ --exclude out/ --exclude tinderclient.log . 192.168.27.5:/cygdrive/c/vbox 
    553         ssh vbox@192.168.27.5 " cd /cygdrive/c/vbox && PATH_OUT_BASE=Z:/add/out tools/env.sh kmk VBOX_ADDITIONS_WIN32_ONLY=1 $(VBOX_ADDITIONS_BUILD.x86)" 
    554 #       ssh vbox@192.168.27.5 "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_WIN32_ONLY=1 $(VBOX_ADDITIONS_BUILD.x86)" 
     553        ssh vbox@192.168.27.5 " cd /cygdrive/c/vbox && PATH_OUT_BASE=Z:/add/out tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.x86)" 
     554#       ssh vbox@192.168.27.5 "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.x86)" 
    555555endif 
    556556 
    …… 
    571571additions-build-linux.x86: 
    572572ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86) 
    573         + $(KMK) VBOX_ADDITIONS_LINUX_ONLY=1 $(VBOX_ADDITIONS_BUILD.x86) 
     573        + $(KMK) $(VBOX_ADDITIONS_BUILD.x86) 
    574574else 
    575         ssh vbox@192.168.27.2 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk VBOX_ADDITIONS_LINUX_ONLY=1 $(VBOX_ADDITIONS_BUILD.x86) " 
     575        ssh vbox@192.168.27.2 " cd /mnt/vbox/add && ./tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) " 
    576576endif 
    577577 

  • trunk/src/VBox/Additions/Makefile.kmk

    r8863 r9639  
    3737 
    3838# 
    39 # Make some indicator adjustments to keep things simple in these makefiles. 
    40 # 
    41 ifdef VBOX_ADDITIONS_LINUX_ONLY 
    42  VBOX_ADDITIONS_XYZ_ONLY = 1 
    43  VBOX_WITH_LINUX_ADDITIONS = 1 
    44  VBOX_WITH_WIN32_ADDITIONS = 
    45 else ifdef VBOX_ADDITIONS_WIN32_ONLY 
    46  VBOX_ADDITIONS_XYZ_ONLY = 1 
    47  VBOX_WITH_WIN32_ADDITIONS = 1 
    48  VBOX_WITH_LINUX_ADDITIONS = 
    49 endif 
    50 ifdef VBOX_WITH_WIN32_ADDITIONS 
    51  VBOX_WITH_ADDITIONS_ISO.win.x86 = 1 
    52 endif 
    53 ifdef VBOX_WITH_LINUX_ADDITIONS 
    54  VBOX_WITH_ADDITIONS_ISO.linux.x86 = 1 
    55 endif 
    56 ifeq ($(KBUILD_TARGET),solaris) 
    57  VBOX_WITH_ADDITIONS_ISO.solaris.x86 = 1 
    58 endif 
    59 ifeq ($(KBUILD_TARGET),freebsd) 
    60  VBOX_WITH_ADDITIONS_ISO.freebsd.x86 = 1 
    61 endif 
     39# Note! VBOX_WITH_ADDITIONS is checked for by our parent makefile. 
     40# 
     41# Note! VBOX_WITH_X11_ADDITIONS is set in Config.kmk 
     42# 
     43# Note! The additions build box will set the VBOX_WITH_ADDITIONS_ISO.win.x86 
     44#       variables before invoking us from the root makefile. 
     45# 
     46#  ==>  All we have to worry about is what to do on the target we're on. 
     47# 
     48VBOX_WITH_ADDITIONS_ISO.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = 1 
    6249 
    6350# Include sub-makefiles. 
    6451include $(PATH_SUB_CURRENT)/common/Makefile.kmk 
    65 ifdef VBOX_WITH_WIN32_ADDITIONS 
    66  include $(PATH_SUB_CURRENT)/WINNT/Makefile.kmk 
    67 endif 
    68 ifdef VBOX_WITH_LINUX_ADDITIONS 
    69  include $(PATH_SUB_CURRENT)/linux/Makefile.kmk 
    70 endif 
     52 
    7153ifdef VBOX_WITH_X11_ADDITIONS 
    7254 include $(PATH_SUB_CURRENT)/x11/Makefile.kmk 
    7355endif 
     56 
     57ifeq ($(KBUILD_TARGET),freebsd) 
     58 include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk 
     59endif 
     60ifeq ($(KBUILD_TARGET),linux) 
     61 include $(PATH_SUB_CURRENT)/linux/Makefile.kmk 
     62endif 
     63#ifeq ($(KBUILD_TARGET),os2) 
     64# include $(PATH_SUB_CURRENT)/os2/Makefile.kmk 
     65#endif 
    7466ifeq ($(KBUILD_TARGET),solaris) 
    7567 include $(PATH_SUB_CURRENT)/solaris/Makefile.kmk 
    7668endif 
    77 ifeq ($(KBUILD_TARGET),freebsd) 
    78  include $(PATH_SUB_CURRENT)/freebsd/Makefile.kmk 
     69ifeq ($(KBUILD_TARGET),win) 
     70 include $(PATH_SUB_CURRENT)/WINNT/Makefile.kmk 
    7971endif 
    8072 
    8173# The packing target rule, but only if we're on the local build box. 
     74# (VBOX_WITHOUT_ADDITIONS_ISO is used by the additions build box, see the root makefile.) 
    8275ifndef VBOX_WITHOUT_ADDITIONS_ISO 
    83  ifndef VBOX_ADDITIONS_XYZ_ONLY 
    84   PACKING += $(PATH_BIN)/additions/VBoxGuestAdditions.iso 
    85  endif 
     76 PACKING += $(PATH_BIN)/additions/VBoxGuestAdditions.iso 
    8677endif 
    8778 
    8879include $(KBUILD_PATH)/subfooter.kmk 
    8980 
    90  
    91 # 
    92 # The x86 Windows .iso file spec. 
    93 # 
     81# 
     82# File per-OS/arch file specs for the additions iso (alphabetical order). 
     83# 
     84# We test for the VBOX_WITH_ADDITIONS_ISO.os.arch so that we don't have to 
     85# do the $(if )'ing down where the GUESTADDITIONS_FILESPEC.os.arch down 
     86# in the dependency list and mkisofs command. 
     87# 
     88 
     89ifdef VBOX_WITH_ADDITIONS_ISO.freebsd.amd64 
     90 VBOX_PATH_ADDITIONS.freebsd.amd64 = $(PATH_OUT_BASE)/freebsd.amd64/$(KBUILD_TYPE)/bin/additions 
     91 GUESTADDITIONS_FILESPEC.freebsd.amd64 = \ 
     92        VBoxFreeBSDAdditions-amd64.tbz=$(VBOX_PATH_ADDITIONS.freebsd.amd64)/VBoxFreeBSDAdditions.tbz 
     93endif 
     94ifdef VBOX_WITH_ADDITIONS_ISO.freebsd.x86 
     95 VBOX_PATH_ADDITIONS.freebsd.x86 = $(PATH_OUT_BASE)/freebsd.x86/$(KBUILD_TYPE)/bin/additions 
     96 GUESTADDITIONS_FILESPEC.freebsd.x86 = \ 
     97        VBoxFreeBSDAdditions-x86.tbz=$(VBOX_PATH_ADDITIONS.freebsd.x86)/VBoxFreeBSDAdditions.tbz 
     98endif 
     99 
     100 
     101ifdef VBOX_WITH_ADDITIONS_ISO.os2.x86 
     102 VBOX_PATH_ADDITIONS.os2.x86 = $(PATH_OUT_BASE)/os2.x86/$(KBUILD_TYPE)/bin/additions 
     103 GUESTADDITIONS_FILESPEC.os2.x86 = \ 
     104        os2/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxGuest.sys \ 
     105        os2/VBoxService.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxService.exe \ 
     106        os2/gengradd.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/gengradd.dll \ 
     107        os2/libc063.dll=./os2/Bin/libc063.dll \ 
     108        os2/readme.txt=./os2/Bin/readme.txt \ 
     109        os2/vboxmouse.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/vboxmouse.sys 
     110else ifdef VBOX_WITH_OS2_ADDITIONS_BIN 
     111 GUESTADDITIONS_FILESPEC.os2.x86 = \ 
     112        os2/VBoxGuest.sys=./os2/Bin/VBoxGuest.sys \ 
     113        os2/VBoxService.exe=./os2/Bin/VBoxService.exe \ 
     114        os2/gengradd.dll=./os2/Bin/gengradd.dll \ 
     115        os2/libc063.dll=./os2/Bin/libc063.dll \ 
     116        os2/readme.txt=./os2/Bin/readme.txt \ 
     117        os2/vboxmouse.sys=./os2/Bin/vboxmouse.sys 
     118endif 
     119 
     120 
     121ifdef VBOX_WITH_ADDITIONS_ISO.linux.amd64 
     122 VBOX_PATH_ADDITIONS.linux.amd64 = $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions 
     123 GUESTADDITIONS_FILESPEC.linux.amd64 = \ 
     124        VBoxLinuxAdditions-amd64.run=$(VBOX_PATH_ADDITIONS.linux.amd64)/VBoxLinuxAdditions.run 
     125endif 
     126ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86 
     127 VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions 
     128## @todo 64-bit additions: rename this package, update docs (?) and tests (?). create wrapper? create gnome/kde autorun app (xplatform) ? 
     129 GUESTADDITIONS_FILESPEC.linux.x86 = \ 
     130        VBoxLinuxAdditions.run=$(VBOX_PATH_ADDITIONS.linux.x86)/VBoxLinuxAdditions.run 
     131endif 
     132 
     133 
     134ifdef VBOX_WITH_ADDITIONS_ISO.solaris.amd64 
     135 VBOX_PATH_ADDITIONS.solaris.amd64 = $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions 
     136 GUESTADDITIONS_FILESPEC.solaris.amd64 = \ 
     137        VBoxSolarisAdditions-amd64.pkg=$(VBOX_PATH_ADDITIONS.solaris.amd64)/VBoxSolarisAdditions.pkg 
     138endif 
     139ifdef VBOX_WITH_ADDITIONS_ISO.solaris.x86 
     140 VBOX_PATH_ADDITIONS.solaris.x86 = $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions 
     141## @todo 64-bit additions: rename this package, update docs (?) and tests (?). 
     142 GUESTADDITIONS_FILESPEC.solaris.x86 = \ 
     143        VBoxSolarisAdditions.pkg=$(VBOX_PATH_ADDITIONS.solaris.x86)/VBoxSolarisAdditions.pkg 
     144endif 
     145 
     146 
     147ifdef VBOX_WITH_ADDITIONS_ISO.win.amd64 
     148 ## @todo 64-bit windows additions: 
     149 # It's going to be most of the files from above, except they must not have the same name on 
     150 # the iso (left hand side). 
     151 # We probably an autorun wrapper which launches the right installer, unless there is 
     152 # some Autorun.inf magic for this or that it can be done from the x86 installer. 
     153 # Also, we MUST fix the .inf / .cat problem mentioned in the todo above. 
     154endif 
    94155ifdef VBOX_WITH_ADDITIONS_ISO.win.x86 
    95  ifdef VBOX_ONLY_ADDITIONS 
    96   VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/bin/additions 
    97  else 
    98   # 32-only hack 
    99   VBOX_PATH_ADDITIONS.win.x86 = $(VBOX_PATH_ADDITIONS) 
    100  endif 
    101  ## @todo We're missing the .cat files and using the wrong .inf files here. 
     156 ## @todo We're missing the .cat files and using the wrong .inf files here! This is kind of serious... 
     157 VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/bin/additions 
    102158 GUESTADDITIONS_FILESPEC.win.x86 = \ 
    103159        driver/VBoxGuest/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxGuest.sys \ 
    …… 
    123179        driver/VBoxSF/VBoxMRXNP.dll=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxMRXNP.dll 
    124180 endif 
    125 endif 
    126  
    127 # 
    128 # The OS/2 .iso file spec. 
    129 # 
    130 ifdef VBOX_WITH_ADDITIONS_ISO.os2.x86 
    131  ifdef VBOX_ONLY_ADDITIONS 
    132   VBOX_PATH_ADDITIONS.os2.x86 = $(PATH_OUT_BASE)/os2.x86/$(KBUILD_TYPE)/bin/additions 
    133  else 
    134   VBOX_PATH_ADDITIONS.os2.x86 = $(VBOX_PATH_ADDITIONS) 
    135  endif 
    136  GUESTADDITIONS_FILESPEC.os2.x86 = \ 
    137         os2/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxGuest.sys \ 
    138         os2/VBoxService.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxService.exe \ 
    139         os2/gengradd.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/gengradd.dll \ 
    140         os2/libc063.dll=./os2/Bin/libc063.dll \ 
    141         os2/readme.txt=./os2/Bin/readme.txt \ 
    142         os2/vboxmouse.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/vboxmouse.sys 
    143 else ifdef VBOX_WITH_OS2_ADDITIONS_BIN 
    144  GUESTADDITIONS_FILESPEC.os2.x86 = \ 
    145         os2/VBoxGuest.sys=./os2/Bin/VBoxGuest.sys \ 
    146         os2/VBoxService.exe=./os2/Bin/VBoxService.exe \ 
    147         os2/gengradd.dll=./os2/Bin/gengradd.dll \ 
    148         os2/libc063.dll=./os2/Bin/libc063.dll \ 
    149         os2/readme.txt=./os2/Bin/readme.txt \ 
    150         os2/vboxmouse.sys=./os2/Bin/vboxmouse.sys 
    151 endif 
    152  
    153 # 
    154 # The x86 Linux .iso file spec. 
    155 # 
    156 ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86 
    157  ifdef VBOX_ONLY_ADDITIONS 
    158   VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions 
    159  else 
    160   # 32-bit only hack 
    161   VBOX_PATH_ADDITIONS.linux.x86 = $(VBOX_PATH_ADDITIONS) 
    162  endif 
    163  GUESTADDITIONS_FILESPEC.linux.x86 = \ 
    164         VBoxLinuxAdditions.run=$(VBOX_PATH_ADDITIONS.linux.x86)/VBoxLinuxAdditions.run 
    165 endif 
    166  
    167  
    168 # 
    169 # The x86 Solaris .iso file spec. 
    170 # 
    171 ifdef VBOX_WITH_ADDITIONS_ISO.solaris.x86 
    172  ifdef VBOX_ONLY_ADDITIONS 
    173   VBOX_PATH_ADDITIONS.solaris.x86 = $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions 
    174  else 
    175   # 32-bit only hack 
    176   VBOX_PATH_ADDITIONS.solaris.x86 = $(VBOX_PATH_ADDITIONS) 
    177  endif 
    178  GUESTADDITIONS_FILESPEC.solaris.x86 = \ 
    179         VBoxSolarisAdditions.pkg=$(VBOX_PATH_ADDITIONS.solaris.x86)/VBoxSolarisAdditions.pkg 
    180 endif 
    181  
    182 # 
    183 # The x86 FreeBSD .iso file spec. 
    184 # 
    185 ifdef VBOX_WITH_ADDITIONS_ISO.freebsd.x86 
    186  ifdef VBOX_ONLY_ADDITIONS 
    187   VBOX_PATH_ADDITIONS.freebsd.x86 = $(PATH_OUT_BASE)/freebsd.x86/$(KBUILD_TYPE)/bin/additions 
    188  else 
    189   # 32-bit only hack 
    190   VBOX_PATH_ADDITIONS.freebsd.x86 = $(VBOX_PATH_ADDITIONS) 
    191  endif 
    192  GUESTADDITIONS_FILESPEC.freebsd.x86 = \ 
    193         VBoxFreeBSDAdditions.tbz=$(VBOX_PATH_ADDITIONS.freebsd.x86)/VBoxFreeBSDAdditions.tbz 
    194 endif 
     181endif # win.x86 
     182 
    195183 
    196184# 
    …… 
    202190                        $(subst =,=deleteme= ,\ 
    203191                                $(GUESTADDITIONS_FILESPEC.win.x86) \ 
     192                                $(GUESTADDITIONS_FILESPEC.win.amd64) \ 
    204193                                $(GUESTADDITIONS_FILESPEC.solaris.x86) \ 
     194                                $(GUESTADDITIONS_FILESPEC.solaris.amd64) \ 
    205195                                $(GUESTADDITIONS_FILESPEC.os2.x86) \ 
    206196                                $(GUESTADDITIONS_FILESPEC.linux.x86) \ 
     197                                $(GUESTADDITIONS_FILESPEC.linux.amd64) \ 
    207198                                $(GUESTADDITIONS_FILESPEC.freebsd.x86) \ 
     199                                $(GUESTADDITIONS_FILESPEC.freebsd.amd64) \ 
    208200                        )\ 
    209201                ) \ 
    …… 
    217209                -volid "VBOXADDITIONS_$(VBOX_VERSION_STRING)_$(VBOX_SVN_REV)" -l -graft-points -o $@ \ 
    218210                $(GUESTADDITIONS_FILESPEC.win.x86) \ 
     211                $(GUESTADDITIONS_FILESPEC.win.amd64) \ 
    219212                $(GUESTADDITIONS_FILESPEC.solaris.x86) \ 
     213                $(GUESTADDITIONS_FILESPEC.solaris.amd64) \ 
    220214                $(GUESTADDITIONS_FILESPEC.os2.x86) \ 
    221215                $(GUESTADDITIONS_FILESPEC.linux.x86) \ 
    222                 $(GUESTADDITIONS_FILESPEC.freebsd.x86) 
    223 endif 
    224  
    225  
     216                $(GUESTADDITIONS_FILESPEC.linux.amd64) \ 
     217                $(GUESTADDITIONS_FILESPEC.freebsd.x86) \ 
     218                $(GUESTADDITIONS_FILESPEC.freebsd.amd64) 
     219endif 
     220 
     221 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy