[liblouis-liblouisxml] [liblouisutdml] push by mwhapples - Reverted breaking changes on 2014-06-19 14:46 GMT
- From: liblouisutdml@xxxxxxxxxxxxxx
- To: liblouis-liblouisxml@xxxxxxxxxxxxx
- Date: Thu, 19 Jun 2014 14:47:20 +0000
Revision: c86c21828d9a
Branch: default
Author: Michael Whapples
Date: Thu Jun 19 14:55:56 2014 UTC
Log: Reverted breaking changes
http://code.google.com/p/liblouisutdml/source/detail?r=c86c21828d9a
Added:
/build-aux/compile
/liblouisutdml/Makesemnames
/liblouisutdml/README
/liblouisutdml/make_sem_names
/liblouisutdml/make_sem_names.c
/liblouisutdml/sem_names.h
Deleted:
/liblouisutdml/make_sem_names.pl
Modified:
/.hgignore
/configure.ac
/liblouisutdml/Makefile.am
=======================================
--- /dev/null
+++ /build-aux/compile Thu Jun 19 14:55:56 2014 UTC
@@ -0,0 +1,142 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@xxxxxxxxxx>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@xxxxxxx> or send patches to
+# <automake-patches@xxxxxxx>.
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@xxxxxxx>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
=======================================
--- /dev/null
+++ /liblouisutdml/Makesemnames Thu Jun 19 14:55:56 2014 UTC
@@ -0,0 +1,7 @@
+# If you change sem_enum.h run this file with
+# make -f Makesemnames
+
+sem_names.h : sem_enum.h make_sem_names
+ ./make_sem_names
+make_sem_names : make_sem_names.c
+ gcc -O2 -Wall -o make_sem_names make_sem_names.c
=======================================
--- /dev/null
+++ /liblouisutdml/README Thu Jun 19 14:55:56 2014 UTC
@@ -0,0 +1,3 @@
+If you change sem_enum.h be sure to run
+make -f Makesemnames
+
=======================================
--- /dev/null
+++ /liblouisutdml/make_sem_names Thu Jun 19 14:55:56 2014 UTC
Binary file, no diff available.
=======================================
--- /dev/null
+++ /liblouisutdml/make_sem_names.c Thu Jun 19 14:55:56 2014 UTC
@@ -0,0 +1,86 @@
+/* liblouisutdml Braille Transcription Library
+
+ This file may contain code borrowed from the Linux screenreader
+ BRLTTY, copyright (C) 1999-2006 by
+ the BRLTTY Team
+
+ Copyright (C) 2004, 2005, 2006
+ ViewPlus Technologies, Inc. www.viewplus.com
+ and
+ JJB Software, Inc. www.jjb-software.com
+ All rights reserved
+
+ This file is free software; you can redistribute it and/or modify it
+ under the terms of the Lesser or Library GNU General Public License
+ as published by the
+ Free Software Foundation; either version 3, or (at your option) any
+ later version.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ Library GNU General Public License for more details.
+
+ You should have received a copy of the Library GNU General Public
+ License along with this program; see the file COPYING. If not, write to
+ the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+
+ Maintained by John J. Boyer john.boyer@xxxxxxxxxxxxxxxx
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int
+main (void)
+{
+ FILE *semIn;
+ FILE *semOut;
+ char inbuf[128];
+ char *curchar;
+ int ch;
+ int ignoreLine = 1;
+ char *name;
+ int nameLength;
+ if ((semIn = fopen ("sem_enum.h", "r")) == NULL)
+ {
+ fprintf (stderr, "Cannot open sem_enum.h file.\n");
+ exit (1);
+ }
+ if ((semOut = fopen ("sem_names.h", "w")) == NULL)
+ {
+ fprintf (stderr, "Cannot open sem_names.h file.\n");
+ exit (1);
+ }
+ fprintf (semOut, "#ifndef __SEM_NAMES_h\n");
+ fprintf (semOut, "#define __SEM_NAMES_h\n");
+ fprintf (semOut, "static const char *semNames[] = {\n");
+ while ((fgets (inbuf, sizeof (inbuf), semIn)))
+ {
+ curchar = inbuf;
+ while ((ch = *curchar++) <= 32 && ch != 0);
+ if (ch == '/')
+continue;
+ if (ignoreLine)
+ {
+ if (ch == '{')
+ ignoreLine = 0;
+ continue;
+ }
+ if (ch == '}')
+ break;
+ name = curchar - 1;
+ while ((ch = *curchar++) > 32 && ch != ',' && ch != '=');
+ nameLength = curchar - name - 1;
+ name[nameLength] = 0;
+ fprintf (semOut, " \"%s\",\n", name);
+ }
+ fclose (semIn);
+ fprintf (semOut, "NULL\n");
+ fprintf (semOut, "};\n");
+ fprintf (semOut, "#endif /*__SEM_NAMES_H*/\n");
+ fclose (semOut);
+ return 0;
+}
=======================================
--- /dev/null
+++ /liblouisutdml/sem_names.h Thu Jun 19 14:55:56 2014 UTC
@@ -0,0 +1,107 @@
+#ifndef __SEM_NAMES_h
+#define __SEM_NAMES_h
+static const char *semNames[] = {
+ "no",
+ "skip",
+ "generic",
+ "cdata",
+ "htmllink",
+ "htmltarget",
+ "changetable",
+ "reverse",
+ "configfile",
+ "configstring",
+ "configtweak",
+ "document",
+ "para",
+ "heading1",
+ "heading2",
+ "heading3",
+ "heading4",
+ "heading5",
+ "heading6",
+ "heading7",
+ "heading8",
+ "heading9",
+ "heading10",
+ "contentsheader",
+ "contents1",
+ "contents2",
+ "contents3",
+ "contents4",
+ "contents5",
+ "contents6",
+ "contents7",
+ "contents8",
+ "contents9",
+ "contents10",
+ "notranslate",
+ "compbrl",
+ "uncontracted",
+ "contracted",
+ "pagenum",
+ "genpurp1",
+ "genpurp2",
+ "pagebreak",
+ "attrtotext",
+ "runninghead",
+ "footer",
+ "italicx",
+ "boldx",
+ "underlinex",
+ "linespacing",
+ "blankline",
+ "softreturn",
+ "newpage",
+ "righthandpage",
+ "code",
+ "music",
+ "math",
+ "mi",
+ "mn",
+ "mo",
+ "mtext",
+ "mspace",
+ "ms",
+ "mglyph",
+ "mrow",
+ "mfrac",
+ "msqrt",
+ "mroot",
+ "mstyle",
+ "merror",
+ "mpadded",
+ "mphantom",
+ "mfenced",
+ "menclose",
+ "msub",
+ "msup",
+ "msubsup",
+ "munder",
+ "mover",
+ "munderover",
+ "mmultiscripts",
+ "none",
+ "semantics",
+ "mprescripts",
+ "mtable",
+ "mtr",
+ "mtd",
+ "maligngroup",
+ "malignmark",
+ "mlabeledtr",
+ "maction",
+ "chemistry",
+ "graphic",
+ "markhead",
+ "utdmeta",
+ "utdbrl",
+ "utdnewpage",
+ "utdnewline",
+ "utdbrlonly",
+ "utddispimg",
+ "utdinlnimg",
+ "end_all",
+NULL
+};
+#endif /*__SEM_NAMES_H*/
=======================================
--- /liblouisutdml/make_sem_names.pl Thu Jun 19 07:28:52 2014 UTC
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use warnings;
-
-print "/* Do not edit this file. It is automatically generated by ", $0, "
*/\n";
-print "#ifndef __SEM_NAMES_h\n";
-print "#define __SEM_NAMES_h\n";
-print "static const char *semNames[] = {\n";
-
-while (<>) {
- # only look at the lines between the curly brackets
- if (/{/ .. /}/) {
- chomp;
- next if /[{}]/; # ignore the lines with curly brackets
- next if /^\s*\/\*/; # ignore comments
- s/^\s+([A-Za-z0-9_]+).*/$1/g; # extract the name
- print " \"", $_, "\",\n";
- }
-}
-
-print "NULL\n";
-print "};\n";
-print "#endif /*__SEM_NAMES_H*/\n";
=======================================
--- /.hgignore Thu Jun 19 07:24:50 2014 UTC
+++ /.hgignore Thu Jun 19 14:55:56 2014 UTC
@@ -22,7 +22,6 @@
config.status
configure
-build-aux/compile
build-aux/config.guess
build-aux/config.sub
build-aux/install-sh
@@ -56,7 +55,6 @@
liblouisutdml/config.h
liblouisutdml/config.h.in
liblouisutdml/stamp-h1
-liblouisutdml/sem_names.h
liblouisutdml-*.tar.gz
=======================================
--- /configure.ac Thu Jun 19 07:20:16 2014 UTC
+++ /configure.ac Thu Jun 19 14:55:56 2014 UTC
@@ -51,7 +51,7 @@
AC_PATH_PROG(PKG_CONFIG, pkg-config)
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, [liblouis >= 2.6.0, libxml-2.0])
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, [liblouis >= 2.5.1, libxml-2.0])
# Checks for libraries.
=======================================
--- /liblouisutdml/Makefile.am Thu Jun 19 07:19:30 2014 UTC
+++ /liblouisutdml/Makefile.am Thu Jun 19 14:55:56 2014 UTC
@@ -57,9 +57,8 @@
liblouisutdml_la_SOURCES += ../java/Jliblouisutdml.c
endif
-# Make sure sem_names.h is generated before everything else
-EXTRA_DIST = make_sem_names.pl
-BUILT_SOURCES = sem_names.h
-sem_names.h: sem_enum.h Makefile
- $(srcdir)/make_sem_names.pl < $< > $@
+EXTRA_DIST = \
+ README \
+ make_sem_names.c \
+ Makesemnames
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com
Other related posts:
- » [liblouis-liblouisxml] [liblouisutdml] push by mwhapples - Reverted breaking changes on 2014-06-19 14:46 GMT - liblouisutdml
