Changeset 12450 in vbox for trunk

Timestamp:

Sep 15, 2008 8:24:49 AM (16 years ago)

Author:

vboxsync

Message:

Build system: introduce separate variables for packing additions and documentation.

Location:

trunk

Files:

• Config.kmk (modified) (4 diffs)
• src/VBox/Installer/linux/Makefile.kmk (modified) (2 diffs)
• src/VBox/Installer/solaris/Makefile.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -188 +188 @@
 # Use additions from the build server.
 #VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER = 1
+# Include additions in the package
+VBOX_WITH_ADDITIONS_PACKING = 1
 # Don't bother with additions, overrides VBOX_WITH_ADDITIONS.
 # This is not used by makefiles, only Config.kmk, see below.
@@ -210 +212 @@
 # Use documentation from the build server.
 #VBOX_WITH_DOCS_FROM_BUILD_SERVER = 1
+# Include documentation in the package
+VBOX_WITH_DOCS_PACKING = 1
 # Don't bother with documentation, overrides VBOX_WITH_DOCS.
 # This is not used by makefiles, only Config.kmk, see below.
@@ -554 +558 @@
  VBOX_WITH_DEBUGGER_GUI=
  VBOX_WITH_WIN32_ADDITIONS_SHAREDFOLDERS=
+ VBOX_WITH_ADDITIONS_PACKING=
  VBOX_WITHOUT_ADDITIONS_ISO=1
  VBOX_WITH_OS2_ADDITIONS_BIN=
@@ -559 +564 @@
  VBOX_WITH_KCHMVIEWER=
  VBOX_WITH_DOCS=
+ VBOX_WITH_DOCS_PACKING=
  VBOX_WITH_TESTSUITE=
  VBOX_WITH_INTEL_PXE=

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

@@ -125 +125 @@
 
 # Guest Additions
-LINUXNOSTRIP += \
-        $(if $(VBOX_OSE),,additions/VBoxGuestAdditions.iso)
+ifdef VBOX_WITH_ADDITIONS_PACKING
+ LINUXNOSTRIP += \
+        $(if $(VBOX_OSE),,additions/VBoxGuestAdditions.iso)
+endif
 
 # Shared Folders
@@ -142 +144 @@
         $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestPropSvc.so)
 
-ifdef VBOX_WITH_DOCS
+ifdef VBOX_WITH_DOCS_PACKING
  LINUXNOSTRIP += \
         UserManual.pdf

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

@@ -155 +155 @@
           nls/VirtualBox_$(f).qm nls/qt_$(f).qm),)
 
-ifdef VBOX_WITH_DOCS
-  SOLARIS_NO_STRIP += \
-        UserManual.pdf
+ifdef VBOX_WITH_DOCS_PACKING
+ SOLARIS_NO_STRIP += \
+        UserManual.pdf
 endif
 
@@ -188 +188 @@
 
 # Guest Additions
-SOLARIS_NO_STRIP += \
-        $(if $(VBOX_OSE),,additions/VBoxGuestAdditions.iso)
+ifdef VBOX_WITH_ADDITIONS_PACKING
+ SOLARIS_NO_STRIP += \
+        additions/VBoxGuestAdditions.iso
+endif
 
 SOLARIS_ARCH_FILES := \
@@ -242 +244 @@
         $(QUIET)$(if $(VBOX_WITH_QT4GUI),$(MKDIR) -p $(SOLARIS_INST_DIR)/nls,)
         $(QUIET)$(if $(and $(VBOX_WITH_QT4GUI), $(not $(VBOX_WITH_SEPARATE_SDK))),$(MKDIR) -p $(SOLARIS_INST_DIR)/nls,)
-        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/additions/VBoxGuestAdditions.iso               $(SOLARIS_INST_DIR)/additions/VBoxGuestAdditions.iso)
+        $(QUIET)$(if $(VBOX_WITH_ADDITIONS_PACKING),$(INSTALL) -m 0644 $(PATH_BIN)/additions/VBoxGuestAdditions.iso               $(SOLARIS_INST_DIR)/additions/)
         $(QUIET)$(if $(VBOX_WITH_VRDP_RDESKTOP),$(MKDIR) -p $(SOLARIS_INST_DIR)/rdesktop-vrdp-keymaps,)
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/vboxdrv                                                          $(SOLARIS_INST_DIR)/vboxdrv
@@ -359 +361 @@
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf               $(SOLARIS_INST_DIR)/vboxdrv.conf
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf            $(SOLARIS_INST_DIR)/vboxflt.conf
-        $(QUIET)$(if $(VBOX_WITH_DOCS),$(INSTALL) -m 0644 $(PATH_BIN)/UserManual.pdf                            $(SOLARIS_INST_DIR)/UserManual.pdf,)
+        $(QUIET)$(if $(VBOX_WITH_DOCS_PACKING)),$(INSTALL) -m 0644 $(PATH_BIN)/UserManual.pdf  $(SOLARIS_INST_DIR)/)
         $(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)