Changeset 37016 in vbox
- Timestamp:
- May 9, 2011 5:48:43 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 71631
- Location:
- trunk
- Files:
-
- 9 edited
-
Config.kmk (modified) (3 diffs)
-
src/VBox/Additions/WINNT/Installer/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (1 diff)
-
src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp (modified) (2 diffs)
-
src/VBox/Installer/win/Makefile.kmk (modified) (3 diffs)
-
src/VBox/Installer/win/VBoxKey.wxi (modified) (1 diff)
-
src/VBox/Installer/win/VirtualBox.wxs (modified) (3 diffs)
-
src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
-
src/VBox/Runtime/testcase/tstRTStrVersion.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r36899 r37016 159 159 # will be published, odd numbers are set during development. 160 160 VBOX_VERSION_BUILD = 51 161 # The raw version string. This *must not* contain any other information/fields than 162 # major, minor and build revision (as it is now) -- also will be used for host/guest version 163 # comparison. 164 VBOX_VERSION_STRING_RAW = $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) 161 165 # Full version string (may include more than just x.y.z, but no spaces or other problematic chars). 162 166 VBOX_BUILD_PUBLISHER = … … 164 168 $(error VBOX_BUILD_PUBLISHER must not be longer than 10 characters!) 165 169 endif 166 VBOX_VERSION_STRING = $(VBOX_VERSION_ MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)$(VBOX_BUILD_PUBLISHER)170 VBOX_VERSION_STRING = $(VBOX_VERSION_STRING_RAW)$(VBOX_BUILD_PUBLISHER) 167 171 # Force the additions.sh script to get an exact additions build when we're doing the release. 168 172 … … 4588 4592 $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_MINOR $(VBOX_VERSION_MINOR)' 4589 4593 $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_BUILD $(VBOX_VERSION_BUILD)' 4594 $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_STRING_RAW "$(VBOX_VERSION_STRING_RAW)"' 4590 4595 $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_STRING "$(VBOX_VERSION_STRING)"' 4591 4596 $(QUIET)$(APPEND) [email protected] '' -
trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk
r35719 r37016 5 5 6 6 # 7 # Copyright (C) 2006-20 07Oracle Corporation7 # Copyright (C) 2006-2011 Oracle Corporation 8 8 # 9 9 # This file is part of VirtualBox Open Source Edition (OSE), as … … 172 172 -E 'VBOX_C_YEAR=$(VBOX_C_YEAR)' \ 173 173 -E 'VBOX_VERSION_STRING=$(VBOX_VERSION_STRING)' \ 174 -E 'VBOX_VERSION_STRING_RAW=$(VBOX_VERSION_STRING_RAW)' \ 174 175 -E 'VBOX_VERSION_MAJOR=$(VBOX_VERSION_MAJOR)' \ 175 176 -E 'VBOX_VERSION_MINOR=$(VBOX_VERSION_MINOR)' \ -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi
r36571 r37016 675 675 676 676 ; Write a registry key with version and installation path for later lookup 677 WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "Version" "$%VBOX_VERSION_STRING%" 677 WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "Version" "$%VBOX_VERSION_STRING_RAW%" 678 WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "VersionExt" "$%VBOX_VERSION_STRING%" 678 679 WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "Revision" "$%VBOX_SVN_REV%" 679 680 WriteRegStr HKLM "${PRODUCT_INSTALL_KEY}" "InstallDir" "$INSTDIR" -
trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp
r35907 r37016 5 5 6 6 /* 7 * Copyright (C) 2007-201 0Oracle Corporation7 * Copyright (C) 2007-2011 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 43 43 if (ppszVer) 44 44 { 45 *ppszVer = RTStrDup(VBOX_VERSION_STRING );45 *ppszVer = RTStrDup(VBOX_VERSION_STRING_RAW); 46 46 if (!*ppszVer) 47 47 return VERR_NO_STR_MEMORY; -
trunk/src/VBox/Installer/win/Makefile.kmk
r35166 r37016 5 5 6 6 # 7 # Copyright (C) 2006-201 0Oracle Corporation7 # Copyright (C) 2006-2011 Oracle Corporation 8 8 # 9 9 # This file is part of VirtualBox Open Source Edition (OSE), as … … 356 356 -E 'VBOX_C_YEAR=$(VBOX_C_YEAR)' \ 357 357 -E 'VBOX_VERSION_STRING=$(VBOX_VERSION_STRING)' \ 358 -E 'VBOX_VERSION_STRING_RAW=$(VBOX_VERSION_STRING_RAW)' \ 358 359 -E 'VBOX_VERSION_MAJOR_INST=$(VBOX_VERSION_MAJOR)' \ 359 360 -E 'VBOX_VERSION_MINOR_INST=$(VBOX_VERSION_MINOR)' \ … … 427 428 # 428 429 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi: $(PATH_SUB_CURRENT)/VBoxKey.wxi $(VBOX_VERSION_STAMP) | $$(dir $$@) 429 $(SED) -e 's/%VER%/$(VBOX_VERSION_STRING)/' --output $@ $< 430 $(SED) -e 's/%VER%/$(VBOX_VERSION_STRING_RAW)/' --output $@ $< 431 $(SED) -e 's/%VER_EXT%/$(VBOX_VERSION_STRING)/' --output $@ $< 430 432 431 433 # -
trunk/src/VBox/Installer/win/VBoxKey.wxi
r31659 r37016 1 1 <Include> 2 2 <Registry Root="HKLM" Key="$(var.Property_RegKey)" Name="Version" Value="%VER%" Type="string" /> 3 <Registry Root="HKLM" Key="$(var.Property_RegKey)" Name="VersionExt" Value="%VER_EXT%" Type="string" /> 3 4 <Registry Root="HKLM" Key="$(var.Property_RegKey)" Name="InstallDir" Value="[INSTALLDIR]" Type="string" /> 4 5 </Include> -
trunk/src/VBox/Installer/win/VirtualBox.wxs
r36715 r37016 3 3 VirtualBox Windows Installation Script (WiX) 4 4 5 Copyright (C) 2006-201 0Oracle Corporation5 Copyright (C) 2006-2011 Oracle Corporation 6 6 7 7 This file is part of VirtualBox Open Source Edition (OSE), as … … 15 15 16 16 <?define Property_RegKey ="Software\$(env.VBOX_VENDOR_SHORT)\VirtualBox" ?> 17 <?define Property_Version = "$(env.VBOX_VERSION_STRING)" ?> 17 <?define Property_Version = "$(env.VBOX_VERSION_STRING_RAW)" ?> 18 <?define Property_VersionExt = "$(env.VBOX_VERSION_STRING)" ?> 18 19 <?define Property_Upgrade = "yes" ?> 19 20 … … 74 75 <!-- Package GUIDs must be different for each package. The "???" directs WiX to create one. --> 75 76 <Package Id="????????-????-????-????-????????????" Keywords="Installer" 76 Description="$(env.VBOX_PRODUCT) $(var.Property_Version ) installation package"77 Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) installation package" 77 78 Comments="$(env.VBOX_PRODUCT) installation package" 78 79 Manufacturer="$(env.VBOX_VENDOR)" -
trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
r36991 r37016 10 10 11 11 /* 12 * Copyright (C) 2006-201 0Oracle Corporation12 * Copyright (C) 2006-2011 Oracle Corporation 13 13 * 14 14 * This file is part of VirtualBox Open Source Edition (OSE), as … … 4675 4675 * will override them. 4676 4676 */ 4677 /* Set the VBox version string as a guest property */ 4677 /* Set the raw VBox version string as a guest property. Used for host/guest 4678 * version comparison. */ 4678 4679 configSetProperty(pConsole->m_pVMMDev, "/VirtualBox/HostInfo/VBoxVer", 4680 VBOX_VERSION_STRING_RAW, "TRANSIENT, RDONLYGUEST"); 4681 /* Set the full VBox version string as a guest property. Can contain vendor-specific 4682 * information/branding and/or pre-release tags. */ 4683 configSetProperty(pConsole->m_pVMMDev, "/VirtualBox/HostInfo/VBoxVerExt", 4679 4684 VBOX_VERSION_STRING, "TRANSIENT, RDONLYGUEST"); 4680 4685 /* Set the VBox SVN revision as a guest property */ -
trunk/src/VBox/Runtime/testcase/tstRTStrVersion.cpp
r35076 r37016 5 5 6 6 /* 7 * Copyright (C) 20 09Oracle Corporation7 * Copyright (C) 2011 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 97 97 { "3.1.0_BETA2-r12345", "3.1.0_BETA1-r12345", 1 }, 98 98 { "3.1.0_BETA2-r12345", "3.1.0_BETA999-r12345", -1 }, 99 { "3.1.0_BETA2", "3.1.0_ABC", -1 }, /* ABC isn't indicating a prerelease, BETA does */99 { "3.1.0_BETA2", "3.1.0_ABC", -1 }, /* ABC isn't indicating a prerelease, BETA does. */ 100 100 { "3.1.0_BETA", "3.1.0_ATEB", -1 }, 101 101 { "4.0.0_ALPHAr68482", "4.0.0_ALPHAr68483", -1 }, … … 106 106 { "4.0.0_ALPHAr68483", "4.0.0_BETA2r68783", -1 }, 107 107 { "4.0.0_ALPHAr68483", "4.0.0_BETA2r68784", -1 }, 108 { "4.0.6", "4.0.6_Ubuntu", -1 }, /* Without stripped guest OS string (Ubuntu). */ 109 { "4.0.6_Windows", "4.0.6", 1 } /* Without stripped guest OS string (Windows). */ 108 110 }; 109 111 for (unsigned iTest = 0; iTest < RT_ELEMENTS(aTests); iTest++)
Note:
See TracChangeset
for help on using the changeset viewer.
