anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Prepare for a bugfix release 

Looks like I'll need to release a 6.1.1 soon

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2014-06-22 12:20:58 -04:00
parent 8b053b8c85
commit d74d1ea634
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sconstruct
View File

@ -2,8 +2,8 @@
import os
# Configuration variables
CONFIG_VERSION = 6.1
CONFIG_DEBUG = False
CONFIG_VERSION = "6.1.1"
CONFIG_DEBUG = True
CONFIG_TEST_VALGRIND = False
CONFIG_TEST_COVERAGE = False
CONFIG_TEST_CPPCHECK = False

7
share/ocarina/ocarina6.glade
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="adjustment1">
@ -212,7 +212,7 @@
<object class="GtkWindow" id="o_window">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Ocarina 6.1</property>
<property name="title" translatable="yes">Ocarina 6.1.1</property>
<property name="default_width">1024</property>
<property name="default_height">683</property>
<child>
@ -1592,8 +1592,6 @@ Manager</property>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@ -1660,7 +1658,6 @@ Manager</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
</object>

2
tests/Sconscript
View File

@ -41,7 +41,7 @@ class OTest:
cmd = "%s | tee %s.out" % (path, path)
if test_env.Valgrind == True:
cmd = "%s %s" % (valgrind, cmd)
test = Command("%s.out" % self.Name, [], "set -x pipefail; %s" % cmd)
test = Command("%s.out" % self.Name, [], "set -x; set -o pipefail; %s" % cmd)
Depends(test, prog)
if (check_depends == True) and (OTest.Prev != None):

4
tests/core/version.cpp
View File

@ -5,9 +5,9 @@
#include <tests/test.h>
#ifdef CONFIG_DEBUG
const std::string expected = "6.1-debug";
const std::string expected = "6.1.1-debug";
#else
const std::string expected = "6.1";
const std::string expected = "6.1.1";
#endif /* CONFIG_DEBUG */
static void test_version()