Changeset 10333 in vbox for trunk

Timestamp:

Jul 7, 2008 3:16:04 PM (16 years ago)

Author:

vboxsync

Message:

added package type property

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Main/VirtualBoxImpl.cpp (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)
• src/VBox/Main/include/VirtualBoxImpl.h (modified) (2 diffs)

trunk/Config.kmk

@@ -127 +127 @@
  export VBOX_ADDITIONS_SH_MODE = release
 endif
+
+
+#
+# The VirtualBox package type.
+#
+ifeq ($(KBUILD_TARGET),win)
+  VBOX_PACKAGE_OS = WINDOWS
+else ifeq ($(KBUILD_TARGET),linux)
+  VBOX_PACKAGE_OS = LINUX
+else ifeq ($(KBUILD_TARGET),darwin)
+  VBOX_PACKAGE_OS = DARWIN
+else ifeq ($(KBUILD_TARGET),solaris
+  VBOX_PACKAGE_OS = SOLARIS
+else if1of ($(KBUILD_TARGET), dragonfly freebsd netbsd openbsd)
+  VBOX_PACKAGE_OS = BSD
+else
+  $(error Cannot determine VBOX_PACKAGE_OS)
+endif
+ifeq ($(KBUILD_TARGET_ARCH),x86)
+  VBOX_PACKAGE_ARCH = 32BITS
+else
+  VBOX_PACKAGE_ARCH = 64BITS
+endif
+# distribution, mostly for Linux/Solaris where we support different distributions
+# this strip will be overridden by the Linux packaging scripts
+VBOX_PACKAGE_DIST ?= GENERIC
+# Full string
+VBOX_PACKAGE_STRING = $(VBOX_PACKAGE_OS)_$(VBOX_PACKAGE_ARCH)_$(VBOX_PACKAGE_DIST)
 
 
@@ -2852 +2880 @@
         $(QUIET)$(MV) -f [email protected] $@
 
+
+VBOX_PACKAGE_HEADER = $(PATH_OUT)/package-generated.h
+
+$(VBOX_PACKAGE_HEADER):
+        $(call MSG_GENERATE,,$@)
+        $(QUIET)$(MKDIR) -p $(@D)
+        $(QUIET)$(RM) -f $@ [email protected]
+        $(QUIET)$(APPEND) [email protected] '#ifndef ___package_generated_h___'
+        $(QUIET)$(APPEND) [email protected] '#define ___package_generated_h___'
+        $(QUIET)$(APPEND) [email protected] ''
+        $(QUIET)$(APPEND) [email protected] '#define VBOX_PACKAGE_STRING "$(VBOX_PACKAGE_STRING)"'
+        $(QUIET)$(APPEND) [email protected] ''
+        $(QUIET)$(APPEND) [email protected] '#endif'
+        $(QUIET)$(MV) -f [email protected] $@
+
 #
 # Used for external makefiles which cannot include Config.kmk
@@ -2883 +2926 @@
 # the tree. This eliminates the need for manual dependencies on it.
 ## @todo there gotta be a better way of doing this.
-Makefile.kmk: | $(VBOX_VERSION_HEADER) $(VBOX_VERSION_MK)
-Makefile: | $(VBOX_VERSION_HEADER) $(VBOX_VERSION_MK)
-makefile: | $(VBOX_VERSION_HEADER) $(VBOX_VERSION_MK)
+Makefile.kmk: | $(VBOX_VERSION_HEADER) $(VBOX_VERSION_MK) $(VBOX_PACKAGE_HEADER)
+Makefile: | $(VBOX_VERSION_HEADER) $(VBOX_VERSION_MK) $(VBOX_PACKAGE_HEADER)
+makefile: | $(VBOX_VERSION_HEADER) $(VBOX_VERSION_MK) $(VBOX_PACKAGE_HEADER)
 
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -61 +61 @@
 #include <VBox/VBoxHDD-new.h>
 #include <VBox/version.h>
+#include <package-generated.h>
 
 #include <VBox/com/com.h>
@@ -98 +99 @@
 
 // static
+Bstr VirtualBox::sPackageType;
+
+// static
 Bstr VirtualBox::sSettingsFormatVersion;
 
@@ -147 +151 @@
     if (sVersion.isNull())
         sVersion = VBOX_VERSION_STRING;
-    LogFlowThisFunc (("Version: %ls\n", sVersion.raw()));
+    if (sPackageType.isNull())
+        sPackageType = VBOX_PACKAGE_STRING;
+    LogFlowThisFunc (("Version: %ls, Package: %ls\n", sVersion.raw(), sPackageType.raw()));
 
     if (sSettingsFormatVersion.isNull())
@@ -472 +478 @@
 
     sVersion.cloneTo (aVersion);
+    return S_OK;
+}
+
+STDMETHODIMP VirtualBox::COMGETTER(PackageType) (BSTR *aPackageType)
+{
+    if (!aPackageType)
+        return E_INVALIDARG;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    sVersion.cloneTo (aPackageType);
     return S_OK;
 }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -911 +911 @@
     </attribute>
 
+    <attribute name="packageType" type="wstring" readonly="yes">
+      <desc>
+        A string representing the package type of this product. The
+        format is OS_ARCH_DIST where OS is either WINDOWS, LINUX,
+        SOLARIS, DARWIN. ARCH is either 32BITS or 64BITS. DIST
+        is either GENERIC, UBUNTU_606, UBUNTU_710, or something like
+        this.
+      </desc>
+    </attribute>
+
     <attribute name="homeFolder" type="wstring" readonly="yes">
       <desc>

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -112 +112 @@
     /* IVirtualBox properties */
     STDMETHOD(COMGETTER(Version)) (BSTR *aVersion);
+    STDMETHOD(COMGETTER(PackageType)) (BSTR *aPackageType);
     STDMETHOD(COMGETTER(HomeFolder)) (BSTR *aHomeFolder);
     STDMETHOD(COMGETTER(SettingsFilePath)) (BSTR *aSettingsFilePath);
@@ -473 +474 @@
 
     static Bstr sVersion;
+    static Bstr sPackageType;
     static Bstr sSettingsFormatVersion;