diff options
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | Makefile.am | 22 | ||||
-rw-r--r-- | README-hacking | 35 | ||||
-rw-r--r-- | bootstrap.conf | 7 | ||||
-rw-r--r-- | configure.ac | 46 | ||||
-rw-r--r-- | gconf/.gitignore | 4 | ||||
-rw-r--r-- | gconf/Makefile.am | 17 | ||||
-rw-r--r-- | gconf/gconf-format.c | 200 | ||||
-rw-r--r-- | gconf/gconf-gram.y | 891 | ||||
-rw-r--r-- | gconf/gconf-lex.l | 476 | ||||
-rw-r--r-- | gconf/gconf-preproc.c | 728 | ||||
-rw-r--r-- | gconf/gconf-text.c | 73 | ||||
-rw-r--r-- | gconf/gconf.h | 163 | ||||
-rw-r--r-- | gconf/gnulib.modules | 14 | ||||
-rw-r--r-- | gconf/wordsplit.c | 568 | ||||
-rw-r--r-- | gconf/wordsplit.h | 88 | ||||
m--------- | grecs | 0 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/cmdline.opt | 18 | ||||
-rw-r--r-- | src/config.c | 476 | ||||
-rw-r--r-- | src/diskio.c | 8 | ||||
-rw-r--r-- | src/tcpwrap.c | 22 | ||||
-rw-r--r-- | src/wydawca.c | 10 | ||||
-rw-r--r-- | src/wydawca.h | 14 | ||||
-rw-r--r-- | tests/Makefile.am | 4 |
26 files changed, 320 insertions, 3575 deletions
@@ -1,5 +1,5 @@ | |||
1 | *.a | ||
2 | *.o | ||
1 | *.tar.* | 3 | *.tar.* |
2 | *~ | 4 | *~ |
3 | *.o | ||
4 | *.a | ||
5 | .bootstrap | 5 | .bootstrap |
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..fea8f96 --- /dev/null +++ b/.gitmodules | |||
@@ -0,0 +1,3 @@ | |||
1 | [submodule "grecs"] | ||
2 | path = grecs | ||
3 | url = git://git.gnu.org.ua/grecs.git | ||
diff --git a/Makefile.am b/Makefile.am index 1eac948..743b2be 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -16,6 +16,6 @@ | |||
16 | 16 | ||
17 | ACLOCAL_AMFLAGS = -I m4 | 17 | ACLOCAL_AMFLAGS = -I m4 -I grecs/am |
18 | AUTOMAKE_OPTIONS = gnu 1.8.5 | 18 | AUTOMAKE_OPTIONS = gnu 1.8.5 |
19 | 19 | ||
20 | SUBDIRS=gnu gconf src doc etc tests | 20 | SUBDIRS=gnu grecs src doc etc tests |
21 | 21 | ||
@@ -26,20 +26,2 @@ distuninstallcheck_listfiles = \ | |||
26 | gen_start_date = 2009-01-25 | 26 | gen_start_date = 2009-01-25 |
27 | .PHONY: make-ChangeLog | ||
28 | make-ChangeLog: | ||
29 | if test -d .git; then \ | ||
30 | $(top_srcdir)/build-aux/gitlog-to-changelog \ | ||
31 | --since=$(gen_start_date) | \ | ||
32 | sed '/<unknown>$$/d' | fmt -s > $(distdir)/cl-t; \ | ||
33 | cat ChangeLog.svn | sed '/^Local Variables:/,/^End:/d' \ | ||
34 | >> $(distdir)/cl-t; \ | ||
35 | echo "Local Variables:" >> $(distdir)/cl-t; \ | ||
36 | echo "mode: change-log" >> $(distdir)/cl-t; \ | ||
37 | echo "version-control: never" >> $(distdir)/cl-t; \ | ||
38 | echo "buffer-read-only: t" >> $(distdir)/cl-t; \ | ||
39 | echo "End:" >> $(distdir)/cl-t; \ | ||
40 | rm -f $(distdir)/ChangeLog; \ | ||
41 | mv $(distdir)/cl-t $(distdir)/ChangeLog; \ | ||
42 | fi | ||
43 | |||
44 | dist-hook: make-ChangeLog | ||
45 | 27 | ||
diff --git a/README-hacking b/README-hacking index 19b957a..a746607 100644 --- a/README-hacking +++ b/README-hacking | |||
@@ -1,2 +1,2 @@ | |||
1 | These notes intend to help people working on the SVN version of | 1 | These notes intend to help people working on the Git version of |
2 | this package. See end of this file for the copying conditions. | 2 | this package. See end of this file for the copying conditions. |
@@ -5,3 +5,3 @@ this package. See end of this file for the copying conditions. | |||
5 | 5 | ||
6 | You need the following packages to build the SVN version of Wydawca. I do | 6 | You need the following packages to build the Git version of Wydawca. I do |
7 | not make any efforts to accommodate older versions of these packages, | 7 | not make any efforts to accommodate older versions of these packages, |
@@ -12,3 +12,5 @@ so please make sure that you have the latest stable version. | |||
12 | - Bison <http://www.gnu.org/software/bison/> | 12 | - Bison <http://www.gnu.org/software/bison/> |
13 | - Git <http://git.or.cz> | ||
13 | - Gnulib <http://www.gnu.org/software/gnulib/> | 14 | - Gnulib <http://www.gnu.org/software/gnulib/> |
15 | - Grecs <http://puszcza.gnu.org.ua/projects/grecs> | ||
14 | - Flex <http://flex.sourceforge.net/> | 16 | - Flex <http://flex.sourceforge.net/> |
@@ -16,3 +18,2 @@ so please make sure that you have the latest stable version. | |||
16 | - Mailutils <http://www.gnu.org/software/mailutils/> | 18 | - Mailutils <http://www.gnu.org/software/mailutils/> |
17 | - Subversion <http://subversion.tigris.org/> | ||
18 | - Texinfo <http://www.gnu.org/software/texinfo> | 19 | - Texinfo <http://www.gnu.org/software/texinfo> |
@@ -21,5 +22,5 @@ so please make sure that you have the latest stable version. | |||
21 | 22 | ||
22 | Obviously, if you are reading these notes, you did manage to check out | 23 | Obviously, if you are reading these notes, you did manage to clone |
23 | the source tree from SVN. The next step is to create the configuration | 24 | the source tree from the Git repository. The next step is to create |
24 | framework: | 25 | the configuration framework: |
25 | 26 | ||
@@ -29,6 +30,5 @@ framework: | |||
29 | 30 | ||
30 | 2. Run `bootstrap' pointing the --gnulib-srcdir option to the location | 31 | 2. Run `bootstrap': |
31 | of the local directory where gnulib sources reside, e.g.: | ||
32 | 32 | ||
33 | ./bootstrap --gnulib-srcdir=/usr/src/gnulib | 33 | ./bootstrap |
34 | 34 | ||
@@ -37,2 +37,17 @@ Once done, proceed as described in the file README (section | |||
37 | 37 | ||
38 | Normally you will have to run bootstrap only once. However, if you | ||
39 | intend to hack on Wydawca, you might need to run it again later. In | ||
40 | this case, you will probably want to save some time and bandwidth by | ||
41 | avoiding downloading the same files again. If so, create in the Wydawca | ||
42 | root directory the file named `.bootstrap' with the following | ||
43 | contents: | ||
44 | |||
45 | --gnulib-srcdir=$HOME/gnulib | ||
46 | |||
47 | Replace `$HOME/gnulib' with the actual directory where the Gnulib | ||
48 | sources reside. | ||
49 | |||
50 | For more information about `bootstrap', run `bootstrap --help'. | ||
51 | |||
52 | |||
38 | 53 | ||
@@ -40,3 +55,3 @@ Once done, proceed as described in the file README (section | |||
40 | 55 | ||
41 | Copyright (C) 2007 Sergey Poznyakoff | 56 | Copyright (C) 2007, 2009 Sergey Poznyakoff |
42 | 57 | ||
diff --git a/bootstrap.conf b/bootstrap.conf index 6119189..fde2671 100644 --- a/bootstrap.conf +++ b/bootstrap.conf | |||
@@ -23,2 +23,7 @@ test -d $source_base || mkdir -p $source_base | |||
23 | 23 | ||
24 | if git config submodule.grecs.url >/dev/null; then : ; else | ||
25 | git submodule init || exit $? | ||
26 | git submodule update || exit $? | ||
27 | fi | ||
28 | |||
24 | # We don't need these modules, even though gnulib-tool mistakenly | 29 | # We don't need these modules, even though gnulib-tool mistakenly |
@@ -31,3 +36,3 @@ avoided_gnulib_modules=' | |||
31 | # gnulib modules used by this package. | 36 | # gnulib modules used by this package. |
32 | gnulib_modules="`grep -h '^[^#]' gnulib.modules gconf/gnulib.modules | sort | uniq`" | 37 | gnulib_modules="`grep -h '^[^#]' gnulib.modules grecs/gnulib.modules | sort | uniq`" |
33 | 38 | ||
diff --git a/configure.ac b/configure.ac index 604ccc4..48e1252 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -108,44 +108,5 @@ if test "$status_tcpwrap" = yes; then | |||
108 | fi | 108 | fi |
109 | |||
110 | # ********************** | ||
111 | # Preprocessor | ||
112 | # ********************** | ||
113 | AC_ARG_WITH([preprocessor], | ||
114 | AC_HELP_STRING([--without-preprocessor], | ||
115 | [do not use external preprocessor]), | ||
116 | [ | ||
117 | case "${withval}" in | ||
118 | yes) use_ext_pp=yes ;; | ||
119 | no) use_ext_pp=no ;; | ||
120 | *) AC_MSG_ERROR(bad value ${withval} for --with-preprocessor) ;; | ||
121 | esac],[use_ext_pp=yes]) | ||
122 | |||
123 | if test $use_ext_pp != no; then | ||
124 | # Check for default preprocessor | ||
125 | AC_ARG_VAR([DEFAULT_PREPROCESSOR], | ||
126 | [Set default preprocessor name]) | ||
127 | if test -z "$DEFAULT_PREPROCESSOR" ; then | ||
128 | DEFAULT_PREPROCESSOR="m4 -s" | ||
129 | fi | ||
130 | |||
131 | save_PATH=$PATH | ||
132 | PREPROC_OPTIONS=`echo $DEFAULT_PREPROCESSOR | sed -n 's/[[^ ]][[^ ]]* //p'` | ||
133 | case "$DEFAULT_PREPROCESSOR" in | ||
134 | /*) PATH=`expr $DEFAULT_PREPROCESSOR : '\(.*\)/.*'`:$PATH | ||
135 | DEFAULT_PREPROCESSOR=`expr $DEFAULT_PREPROCESSOR : '.*/\(.*\)'`;; | ||
136 | esac | ||
137 | AC_PATH_PROG(PPBIN, $DEFAULT_PREPROCESSOR) | ||
138 | DEFAULT_PREPROCESSOR=$PPBIN | ||
139 | if test -n "$DEFAULT_PREPROCESSOR"; then | ||
140 | DEFAULT_PREPROCESSOR="$DEFAULT_PREPROCESSOR $PREPROC_OPTIONS" | ||
141 | case $PPBIN in | ||
142 | *m4) AC_SUBST(PP_SETUP_FILE,'pp-setup');; # Install default pp-setup | ||
143 | esac | ||
144 | fi | ||
145 | PATH=$save_PATH | ||
146 | DEFAULT_PREPROCESSOR="\\\"$DEFAULT_PREPROCESSOR\\\"" | ||
147 | else | ||
148 | DEFAULT_PREPROCESSOR=NULL | ||
149 | fi | ||
150 | 109 | ||
110 | # Grecs subsystem | ||
111 | GRECS_SETUP | ||
151 | 112 | ||
@@ -174,3 +135,4 @@ AC_CONFIG_FILES([Makefile | |||
174 | gnu/Makefile | 135 | gnu/Makefile |
175 | gconf/Makefile | 136 | grecs/Makefile |
137 | grecs/src/Makefile | ||
176 | src/Makefile | 138 | src/Makefile |
diff --git a/gconf/.gitignore b/gconf/.gitignore deleted file mode 100644 index 42c88b2..0000000 --- a/gconf/.gitignore +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | gconf-gram.c | ||
2 | gconf-gram.h | ||
3 | gconf-gram.output | ||
4 | gconf-lex.c | ||
diff --git a/gconf/Makefile.am b/gconf/Makefile.am deleted file mode 100644 index afe06b0..0000000 --- a/gconf/Makefile.am +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | noinst_LIBRARIES=libgconf.a | ||
2 | libgconf_a_SOURCES = \ | ||
3 | gconf-format.c\ | ||
4 | gconf-gram.y\ | ||
5 | gconf-lex.l\ | ||
6 | gconf-preproc.c\ | ||
7 | gconf-text.c\ | ||
8 | gconf.h\ | ||
9 | wordsplit.c\ | ||