Skip to content

Commit df3da41

Browse files
author
Kasper Peeters
committed
Disable old code related to TeX cell handling. Fix warnings and disable irrelevant ones. Bump version ready for release candidate 2.5.14rc1.
1 parent ead0e12 commit df3da41

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
254254
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
255255
endif()
256256
endif()
257-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Wextra -Wunused -Wno-unknown-pragmas -Wno-misleading-indentation -fvisibility=hidden -Wno-unused-but-set-variable -Wno-unused-parameter")
257+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Wextra -Wunused -Wno-psabi -Wno-unknown-pragmas -Wno-misleading-indentation -fvisibility=hidden -Wno-unused-but-set-variable -Wno-unused-parameter")
258258
endif()
259259

260260
# Clang

cmake/version.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(CADABRA_VERSION_MAJOR 2)
22
set(CADABRA_VERSION_MINOR 5)
3-
set(CADABRA_VERSION_PATCH 13)
4-
set(CADABRA_VERSION_RC "") # do *not* use rcX here, just use X
3+
set(CADABRA_VERSION_PATCH 14)
4+
set(CADABRA_VERSION_RC "1") # do *not* use rcX here, just use X
55
set(CADABRA_VERSION_SEM ${CADABRA_VERSION_MAJOR}.${CADABRA_VERSION_MINOR}.${CADABRA_VERSION_PATCH})
66
set(CADABRA_VERSION_GITHUB_TAG ${CADABRA_VERSION_SEM})
77
if(NOT "${CADABRA_VERSION_RC}" STREQUAL "")

core/algorithms/first_order_form.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "Functional.hh"
99
#include "properties/PartialDerivative.hh"
1010

11-
#define DEBUG __FILE__
11+
// #define DEBUG __FILE__
1212
#include "Debug.hh"
1313

1414
using namespace cadabra;

frontend/common/TeXEngine.cc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <iostream>
77
#include <cstdio>
88
#include <boost/algorithm/string.hpp>
9-
#include "lodepng.h"
9+
// #include "lodepng.h"
1010
#include <fstream>
1111
#include <sstream>
1212
#include <internal/unistd.h>
@@ -354,6 +354,10 @@ void TeXEngine::convert_one(std::shared_ptr<TeXRequest> req)
354354

355355
void TeXEngine::convert_set(std::set<std::shared_ptr<TeXRequest> >& reqs)
356356
{
357+
throw std::logic_error("TeXEngine::convert_set: disabled in favour of MicroTeX.");
358+
359+
#if 1==0
360+
357361
// We now no longer follow
358362
//
359363
// https://www.securecoding.cert.org/confluence/display/seccode/FI039-C.+Create+temporary+files+securely
@@ -636,4 +640,6 @@ void TeXEngine::convert_set(std::set<std::shared_ptr<TeXRequest> >& reqs)
636640

637641
if(chdir(olddir)==-1)
638642
throw TeXException("Failed to chdir back to " +std::string(olddir)+".");
643+
644+
#endif
639645
}

frontend/gtkmm/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ set(cadabra_gtk_src
107107
Console.cc
108108
Keywords.cc
109109
../common/TeXEngine.cc
110-
../common/lodepng.cc
110+
# ../common/lodepng.cc
111111
# ../common/exec-stream.cc
112112
${CADABRA_CORE_DIR}/CdbPython.cc
113113
${CADABRA_LIBS_DIR}/tiny-process-library/process.cpp

0 commit comments

Comments
 (0)