VirtualBox

Changeset 54063 in vbox for trunk/src/VBox/Installer


Ignore:
Timestamp:
Feb 3, 2015 2:23:27 AM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
98002
Message:

Share the python bindings and installer file lists between the darwin, linux and solaris makefiles.

Location:
trunk/src/VBox/Installer
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/Config.kmk

    r54030 r54063  
    2121ifndef VBOX_ROOT_CONFIG_KMK_INCLUDED
    2222 include $(PATH_ROOT)/Config.kmk
     23endif
     24
     25#
     26# Generic stuff.
     27#
     28VBOX_PATH_INST_COMMON_SRC := $(PATH_SUB_CURRENT)/common
     29
     30
     31ifdef VBOX_WITH_PYTHON
     32 VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES = \
     33        sdk/bindings/xpcom/python/xpcom/__init__.py \
     34        sdk/bindings/xpcom/python/xpcom/primitives.py \
     35        sdk/bindings/xpcom/python/xpcom/file.py \
     36        sdk/bindings/xpcom/python/xpcom/xpcom_consts.py \
     37        sdk/bindings/xpcom/python/xpcom/nsError.py \
     38        sdk/bindings/xpcom/python/xpcom/xpt.py \
     39        sdk/bindings/xpcom/python/xpcom/components.py \
     40        sdk/bindings/xpcom/python/xpcom/vboxxpcom.py \
     41        sdk/bindings/xpcom/python/xpcom/client/__init__.py \
     42        sdk/bindings/xpcom/python/xpcom/server/__init__.py \
     43        sdk/bindings/xpcom/python/xpcom/server/enumerator.py \
     44        sdk/bindings/xpcom/python/xpcom/server/factory.py \
     45        sdk/bindings/xpcom/python/xpcom/server/loader.py \
     46        sdk/bindings/xpcom/python/xpcom/server/module.py \
     47        sdk/bindings/xpcom/python/xpcom/server/policy.py
     48 VBOXINST_SDK_INSTALLER_PYTHON_FILES = \
     49        sdk/installer/vboxapisetup.py \
     50        sdk/installer/vboxapi/__init__.py \
     51        sdk/installer/vboxapi/VirtualBox_constants.py
    2352endif
    2453

  • trunk/src/VBox/Installer/darwin/Makefile.kmk

    r54039 r54063  
    527527 # Python XPCOM glue
    528528 VBOX_DI_VBAPP_PYTHON_FILES = \
    529         $(foreach f,$(notdir $(wildcard $(VBOX_PATH_DIST)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \
    530         sdk/bindings/xpcom/python/xpcom/client/__init__.py \
    531         sdk/bindings/xpcom/python/xpcom/server/__init__.py \
    532         sdk/bindings/xpcom/python/xpcom/server/enumerator.py \
    533         sdk/bindings/xpcom/python/xpcom/server/factory.py \
    534         sdk/bindings/xpcom/python/xpcom/server/loader.py \
    535         sdk/bindings/xpcom/python/xpcom/server/module.py \
    536         sdk/bindings/xpcom/python/xpcom/server/policy.py \
    537         sdk/installer/vboxapisetup.py \
    538         sdk/installer/vboxapi/__init__.py \
    539         sdk/installer/vboxapi/VirtualBox_constants.py
     529        $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \
     530        $(VBOXINST_SDK_INSTALLER_PYTHON_FILES)
    540531endif
    541532

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r54034 r54063  
    9191linux-misc_SOURCES = \
    9292        $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
    93         $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml \
     93        $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.xml \
    9494        $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
    9595        $(linux-misc_0_OUTDIR)/generated.sh=>scripts/generated.sh \
    … …  
    107107        $(QUIET)$(APPEND) '$@' 'VBOX_VENDOR="$(VBOX_VENDOR)"'
    108108
    109 $$(linux-misc_0_OUTDIR)/virtualbox.desktop: $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
     109$$(linux-misc_0_OUTDIR)/virtualbox.desktop: $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
    110110        $(call MSG_GENERATE,,$@,$<)
    111111ifdef VBOX_PATH_PACKAGE_DOCS
    … …  
    275275ifdef VBOX_WITH_PYTHON
    276276 VBOX_LNX_NO_STRIP += \
    277         $(foreach f,$(notdir $(wildcard $(PATH_STAGE_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \
    278         sdk/bindings/xpcom/python/xpcom/client/__init__.py \
    279         sdk/bindings/xpcom/python/xpcom/server/__init__.py \
    280         sdk/bindings/xpcom/python/xpcom/server/enumerator.py \
    281         sdk/bindings/xpcom/python/xpcom/server/factory.py \
    282         sdk/bindings/xpcom/python/xpcom/server/loader.py \
    283         sdk/bindings/xpcom/python/xpcom/server/module.py \
    284         sdk/bindings/xpcom/python/xpcom/server/policy.py \
    285         sdk/installer/vboxapisetup.py \
    286         sdk/installer/vboxapi/__init__.py \
    287         sdk/installer/vboxapi/VirtualBox_constants.py
     277        $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \
     278        $(VBOXINST_SDK_INSTALLER_PYTHON_FILES)
    288279endif
    289280

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r54062 r54063  
    134134## List of file list variable names.
    135135SOLARIS_FILE_LIST_VARS :=
     136
     137## @def SOLARIS_ETC_FILES
     138# Service management facility manifest files to copy from VBOX_PATH_SOL_INST_SRC to /var/svc/manifest/application/virtualbox/.
     139SOLARIS_FILE_LIST_VARS += SOLARIS_ETC_FILES
     140SOLARIS_ETC_FILES.SUBDIRS := yes
     141SOLARIS_ETC_FILES.STRIP   := no
     142SOLARIS_ETC_FILES.MODE    := 0644
     143SOLARIS_ETC_FILES.SRC     := $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris
     144SOLARIS_ETC_FILES.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/etc
     145SOLARIS_ETC_FILES := $(if-expr defined(VBOX_WITH_NETADP),hostname.vboxnet0,)
     146
     147## @def SOLARIS_SMF_FILES
     148# Service management facility manifest files to copy from VBOX_PATH_SOL_INST_SRC to /var/svc/manifest/application/virtualbox/.
     149SOLARIS_FILE_LIST_VARS += SOLARIS_SMF_FILES
     150SOLARIS_SMF_FILES.SUBDIRS := yes
     151SOLARIS_SMF_FILES.STRIP   := no
     152SOLARIS_SMF_FILES.MODE    := 0644
     153SOLARIS_SMF_FILES.SRC     := $(VBOX_PATH_SOL_INST_SRC)
     154SOLARIS_SMF_FILES.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/var/svc/manifest/application/virtualbox
     155SOLARIS_SMF_FILES = \
     156        virtualbox-zoneaccess.xml \
     157        virtualbox-balloonctrl.xml \
     158        virtualbox-autostart.xml \
     159        $(if-expr defined(VBOX_WITH_WEBSERVICES),virtualbox-webservice.xml,)
     160
     161## @def SOLARIS_MIME_INFO_FILES
     162# MIME info files to be copied directly from VBOX_PATH_SOL_INST_SRC to /usr/share/mime-info/.
     163SOLARIS_FILE_LIST_VARS += SOLARIS_MIME_INFO_FILES
     164SOLARIS_MIME_INFO_FILES.SUBDIRS := yes
     165SOLARIS_MIME_INFO_FILES.STRIP   := no
     166SOLARIS_MIME_INFO_FILES.MODE    := 0644
     167SOLARIS_MIME_INFO_FILES.SRC     := $(VBOX_PATH_SOL_INST_SRC)
     168SOLARIS_MIME_INFO_FILES.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/mime-info
     169SOLARIS_MIME_INFO_FILES = \
     170        virtualbox.keys \
     171        virtualbox.mime
     172
     173## @def SOLARIS_PIXMAP_FILES
     174# Bitmap files to copy directly from INST_BIN to /usr/share/pixmaps/.
     175SOLARIS_FILE_LIST_VARS += SOLARIS_PIXMAP_FILES
     176SOLARIS_PIXMAP_FILES.SUBDIRS = no
     177SOLARIS_PIXMAP_FILES.STRIP   = no
     178SOLARIS_PIXMAP_FILES.MODE    = 0644
     179SOLARIS_PIXMAP_FILES.SRC     = $(PATH_STAGE_BIN)
     180SOLARIS_PIXMAP_FILES.DST     = $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/pixmaps
     181SOLARIS_PIXMAP_FILES = \
     182        VBox.png \
     183        virtualbox.png
     184
     185
     186## @def SOLARIS_INSTALLER_SCRIPTS
     187# Installer shell scripts that gets copied directly from VBOX_PATH_SOL_INST_SRC to VBOX_PATH_SI_SCRATCH_PKG (/).
     188SOLARIS_FILE_LIST_VARS += SOLARIS_INSTALLER_SCRIPTS
     189SOLARIS_INSTALLER_SCRIPTS.SUBDIRS = no
     190SOLARIS_INSTALLER_SCRIPTS.STRIP   = no
     191SOLARIS_INSTALLER_SCRIPTS.MODE    = 0755
     192SOLARIS_INSTALLER_SCRIPTS.SRC     = $(VBOX_PATH_SOL_INST_SRC)
     193SOLARIS_INSTALLER_SCRIPTS.DST     = $(VBOX_PATH_SI_SCRATCH_PKG)
     194SOLARIS_INSTALLER_SCRIPTS = \
     195        postinstall.sh \
     196        checkinstall.sh \
     197        preremove.sh \
     198        makepackage.sh
     199
     200## @def SOLARIS_INSTALLER_FILES
     201# Installer files that gets copied directly from VBOX_PATH_SOL_INST_SRC to VBOX_PATH_SI_SCRATCH_PKG (/).
     202SOLARIS_FILE_LIST_VARS += SOLARIS_INSTALLER_FILES
     203SOLARIS_INSTALLER_FILES.SUBDIRS = no
     204SOLARIS_INSTALLER_FILES.STRIP   = no
     205SOLARIS_INSTALLER_FILES.MODE    = 0644
     206SOLARIS_INSTALLER_FILES.SRC     = $(VBOX_PATH_SOL_INST_SRC)
     207SOLARIS_INSTALLER_FILES.DST     = $(VBOX_PATH_SI_SCRATCH_PKG)
     208SOLARIS_INSTALLER_FILES = \
     209        vbox.space
     210
     211## @def SOLARIS_DRIVER_BINS
     212# List of kernel module files that are copied from INST_BIN to platform/i86pc/kernel/drv/[amd64/] and stripped of debug info.
     213SOLARIS_FILE_LIST_VARS += SOLARIS_DRIVER_BINS
     214SOLARIS_DRIVER_BINS.SUBDIRS := no
     215SOLARIS_DRIVER_BINS.STRIP   := yes
     216SOLARIS_DRIVER_BINS.MODE    := 0644
     217SOLARIS_DRIVER_BINS.SRC     := $(PATH_STAGE_BIN)
     218SOLARIS_DRIVER_BINS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/kernel/drv/$(subst x86,,$(KBUILD_TARGET_ARCH))
     219SOLARIS_DRIVER_BINS = \
     220        vboxdrv \
     221        $(if $(VBOX_WITH_NETFLT),vboxflt,) \
     222        $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow,) \
     223        $(if $(VBOX_WITH_NETADP),vboxnet,) \
     224        $(if $(VBOX_WITH_USB),vboxusbmon,) \
     225        $(if $(VBOX_WITH_USB),vboxusb,)
     226
     227## @def SOLARIS_DRIVER_CONFS
     228# List of kernel module configuration files that are copied directly from INST_BIN to platform/i86pc/kernel/drv/.
     229SOLARIS_FILE_LIST_VARS += SOLARIS_DRIVER_CONFS
     230SOLARIS_DRIVER_CONFS.SUBDIRS := no
     231SOLARIS_DRIVER_CONFS.STRIP   := no
     232SOLARIS_DRIVER_CONFS.MODE    := 0644
     233SOLARIS_DRIVER_CONFS.SRC     := $(PATH_STAGE_BIN)
     234SOLARIS_DRIVER_CONFS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/kernel/drv
     235SOLARIS_DRIVER_CONFS = \
     236        vboxdrv.conf \
     237        $(if $(VBOX_WITH_NETFLT),vboxflt.conf,) \
     238        $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow.conf,) \
     239        $(if $(VBOX_WITH_NETADP),vboxnet.conf,) \
     240        $(if $(VBOX_WITH_USB),vboxusbmon.conf,) \
     241        $(if $(VBOX_WITH_USB),vboxusb.conf,)
    136242
    137243## @def SOLARIS_COMMON
    … …  
    155261SOLARIS_COMMON_EXES = \
    156262        VBoxISAExec
     263
     264## @def SOLARIS_COMMON_BINS
     265# List of INST_BIN shared libraries that should be copied into /opt/VirtualBox/ and stripped.
     266SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_STRIP_BINS
     267SOLARIS_COMMON_STRIP_BINS.SUBDIRS := yes
     268SOLARIS_COMMON_STRIP_BINS.STRIP   := no
     269SOLARIS_COMMON_STRIP_BINS.MODE    := 0644
     270SOLARIS_COMMON_STRIP_BINS.SRC     := $(PATH_STAGE_BIN)
     271SOLARIS_COMMON_STRIP_BINS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/
     272SOLARIS_COMMON_STRIP_BINS =
     273
     274## @def SOLARIS_COMMON_64_STRIP_BINS
     275# List of INST_BIN shared libraries that should be copied into /opt/VirtualBox/64/ and stripped.
     276SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_64_STRIP_BINS
     277SOLARIS_COMMON_64_STRIP_BINS.SUBDIRS := yes
     278SOLARIS_COMMON_64_STRIP_BINS.STRIP   := yes
     279SOLARIS_COMMON_64_STRIP_BINS.MODE    := 0644
     280SOLARIS_COMMON_64_STRIP_BINS.SRC     := $(PATH_STAGE_BIN)
     281SOLARIS_COMMON_64_STRIP_BINS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/64
     282SOLARIS_COMMON_64_STRIP_BINS =
     283
    157284
    158285## @def SOLARIS_STRIP_EXES
    … …  
    178305        $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,) \
    179306       $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
    180 
    181 ## @def SOLARIS_DRIVER_BINS
    182 # List of kernel module files that are copied from INST_BIN to platform/i86pc/kernel/drv/[amd64/] and stripped of debug info.
    183 SOLARIS_FILE_LIST_VARS += SOLARIS_DRIVER_BINS
    184 SOLARIS_DRIVER_BINS.SUBDIRS := no
    185 SOLARIS_DRIVER_BINS.STRIP   := yes
    186 SOLARIS_DRIVER_BINS.MODE    := 0644
    187 SOLARIS_DRIVER_BINS.SRC     := $(PATH_STAGE_BIN)
    188 SOLARIS_DRIVER_BINS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/kernel/drv/$(subst x86,,$(KBUILD_TARGET_ARCH))
    189 SOLARIS_DRIVER_BINS = \
    190         vboxdrv \
    191         $(if $(VBOX_WITH_NETFLT),vboxflt,) \
    192         $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow,) \
    193         $(if $(VBOX_WITH_NETADP),vboxnet,) \
    194         $(if $(VBOX_WITH_USB),vboxusbmon,) \
    195         $(if $(VBOX_WITH_USB),vboxusb,)
    196 
    197 ## @def SOLARIS_DRIVER_CONFS
    198 # List of kernel module configuration files that are copied directly from INST_BIN to platform/i86pc/kernel/drv/.
    199 SOLARIS_FILE_LIST_VARS += SOLARIS_DRIVER_CONFS
    200 SOLARIS_DRIVER_CONFS.SUBDIRS := no
    201 SOLARIS_DRIVER_CONFS.STRIP   := no
    202 SOLARIS_DRIVER_CONFS.MODE    := 0644
    203 SOLARIS_DRIVER_CONFS.SRC     := $(PATH_STAGE_BIN)
    204 SOLARIS_DRIVER_CONFS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/kernel/drv
    205 SOLARIS_DRIVER_CONFS = \
    206         vboxdrv.conf \
    207         $(if $(VBOX_WITH_NETFLT),vboxflt.conf,) \
    208         $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow.conf,) \
    209         $(if $(VBOX_WITH_NETADP),vboxnet.conf,) \
    210         $(if $(VBOX_WITH_USB),vboxusbmon.conf,) \
    211         $(if $(VBOX_WITH_USB),vboxusb.conf,)
    212307
    213308## @def SOLARIS_STRIP_BINS
    … …  
    319414
    320415
    321 
    322416## @def SOLARIS_QTLIBS
    323417# List of Qt shared libs that we need to copy from $(VBOX_PATH_QT4)/lib/ to /opt/VirtualBox/$(VBOX_SI_ARCH)/
    … …  
    351445endif
    352446
    353 ## @def SOLARIS_COMMON_64_STRIP_BINS
    354 # List of INST_BIN shared libraries that should be copied into /opt/VirtualBox/64/ and stripped.
    355 SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_64_STRIP_BINS
    356 SOLARIS_COMMON_64_STRIP_BINS.SUBDIRS := yes
    357 SOLARIS_COMMON_64_STRIP_BINS.STRIP   := yes
    358 SOLARIS_COMMON_64_STRIP_BINS.MODE    := 0644
    359 SOLARIS_COMMON_64_STRIP_BINS.SRC     := $(PATH_STAGE_BIN)
    360 SOLARIS_COMMON_64_STRIP_BINS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/64
    361 SOLARIS_COMMON_64_STRIP_BINS =
    362 ## @def SOLARIS_COMMON_BINS
    363 # List of INST_BIN shared libraries that should be copied into /opt/VirtualBox/ and stripped.
    364 SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_STRIP_BINS
    365 SOLARIS_COMMON_STRIP_BINS.SUBDIRS := yes
    366 SOLARIS_COMMON_STRIP_BINS.STRIP   := no
    367 SOLARIS_COMMON_STRIP_BINS.MODE    := 0644
    368 SOLARIS_COMMON_STRIP_BINS.SRC     := $(PATH_STAGE_BIN)
    369 SOLARIS_COMMON_STRIP_BINS.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/
    370 SOLARIS_COMMON_STRIP_BINS =
    371 
    372447# Python XPCOM glue
    373448ifdef VBOX_WITH_PYTHON
    374449 SOLARIS_COMMON += \
    375         $(foreach f,$(notdir $(wildcard $(PATH_STAGE_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \
    376         sdk/bindings/xpcom/python/xpcom/client/__init__.py \
    377         sdk/bindings/xpcom/python/xpcom/server/__init__.py \
    378         sdk/bindings/xpcom/python/xpcom/server/enumerator.py \
    379         sdk/bindings/xpcom/python/xpcom/server/factory.py \
    380         sdk/bindings/xpcom/python/xpcom/server/loader.py \
    381         sdk/bindings/xpcom/python/xpcom/server/module.py \
    382         sdk/bindings/xpcom/python/xpcom/server/policy.py \
    383         sdk/installer/vboxapisetup.py \
    384         sdk/installer/vboxapi/__init__.py \
    385         sdk/installer/vboxapi/VirtualBox_constants.py
     450        $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \
     451        $(VBOXINST_SDK_INSTALLER_PYTHON_FILES)
    386452 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    387453  ifdef VBOX_WITH_32_ON_64_MAIN_API
    … …  
    395461
    396462ifdef VBOX_WITH_JXPCOM
    397    SOLARIS_COMMON += \
    398          sdk/bindings/xpcom/java/vboxjxpcom.jar
     463 SOLARIS_COMMON += \
     464        sdk/bindings/xpcom/java/vboxjxpcom.jar
    399465endif
    400466
    … …  
    453519endif
    454520
    455 ## @def SOLARIS_ETC_FILES
    456 # Service management facility manifest files to copy from VBOX_PATH_SOL_INST_SRC to /var/svc/manifest/application/virtualbox/.
    457 SOLARIS_FILE_LIST_VARS += SOLARIS_ETC_FILES
    458 SOLARIS_ETC_FILES.SUBDIRS := yes
    459 SOLARIS_ETC_FILES.STRIP   := no
    460 SOLARIS_ETC_FILES.MODE    := 0644
    461 SOLARIS_ETC_FILES.SRC     := $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris
    462 SOLARIS_ETC_FILES.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/etc
    463 SOLARIS_ETC_FILES := $(if-expr defined(VBOX_WITH_NETADP),hostname.vboxnet0,)
    464 
    465 ## @def SOLARIS_SMF_FILES
    466 # Service management facility manifest files to copy from VBOX_PATH_SOL_INST_SRC to /var/svc/manifest/application/virtualbox/.
    467 SOLARIS_FILE_LIST_VARS += SOLARIS_SMF_FILES
    468 SOLARIS_SMF_FILES.SUBDIRS := yes
    469 SOLARIS_SMF_FILES.STRIP   := no
    470 SOLARIS_SMF_FILES.MODE    := 0644
    471 SOLARIS_SMF_FILES.SRC     := $(VBOX_PATH_SOL_INST_SRC)
    472 SOLARIS_SMF_FILES.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/var/svc/manifest/application/virtualbox
    473 SOLARIS_SMF_FILES = \
    474         virtualbox-zoneaccess.xml \
    475         virtualbox-balloonctrl.xml \
    476         virtualbox-autostart.xml \
    477         $(if-expr defined(VBOX_WITH_WEBSERVICES),virtualbox-webservice.xml,)
    478 
    479 ## @def SOLARIS_MIME_INFO_FILES
    480 # MIME info files to be copied directly from VBOX_PATH_SOL_INST_SRC to /usr/share/mime-info/.
    481 # No subdirectories. MODE=644
    482 SOLARIS_FILE_LIST_VARS += SOLARIS_MIME_INFO_FILES
    483 SOLARIS_MIME_INFO_FILES.SUBDIRS := yes
    484 SOLARIS_MIME_INFO_FILES.STRIP   := no
    485 SOLARIS_MIME_INFO_FILES.MODE    := 0644
    486 SOLARIS_MIME_INFO_FILES.SRC     := $(VBOX_PATH_SOL_INST_SRC)
    487 SOLARIS_MIME_INFO_FILES.DST     := $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/mime-info
    488 SOLARIS_MIME_INFO_FILES = \
    489         virtualbox.keys \
    490         virtualbox.mime
    491 
    492 ## @def SOLARIS_PIXMAP_FILES
    493 # Bitmap files to copy directly from INST_BIN to /usr/share/pixmaps/.
    494 # No subdirectories. MODE=644
    495 SOLARIS_FILE_LIST_VARS += SOLARIS_PIXMAP_FILES
    496 SOLARIS_PIXMAP_FILES.SUBDIRS = no
    497 SOLARIS_PIXMAP_FILES.STRIP   = no
    498 SOLARIS_PIXMAP_FILES.MODE    = 0644
    499 SOLARIS_PIXMAP_FILES.SRC     = $(PATH_STAGE_BIN)
    500 SOLARIS_PIXMAP_FILES.DST     = $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/pixmaps
    501 SOLARIS_PIXMAP_FILES = \
    502         VBox.png \
    503         virtualbox.png
    504 
    505 
    506 ## @def SOLARIS_INSTALLER_SCRIPTS
    507 # Installer shell scripts that gets copied directly from VBOX_PATH_SOL_INST_SRC to VBOX_PATH_SI_SCRATCH_PKG (/).
    508 SOLARIS_FILE_LIST_VARS += SOLARIS_INSTALLER_SCRIPTS
    509 SOLARIS_INSTALLER_SCRIPTS.SUBDIRS = no
    510 SOLARIS_INSTALLER_SCRIPTS.STRIP   = no
    511 SOLARIS_INSTALLER_SCRIPTS.MODE    = 0755
    512 SOLARIS_INSTALLER_SCRIPTS.SRC     = $(VBOX_PATH_SOL_INST_SRC)
    513 SOLARIS_INSTALLER_SCRIPTS.DST     = $(VBOX_PATH_SI_SCRATCH_PKG)
    514 SOLARIS_INSTALLER_SCRIPTS = \
    515         postinstall.sh \
    516         checkinstall.sh \
    517         preremove.sh \
    518         makepackage.sh
    519 
    520 SOLARIS_FILE_LIST_VARS += SOLARIS_INSTALLER_FILES
    521 SOLARIS_INSTALLER_FILES.SUBDIRS = no
    522 SOLARIS_INSTALLER_FILES.STRIP   = no
    523 SOLARIS_INSTALLER_FILES.MODE    = 0644
    524 SOLARIS_INSTALLER_FILES.SRC     = $(VBOX_PATH_SOL_INST_SRC)
    525 SOLARIS_INSTALLER_FILES.DST     = $(VBOX_PATH_SI_SCRATCH_PKG)
    526 SOLARIS_INSTALLER_FILES = \
    527         vbox.space
    528 
    529521
    530522#
    … …  
    543535                $(VBOX_VERSION_STAMP) \
    544536                \
    545                 $(VBOX_PATH_SOL_INST_SRC)/../common/virtualbox.desktop.in \
    546                 $(VBOX_PATH_SOL_INST_SRC)/../common/virtualbox.xml \
     537                $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in \
     538                $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.xml \
    547539                $(VBOX_PATH_SOL_INST_SRC)/virtualbox.applications.in \
    548540                $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \
    … …  
    636628                -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \
    637629                --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualbox.desktop \
    638                 $(VBOX_PATH_SOL_INST_SRC)/../common/virtualbox.desktop.in
     630                $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in
    639631        $(CHMOD) 0644 $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualbox.desktop
    640632
    … …  
    642634        $(SED)  -e '/<icon/d' \
    643635                --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/mime/packages/virtualbox.xml \
    644                 $(VBOX_PATH_SOL_INST_SRC)/../common/virtualbox.xml
     636                $(VBOX_PATH_INST_COMMON_SRC)/common/virtualbox.xml
    645637        $(CHMOD) 0644 $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/mime/packages/virtualbox.xml
    646638
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette