I was using "git show" yesterday to find out how David had made the v7.8.0 tag
(and how Rom had made the v7.6.33 tag, come to that). Both outputs attached: it
appears that some sort of script was used. That sort of rules out Rom's old
cherrypicking of individual commits: it also means that the whole of the Drupal
source code was included in the v7.8.0 'client' tag.
I was looking because I was worried that a wholesale tagging might incorporate
commits which Rom might have deliberately excluded - with unexpected effects
that might need to be specially tested for. But I think that if that was going
to happen, it probably happened well before v7.6.33, and we survived the
experience.
On Thursday, 3 August 2017, 15:38, Charlie Fenton
<[email protected]> wrote:
I almost forget: I believe that the translations need to be updated in the 7.8
branch before tagging 7.8.1.
@Christian: Can you take care of this? I believe you have been working on the
Transifex stuff.
Cheers,
--Charlie
On Aug 1, 2017, at 7:11 PM, Charlie Fenton <[email protected]> wrote:
> I just merged my July 21 fix for the Windows 10 Manager crashes into the
> client_release/7/7.8 branch. If we want to get a new public version released,
> we need to keep moving alpha testing forward.
>
> Are there any other changes in GIT master that should be ported into the 7.8
> branch before we tag and build BOINC 7.8.1 and release it for alpha testing?
> (The way Rom and I have always ported individual commits is to cherry pick
> from master into the 7.8 branch.)
>
> Should the new keyword stuff be included in the 7.8.1 builds? If so, it is
> important that the Windows projects be updated for all supported versions of
> Visual Studio and ported to the 7.8 branch before tagging 7.8.1, as well as
> my commits 039fd90 (7/16/17) and 11b6ccc (7/31/17). Is anyone other than me
> still using VS 2010 for local Windows builds?
>
> Opinions? Thoughts? Volunteers to do the porting and tagging?
>
> Cheers,
> --Charlie
>
_______________________________________________
boinc_dev mailing list
[email protected]
https://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
commit 3e6998e7cef71d2042c2b6585db51d2ed5d8ada2
Author: David Anderson <[email protected]>
Date: Sun Jun 18 15:22:59 2017 -0700
update version #s, create tag client_release/7.8/7.8.0
diff --git a/configure.ac b/configure.ac
index e7d8e00..16b702d 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.7.0)
+AC_INIT(BOINC, 7.8.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 d8ef9cb..0d94688 100644
--- a/version.h
+++ b/version.h
@@ -7,10 +7,10 @@
#define BOINC_MAJOR_VERSION 7
/* Minor part of BOINC version number */
-#define BOINC_MINOR_VERSION 7
+#define BOINC_MINOR_VERSION 8
/* Release part of BOINC version number */
-#define BOINC_RELEASE 2
+#define BOINC_RELEASE 0
/* Release part of wrapper version number */
#define WRAPPER_RELEASE 26016
@@ -19,10 +19,10 @@
#define VBOXWRAPPER_RELEASE 26197
/* String representation of BOINC version number */
-#define BOINC_VERSION_STRING "7.7.2"
+#define BOINC_VERSION_STRING "7.8.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.7.2"
+#define PACKAGE_STRING "BOINC 7.8.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.7.2"
+#define PACKAGE_VERSION "7.8.0"
#endif /* #if (defined(_WIN32) || defined(__APPLE__)) */
diff --git a/version.h.in b/version.h.in
index bc0e367..feefc44 100644
--- a/version.h.in
+++ b/version.h.in
@@ -22,7 +22,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 */
diff --git a/version.log b/version.log
index 18bb418..09a6d30 100644
--- a/version.log
+++ b/version.log
@@ -1 +1 @@
-7.5.0
+7.8.0
commit 6f6c8b7eb5a3066171757ef162d72ca084cd3230
Author: Rom Walton <[email protected]>
Date: Sun Jun 5 12:39:54 2016 -0700
- Tag for 7.6.33 release
client_release/7.6/7.6.33
diff --git a/android/BOINC/AndroidManifest.xml
b/android/BOINC/AndroidManifest.xml
index 363b4b1..07f93aa 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -20,8 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android";
package="edu.berkeley.boinc"
android:installLocation="internalOnly"
- android:versionCode="145"
- android:versionName="7.6.32" > <!-- installation on SD card would break
boot receiver -->
+ android:versionCode="146"
+ android:versionName="7.6.33" > <!-- installation on SD card would break
boot receiver -->
<!-- Add Google Play store metadata informing the store we can run on
tablets and other large screen devices -->
diff --git a/configure.ac b/configure.ac
index 3ff2b75..8dadc80 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.6.32)
+AC_INIT(BOINC, 7.6.33)
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 329e98a..720be9b 100644
--- a/version.h
+++ b/version.h
@@ -10,7 +10,7 @@
#define BOINC_MINOR_VERSION 6
/* Release part of BOINC version number */
-#define BOINC_RELEASE 32
+#define BOINC_RELEASE 33
/* Release part of wrapper version number */
#define WRAPPER_RELEASE 26014
@@ -19,7 +19,7 @@
#define VBOXWRAPPER_RELEASE 26169
/* String representation of BOINC version number */
-#define BOINC_VERSION_STRING "7.6.32"
+#define BOINC_VERSION_STRING "7.6.33"
/* Package is a pre-release (Alpha/Beta) package */
/* #define BOINC_PRERELEASE 1 */
@@ -35,13 +35,13 @@
#define PACKAGE_NAME "BOINC"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "BOINC 7.6.32"
+#define PACKAGE_STRING "BOINC 7.6.33"
/* 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.6.32"
+#define PACKAGE_VERSION "7.6.33"
#endif /* #if (defined(_WIN32) || defined(__APPLE__)) */
diff --git a/version.log b/version.log
index ee584f7..7e977a8 100644
--- a/version.log
+++ b/version.log
@@ -1 +1 @@
-7.6.32
+7.6.33
_______________________________________________
boinc_dev mailing list
[email protected]
https://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
