Skip to content

Commit aef6867

Browse files
committedJul 31, 2014
Merge branch 'develop'
2 parents ca1ea7e + 4645124 commit aef6867

8 files changed

+192
-45
lines changed
 

‎ChangeLog

+110
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
2014-07-31 Hayaki Saito <user@zuse.jp>
2+
3+
* README.md, main.c: Minor fix
4+
5+
* README.md, main.c, terminal.c, terminal.h, yaft.h: Add --cjkwidth option
6+
7+
2014-07-30 Hayaki Saito <user@zuse.jp>
8+
9+
* config.h.in, configure, configure.ac, main.c: Minor fix
10+
11+
* config.h.in, configure, configure.ac, main.c: Fix for mingw environment
12+
13+
* Makefile.am, Makefile.in, malloc_stub.c, malloc_stub.h, terminal.c,
14+
wcwidth.h, yaft.h: Minor fix
15+
16+
2014-07-29 Hayaki Saito <user@zuse.jp>
17+
18+
* config.h.in, configure, configure.ac, util.c: Checks calloc availability
19+
20+
* README.md, dcs.c: Strip a needless strlen
21+
22+
* README.md, configure, configure.ac: Update README
23+
24+
* README.md, main.c: Update README and output of --help option
25+
26+
2014-07-28 Hayaki Saito <user@zuse.jp>
27+
28+
* config.h.in, configure, configure.ac, dcs.c, gifsave89.c, main.c, osc.c,
29+
parse.c, util.c: Update configure script
30+
31+
* conf.h, dcs.c, function.c, main.c, osc.c, parse.c, pseudo.c, terminal.c,
32+
util.c, yaft.h: Drop conf.h
33+
34+
* conf.h, main.c, terminal.c, terminal.h, yaft.h: Add tabstop option
35+
36+
* conf.h, main.c, pseudo.c, terminal.c, terminal.h, yaft.h: Add
37+
--cursor-color option
38+
39+
* main.c, parse.c, parse.h: Support sixel animation
40+
41+
* README.md, conf.h, function.c, main.c, pseudo.c, terminal.c, terminal.h,
42+
yaft.h: Add --foreground-color/--background-color option
43+
44+
* README.md, main.c: Add --last-frame-delay option
45+
46+
2014-07-27 Hayaki Saito <user@zuse.jp>
47+
48+
* config.h.in, configure, configure.ac, dcs.c, function.c, gifsave89.h,
49+
main.c, osc.c, parse.c, pseudo.c, terminal.c, util.c, wcwidth.h, yaft.h:
50+
Include config.h in each source files
51+
52+
* COPYING, INSTALL: Add proper COPYING and INSTALL file
53+
54+
2014-07-27 saitoha <user@zuse.jp>
55+
56+
* Makefile.am, Makefile.in, aclocal.m4, config.h.in, configure, configure.ac,
57+
main.c, malloc_stub.c, malloc_stub.h, osc.c, terminal.c, wcwidth.c,
58+
wcwidth.h, yaft.h: Add malloc stub and wcwidth function
59+
60+
2014-07-27 Hayaki Saito <user@zuse.jp>
61+
62+
* configure, configure.ac: Add a hack against that git does not preverve file
63+
timestamp
64+
65+
* README.md, main.c: Update default width and height value
66+
67+
* config.h.in, configure, configure.ac, main.c: Check getopt_long
68+
availability
69+
70+
* configure, configure.ac, gifsave89.h, main.c: Add --width, --height,
71+
--version option
72+
73+
* main.c, parse.c, pseudo.c, terminal.c, terminal.h, util.c, util.h, yaft.h:
74+
Delete unused functions and definitions
75+
76+
* color.h, conf.h, dcs.c, dcs.h, function.c, function.h, main.c, osc.c,
77+
osc.h, parse.c, parse.h, pseudo.c, pseudo.h, terminal.c, terminal.h, util.c,
78+
util.h: Add mode lines
79+
80+
* color.h, conf.h, dcs.c, dcs.h, function.c, function.h, gifsave89.c,
81+
gifsave89.h, glyph.h, glyph/milkjf.h, glyph/mplus.h, images/gplv3.png,
82+
main.c, osc.c, osc.h, parse.c, parse.h, pseudo.c, pseudo.h, sample/256.gif,
83+
sample/man.gif, sample/netlab.gif, sample/peco.gif, sample/sl.gif,
84+
terminal.c, terminal.h, util.c, util.h, yaft.h: Add license blocks
85+
86+
2014-07-26 Hayaki Saito <user@zuse.jp>
87+
88+
* COPYING, INSTALL, LICENSE, Makefile.am, Makefile.in, aclocal.m4, compile,
89+
config.h.in, configure, configure.ac, depcomp, install-sh, main.c, makefile,
90+
missing: Generate configure script using autotools
91+
92+
2014-07-25 Hayaki Saito <user@zuse.jp>
93+
94+
* dcs.c, function.c, gifsave89.c, gifsave89.h, glyph.h, main.c, osc.c,
95+
parse.c, pseudo.c, terminal.c, util.c, yaft.h: Add missing files
96+
97+
* color.h, conf.h, gifsave89.h, util.h: Style fix
98+
99+
* README.md, color.h, conf.h, dcs.h, draw.h, function.h, gifsave89.h,
100+
makefile, osc.h, parse.h, pseudo.h, recterm.c, recterm.h, terminal.h, util.h:
101+
Strip pseudo terminal and read stdin as output sequences
102+
103+
* README.md, conf.h: Forked by Hayaki Saito
104+
105+
2014-07-25 uobikiemukot <uobikiemukot@gmail.com>
106+
107+
* README.md, color.h, conf.h, dcs.h, draw.h, function.h, gifsave89.h,
108+
glyph/milkjf.h, glyph/mplus.h, makefile, osc.h, parse.h, pseudo.h, recterm.c,
109+
recterm.h, sample/256.gif, sample/man.gif, sample/netlab.gif,
110+
sample/peco.gif, sample/sl.gif, terminal.h, util.h: first version

