Skip to content

Commit 60c9c80

Browse files
committed
Fix for CentOS
1 parent 19395b4 commit 60c9c80

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

config/buildbot.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ function runbuild {
55
# Start the VM and wait for it to come up.
66
echo "Starting build bot for $1, ssh port $3"
77
ssh buildbothost "nohup VBoxHeadless -s '$1' > /tmp/buildbot.out 2> /tmp/buildbot.err < /dev/null &"
8-
sleep 5
8+
echo "Waiting 10 seconds for VM to start up..."
9+
sleep 10
910

1011
# Setup the tunnel to the VM; a local port $3 gets mapped
1112
# to a port $3 on the build host, which is forwarded by
@@ -52,10 +53,10 @@ function runbuild {
5253

5354
# Parameters: VM name, package type, local ssh port, folder name on web server.
5455

55-
runbuild "Ubuntu_16.04_build" ".deb" 7000 ubuntu1604
56-
runbuild "Fedora_24_build" ".rpm" 7001 fedora24
57-
runbuild "Mint_18" ".deb" 7002 mint18
58-
runbuild "OpenSUSE_Leap" ".rpm" 7003 opensuse421
56+
#runbuild "Ubuntu_16.04_build" ".deb" 7000 ubuntu1604
57+
#runbuild "Fedora_24_build" ".rpm" 7001 fedora24
58+
#runbuild "Mint_18" ".deb" 7002 mint18
59+
#runbuild "OpenSUSE_Leap" ".rpm" 7003 opensuse421
5960
runbuild "CentOS_7" ".rpm" 7004 centos7
6061
runbuild "Ubuntu_14.04_build" ".deb" 7005 ubuntu1404
61-
runbuild "Debian86" ".deb" 7006 debian86
62+
#runbuild "Debian86" ".deb" 7006 debian86

frontend/gtkmm/NotebookWindow.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ NotebookWindow::NotebookWindow(Cadabra *c, bool ro)
7979
throw std::logic_error("Failed to parse widget CSS information.");
8080
}
8181
auto screen = Gdk::Screen::get_default();
82-
std::cerr << "cadabra-client: scale = " << screen->get_monitor_scale_factor(0) << std::endl;
82+
// std::cerr << "cadabra-client: scale = " << screen->get_monitor_scale_factor(0) << std::endl;
8383
Gtk::StyleContext::add_provider_for_screen(screen, css_provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
8484

8585
// Setup menu.

web2/cadabra2/source/changelog.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ <h1>Change log</h1>
1212
one version to the next. For details of precisely what is changed at
1313
the code level, consult
1414
the <a href="http://github.com/kpeeters/cadabra2">github
15-
repository</a>.
15+
repository</a>. Odd patch levels correspond to versions in
16+
development, even numbered ones are released in packaged form.
1617
</p>
1718
<a name="master"></a>
1819
<h3>github master</h3>
20+
21+
<a name="2.1.4"></a>
22+
<h3>2.1.4 (released 14-Apr-2017)</h3>
1923
<ul>
2024
<li>Enable packages to be written using Cadabra notation, instead of
21-
only pure Python.</li>
25+
only pure Python (still experimental).</li>
2226
<li>Young tableaux
2327
properties <tt><a href="/manual/Tableau.html">Tableau</a></tt> and
2428
<tt><a href="/manual/FilledTableau.html">FilledTableau</a></tt>
@@ -58,6 +62,7 @@ <h3>github master</h3>
5862
expression, should have <tt>deep=True</tt> by default.</li>
5963
<li>Fixed: a bug which would lead to a segfault when using <tt>deep=True</tt>.
6064
</ul>
65+
6166
<a name="2.1.2"></a>
6267
<h3>2.1.2</h3>
6368
<ul>

web2/cadabra2/source/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ <h1>News</h1>
1515
<p>See the <a href="changelog.html">change log</a> for latest changes
1616
only available on github.</p>
1717
<dl>
18+
<dt>14 April 2017</dt>
19+
<dd>Version 2.1.4 released (<a href="changelog.html#2.1.4">changes</a>).</dd>
1820
<dt>4 January 2017</dt>
1921
<dd>Version 2.1.2 released (<a href="changelog.html#2.1.2">changes</a>).</dd>
2022
<dt>3 January 2017</dt>

0 commit comments

Comments
 (0)