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

Timestamp:

Feb 21, 2009 1:45:52 AM (16 years ago)

Author:

vboxsync

Message:

Installer: Merged VBOX_WITH_COMBINED_SOLARIS_PACKAGE and VBOX_WITH_COMBINED_DARWIN_PACKAGE into VBOX_WITH_COMBINED_PACKAGE.

File:

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

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

@@ -33 +33 @@
 # Globals
 #
+ifdef VBOX_WITH_COMBINED_SOLARIS_PACKAGE ## @todo remove this when tinderclient.pl is updated.
+ VBOX_WITH_COMBINED_PACKAGE := 1
+endif
 VBOX_PATH_SOL_INST_SRC := $(PATH_SUB_CURRENT)
 SOLARIS_DIR_NAME_64    := amd64
@@ -60 +63 @@
 PKGINFO_ARCH     = $(shell uname -p)
 PKGINFO_REVSTAMP = $(date %Y.%m.%d.%H.%M)
-ifndef VBOX_WITH_COMBINED_SOLARIS_PACKAGE
+ifndef VBOX_WITH_COMBINED_PACKAGE
  PKG_FILENAME    = VirtualBox-$(VBOX_VERSION_STRING)-SunOS-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV)
 else
@@ -277 +280 @@
         $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg
 
-ifdef VBOX_WITH_COMBINED_SOLARIS_PACKAGE
+ifdef VBOX_WITH_COMBINED_PACKAGE
  SOLARIS_ARCH_DEPFILES = $(addprefix $(SOLARIS_INST_DIR_64)/,$(SOLARIS_STRIP_EXES)) \
         $(addprefix $(SOLARIS_INST_DIR_64)/,$(SOLARIS_STRIP_BINS)) \
@@ -362 +365 @@
                 $(SOLARIS_ARCH_DEPFILES)
         $(call MSG_L1,Installing binaries $(SOLARIS_INST_DIR))
-ifdef VBOX_WITH_COMBINED_SOLARIS_PACKAGE
+ifdef VBOX_WITH_COMBINED_PACKAGE
         $(QUIET)$(if $(VBOX_WITH_ADDITIONS_PACKING),$(INSTALL) -m 0644 $(SOLARIS_OUT_BIN_32)/additions/VBoxGuestAdditions.iso            $(SOLARIS_INST_DIR)/additions/)
 else
@@ -379 +382 @@
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_INST_DIR)/LICENSE)
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_INST_DIR)/vbox.copyright)
-ifdef VBOX_WITH_COMBINED_SOLARIS_PACKAGE
+ifdef VBOX_WITH_COMBINED_PACKAGE
         $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.x86/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2     $(SOLARIS_INST_DIR_32)/libSDL-1.2.so.0,)
         $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS)/solaris.amd64/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2   $(SOLARIS_INST_DIR_64)/libSDL-1.2.so.0,)
@@ -429 +432 @@
                 $(SOLARIS_INST_DIR) \
                 $(PKG_FILENAME) \
-                $(if $(VBOX_WITH_SOLARIS_COMBINED_PACKAGE),neutral,$(KBUILD_TARGET_ARCH)) \
+                $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),neutral,$(KBUILD_TARGET_ARCH)) \
                 $(VBOX_SVN_REV) \
                 $(if $(VBOX_WITH_SOLARIS_VBI),$(VBIPKG_FILENAME).pkg,)
@@ -503 +506 @@
 
 #
-#  -=-=-=-=-=-=-=- VBI package  -=-=-=-=-=-=-=- 
+#  -=-=-=-=-=-=-=- VBI package  -=-=-=-=-=-=-=-
 #
 $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg: \
@@ -535 +538 @@
 
 #
-#  -=-=-=-=-=-=-=- Debug package  -=-=-=-=-=-=-=- 
+#  -=-=-=-=-=-=-=- Debug package  -=-=-=-=-=-=-=-
 #
 $(PATH_BIN)/$(DBG_ARCHIVE): \