Changeset 26093 in vbox

Timestamp:

Jan 29, 2010 9:12:27 AM (15 years ago)

Author:

vboxsync

Message:

Branding: right fix for r57057

Location:

trunk

Files:

• Config.kmk (modified) (4 diffs)
• include/VBox/version.h (modified) (2 diffs)

trunk/Config.kmk

@@ -3857 +3857 @@
 #
 VBOX_BAD_CHAR_SET   = ,;:/\$(SP)$(TAB)$(HASH)=![]@%&''()*""<>?^{}|~
-VBOX_VERSION_STAMP  = $(PATH_OUT)/version-stamp-$(translate $(VBOX_VERSION_STRING)-$(VBOX_C_YEAR)-$(VBOX_VENDOR)-$(VBOX_PRODUCTS),$(VBOX_BAD_CHAR_SET),,_)
+VBOX_VERSION_STAMP  = $(PATH_OUT)/version-stamp-$(translate $(VBOX_VERSION_STRING)-$(VBOX_C_YEAR)-$(VBOX_VENDOR)-$(VBOX_PRODUCT),$(VBOX_BAD_CHAR_SET),,_)
 VBOX_VERSION_HEADER = $(PATH_OUT)/version-generated.h
 VBOX_VERSION_MK     = $(PATH_OUT)/version-generated.mk
@@ -3878 +3878 @@
         $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_BUILD $(VBOX_VERSION_BUILD)'
         $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_STRING "$(VBOX_VERSION_STRING)"'
-        $(QUIET)$(APPEND) [email protected] '#define VBOX_VENDOR "$(VBOX_VENDOR)"'
-        $(QUIET)$(APPEND) [email protected] '#define VBOX_PRODUCT "$(VBOX_PRODUCT)"'
-        $(QUIET)$(APPEND) [email protected] '#define VBOX_C_YEAR "$(VBOX_C_YEAR)"'
         $(QUIET)$(APPEND) [email protected] ''
         $(QUIET)$(APPEND) [email protected] '#endif'
@@ -3896 +3893 @@
         $(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] $@
+
+VBOX_PRODUCT_HEADER = $(PATH_OUT)/product-generated.h
+
+$(VBOX_PRODUCT_HEADER): $(VBOX_VERSION_STAMP)
+        $(call MSG_GENERATE,,$@)
+        $(QUIET)$(MKDIR) -p $(@D)
+        $(QUIET)$(RM) -f $@ [email protected]
+        $(QUIET)$(APPEND) [email protected] '#ifndef ___product_generated_h___'
+        $(QUIET)$(APPEND) [email protected] '#define ___product_generated_h___'
+        $(QUIET)$(APPEND) [email protected] ''
+        $(QUIET)$(APPEND) [email protected] '#define VBOX_VENDOR "$(VBOX_VENDOR)"'
+        $(QUIET)$(APPEND) [email protected] '#define VBOX_PRODUCT "$(VBOX_PRODUCT)"'
+        $(QUIET)$(APPEND) [email protected] '#define VBOX_C_YEAR "$(VBOX_C_YEAR)"'
         $(QUIET)$(APPEND) [email protected] ''
         $(QUIET)$(APPEND) [email protected] '#endif'
@@ -3942 +3955 @@
 # 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) $(VBOX_PACKAGE_HEADER)
+Makefile.kmk: | $(VBOX_VERSION_HEADER) $(VBOX_VERSION_MK) $(VBOX_PRODUCT_HEADER) $(VBOX_PACKAGE_HEADER)
 endif
 

trunk/include/VBox/version.h

@@ -30 +30 @@
 #ifndef ___VBox_version_h
 #define ___VBox_version_h
+
+/** Product info */
+#include <product-generated.h>
 
 #ifndef RC_INVOKED
@@ -70 +73 @@
 #endif /* !RC_INVOKED */
 
-/** Vendor name */
-#ifndef VBOX_VENDOR
-# define VBOX_VENDOR                     "Sun Microsystems, Inc."
-#endif
-
-/** Product name */
-#ifndef VBOX_PRODUCT
-# define VBOX_PRODUCT                    "Sun VirtualBox"
-#endif
-
 /** @name Prefined strings for Windows resource files
  *