VirtualBox

Changeset 6053

Show
Ignore:
Timestamp:
12/11/07 16:20:21 (1 year ago)
Author:
vboxsync
Message:

Additions build server hacking.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6019 r6053  
    5252 VBOX_WITH_LINUX_ADDITIONS = 
    5353endif 
     54ifdef VBOX_WITH_WIN32_ADDITIONS 
     55 VBOX_WITH_ADDITIONS_ISO.win.x86 = 1 
     56endif 
     57ifneq ($(VBOX_WITH_LINUX_ADDITIONS)$(VBOX_ADDITIONS_LINUX_CROSS),) 
     58 VBOX_WITH_ADDITIONS_ISO.linux.x86 = 1 
     59endif 
    5460 
    5561# Include sub-makefiles. 
    …… 
    6268 
    6369ifdef VBOX_WITH_LINUX_ADDITIONS 
    64  SUBDIRS      += linux 
    65  LINUXINSTALLER = $(PATH_BIN)/additions/VBoxLinuxAdditions.run 
    66 endif 
    67 LINUXINSTALLER_CROSS = $(PATH_ROOT)/out/linux.x86/$(BUILD_TYPE)/bin/additions/VBoxLinuxAdditions.run 
     70 SUBDIRS += linux 
     71 LINUXINSTALLER = $(VBOX_PATH_ADDITIONS)/VBoxLinuxAdditions.run 
     72endif 
     73LINUXINSTALLER_CROSS = $(PATH_OUT_BASE)/linux.x86/$(BUILD_TYPE)/bin/additions/VBoxLinuxAdditions.run 
    6874ifdef VBOX_ADDITIONS_LINUX_CROSS 
    6975 OTHER_CLEAN   += $(LINUXINSTALLER_CROSS) 
    …… 
    7278 
    7379# The packing target rule, but only if we're on the local build box. 
    74 ifndef VBOX_ADDITIONS_XYZ_ONLY 
    75  ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS),) 
    76   PACKING += $(if $(VBOX_OSE),,$(PATH_BIN)/additions/VBoxGuestAdditions.iso) 
     80ifndef VBOX_WITHOUT_ADDITIONS_ISO 
     81 ifndef VBOX_ADDITIONS_XYZ_ONLY 
     82  ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS),) 
     83   PACKING += $(if $(VBOX_OSE),,$(PATH_BIN)/additions/VBoxGuestAdditions.iso) 
     84  endif 
    7785 endif 
    7886endif 
    …… 
    8189 
    8290 
    83 ifdef VBOX_WITH_WIN32_ADDITIONS 
    84 GUESTADDITIONS_WIN32_DEPS = $(PATH_BIN)/additions/VBoxGuest.sys \ 
    85         ./WINNT/VBoxGuest/VBoxGuest.inf \ 
    86         $(PATH_BIN)/additions/VBoxService.exe \ 
    87         $(PATH_BIN)/additions/VBoxHook.dll \ 
    88         $(PATH_BIN)/additions/VBoxControl.exe \ 
    89         $(PATH_BIN)/additions/VBCoInst.dll \ 
    90         $(PATH_BIN)/additions/VBoxMouse.sys \ 
    91         ./WINNT/MouseFilter/VBoxMouse.inf \ 
    92         $(PATH_BIN)/additions/VBoxVideo.sys \ 
    93         ./WINNT/Graphics/Miniport/VBoxVideo.inf \ 
    94         $(PATH_BIN)/additions/VBoxDisp.dll \ 
    95         $(PATH_BIN)/additions/VBoxGINA.dll \ 
    96         $(PATH_BIN)/additions/VBoxGuestAdditions.exe \ 
    97         ./WINNT/Installer/AUTORUN.INF \ 
    98         ./WINNT/Network/AMD/netamd.inf \ 
    99         ./WINNT/Network/AMD/pcntpci5.cat \ 
    100         ./WINNT/Network/AMD/PCNTPCI5.sys 
    101  
    102 ifdef VBOX_WITH_WIN32_ADDITIONS_SHAREDFOLDERS 
    103 GUESTADDITIONS_WIN32_DEPS += \ 
    104         $(PATH_BIN)/additions/VBoxMRXNP.dll \ 
    105         $(PATH_BIN)/additions/VBoxSF.sys 
    106 endif 
    107  
    108 ## @todo We're missing the .cat files and using the wrong .inf files here. 
    109 GUESTADDITIONS_WIN32_FILESPEC = \ 
    110         driver/VBoxGuest/VBoxGuest.sys=$(PATH_BIN)/additions/VBoxGuest.sys \ 
     91# 
     92# The x86 Windows .iso file spec. 
     93# 
     94ifdef VBOX_WITH_ADDITIONS_ISO.win.x86 
     95 ifdef VBOX_ONLY_ADDITIONS 
     96  VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$(BUILD_TYPE)/bin/additions 
     97 else 
     98  VBOX_PATH_ADDITIONS.win.x86 = $(VBOX_PATH_ADDITIONS) 
     99 endif 
     100 ## @todo We're missing the .cat files and using the wrong .inf files here. 
     101 GUESTADDITIONS_FILESPEC.win.x86 = \ 
     102        driver/VBoxGuest/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxGuest.sys \ 
    111103        driver/VBoxGuest/VBoxGuest.inf=./WINNT/VBoxGuest/VBoxGuest.inf \ 
    112         driver/VBoxGuest/VBoxService.exe=$(PATH_BIN)/additions/VBoxService.exe \ 
    113         driver/VBoxGuest/VBoxHook.dll=$(PATH_BIN)/additions/VBoxHook.dll \ 
    114         driver/VBoxGuest/VBoxControl.exe=$(PATH_BIN)/additions/VBoxControl.exe \ 
    115         driver/VBoxGuest/VBCoInst.dll=$(PATH_BIN)/additions/VBCoInst.dll \ 
    116         driver/VBoxGuest/VBoxMouse.sys=$(PATH_BIN)/additions/VBoxMouse.sys \ 
     104        driver/VBoxGuest/VBoxService.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxService.exe \ 
     105        driver/VBoxGuest/VBoxHook.dll=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxHook.dll \ 
     106        driver/VBoxGuest/VBoxControl.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxControl.exe \ 
     107        driver/VBoxGuest/VBCoInst.dll=$(VBOX_PATH_ADDITIONS.win.x86)/VBCoInst.dll \ 
     108        driver/VBoxGuest/VBoxMouse.sys=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxMouse.sys \ 
    117109        driver/VBoxGuest/VBoxMouse.inf=./WINNT/MouseFilter/VBoxMouse.inf \ 
    118         driver/VBoxVideo/VBoxVideo.sys=$(PATH_BIN)/additions/VBoxVideo.sys \ 
     110        driver/VBoxVideo/VBoxVideo.sys=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxVideo.sys \ 
    119111        driver/VBoxVideo/VBoxVideo.inf=./WINNT/Graphics/Miniport/VBoxVideo.inf \ 
    120         driver/VBoxVideo/VBoxDisp.dll=$(PATH_BIN)/additions/VBoxDisp.dll \ 
    121         driver/VBoxSF/VBoxSF.sys=$(PATH_BIN)/additions/VBoxSF.sys \ 
    122         driver/VBoxSF/VBoxMRXNP.dll=$(PATH_BIN)/additions/VBoxMRXNP.dll \ 
    123         gina/VBoxGINA.dll=$(PATH_BIN)/additions/VBoxGINA.dll \ 
     112        driver/VBoxVideo/VBoxDisp.dll=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxDisp.dll \ 
     113        gina/VBoxGINA.dll=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxGINA.dll \ 
    124114        AMD_PCnet/netamd.inf=./WINNT/Network/AMD/netamd.inf \ 
    125115        AMD_PCnet/pcntpci5.cat=./WINNT/Network/AMD/pcntpci5.cat \ 
    126116        AMD_PCnet/PCNTPCI5.sys=./WINNT/Network/AMD/PCNTPCI5.sys \ 
    127         VBoxGuestAdditions.exe=$(PATH_BIN)/additions/VBoxGuestAdditions.exe \ 
     117        VBoxGuestAdditions.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxGuestAdditions.exe \ 
    128118        AUTORUN.INF=./WINNT/Installer/AUTORUN.INF 
    129 endif 
    130  
    131 ifdef LINUXINSTALLER 
    132 GUESTADDITIONS_LINUX_DEPS = $(LINUXINSTALLER) 
    133 GUESTADDITIONS_LINUX_FILESPEC = VBoxLinuxAdditions.run=$(LINUXINSTALLER) 
    134 endif 
    135  
    136 ifdef VBOX_WITH_OS2_ADDITIONS_BIN 
    137 GUESTADDITIONS_OS2_FILESPEC = \ 
     119 ifdef VBOX_WITH_WIN32_ADDITIONS_SHAREDFOLDERS 
     120  GUESTADDITIONS_FILESPEC.win.x86 += \ 
     121        driver/VBoxSF/VBoxSF.sys=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxSF.sys \ 
     122        driver/VBoxSF/VBoxMRXNP.dll=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxMRXNP.dll 
     123 endif 
     124 ## @todo remove GUESTADDITIONS_WIN32_DEPS when cleaning up later. 
     125 GUESTADDITIONS_WIN32_DEPS := $(filter-out %=deleteme=,,$(subst =,=deleteme= ,$(GUESTADDITIONS_FILESPEC.win.x86))) 
     126endif 
     127 
     128# 
     129# The OS/2 .iso file spec. 
     130# 
     131ifdef VBOX_WITH_ADDITIONS_ISO.os2.x86 
     132 ifdef VBOX_ONLY_ADDITIONS 
     133  VBOX_PATH_ADDITIONS.os2.x86 = $(PATH_OUT_BASE)/os2.x86/$(BUILD_TYPE)/bin/additions 
     134 else 
     135  VBOX_PATH_ADDITIONS.os2.x86 = $(VBOX_PATH_ADDITIONS) 
     136 endif 
     137 GUESTADDITIONS_FILESPEC.os2.x86 = \ 
     138        os2/VBoxGuest.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxGuest.sys \ 
     139        os2/VBoxService.exe=$(VBOX_PATH_ADDITIONS.os2.x86)/VBoxService.exe \ 
     140        os2/gengradd.dll=$(VBOX_PATH_ADDITIONS.os2.x86)/gengradd.dll \ 
     141        os2/libc063.dll=./os2/Bin/libc063.dll \ 
     142        os2/readme.txt=./os2/Bin/readme.txt \ 
     143        os2/vboxmouse.sys=$(VBOX_PATH_ADDITIONS.os2.x86)/vboxmouse.sys 
     144else ifdef VBOX_WITH_OS2_ADDITIONS_BIN 
     145 GUESTADDITIONS_FILESPEC.os2.x86 = \ 
    138146        os2/VBoxGuest.sys=./os2/Bin/VBoxGuest.sys \ 
    139147        os2/VBoxService.exe=./os2/Bin/VBoxService.exe \ 
    …… 
    145153 
    146154# 
     155# The x86 Linux .iso file spec. 
     156# 
     157ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86 
     158 ifneq ($(VBOX_ONLY_ADDITIONS)$(VBOX_ADDITIONS_LINUX_CROSS),) 
     159  VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(BUILD_TYPE)/bin/additions 
     160 else 
     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 
     165endif 
     166 
     167 
     168# 
    147169# Build the Guest Additions ISO image. 
    148170# 
    149 $(PATH_BIN)/additions/VBoxGuestAdditions.iso: \ 
    150                 $(GUESTADDITIONS_WIN32_DEPS) $(GUESTADDITIONS_LINUX_DEPS) $(VBOX_SVN_REV_KMK) \ 
     171ifndef VBOX_WITHOUT_ADDITIONS_ISO 
     172$(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.iso: \ 
     173                $(filter-out %=deleteme=,\ 
     174                        $(subst =,=deleteme= ,\ 
     175                                $(GUESTADDITIONS_FILESPEC.win.x86) \ 
     176                                $(GUESTADDITIONS_FILESPEC.linux.x86) \ 
     177                                $(GUESTADDITIONS_FILESPEC.os2.x86) \ 
     178                        )\ 
     179                ) \ 
     180                $(VBOX_SVN_REV_KMK) \ 
    151181                Makefile.kmk 
    152182        $(call MSG_TOOL,mkisofs,,$@) 
    153         $(QUIET)$(VBOX_MKISOFS) -rational-rock -joliet -iso-level 4 -volid "VBOXADDITIONS_$(VBOX_VERSION_STRING)_$(VBOX_SVN_REV)" -l -graft-points -o $@ \ 
    154                 $(GUESTADDITIONS_WIN32_FILESPEC) $(GUESTADDITIONS_LINUX_FILESPEC) $(GUESTADDITIONS_OS2_FILESPEC) 
    155  
    156 # 
    157 # Remote building. 
     183        $(QUIET)$(MKDIR) -p $(@D) 
     184        $(VBOX_MKISOFS) -rational-rock -joliet -iso-level 4 \ 
     185                -volid "VBOXADDITIONS_$(VBOX_VERSION_STRING)_$(VBOX_SVN_REV)" -l -graft-points -o $@ \ 
     186                $(GUESTADDITIONS_FILESPEC.win.x86) \ 
     187                $(GUESTADDITIONS_FILESPEC.linux.x86) \ 
     188                $(GUESTADDITIONS_FILESPEC.os2.x86) 
     189endif 
     190 
     191 
     192# 
     193# Remote building (to be obsoleted). 
    158194# 
    159195ifdef VBOX_REMOTE_WIN32_ADDITIONS_BUILD 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy