Index: /trunk/src/VBox/Installer/Config.kmk =================================================================== --- /trunk/src/VBox/Installer/Config.kmk (revision 54062) +++ /trunk/src/VBox/Installer/Config.kmk (revision 54063) @@ -21,4 +21,33 @@ ifndef VBOX_ROOT_CONFIG_KMK_INCLUDED include $(PATH_ROOT)/Config.kmk +endif + +# +# Generic stuff. +# +VBOX_PATH_INST_COMMON_SRC := $(PATH_SUB_CURRENT)/common + + +ifdef VBOX_WITH_PYTHON + VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES = \ + sdk/bindings/xpcom/python/xpcom/__init__.py \ + sdk/bindings/xpcom/python/xpcom/primitives.py \ + sdk/bindings/xpcom/python/xpcom/file.py \ + sdk/bindings/xpcom/python/xpcom/xpcom_consts.py \ + sdk/bindings/xpcom/python/xpcom/nsError.py \ + sdk/bindings/xpcom/python/xpcom/xpt.py \ + sdk/bindings/xpcom/python/xpcom/components.py \ + sdk/bindings/xpcom/python/xpcom/vboxxpcom.py \ + sdk/bindings/xpcom/python/xpcom/client/__init__.py \ + sdk/bindings/xpcom/python/xpcom/server/__init__.py \ + sdk/bindings/xpcom/python/xpcom/server/enumerator.py \ + sdk/bindings/xpcom/python/xpcom/server/factory.py \ + sdk/bindings/xpcom/python/xpcom/server/loader.py \ + sdk/bindings/xpcom/python/xpcom/server/module.py \ + sdk/bindings/xpcom/python/xpcom/server/policy.py + VBOXINST_SDK_INSTALLER_PYTHON_FILES = \ + sdk/installer/vboxapisetup.py \ + sdk/installer/vboxapi/__init__.py \ + sdk/installer/vboxapi/VirtualBox_constants.py endif Index: /trunk/src/VBox/Installer/darwin/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/darwin/Makefile.kmk (revision 54062) +++ /trunk/src/VBox/Installer/darwin/Makefile.kmk (revision 54063) @@ -527,15 +527,6 @@ # Python XPCOM glue VBOX_DI_VBAPP_PYTHON_FILES = \ - $(foreach f,$(notdir $(wildcard $(VBOX_PATH_DIST)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \ - sdk/bindings/xpcom/python/xpcom/client/__init__.py \ - sdk/bindings/xpcom/python/xpcom/server/__init__.py \ - sdk/bindings/xpcom/python/xpcom/server/enumerator.py \ - sdk/bindings/xpcom/python/xpcom/server/factory.py \ - sdk/bindings/xpcom/python/xpcom/server/loader.py \ - sdk/bindings/xpcom/python/xpcom/server/module.py \ - sdk/bindings/xpcom/python/xpcom/server/policy.py \ - sdk/installer/vboxapisetup.py \ - sdk/installer/vboxapi/__init__.py \ - sdk/installer/vboxapi/VirtualBox_constants.py + $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \ + $(VBOXINST_SDK_INSTALLER_PYTHON_FILES) endif Index: /trunk/src/VBox/Installer/linux/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/linux/Makefile.kmk (revision 54062) +++ /trunk/src/VBox/Installer/linux/Makefile.kmk (revision 54063) @@ -91,5 +91,5 @@ linux-misc_SOURCES = \ $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \ - $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml \ + $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.xml \ $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \ $(linux-misc_0_OUTDIR)/generated.sh=>scripts/generated.sh \ @@ -107,5 +107,5 @@ $(QUIET)$(APPEND) '$@' 'VBOX_VENDOR="$(VBOX_VENDOR)"' -$$(linux-misc_0_OUTDIR)/virtualbox.desktop: $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@) +$$(linux-misc_0_OUTDIR)/virtualbox.desktop: $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@) $(call MSG_GENERATE,,$@,$<) ifdef VBOX_PATH_PACKAGE_DOCS @@ -275,15 +275,6 @@ ifdef VBOX_WITH_PYTHON VBOX_LNX_NO_STRIP += \ - $(foreach f,$(notdir $(wildcard $(PATH_STAGE_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \ - sdk/bindings/xpcom/python/xpcom/client/__init__.py \ - sdk/bindings/xpcom/python/xpcom/server/__init__.py \ - sdk/bindings/xpcom/python/xpcom/server/enumerator.py \ - sdk/bindings/xpcom/python/xpcom/server/factory.py \ - sdk/bindings/xpcom/python/xpcom/server/loader.py \ - sdk/bindings/xpcom/python/xpcom/server/module.py \ - sdk/bindings/xpcom/python/xpcom/server/policy.py \ - sdk/installer/vboxapisetup.py \ - sdk/installer/vboxapi/__init__.py \ - sdk/installer/vboxapi/VirtualBox_constants.py + $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \ + $(VBOXINST_SDK_INSTALLER_PYTHON_FILES) endif Index: /trunk/src/VBox/Installer/solaris/Makefile.kmk =================================================================== --- /trunk/src/VBox/Installer/solaris/Makefile.kmk (revision 54062) +++ /trunk/src/VBox/Installer/solaris/Makefile.kmk (revision 54063) @@ -134,4 +134,110 @@ ## List of file list variable names. SOLARIS_FILE_LIST_VARS := + +## @def SOLARIS_ETC_FILES +# Service management facility manifest files to copy from VBOX_PATH_SOL_INST_SRC to /var/svc/manifest/application/virtualbox/. +SOLARIS_FILE_LIST_VARS += SOLARIS_ETC_FILES +SOLARIS_ETC_FILES.SUBDIRS := yes +SOLARIS_ETC_FILES.STRIP := no +SOLARIS_ETC_FILES.MODE := 0644 +SOLARIS_ETC_FILES.SRC := $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris +SOLARIS_ETC_FILES.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/etc +SOLARIS_ETC_FILES := $(if-expr defined(VBOX_WITH_NETADP),hostname.vboxnet0,) + +## @def SOLARIS_SMF_FILES +# Service management facility manifest files to copy from VBOX_PATH_SOL_INST_SRC to /var/svc/manifest/application/virtualbox/. +SOLARIS_FILE_LIST_VARS += SOLARIS_SMF_FILES +SOLARIS_SMF_FILES.SUBDIRS := yes +SOLARIS_SMF_FILES.STRIP := no +SOLARIS_SMF_FILES.MODE := 0644 +SOLARIS_SMF_FILES.SRC := $(VBOX_PATH_SOL_INST_SRC) +SOLARIS_SMF_FILES.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/var/svc/manifest/application/virtualbox +SOLARIS_SMF_FILES = \ + virtualbox-zoneaccess.xml \ + virtualbox-balloonctrl.xml \ + virtualbox-autostart.xml \ + $(if-expr defined(VBOX_WITH_WEBSERVICES),virtualbox-webservice.xml,) + +## @def SOLARIS_MIME_INFO_FILES +# MIME info files to be copied directly from VBOX_PATH_SOL_INST_SRC to /usr/share/mime-info/. +SOLARIS_FILE_LIST_VARS += SOLARIS_MIME_INFO_FILES +SOLARIS_MIME_INFO_FILES.SUBDIRS := yes +SOLARIS_MIME_INFO_FILES.STRIP := no +SOLARIS_MIME_INFO_FILES.MODE := 0644 +SOLARIS_MIME_INFO_FILES.SRC := $(VBOX_PATH_SOL_INST_SRC) +SOLARIS_MIME_INFO_FILES.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/mime-info +SOLARIS_MIME_INFO_FILES = \ + virtualbox.keys \ + virtualbox.mime + +## @def SOLARIS_PIXMAP_FILES +# Bitmap files to copy directly from INST_BIN to /usr/share/pixmaps/. +SOLARIS_FILE_LIST_VARS += SOLARIS_PIXMAP_FILES +SOLARIS_PIXMAP_FILES.SUBDIRS = no +SOLARIS_PIXMAP_FILES.STRIP = no +SOLARIS_PIXMAP_FILES.MODE = 0644 +SOLARIS_PIXMAP_FILES.SRC = $(PATH_STAGE_BIN) +SOLARIS_PIXMAP_FILES.DST = $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/pixmaps +SOLARIS_PIXMAP_FILES = \ + VBox.png \ + virtualbox.png + + +## @def SOLARIS_INSTALLER_SCRIPTS +# Installer shell scripts that gets copied directly from VBOX_PATH_SOL_INST_SRC to VBOX_PATH_SI_SCRATCH_PKG (/). +SOLARIS_FILE_LIST_VARS += SOLARIS_INSTALLER_SCRIPTS +SOLARIS_INSTALLER_SCRIPTS.SUBDIRS = no +SOLARIS_INSTALLER_SCRIPTS.STRIP = no +SOLARIS_INSTALLER_SCRIPTS.MODE = 0755 +SOLARIS_INSTALLER_SCRIPTS.SRC = $(VBOX_PATH_SOL_INST_SRC) +SOLARIS_INSTALLER_SCRIPTS.DST = $(VBOX_PATH_SI_SCRATCH_PKG) +SOLARIS_INSTALLER_SCRIPTS = \ + postinstall.sh \ + checkinstall.sh \ + preremove.sh \ + makepackage.sh + +## @def SOLARIS_INSTALLER_FILES +# Installer files that gets copied directly from VBOX_PATH_SOL_INST_SRC to VBOX_PATH_SI_SCRATCH_PKG (/). +SOLARIS_FILE_LIST_VARS += SOLARIS_INSTALLER_FILES +SOLARIS_INSTALLER_FILES.SUBDIRS = no +SOLARIS_INSTALLER_FILES.STRIP = no +SOLARIS_INSTALLER_FILES.MODE = 0644 +SOLARIS_INSTALLER_FILES.SRC = $(VBOX_PATH_SOL_INST_SRC) +SOLARIS_INSTALLER_FILES.DST = $(VBOX_PATH_SI_SCRATCH_PKG) +SOLARIS_INSTALLER_FILES = \ + vbox.space + +## @def SOLARIS_DRIVER_BINS +# List of kernel module files that are copied from INST_BIN to platform/i86pc/kernel/drv/[amd64/] and stripped of debug info. +SOLARIS_FILE_LIST_VARS += SOLARIS_DRIVER_BINS +SOLARIS_DRIVER_BINS.SUBDIRS := no +SOLARIS_DRIVER_BINS.STRIP := yes +SOLARIS_DRIVER_BINS.MODE := 0644 +SOLARIS_DRIVER_BINS.SRC := $(PATH_STAGE_BIN) +SOLARIS_DRIVER_BINS.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/kernel/drv/$(subst x86,,$(KBUILD_TARGET_ARCH)) +SOLARIS_DRIVER_BINS = \ + vboxdrv \ + $(if $(VBOX_WITH_NETFLT),vboxflt,) \ + $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow,) \ + $(if $(VBOX_WITH_NETADP),vboxnet,) \ + $(if $(VBOX_WITH_USB),vboxusbmon,) \ + $(if $(VBOX_WITH_USB),vboxusb,) + +## @def SOLARIS_DRIVER_CONFS +# List of kernel module configuration files that are copied directly from INST_BIN to platform/i86pc/kernel/drv/. +SOLARIS_FILE_LIST_VARS += SOLARIS_DRIVER_CONFS +SOLARIS_DRIVER_CONFS.SUBDIRS := no +SOLARIS_DRIVER_CONFS.STRIP := no +SOLARIS_DRIVER_CONFS.MODE := 0644 +SOLARIS_DRIVER_CONFS.SRC := $(PATH_STAGE_BIN) +SOLARIS_DRIVER_CONFS.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/kernel/drv +SOLARIS_DRIVER_CONFS = \ + vboxdrv.conf \ + $(if $(VBOX_WITH_NETFLT),vboxflt.conf,) \ + $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow.conf,) \ + $(if $(VBOX_WITH_NETADP),vboxnet.conf,) \ + $(if $(VBOX_WITH_USB),vboxusbmon.conf,) \ + $(if $(VBOX_WITH_USB),vboxusb.conf,) ## @def SOLARIS_COMMON @@ -155,4 +261,25 @@ SOLARIS_COMMON_EXES = \ VBoxISAExec + +## @def SOLARIS_COMMON_BINS +# List of INST_BIN shared libraries that should be copied into /opt/VirtualBox/ and stripped. +SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_STRIP_BINS +SOLARIS_COMMON_STRIP_BINS.SUBDIRS := yes +SOLARIS_COMMON_STRIP_BINS.STRIP := no +SOLARIS_COMMON_STRIP_BINS.MODE := 0644 +SOLARIS_COMMON_STRIP_BINS.SRC := $(PATH_STAGE_BIN) +SOLARIS_COMMON_STRIP_BINS.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/ +SOLARIS_COMMON_STRIP_BINS = + +## @def SOLARIS_COMMON_64_STRIP_BINS +# List of INST_BIN shared libraries that should be copied into /opt/VirtualBox/64/ and stripped. +SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_64_STRIP_BINS +SOLARIS_COMMON_64_STRIP_BINS.SUBDIRS := yes +SOLARIS_COMMON_64_STRIP_BINS.STRIP := yes +SOLARIS_COMMON_64_STRIP_BINS.MODE := 0644 +SOLARIS_COMMON_64_STRIP_BINS.SRC := $(PATH_STAGE_BIN) +SOLARIS_COMMON_64_STRIP_BINS.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/64 +SOLARIS_COMMON_64_STRIP_BINS = + ## @def SOLARIS_STRIP_EXES @@ -178,36 +305,4 @@ $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,) \ $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) - -## @def SOLARIS_DRIVER_BINS -# List of kernel module files that are copied from INST_BIN to platform/i86pc/kernel/drv/[amd64/] and stripped of debug info. -SOLARIS_FILE_LIST_VARS += SOLARIS_DRIVER_BINS -SOLARIS_DRIVER_BINS.SUBDIRS := no -SOLARIS_DRIVER_BINS.STRIP := yes -SOLARIS_DRIVER_BINS.MODE := 0644 -SOLARIS_DRIVER_BINS.SRC := $(PATH_STAGE_BIN) -SOLARIS_DRIVER_BINS.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/kernel/drv/$(subst x86,,$(KBUILD_TARGET_ARCH)) -SOLARIS_DRIVER_BINS = \ - vboxdrv \ - $(if $(VBOX_WITH_NETFLT),vboxflt,) \ - $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow,) \ - $(if $(VBOX_WITH_NETADP),vboxnet,) \ - $(if $(VBOX_WITH_USB),vboxusbmon,) \ - $(if $(VBOX_WITH_USB),vboxusb,) - -## @def SOLARIS_DRIVER_CONFS -# List of kernel module configuration files that are copied directly from INST_BIN to platform/i86pc/kernel/drv/. -SOLARIS_FILE_LIST_VARS += SOLARIS_DRIVER_CONFS -SOLARIS_DRIVER_CONFS.SUBDIRS := no -SOLARIS_DRIVER_CONFS.STRIP := no -SOLARIS_DRIVER_CONFS.MODE := 0644 -SOLARIS_DRIVER_CONFS.SRC := $(PATH_STAGE_BIN) -SOLARIS_DRIVER_CONFS.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/kernel/drv -SOLARIS_DRIVER_CONFS = \ - vboxdrv.conf \ - $(if $(VBOX_WITH_NETFLT),vboxflt.conf,) \ - $(if $(VBOX_WITH_NETFLT_CROSSBOW),vboxbow.conf,) \ - $(if $(VBOX_WITH_NETADP),vboxnet.conf,) \ - $(if $(VBOX_WITH_USB),vboxusbmon.conf,) \ - $(if $(VBOX_WITH_USB),vboxusb.conf,) ## @def SOLARIS_STRIP_BINS @@ -319,5 +414,4 @@ - ## @def SOLARIS_QTLIBS # List of Qt shared libs that we need to copy from $(VBOX_PATH_QT4)/lib/ to /opt/VirtualBox/$(VBOX_SI_ARCH)/ @@ -351,37 +445,9 @@ endif -## @def SOLARIS_COMMON_64_STRIP_BINS -# List of INST_BIN shared libraries that should be copied into /opt/VirtualBox/64/ and stripped. -SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_64_STRIP_BINS -SOLARIS_COMMON_64_STRIP_BINS.SUBDIRS := yes -SOLARIS_COMMON_64_STRIP_BINS.STRIP := yes -SOLARIS_COMMON_64_STRIP_BINS.MODE := 0644 -SOLARIS_COMMON_64_STRIP_BINS.SRC := $(PATH_STAGE_BIN) -SOLARIS_COMMON_64_STRIP_BINS.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/64 -SOLARIS_COMMON_64_STRIP_BINS = -## @def SOLARIS_COMMON_BINS -# List of INST_BIN shared libraries that should be copied into /opt/VirtualBox/ and stripped. -SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_STRIP_BINS -SOLARIS_COMMON_STRIP_BINS.SUBDIRS := yes -SOLARIS_COMMON_STRIP_BINS.STRIP := no -SOLARIS_COMMON_STRIP_BINS.MODE := 0644 -SOLARIS_COMMON_STRIP_BINS.SRC := $(PATH_STAGE_BIN) -SOLARIS_COMMON_STRIP_BINS.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/ -SOLARIS_COMMON_STRIP_BINS = - # Python XPCOM glue ifdef VBOX_WITH_PYTHON SOLARIS_COMMON += \ - $(foreach f,$(notdir $(wildcard $(PATH_STAGE_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \ - sdk/bindings/xpcom/python/xpcom/client/__init__.py \ - sdk/bindings/xpcom/python/xpcom/server/__init__.py \ - sdk/bindings/xpcom/python/xpcom/server/enumerator.py \ - sdk/bindings/xpcom/python/xpcom/server/factory.py \ - sdk/bindings/xpcom/python/xpcom/server/loader.py \ - sdk/bindings/xpcom/python/xpcom/server/module.py \ - sdk/bindings/xpcom/python/xpcom/server/policy.py \ - sdk/installer/vboxapisetup.py \ - sdk/installer/vboxapi/__init__.py \ - sdk/installer/vboxapi/VirtualBox_constants.py + $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \ + $(VBOXINST_SDK_INSTALLER_PYTHON_FILES) ifeq ($(KBUILD_TARGET_ARCH),amd64) ifdef VBOX_WITH_32_ON_64_MAIN_API @@ -395,6 +461,6 @@ ifdef VBOX_WITH_JXPCOM - SOLARIS_COMMON += \ - sdk/bindings/xpcom/java/vboxjxpcom.jar + SOLARIS_COMMON += \ + sdk/bindings/xpcom/java/vboxjxpcom.jar endif @@ -453,78 +519,4 @@ endif -## @def SOLARIS_ETC_FILES -# Service management facility manifest files to copy from VBOX_PATH_SOL_INST_SRC to /var/svc/manifest/application/virtualbox/. -SOLARIS_FILE_LIST_VARS += SOLARIS_ETC_FILES -SOLARIS_ETC_FILES.SUBDIRS := yes -SOLARIS_ETC_FILES.STRIP := no -SOLARIS_ETC_FILES.MODE := 0644 -SOLARIS_ETC_FILES.SRC := $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris -SOLARIS_ETC_FILES.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/etc -SOLARIS_ETC_FILES := $(if-expr defined(VBOX_WITH_NETADP),hostname.vboxnet0,) - -## @def SOLARIS_SMF_FILES -# Service management facility manifest files to copy from VBOX_PATH_SOL_INST_SRC to /var/svc/manifest/application/virtualbox/. -SOLARIS_FILE_LIST_VARS += SOLARIS_SMF_FILES -SOLARIS_SMF_FILES.SUBDIRS := yes -SOLARIS_SMF_FILES.STRIP := no -SOLARIS_SMF_FILES.MODE := 0644 -SOLARIS_SMF_FILES.SRC := $(VBOX_PATH_SOL_INST_SRC) -SOLARIS_SMF_FILES.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/var/svc/manifest/application/virtualbox -SOLARIS_SMF_FILES = \ - virtualbox-zoneaccess.xml \ - virtualbox-balloonctrl.xml \ - virtualbox-autostart.xml \ - $(if-expr defined(VBOX_WITH_WEBSERVICES),virtualbox-webservice.xml,) - -## @def SOLARIS_MIME_INFO_FILES -# MIME info files to be copied directly from VBOX_PATH_SOL_INST_SRC to /usr/share/mime-info/. -# No subdirectories. MODE=644 -SOLARIS_FILE_LIST_VARS += SOLARIS_MIME_INFO_FILES -SOLARIS_MIME_INFO_FILES.SUBDIRS := yes -SOLARIS_MIME_INFO_FILES.STRIP := no -SOLARIS_MIME_INFO_FILES.MODE := 0644 -SOLARIS_MIME_INFO_FILES.SRC := $(VBOX_PATH_SOL_INST_SRC) -SOLARIS_MIME_INFO_FILES.DST := $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/mime-info -SOLARIS_MIME_INFO_FILES = \ - virtualbox.keys \ - virtualbox.mime - -## @def SOLARIS_PIXMAP_FILES -# Bitmap files to copy directly from INST_BIN to /usr/share/pixmaps/. -# No subdirectories. MODE=644 -SOLARIS_FILE_LIST_VARS += SOLARIS_PIXMAP_FILES -SOLARIS_PIXMAP_FILES.SUBDIRS = no -SOLARIS_PIXMAP_FILES.STRIP = no -SOLARIS_PIXMAP_FILES.MODE = 0644 -SOLARIS_PIXMAP_FILES.SRC = $(PATH_STAGE_BIN) -SOLARIS_PIXMAP_FILES.DST = $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/pixmaps -SOLARIS_PIXMAP_FILES = \ - VBox.png \ - virtualbox.png - - -## @def SOLARIS_INSTALLER_SCRIPTS -# Installer shell scripts that gets copied directly from VBOX_PATH_SOL_INST_SRC to VBOX_PATH_SI_SCRATCH_PKG (/). -SOLARIS_FILE_LIST_VARS += SOLARIS_INSTALLER_SCRIPTS -SOLARIS_INSTALLER_SCRIPTS.SUBDIRS = no -SOLARIS_INSTALLER_SCRIPTS.STRIP = no -SOLARIS_INSTALLER_SCRIPTS.MODE = 0755 -SOLARIS_INSTALLER_SCRIPTS.SRC = $(VBOX_PATH_SOL_INST_SRC) -SOLARIS_INSTALLER_SCRIPTS.DST = $(VBOX_PATH_SI_SCRATCH_PKG) -SOLARIS_INSTALLER_SCRIPTS = \ - postinstall.sh \ - checkinstall.sh \ - preremove.sh \ - makepackage.sh - -SOLARIS_FILE_LIST_VARS += SOLARIS_INSTALLER_FILES -SOLARIS_INSTALLER_FILES.SUBDIRS = no -SOLARIS_INSTALLER_FILES.STRIP = no -SOLARIS_INSTALLER_FILES.MODE = 0644 -SOLARIS_INSTALLER_FILES.SRC = $(VBOX_PATH_SOL_INST_SRC) -SOLARIS_INSTALLER_FILES.DST = $(VBOX_PATH_SI_SCRATCH_PKG) -SOLARIS_INSTALLER_FILES = \ - vbox.space - # @@ -543,6 +535,6 @@ $(VBOX_VERSION_STAMP) \ \ - $(VBOX_PATH_SOL_INST_SRC)/../common/virtualbox.desktop.in \ - $(VBOX_PATH_SOL_INST_SRC)/../common/virtualbox.xml \ + $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in \ + $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.xml \ $(VBOX_PATH_SOL_INST_SRC)/virtualbox.applications.in \ $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo \ @@ -636,5 +628,5 @@ -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \ --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualbox.desktop \ - $(VBOX_PATH_SOL_INST_SRC)/../common/virtualbox.desktop.in + $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in $(CHMOD) 0644 $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualbox.desktop @@ -642,5 +634,5 @@ $(SED) -e '/