儲存庫 vbox 的更動 12502

時間撮記:

2008-9-16 下午04:21:42 (16 年 以前)

作者:

vboxsync

訊息:

VBOX_BRAND_LICENSE_TXT and VBOX_BRAND_LICENSE_VER

位置:

trunk

檔案:

• Config.kmk (修改) (2 筆差異)
• src/VBox/Installer/linux/Makefile.kmk (修改) (1 筆差異)
• src/VBox/Installer/solaris/Makefile.kmk (修改) (1 筆差異)

trunk/Config.kmk

@@ -435 +435 @@
 VBOX_BRAND_LICENSE_HTML       := $(PATH_ROOT)/doc/License.html
 VBOX_BRAND_LICENSE_RTF        := $(PATH_ROOT)/doc/License.rtf
+VBOX_BRAND_LICENSE_TXT        := $(PATH_ROOT)/doc/License.txt
+VBOX_BRAND_LICENSE_VER        :=
 VBOX_BRAND_GUI_ABOUT_PNG      := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/about.png
 VBOX_BRAND_GUI_ABOUT_16PX_PNG := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox4/images/NonOSE/about_16px.png
@@ -3492 +3494 @@
         $(call MSG_GENERATE,,$(VBOX_LICENSE_VER_KMK))
         $(QUIET)$(MKDIR) -p $(@D)
+ifdef VBOX_BRAND_LICENSE_VER
+        $(QUIET)$(RM) -f '$@'
+        $(APPEND) '$@' 'VBOX_LICENSE_VER=$(VBOX_BRAND_LICENSE_VER)'
+else
         $(QUIET)$(SED) -e "s/.*License version \([0-9.]*\),.*/VBOX_LICENSE_VER=\1/;t;d" --output $@ $(VBOX_BRAND_LICENSE_HTML)
+endif
 -include $(VBOX_LICENSE_VER_KMK)
 VBOX_LICENSE_BIN = $(PATH_BIN)/License-$(VBOX_LICENSE_VER).html

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

@@ -59 +59 @@
 linux-doc_MODE = a+r,u+w
 linux-doc_SOURCES = \
-        $(if $(VBOX_OSE),,$(PATH_ROOT)/doc/License.txt=>LICENSE) \
+        $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
         $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png
 

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

@@ -58 +58 @@
 solaris-doc_MODE = a+r,u+w
 solaris-doc_SOURCES = \
-        $(if $(VBOX_OSE),,$(PATH_ROOT)/doc/License.txt=>LICENSE) \
+        $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
         $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_64px.png=>VBox.png