Build,Doc: Update files for 2012.07 release.

6 files changed, 16 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 4e6393a..0333d9a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+glmark2 2012.07 (20120719)
+==========================
+
+* Add Android GUI for defining and running benchmarks.
+* Add benchmark based on the WebGL jellyfish demo (scene 'jellyfish').
+* Add benchmark based on the WebGL dynamic terrain demo (scene 'terrain').
+* Extend texture scene with the option to compute texture coordinates
+  in the shader (option 'texgen').
+* Add support for reading texture data from JPEG files.
+* Properly support options that have a finite set of acceptable values.
+
 glmark2 2012.06 (20120621)
 ==========================
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 32701a4..1be296a 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.06" package="org.linaro.glmark2">
+      android:versionName="2012.07" 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 72a94a5..ada4093 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.06\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.07\"" \
                 -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 af4cee6..558da83 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.06\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.07\"" \
                 -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 23030f4..c902881 100644
--- a/doc/glmark2.1.in
+++ b/doc/glmark2.1.in
@@ -1,4 +1,4 @@
-.TH @APPNAME@ "1" "June 2012" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "July 2012" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS
diff --git a/wscript b/wscript
index 1c5d7b7..f55b219 100644
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ from waflib import Context
 out = 'build'
 top = '.'
 
-VERSION = '2012.06'
+VERSION = '2012.07'
 APPNAME = 'glmark2'
 
 def options(opt):