mirror of https://github.com/BOINC/boinc.git
update installshield files; update version #s; fix Win custom action build
This commit is contained in:
David Anderson
parent
80a2cae9b7
commit
1bffea8aaf
|
|
@ -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])
|
||||
|
|
|
|||
10
version.h
10
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__)) */
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
7.11.0
|
||||
7.13.0
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@
|
|||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<AdditionalIncludeDirectories>..\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\lib;../win_build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>atls.lib;msi.lib;libcmt.lib;libcpmt.lib;delayimp.lib;netapi32.lib;advapi32.lib;kernel32.lib;user32.lib;version.lib;libboinc_staticcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
|
|
|
|||
|
|
@ -2461,7 +2461,7 @@
|
|||
<row><td>WEBx86</td><td>ProductCode</td><td/></row>
|
||||
<row><td>WEBx86</td><td>ProductName</td><td/></row>
|
||||
<row><td>WEBx86</td><td>ProductVersion</td><td/></row>
|
||||
<row><td>WEBx86</td><td>SetupFileName</td><td>boinc_7.7.2_windows_intelx86</td></row>
|
||||
<row><td>WEBx86</td><td>SetupFileName</td><td>boinc_7.12.1_windows_intelx86</td></row>
|
||||
<row><td>WEBx86</td><td>UpgradeCode</td><td/></row>
|
||||
</table>
|
||||
|
||||
|
|
@ -4553,11 +4553,11 @@ VwBlAGIAAQBXAEUAQgB4ADgANgA=
|
|||
<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
|
||||
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
|
||||
<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#boincmgr.exe]</td><td/></row>
|
||||
<row><td>ProductCode</td><td>{CCB6AAA0-BF11-4F62-9E2F-ABF9489D448C}</td><td/></row>
|
||||
<row><td>ProductCode</td><td>{A48CBA96-E95D-4CF3-BB3E-741D88686A5C}</td><td/></row>
|
||||
<row><td>ProductID</td><td>none</td><td/></row>
|
||||
<row><td>ProductLanguage</td><td>1033</td><td/></row>
|
||||
<row><td>ProductName</td><td>BOINC</td><td/></row>
|
||||
<row><td>ProductVersion</td><td>7.7.2</td><td/></row>
|
||||
<row><td>ProductVersion</td><td>7.12.1</td><td/></row>
|
||||
<row><td>ProgressType0</td><td>install</td><td/></row>
|
||||
<row><td>ProgressType1</td><td>Installing</td><td/></row>
|
||||
<row><td>ProgressType2</td><td>installed</td><td/></row>
|
||||
|
|
|
|||
|
|
@ -2460,7 +2460,7 @@
|
|||
<row><td>WEBx86</td><td>ProductCode</td><td/></row>
|
||||
<row><td>WEBx86</td><td>ProductName</td><td/></row>
|
||||
<row><td>WEBx86</td><td>ProductVersion</td><td/></row>
|
||||
<row><td>WEBx86</td><td>SetupFileName</td><td>boinc_7.7.2_windows_intelx86_vbox</td></row>
|
||||
<row><td>WEBx86</td><td>SetupFileName</td><td>boinc_7.12.1_windows_intelx86_vbox</td></row>
|
||||
<row><td>WEBx86</td><td>UpgradeCode</td><td/></row>
|
||||
</table>
|
||||
|
||||
|
|
@ -2719,7 +2719,7 @@
|
|||
<col def="I2">Order</col>
|
||||
<col def="I2">ISSetupLocation</col>
|
||||
<col def="S255">ISReleaseFlags</col>
|
||||
<row><td>_B2A694FE_55E0_4B53_BE88_01C03CEF8EA0_</td><td>Oracle VM VirtualBox 5.2.8 (x86).prq</td><td/><td/><td/></row>
|
||||
<row><td>_0AAAC1E4_13B5_4453_A2F5_AB3133662623_</td><td>Oracle VM VirtualBox 5.2.8 (x86).prq</td><td/><td/><td/></row>
|
||||
</table>
|
||||
|
||||
<table name="ISSetupType">
|
||||
|
|
@ -4553,11 +4553,11 @@ VwBlAGIAAQBXAEUAQgB4ADgANgA=
|
|||
<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
|
||||
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
|
||||
<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#boincmgr.exe]</td><td/></row>
|
||||
<row><td>ProductCode</td><td>{D6BC89DB-BFB8-4EEA-ACD3-F8B0E1BA80D1}</td><td/></row>
|
||||
<row><td>ProductCode</td><td>{5A7EAFAC-C817-4B6C-915B-4DC6A04787D8}</td><td/></row>
|
||||
<row><td>ProductID</td><td>none</td><td/></row>
|
||||
<row><td>ProductLanguage</td><td>1033</td><td/></row>
|
||||
<row><td>ProductName</td><td>BOINC</td><td/></row>
|
||||
<row><td>ProductVersion</td><td>7.7.2</td><td/></row>
|
||||
<row><td>ProductVersion</td><td>7.12.1</td><td/></row>
|
||||
<row><td>ProgressType0</td><td>install</td><td/></row>
|
||||
<row><td>ProgressType1</td><td>Installing</td><td/></row>
|
||||
<row><td>ProgressType2</td><td>installed</td><td/></row>
|
||||
|
|
|
|||
|
|
@ -2460,7 +2460,7 @@
|
|||
<row><td>WEBx64</td><td>ProductCode</td><td/></row>
|
||||
<row><td>WEBx64</td><td>ProductName</td><td/></row>
|
||||
<row><td>WEBx64</td><td>ProductVersion</td><td/></row>
|
||||
<row><td>WEBx64</td><td>SetupFileName</td><td>boinc_7.9.0_windows_x86_64</td></row>
|
||||
<row><td>WEBx64</td><td>SetupFileName</td><td>boinc_7.12.1_windows_x86_64</td></row>
|
||||
<row><td>WEBx64</td><td>UpgradeCode</td><td/></row>
|
||||
</table>
|
||||
|
||||
|
|
@ -4551,11 +4551,11 @@ VwBlAGIAAQBXAEUAQgB4ADYANAA=
|
|||
<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
|
||||
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
|
||||
<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#boincmgr.exe]</td><td/></row>
|
||||
<row><td>ProductCode</td><td>{A94AB3A9-7A06-4D32-9CCD-04F37C8EB11D}</td><td/></row>
|
||||
<row><td>ProductCode</td><td>{AD6DD68E-F93B-4D15-BA53-FB2DD07C68A8}</td><td/></row>
|
||||
<row><td>ProductID</td><td>none</td><td/></row>
|
||||
<row><td>ProductLanguage</td><td>1033</td><td/></row>
|
||||
<row><td>ProductName</td><td>BOINC</td><td/></row>
|
||||
<row><td>ProductVersion</td><td>7.9.0</td><td/></row>
|
||||
<row><td>ProductVersion</td><td>7.12.1</td><td/></row>
|
||||
<row><td>ProgressType0</td><td>install</td><td/></row>
|
||||
<row><td>ProgressType1</td><td>Installing</td><td/></row>
|
||||
<row><td>ProgressType2</td><td>installed</td><td/></row>
|
||||
|
|
|
|||
|
|
@ -2460,7 +2460,7 @@
|
|||
<row><td>WEBx64</td><td>ProductCode</td><td/></row>
|
||||
<row><td>WEBx64</td><td>ProductName</td><td/></row>
|
||||
<row><td>WEBx64</td><td>ProductVersion</td><td/></row>
|
||||
<row><td>WEBx64</td><td>SetupFileName</td><td>boinc_7.7.2_windows_x86_64_vbox</td></row>
|
||||
<row><td>WEBx64</td><td>SetupFileName</td><td>boinc_7.12.1_windows_x86_64_vbox</td></row>
|
||||
<row><td>WEBx64</td><td>UpgradeCode</td><td/></row>
|
||||
</table>
|
||||
|
||||
|
|
@ -2719,7 +2719,7 @@
|
|||
<col def="I2">Order</col>
|
||||
<col def="I2">ISSetupLocation</col>
|
||||
<col def="S255">ISReleaseFlags</col>
|
||||
<row><td>_6C22F14B_0AD3_4B66_9AFB_A49D322E5CD9_</td><td>Oracle VM VirtualBox 5.2.8 (x64).prq</td><td/><td/><td/></row>
|
||||
<row><td>_593D0543_708E_4B67_B7A6_F5DE62A65B28_</td><td>Oracle VM VirtualBox 5.2.8 (x64).prq</td><td/><td/><td/></row>
|
||||
</table>
|
||||
|
||||
<table name="ISSetupType">
|
||||
|
|
@ -4552,11 +4552,11 @@ VwBlAGIAAQBXAEUAQgB4ADYANAA=
|
|||
<row><td>PROGMSG_IIS_ROLLBACKAPPPOOLS</td><td>##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS##</td><td/></row>
|
||||
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
|
||||
<row><td>PROGRAMFILETOLAUNCHATEND</td><td>[#boincmgr.exe]</td><td/></row>
|
||||
<row><td>ProductCode</td><td>{2D1FAE3A-6973-444A-B2D1-C8E0379FE107}</td><td/></row>
|
||||
<row><td>ProductCode</td><td>{CB547835-9B43-4851-BCFA-8283AB38A36A}</td><td/></row>
|
||||
<row><td>ProductID</td><td>none</td><td/></row>
|
||||
<row><td>ProductLanguage</td><td>1033</td><td/></row>
|
||||
<row><td>ProductName</td><td>BOINC</td><td/></row>
|
||||
<row><td>ProductVersion</td><td>7.7.2</td><td/></row>
|
||||
<row><td>ProductVersion</td><td>7.12.1</td><td/></row>
|
||||
<row><td>ProgressType0</td><td>install</td><td/></row>
|
||||
<row><td>ProgressType1</td><td>Installing</td><td/></row>
|
||||
<row><td>ProgressType2</td><td>installed</td><td/></row>
|
||||
|
|
|
|||
Loading…
Reference in New Issue