‎Makefile.in

+5-3
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ bin_PROGRAMS = seq2gif$(EXEEXT)
8080
subdir = .
8181
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
8282
$(top_srcdir)/configure $(am__configure_deps) \
83-
$(srcdir)/config.h.in depcomp COPYING INSTALL compile \
84-
install-sh missing
83+
$(srcdir)/config.h.in $(srcdir)/package.json.in depcomp \
84+
COPYING ChangeLog INSTALL compile install-sh missing
8585
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8686
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8787
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -90,7 +90,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
9090
configure.lineno config.status.lineno
9191
mkinstalldirs = $(install_sh) -d
9292
CONFIG_HEADER = config.h
93-
CONFIG_CLEAN_FILES =
93+
CONFIG_CLEAN_FILES = package.json
9494
CONFIG_CLEAN_VPATH_FILES =
9595
am__installdirs = "$(DESTDIR)$(bindir)"
9696
PROGRAMS = $(bin_PROGRAMS)
@@ -322,6 +322,8 @@ $(srcdir)/config.h.in: $(am__configure_deps)
322322

323323
distclean-hdr:
324324
-rm -f config.h stamp-h1
325+
package.json: $(top_builddir)/config.status $(srcdir)/package.json.in
326+
cd $(top_builddir) && $(SHELL) ./config.status $@
325327
install-binPROGRAMS: $(bin_PROGRAMS)
326328
@$(NORMAL_INSTALL)
327329
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ Options:
6262
-c COLORNO --cursor-color COLORNO specify cursor color palette
6363
number
6464
-t TABSTOP --tabstop TABSTOP specify hardware tabstop(default: 8)
65-
-j --cjk treat East Asian Ambiguous width characters
66-
(UAX#11) as wide
65+
-j --cjkwidth treat East Asian Ambiguous width
66+
characters (UAX#11) as wide
6767
-H, --help show help
6868
-V, --version show version and license information
6969
```

‎configure

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for seq2gif 0.8.0.
3+
# Generated by GNU Autoconf 2.69 for seq2gif 0.9.0.
44
#
55
# Report bugs to <user@zuse.jp>.
66
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
579579
# Identity of this package.
580580
PACKAGE_NAME='seq2gif'
581581
PACKAGE_TARNAME='seq2gif'
582-
PACKAGE_VERSION='0.8.0'
583-
PACKAGE_STRING='seq2gif 0.8.0'
582+
PACKAGE_VERSION='0.9.0'
583+
PACKAGE_STRING='seq2gif 0.9.0'
584584
PACKAGE_BUGREPORT='user@zuse.jp'
585585
PACKAGE_URL=''
586586

@@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then
12651265
# Omit some internal or obsolete options to make the list less imposing.
12661266
# This message is too long to be a string in the A/UX 3.1 sh.
12671267
cat <<_ACEOF
1268-
\`configure' configures seq2gif 0.8.0 to adapt to many kinds of systems.
1268+
\`configure' configures seq2gif 0.9.0 to adapt to many kinds of systems.
12691269
12701270
Usage: $0 [OPTION]... [VAR=VALUE]...
12711271
@@ -1331,7 +1331,7 @@ fi
13311331

13321332
if test -n "$ac_init_help"; then
13331333
case $ac_init_help in
1334-
short | recursive ) echo "Configuration of seq2gif 0.8.0:";;
1334+
short | recursive ) echo "Configuration of seq2gif 0.9.0:";;
13351335
esac
13361336
cat <<\_ACEOF
13371337
@@ -1422,7 +1422,7 @@ fi
14221422
test -n "$ac_init_help" && exit $ac_status
14231423
if $ac_init_version; then
14241424
cat <<\_ACEOF
1425-
seq2gif configure 0.8.0
1425+
seq2gif configure 0.9.0
14261426
generated by GNU Autoconf 2.69
14271427
14281428
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1975,7 +1975,7 @@ cat >config.log <<_ACEOF
19751975
This file contains any messages produced by compilers while
19761976
running configure, to aid debugging if configure makes a mistake.
19771977
1978-
It was created by seq2gif $as_me 0.8.0, which was
1978+
It was created by seq2gif $as_me 0.9.0, which was
19791979
generated by GNU Autoconf 2.69. Invocation command line was
19801980
19811981
$ $0 $@
@@ -2841,7 +2841,7 @@ fi
28412841
28422842
# Define the identity of the package.
28432843
PACKAGE='seq2gif'
2844-
VERSION='0.8.0'
2844+
VERSION='0.9.0'
28452845
28462846
28472847
cat >>confdefs.h <<_ACEOF
@@ -4874,7 +4874,7 @@ done
48744874
touch aclocal.m4 Makefile.in configure config.h.in
48754875
48764876
4877-
ac_config_files="$ac_config_files Makefile"
4877+
ac_config_files="$ac_config_files Makefile package.json"
48784878
48794879
cat >confcache <<\_ACEOF
48804880
# This file is a shell script that caches the results of configure
@@ -5406,7 +5406,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
54065406
# report actual input values of CONFIG_FILES etc. instead of their
54075407
# values after options handling.
54085408
ac_log="
5409-
This file was extended by seq2gif $as_me 0.8.0, which was
5409+
This file was extended by seq2gif $as_me 0.9.0, which was
54105410
generated by GNU Autoconf 2.69. Invocation command line was
54115411
54125412
CONFIG_FILES = $CONFIG_FILES
@@ -5472,7 +5472,7 @@ _ACEOF
54725472
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
54735473
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
54745474
ac_cs_version="\\
5475-
seq2gif config.status 0.8.0
5475+
seq2gif config.status 0.9.0
54765476
configured by $0, generated by GNU Autoconf 2.69,
54775477
with options \\"\$ac_cs_config\\"
54785478
@@ -5604,6 +5604,7 @@ do
56045604
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
56055605
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
56065606
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
5607+
"package.json") CONFIG_FILES="$CONFIG_FILES package.json" ;;
56075608
56085609
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
56095610
esac

‎configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([seq2gif], [0.8.0], [user@zuse.jp])
5+
AC_INIT([seq2gif], [0.9.0], [user@zuse.jp])
66
AC_CONFIG_SRCDIR([color.h])
77
AC_CONFIG_HEADERS([config.h])
88
AM_INIT_AUTOMAKE([foreign])
@@ -67,5 +67,5 @@ AC_DEFUN([LS_UPDATE_TIMESTAMP], [
6767
])
6868
LS_UPDATE_TIMESTAMP
6969

70-
AC_CONFIG_FILES([Makefile])
70+
AC_CONFIG_FILES([Makefile package.json])
7171
AC_OUTPUT

0 commit comments

Comments
 (0)