diff --git a/configure.ac b/configure.ac index 47f3d622f1..20ae64cc6a 100644 --- a/configure.ac +++ b/configure.ac @@ -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.11.0) +AC_INIT(BOINC, 7.13.0) AC_CONFIG_MACRO_DIR([m4]) LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'` AC_SUBST([LIBBOINC_VERSION]) diff --git a/version.h b/version.h index ba54a18dc9..92c361a2fc 100644 --- a/version.h +++ b/version.h @@ -7,7 +7,7 @@ #define BOINC_MAJOR_VERSION 7 /* Minor part of BOINC version number */ -#define BOINC_MINOR_VERSION 11 +#define BOINC_MINOR_VERSION 13 /* Release part of BOINC version number */ #define BOINC_RELEASE 0 @@ -19,10 +19,10 @@ #define VBOXWRAPPER_RELEASE 26200 /* String representation of BOINC version number */ -#define BOINC_VERSION_STRING "7.11.0" +#define BOINC_VERSION_STRING "7.13.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 */ @@ -35,13 +35,13 @@ #define PACKAGE_NAME "BOINC" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "BOINC 7.11.0" +#define PACKAGE_STRING "BOINC 7.13.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.11.0" +#define PACKAGE_VERSION "7.13.0" #endif /* #if (defined(_WIN32) || defined(__APPLE__)) */ diff --git a/version.log b/version.log index b23eb27529..eb1dc6a51a 100644 --- a/version.log +++ b/version.log @@ -1 +1 @@ -7.11.0 +7.13.0 diff --git a/win_build/boinccas.vcxproj b/win_build/boinccas.vcxproj index 0b19447525..9ab373034d 100644 --- a/win_build/boinccas.vcxproj +++ b/win_build/boinccas.vcxproj @@ -194,7 +194,7 @@ Use Level3 ProgramDatabase - ..\lib;%(AdditionalIncludeDirectories) + ..\lib;../win_build;%(AdditionalIncludeDirectories) atls.lib;msi.lib;libcmt.lib;libcpmt.lib;delayimp.lib;netapi32.lib;advapi32.lib;kernel32.lib;user32.lib;version.lib;libboinc_staticcrt.lib;%(AdditionalDependencies) diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism index f1ffcc84e2..a666482b58 100644 --- a/win_build/installerv2/BOINC.ism +++ b/win_build/installerv2/BOINC.ism @@ -2461,7 +2461,7 @@ WEBx86ProductCode WEBx86ProductName WEBx86ProductVersion - WEBx86SetupFileNameboinc_7.7.2_windows_intelx86 + WEBx86SetupFileNameboinc_7.12.1_windows_intelx86 WEBx86UpgradeCode @@ -4553,11 +4553,11 @@ VwBlAGIAAQBXAEUAQgB4ADgANgA= PROGMSG_IIS_ROLLBACKAPPPOOLS##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS## PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS## PROGRAMFILETOLAUNCHATEND[#boincmgr.exe] - ProductCode{CCB6AAA0-BF11-4F62-9E2F-ABF9489D448C} + ProductCode{A48CBA96-E95D-4CF3-BB3E-741D88686A5C} ProductIDnone ProductLanguage1033 ProductNameBOINC - ProductVersion7.7.2 + ProductVersion7.12.1 ProgressType0install ProgressType1Installing ProgressType2installed diff --git a/win_build/installerv2/BOINC_vbox.ism b/win_build/installerv2/BOINC_vbox.ism index 2d8d3033c1..396d820ac9 100644 --- a/win_build/installerv2/BOINC_vbox.ism +++ b/win_build/installerv2/BOINC_vbox.ism @@ -2460,7 +2460,7 @@ WEBx86ProductCode WEBx86ProductName WEBx86ProductVersion - WEBx86SetupFileNameboinc_7.7.2_windows_intelx86_vbox + WEBx86SetupFileNameboinc_7.12.1_windows_intelx86_vbox WEBx86UpgradeCode @@ -2719,7 +2719,7 @@ Order ISSetupLocation ISReleaseFlags - _B2A694FE_55E0_4B53_BE88_01C03CEF8EA0_Oracle VM VirtualBox 5.2.8 (x86).prq + _0AAAC1E4_13B5_4453_A2F5_AB3133662623_Oracle VM VirtualBox 5.2.8 (x86).prq @@ -4553,11 +4553,11 @@ VwBlAGIAAQBXAEUAQgB4ADgANgA= +
PROGMSG_IIS_ROLLBACKAPPPOOLS##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS## PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS## PROGRAMFILETOLAUNCHATEND[#boincmgr.exe] - ProductCode{D6BC89DB-BFB8-4EEA-ACD3-F8B0E1BA80D1} + ProductCode{5A7EAFAC-C817-4B6C-915B-4DC6A04787D8} ProductIDnone ProductLanguage1033 ProductNameBOINC - ProductVersion7.7.2 + ProductVersion7.12.1 ProgressType0install ProgressType1Installing ProgressType2installed diff --git a/win_build/installerv2/BOINCx64.ism b/win_build/installerv2/BOINCx64.ism index e7aa20f9ee..03d85d261c 100644 --- a/win_build/installerv2/BOINCx64.ism +++ b/win_build/installerv2/BOINCx64.ism @@ -2460,7 +2460,7 @@ WEBx64ProductCode WEBx64ProductName WEBx64ProductVersion - WEBx64SetupFileNameboinc_7.9.0_windows_x86_64WEBx64SetupFileNameboinc_7.12.1_windows_x86_64 WEBx64UpgradeCode
@@ -4551,11 +4551,11 @@ VwBlAGIAAQBXAEUAQgB4ADYANAA= PROGMSG_IIS_ROLLBACKAPPPOOLS##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS## PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS## PROGRAMFILETOLAUNCHATEND[#boincmgr.exe] - ProductCode{A94AB3A9-7A06-4D32-9CCD-04F37C8EB11D} + ProductCode{AD6DD68E-F93B-4D15-BA53-FB2DD07C68A8} ProductIDnone ProductLanguage1033 ProductNameBOINC - ProductVersion7.9.0 + ProductVersion7.12.1 ProgressType0install ProgressType1Installing ProgressType2installed diff --git a/win_build/installerv2/BOINCx64_vbox.ism b/win_build/installerv2/BOINCx64_vbox.ism index 67274f69a4..3b7d087f87 100644 --- a/win_build/installerv2/BOINCx64_vbox.ism +++ b/win_build/installerv2/BOINCx64_vbox.ism @@ -2460,7 +2460,7 @@ WEBx64ProductCode WEBx64ProductName WEBx64ProductVersion - WEBx64SetupFileNameboinc_7.7.2_windows_x86_64_vbox + WEBx64SetupFileNameboinc_7.12.1_windows_x86_64_vbox WEBx64UpgradeCode @@ -2719,7 +2719,7 @@ Order ISSetupLocation ISReleaseFlags - _6C22F14B_0AD3_4B66_9AFB_A49D322E5CD9_Oracle VM VirtualBox 5.2.8 (x64).prq + _593D0543_708E_4B67_B7A6_F5DE62A65B28_Oracle VM VirtualBox 5.2.8 (x64).prq @@ -4552,11 +4552,11 @@ VwBlAGIAAQBXAEUAQgB4ADYANAA=
PROGMSG_IIS_ROLLBACKAPPPOOLS##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS## PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS## PROGRAMFILETOLAUNCHATEND[#boincmgr.exe] - ProductCode{2D1FAE3A-6973-444A-B2D1-C8E0379FE107} + ProductCode{CB547835-9B43-4851-BCFA-8283AB38A36A} ProductIDnone ProductLanguage1033 ProductNameBOINC - ProductVersion7.7.2 + ProductVersion7.12.1 ProgressType0install ProgressType1Installing ProgressType2installed