Skip to content

Commit d4ae40c

Browse files
committed
Upgrade versions
New versions: * OpenFST 1.6.6 * OpenGRM NGram 1.3.4 * Thrax 1.2.5
1 parent 5cb241d commit d4ae40c

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
2525
ENV ZLIB_VERSION 1.2.8
2626
ENV NCURSES_VERSION 6.0
2727
ENV READLINE_VERSION 7.0
28-
ENV OPENFST_VERSION 1.6.5
29-
ENV OPENGRM_NGRAM_VERSION 1.3.3
30-
ENV THRAX_VERSION 1.2.4
28+
ENV OPENFST_VERSION 1.6.6
29+
ENV OPENGRM_NGRAM_VERSION 1.3.4
30+
ENV THRAX_VERSION 1.2.5
3131

3232
# Prepare compilation directories
3333
ENV C /tmp/compile

thrax-random-generator-cc-mingw.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@@ -61,6 +65,30 @@
1515
CHECK(grm.LoadArchive(FLAGS_far));
1616
const SymbolTable* generated_symtab = GetGeneratedSymbolTable(&grm);
17-
SymbolTable* output_symtab = NULL;
17+
SymbolTable* output_symtab = nullptr;
1818
+#if defined __MINGW32__
1919
+ fst::StringTokenType type;
2020
+ if (FLAGS_output_mode == "byte") {

thrax-rewrite-tester-utils-cc-mingw.patch

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,21 @@
1111
DEFINE_string(far, "", "Path to the FAR.");
1212
DEFINE_string(rules, "", "Names of the rewrite rules.");
1313
DEFINE_string(input_mode, "byte", "Either \"byte\", \"utf8\", or the path to a "
14+
@@ -47,8 +51,8 @@
15+
16+
inline void InitializeHistoryFile() {
17+
// Create history file if it doesn't exist
18+
- if (!File::Open(FLAGS_history_file, "r")) {
19+
- File* fp = File::Open(FLAGS_history_file, "w");
20+
+ if (!Open(FLAGS_history_file, "r")) {
21+
+ File* fp = Open(FLAGS_history_file, "w");
22+
// Fail silently if we can't open it: just don't record history
23+
if (fp) fp->Close();
24+
}
1425
@@ -159,6 +163,18 @@
1526
}
1627

17-
output_symtab_ = NULL;
28+
output_symtab_ = nullptr;
1829
+#if defined __MINGW32__
1930
+ if (FLAGS_output_mode == "byte") {
2031
+ type_ = fst::BYTE;

0 commit comments

Comments
 (0)