Skip to content

Commit

Permalink
- Remove unicode.patch now that unicode.xml is fixed upstream (issue #36
Browse files Browse the repository at this point in the history
) and update the unit test accordingly.

- Remove the dependencies on patch (was used for unicode.xml) and wget (replaced with curl, which is also used in unit tests)
  • Loading branch information
fred-wang committed Mar 16, 2015
1 parent 829c33b commit 1b60085
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 134 deletions.
4 changes: 1 addition & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ help:

unicode.xml:
# Download the unicode.xml file from the "XML Entity Definitions for Characters"
@WGET@ http://www.w3.org/2003/entities/2007xml/unicode.xml
# Workaround for https://github.com/fred-wang/TeXZilla/issues/5
@PATCH@ $@ < unicode.patch
@CURL@ http://www.w3.org/2003/entities/2007xml/unicode.xml -o $@

chars.txt: extractChars.xsl unicode.xml
# Extract the relevant information on characters from unicode.xml
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ Build Instructions

The following dependencies are required:

- [coreutils](https://www.gnu.org/software/coreutils/), [sed](https://www.gnu.org/software/sed/), [patch](https://www.gnu.org/software/patch/), [wget](https://www.gnu.org/software/wget/), [make](https://www.gnu.org/software/make/)
- [coreutils](https://www.gnu.org/software/coreutils/), [sed](https://www.gnu.org/software/sed/), [curl](http://curl.haxx.se/), [make](https://www.gnu.org/software/make/)
- [xsltproc](http://xmlsoft.org/XSLT/xsltproc2.html)
- [Python](http://www.python.org/)
- [Jison](http://zaach.github.io/jison).
- To run unit tests: [slimerJS](http://slimerjs.org/) or [phantomJS](http://phantomjs.org/), [bash](https://www.gnu.org/software/bash/). [nodejs](http://nodejs.org/) can be used to run the DOM-less tests.
- To generate the minified version `TeXZilla-min.js`: [Google Closure Compiler](https://developers.google.com/closure/compiler/).

On Debian-based Linux distributions, try `sudo apt-get install coreutils sed patch wget make xsltproc python npm phantomjs bash closure-compiler` and install Jison with `npm install jison -g`.
On Debian-based Linux distributions, try `sudo apt-get install coreutils sed curl make xsltproc python npm phantomjs bash closure-compiler` and install Jison with `npm install jison -g`.

To build TeXZilla, run the tests and generate the minified version:

Expand Down
86 changes: 0 additions & 86 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,8 @@ ac_unique_file="TeXZilla.jison"
ac_subst_vars='LTLIBOBJS
LIBOBJS
XSLTPROC
WGET
SED
PYTHON
PATCH
NPM
MAKE
KILL
Expand Down Expand Up @@ -2099,48 +2097,6 @@ fi
test -n "$NPM" && break
done

for ac_prog in patch
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_PATCH+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PATCH"; then
ac_cv_prog_PATCH="$PATCH" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_PATCH="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

fi
fi
PATCH=$ac_cv_prog_PATCH
if test -n "$PATCH"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
$as_echo "$PATCH" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


test -n "$PATCH" && break
done

for ac_prog in python
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
Expand Down Expand Up @@ -2225,48 +2181,6 @@ fi
test -n "$SED" && break
done

for ac_prog in wget
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_WGET+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$WGET"; then
ac_cv_prog_WGET="$WGET" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_WGET="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

fi
fi
WGET=$ac_cv_prog_WGET
if test -n "$WGET"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
$as_echo "$WGET" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


test -n "$WGET" && break
done

for ac_prog in xsltproc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
Expand Down
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ AC_CHECK_PROGS(JISON, jison)
AC_CHECK_PROGS(KILL, kill)
AC_CHECK_PROGS(MAKE, make)
AC_CHECK_PROGS(NPM, npm)
AC_CHECK_PROGS(PATCH, patch)
AC_CHECK_PROGS(PYTHON, python)
AC_CHECK_PROGS(SED, sed)
AC_CHECK_PROGS(WGET, wget)
AC_CHECK_PROGS(XSLTPROC, xsltproc)

AC_CONFIG_FILES(Makefile)
Expand Down
40 changes: 0 additions & 40 deletions unicode.patch

This file was deleted.

2 changes: 1 addition & 1 deletion unit-tests.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1b60085

Please sign in to comment.