Build,Doc: Update files for 2012.08 release.

6 files changed, 18 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 0333d9a..61fdfec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+glmark2 2012.08 (20120817)
+==========================
+
+* Display benchmark results in the Android GUI.
+* Add an Android option menu offering load/save/delete benchmark list
+  functionality, access to last benchmark results, settings and
+  information about glmark2.
+* Properly handle spaces in scene options on Android.
+* Exclude from score calculation benchmarks whose set up wasn't successful.
+* Display an appropriate message (instead of a 0 FPS value) if benchmark
+  set up isn't successful.
+* Add support for standard GNU installation directories.
+
 glmark2 2012.07 (20120719)
 ==========================
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 70d99be..cf4fbaf 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       android:versionCode="1"
-      android:versionName="2012.07" package="org.linaro.glmark2">
+      android:versionName="2012.08" package="org.linaro.glmark2">
     <application android:label="@string/app_name">
         <activity android:name="org.linaro.glmark2.MainActivity"
                   android:label="@string/title_activity_main">
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index ada4093..bd13feb 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -54,7 +54,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.07\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.08\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
                 -Wno-error=unused-parameter
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
diff --git a/android/jni/Android.ndk.mk b/android/jni/Android.ndk.mk
index 558da83..91c12c3 100644
--- a/android/jni/Android.ndk.mk
+++ b/android/jni/Android.ndk.mk
@@ -47,7 +47,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.07\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.08\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
                 -Wno-error=unused-parameter
 LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
diff --git a/doc/glmark2.1.in b/doc/glmark2.1.in
index c902881..6121de3 100644
--- a/doc/glmark2.1.in
+++ b/doc/glmark2.1.in
@@ -1,4 +1,4 @@
-.TH @APPNAME@ "1" "July 2012" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "August 2012" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS
diff --git a/wscript b/wscript
index e0fcabb..8ec3815 100644
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ from waflib import Context
 out = 'build'
 top = '.'
 
-VERSION = '2012.07'
+VERSION = '2012.08'
 APPNAME = 'glmark2'
 
 def options(opt):