- Moving trunk back into a development branch, further stabilization of the 7.0.x

client is now in the boinc_core_release_7_0a branch.

    /
        configure.ac
        version.h
        version.h.in

svn path=/trunk/boinc/; revision=25436
This commit is contained in:
Rom Walton 2012-03-16 17:29:30 +00:00
parent 906798fb52
commit 93a015300b
4 changed files with 12 additions and 12 deletions

View File

@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
AC_INIT(BOINC, 7.0.20)
AC_INIT(BOINC, 7.1.0)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])

View File

@ -7,16 +7,16 @@
#define BOINC_MAJOR_VERSION 7
/* Minor part of BOINC version number */
#define BOINC_MINOR_VERSION 0
#define BOINC_MINOR_VERSION 1
/* Release part of BOINC version number */
#define BOINC_RELEASE 20
#define BOINC_RELEASE 0
/* String representation of BOINC version number */
#define BOINC_VERSION_STRING "7.0.20"
#define BOINC_VERSION_STRING "7.1.0"
/* Package is a pre-release (Alpha/Beta) package */
/* #define BOINC_PRERELEASE 1 */
#define BOINC_PRERELEASE 1
#if (defined(_WIN32) || defined(__APPLE__))
/* Name of package */
@ -29,13 +29,13 @@
#define PACKAGE_NAME "BOINC"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "BOINC 7.0.20"
#define PACKAGE_STRING "BOINC 7.1.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "boinc"
/* Define to the version of this package. */
#define PACKAGE_VERSION "7.0.20"
#define PACKAGE_VERSION "7.1.0"
#endif /* #if (defined(_WIN32) || defined(__APPLE__)) */

View File

@ -16,7 +16,7 @@
#define BOINC_VERSION_STRING "@BOINC_VERSION_STRING@"
/* Package is a pre-release (Alpha/Beta) package */
/* #define BOINC_PRERELEASE 1 */
#define BOINC_PRERELEASE 1
#if (defined(_WIN32) || defined(__APPLE__))
/* Name of package */

View File

@ -81,13 +81,13 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25425_windows_intelx86.exe"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_intelx86.exe"
LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
DelayLoadDLLs=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25425_windows_intelx86.pdb"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_intelx86.pdb"
SubSystem="2"
TargetMachine="1"
/>
@ -182,13 +182,13 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmt.lib libcpmt.lib kernel32.lib user32.lib gdi32.lib ole32.lib wsock32.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25425_windows_x86_64.exe"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_x86_64.exe"
LinkIncremental="0"
SuppressStartupBanner="true"
IgnoreAllDefaultLibraries="true"
DelayLoadDLLs=""
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25425_windows_x86_64.pdb"
ProgramDatabaseFile=".\Build\$(PlatformName)\$(ConfigurationName)\vboxwrapper_25433_windows_x86_64.pdb"
SubSystem="2"
TargetMachine="17"
/>