[Libreoffice-commits] core.git: editeng/CustomTarget_generated.mk solenv/bin sw/CustomTarget_generated.mk
Jussi Pakkanen (via logerrit)
logerrit at kemper.freedesktop.org
Tue Feb 25 07:33:41 UTC 2020
editeng/CustomTarget_generated.mk | 6 +--
solenv/bin/gentoken.pl | 65 --------------------------------------
solenv/bin/gentoken.py | 55 ++++++++++++++++++++++++++++++++
sw/CustomTarget_generated.mk | 10 ++---
4 files changed, 63 insertions(+), 73 deletions(-)
New commits:
commit e6b9bc3f2ecf0fb7fde5b02f9d750ccbe022f4c1
Author: Jussi Pakkanen <jpakkane at gmail.com>
AuthorDate: Sat Feb 22 18:39:34 2020 +0200
Commit: Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Feb 25 08:33:07 2020 +0100
Convert gentoken from Perl to Python.
See tdf#130911 for motivation.
Change-Id: I62759a9c7766e5c62c6fbab06c15e8300df25935
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89262
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/editeng/CustomTarget_generated.mk b/editeng/CustomTarget_generated.mk
index c47dda3ecc57..2e975d65cabd 100644
--- a/editeng/CustomTarget_generated.mk
+++ b/editeng/CustomTarget_generated.mk
@@ -10,12 +10,12 @@
$(eval $(call gb_CustomTarget_CustomTarget,editeng/generated))
editeng_SRC := $(SRCDIR)/editeng/source/misc
-editeng_PL := $(SRCDIR)/solenv/bin/gentoken.pl
+editeng_PY := $(SRCDIR)/solenv/bin/gentoken.py
editeng_INC := $(call gb_CustomTarget_get_workdir,editeng/generated)
-$(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : $(editeng_SRC)/tokens.txt $(editeng_PL)
+$(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : $(editeng_SRC)/tokens.txt $(editeng_PY)
mkdir -p $(editeng_INC)
- $(PERL) $(editeng_PL) $(editeng_SRC)/tokens.txt $(editeng_INC)/tokens.gperf
+ $(PYTHON) $(editeng_PY) $(editeng_SRC)/tokens.txt $(editeng_INC)/tokens.gperf
$(editeng_INC)/tokens.cxx : $(editeng_INC)/tokens.gperf
$(GPERF) --compare-strncmp --readonly-tables --output-file=$(editeng_INC)/tokens.cxx $(editeng_INC)/tokens.gperf
diff --git a/solenv/bin/gentoken.pl b/solenv/bin/gentoken.pl
deleted file mode 100644
index f742e65c462d..000000000000
--- a/solenv/bin/gentoken.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$ARGV0 = shift @ARGV;
-$ARGV1 = shift @ARGV;
-
-open ( TOKENS, $ARGV0 ) || die "can't open token file: $!";
-my %tokens;
-
-while ( defined ($line = <TOKENS>) )
-{
- if( !($line =~ /^#/) )
- {
- chomp($line);
- @token = split(/\s+/,$line);
- if ( not defined ($token[1]) )
- {
- $token[1] = "XML_".$token[0];
- $token[1] =~ tr/\-\.\:/___/;
- $token[1] =~ s/\+/PLUS/g;
- $token[1] =~ s/\-/MINUS/g;
- }
-
- $tokens{$token[0]} = uc($token[1]);
- }
-}
-close ( TOKENS );
-
-open ( GPERF, ">$ARGV1" ) || die "can't open tokens.gperf file: $!";
-
-print ( GPERF "%language=C++\n" );
-print ( GPERF "%global-table\n" );
-print ( GPERF "%null-strings\n" );
-print ( GPERF "%struct-type\n" );
-print ( GPERF "struct xmltoken\n" );
-print ( GPERF "{\n" );
-print ( GPERF " const sal_Char *name; XMLTokenEnum nToken; \n" );
-print ( GPERF "};\n" );
-print ( GPERF "%%\n" );
-
-$i = 0;
-foreach( sort(keys(%tokens)) )
-{
- $i = $i + 1;
- print( GPERF "$_,$tokens{$_}\n" );
-}
-print ( GPERF "%%\n" );
-close ( GPERF );
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/gentoken.py b/solenv/bin/gentoken.py
new file mode 100755
index 000000000000..55438a1be040
--- /dev/null
+++ b/solenv/bin/gentoken.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+import sys
+
+gperf_header = """%language=C++
+%global-table
+%null-strings
+%struct-type
+struct xmltoken
+{
+ const sal_Char *name; XMLTokenEnum nToken;
+};
+%%
+"""
+
+token_input_file = sys.argv[1]
+gperf_output_file = sys.argv[2]
+
+tokens = {}
+
+with open(token_input_file) as ifile:
+ for line in ifile:
+ line = line.strip()
+ if line:
+ token = "XML_" + line
+ token = token.replace("-", "_").replace(".", "_").replace(":", "_")
+ token = token.replace("+", "PLUS")
+ tokens[line] = token.upper()
+
+with open(gperf_output_file, "w") as gperf:
+ gperf.write(gperf_header)
+
+ for token in sorted(tokens.keys()):
+ gperf.write("{},{}\n".format(token, tokens[token]))
+
+ gperf.write("%%\n")
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk
index e3c266b52665..eafb8705564d 100644
--- a/sw/CustomTarget_generated.mk
+++ b/sw/CustomTarget_generated.mk
@@ -10,16 +10,16 @@
$(eval $(call gb_CustomTarget_CustomTarget,sw/generated))
sw_SRC := $(SRCDIR)/sw/source/core/swg
-sw_PL := $(SRCDIR)/solenv/bin/gentoken.pl
+sw_PY := $(SRCDIR)/solenv/bin/gentoken.py
sw_INC := $(call gb_CustomTarget_get_workdir,sw/generated)
-$(sw_INC)/TextBlockTokens.gperf : $(sw_SRC)/TextBlockTokens.txt $(sw_PL)
+$(sw_INC)/TextBlockTokens.gperf : $(sw_SRC)/TextBlockTokens.txt $(sw_PY)
mkdir -p $(sw_INC)
- $(PERL) $(sw_PL) $(sw_SRC)/TextBlockTokens.txt $(sw_INC)/TextBlockTokens.gperf
+ $(PYTHON) $(sw_PY) $(sw_SRC)/TextBlockTokens.txt $(sw_INC)/TextBlockTokens.gperf
-$(sw_INC)/BlockListTokens.gperf : $(sw_SRC)/BlockListTokens.txt $(sw_PL)
+$(sw_INC)/BlockListTokens.gperf : $(sw_SRC)/BlockListTokens.txt $(sw_PY)
mkdir -p $(sw_INC)
- $(PERL) $(sw_PL) $(sw_SRC)/BlockListTokens.txt $(sw_INC)/BlockListTokens.gperf
+ $(PYTHON) $(sw_PY) $(sw_SRC)/BlockListTokens.txt $(sw_INC)/BlockListTokens.gperf
$(sw_INC)/tokens.cxx : $(sw_INC)/TextBlockTokens.gperf $(sw_INC)/BlockListTokens.gperf
$(GPERF) --compare-strncmp --readonly-tables --output-file=$(sw_INC)/tokens.cxx \
More information about the Libreoffice-commits
mailing list