Changeset 98429 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Feb 2, 2023 12:03:46 PM (22 months ago)

Author:

vboxsync

Message:

Installer/*.kmk: Automatic scm cleanups. bugref:10348

File:

• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (10 diffs)

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

@@ -30 +30 @@
 
 ifneq ($(KBUILD_HOST),solaris)
-$(error "The Solaris installer can only be built on Solaris!") # yeah, right.
+ $(error "The Solaris installer can only be built on Solaris!") # yeah, right.
 endif
 
@@ -138 +138 @@
 solaris-icons_INST = bin/icons/
 solaris-icons_MODE = a+r,u+w
-solaris-icons_SOURCES = $(foreach f,$(VBOX_SI_ICON_TYPES), $(foreach s,$(VBOX_SI_ICON_SIZES)\
+solaris-icons_SOURCES = $(foreach f,$(VBOX_SI_ICON_TYPES), $(foreach s,$(VBOX_SI_ICON_SIZES) \
         ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png))
 
@@ -356 +356 @@
         VBoxHostChannel.so \
         $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \
-        $(if $(VBOX_WITH_QTGUI),\
-          VBoxKeyboard.so) \
+        $(if $(VBOX_WITH_QTGUI), \
+        VBoxKeyboard.so) \
         $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so,) \
         components/VBoxC.so \
@@ -373 +373 @@
 ifdef VBOX_WITH_32_ON_64_MAIN_API
  SOLARIS_STRIP_BINS += \
-        VBoxRT-x86.so \
-        VBoxXPCOM-x86.so \
-        components/VBoxClient-x86.so \
-        components/VBoxSVCM-x86.so \
-        components/VBoxXPCOMIPCC-x86.so
+        VBoxRT-x86.so \
+        VBoxXPCOM-x86.so \
+        components/VBoxClient-x86.so \
+        components/VBoxSVCM-x86.so \
+        components/VBoxXPCOMIPCC-x86.so
 endif
 ifdef VBOX_WITH_HARDENING
  SOLARIS_STRIP_BINS += \
-        VBoxNetDHCP.so \
-        VBoxNetNAT.so \
-        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \
-        $(if $(VBOX_WITH_QTGUI),VirtualBoxVM.so UICommon.so,)
+        VBoxNetDHCP.so \
+        VBoxNetNAT.so \
+        $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \
+        $(if $(VBOX_WITH_QTGUI),VirtualBoxVM.so UICommon.so,)
 endif
 
@@ -400 +400 @@
         VMMR0.r0
 ifdef VBOX_WITH_RAW_MODE
-SOLARIS_STRIP_OBJS += \
-        VBoxDDRC.rc \
-        VMMRC.rc
+ SOLARIS_STRIP_OBJS += \
+        VBoxDDRC.rc \
+        VMMRC.rc
 endif
 
@@ -441 +441 @@
 ifdef VBOX_WITH_DOCS_PACKING
  SOLARIS_COMMON += \
-        $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox.chm,) \
-        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual.qch UserManual.qhc,) \
-        UserManual.pdf \
-        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
-                $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox_$(f).chm,) \
-                $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \
-                UserManual_$(f).pdf)
+        $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox.chm,) \
+        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual.qch UserManual.qhc,) \
+        UserManual.pdf \
+        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
+        $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox_$(f).chm,) \
+        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \
+        UserManual_$(f).pdf)
 endif
 
@@ -453 +453 @@
 ifdef VBOX_WITH_PYTHON
  SOLARIS_COMMON += \
-        $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \
-        $(VBOXINST_SDK_INSTALLER_PYTHON_FILES)
+        $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \
+        $(VBOXINST_SDK_INSTALLER_PYTHON_FILES)
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
   SOLARIS_PYTHON_32_ON_64_BINS = $(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*_x86.so))
@@ -497 +497 @@
 # Guest Additions
 ifdef VBOX_WITH_ADDITIONS_PACKING
-# SOLARIS_COMMON += \
-#       additions/VBoxGuestAdditions.iso
+ # SOLARIS_COMMON += \
+ #      additions/VBoxGuestAdditions.iso
 endif
 
@@ -505 +505 @@
 ifdef VBOX_WITH_EFIFW_PACKING
  SOLARIS_COMMON += \
-        VBoxEFI32.fd \
-        VBoxEFI64.fd
+        VBoxEFI32.fd \
+        VBoxEFI64.fd
 endif
 
@@ -552 +552 @@
                 \
                 $(foreach size, $(VBOX_SI_ICON_SIZES), $(foreach type, $(VBOX_SI_ICON_TYPES) \
-                ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(type)-$(size)px.png)) \
+                                ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(type)-$(size)px.png)) \
                 \
                 $(VBOX_SI_DEP_ON_MAKEFILE) \