groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 27/45: Add contrib/groffer.


From: Bertrand Garrigues
Subject: [groff] 27/45: Add contrib/groffer.
Date: Mon, 20 Oct 2014 21:39:54 +0000

bgarrigues pushed a commit to branch automake3
in repository groff.

commit 255cd8da7e410abe0c6b7a5a02b6283381ebda51
Author: Bertrand Garrigues <address@hidden>
Date:   Sat Sep 6 20:28:05 2014 +0200

    Add contrib/groffer.
    
    Fix glilypond: glilypond.pl should not be installed.
---
 Makefile.am                    |    1 +
 TESTS                          |   29 +++++++----
 contrib/glilypond/glilypond.am |    4 +-
 contrib/groffer/Makefile.sub   |  109 ----------------------------------------
 contrib/groffer/groffer.am     |  106 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 128 insertions(+), 121 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6ac0523..4a368b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -538,6 +538,7 @@ include $(top_srcdir)/contrib/gperl/gperl.am
 include $(top_srcdir)/contrib/gpinyin/gpinyin.am
 include $(top_srcdir)/contrib/grap2graph/grap2graph.am
 include $(top_srcdir)/contrib/groff_filenames/groff_filenames.am
+include $(top_srcdir)/contrib/groffer/groffer.am
 include $(top_srcdir)/contrib/pic2graph/pic2graph.am
 include $(top_srcdir)/font/devX100/devX100.am
 include $(top_srcdir)/font/devX100-12/devX100-12.am
diff --git a/TESTS b/TESTS
index cfd1a2d..8353086 100644
--- a/TESTS
+++ b/TESTS
@@ -11,7 +11,7 @@ Arch Linux x64 with:
 Current status
 --------------
   - Gnulib integrated
-  - Minimum Automake support
+  - Automake support
   - Build src/libs/*
   - Build src/utils/*
   - Build src/preproc/*
@@ -20,10 +20,11 @@ Current status
   - Build font/*
   - man files from 'man' directory installed
   - tmac files from 'tmac' directory installed
-  - Build and installation of contrib:
-    -- chem
-    -- eqn2graph
-    -- gdiffmk
+  - Build and installation of contrib, except:
+    -- mm
+    -- hdtbl
+    -- pdfmark
+    -- mom
 
 Tests
 -----
@@ -158,6 +159,12 @@ from contrib/grap2graph
 from contrib/pic2graph
   - `pic2graph' script
 
+from contrib/glilypond
+  - `glilypond' script
+
+from contrib/groffer
+  - `groffer' script, all the man files.
+
 In order to check and improve the dependencies, the following targets
 were built from a clean environment:
   - make lib/libgnu.a
@@ -202,6 +209,8 @@ were built from a clean environment:
   - make gpinyin
   - make grap2graph
   - make pic2graph
+  - make glilypond
+  - make groffer
 
 2.2 make clean
 
@@ -294,10 +303,8 @@ Differences with former build system:
     strictly identical to the one install by the original build
     system.
   
-  - contrib scripts installed in $(DESTDIR)/usr/local/bin:
-    -- chem
-    -- eqn2graph
-    -- gdiffmk
+  - contrib scripts installed in $(DESTDIR)/usr/local/bin (TODO:
+    remaining contrib)
 
   - contrib/chem:
 
@@ -331,7 +338,9 @@ TODO:
   - Add automake conditional for examples, html, and doc in `contrib'.
 
   - When contrib and doc will be completed, full installation tree
-    comparison with the tree installed by the old build system
+    comparison with the tree installed by the old build system.  Note:
+    to ease tree comparison, it is usefull to touch all .man files in
+    order to get rid of the date difference.
 
 2.7 make uninstall
 
diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am
index d05f4db..0f173c6 100644
--- a/contrib/glilypond/glilypond.am
+++ b/contrib/glilypond/glilypond.am
@@ -34,13 +34,13 @@ glilyponddir = $(glilypond_dir)
 dist_glilypond_DATA = \
   contrib/glilypond/subs.pl \
   contrib/glilypond/oop_fh.pl \
-  contrib/glilypond/args.pl \
-  contrib/glilypond/glilypond.pl
+  contrib/glilypond/args.pl
 
 EXTRA_DIST += \
   contrib/glilypond/ChangeLog \
   contrib/glilypond/ChangeLog.0x \
   contrib/glilypond/glilypond.man \
+  contrib/glilypond/glilypond.pl \
   contrib/glilypond/README.txt \
   contrib/glilypond/examples/example.groff
 
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
deleted file mode 100644
index 05e00d2..0000000
--- a/contrib/groffer/Makefile.sub
+++ /dev/null
@@ -1,109 +0,0 @@
-# Makefile.sub for `groffer' (integration into the `groff' source tree)
-
-# File position: <groff-source>/contrib/groffer/Makefile.sub
-
-# Copyright (C) 2001-2014  Free Software Foundation, Inc.
-# Written by Werner Lemberg <address@hidden> and
-# Bernd Warken <address@hidden>.
-
-# This file is part of `groffer' which is part of `groff'.
-
-# `groff' 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 of the License, or
-# (at your option) any later version.
-
-# `groff' 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, see
-# <http://www.gnu.org/licenses/gpl-2.0.html>.
-
-########################################################################
-
-ROFF2MODES=dvi html pdf ps text x
-ROFF2PROGS=`echo $(ROFF2MODES) | sed 's/[a-z][a-z]*/roff2&/g'`
-ROFF2MAN=`echo $(ROFF2MODES) | sed 's/[a-z][a-z]*/roff2&.man/g'`
-ROFF2N=`echo $(ROFF2MODES) | sed 's/[a-z][a-z]*/roff2&.n/g'`
-
-MAN1=groffer.n \
-     roff2dvi.n \
-     roff2html.n \
-     roff2pdf.n \
-     roff2ps.n \
-     roff2text.n \
-     roff2x.n
-
-MOSTLYCLEANADD=groffer $(MAN1) $(ROFF2MAN) $(ROFF2N) $(ROFF2PROGS)
-
-RM=rm -f
-
-all: groffer
-
-GROFFER_PERL=subs.pl \
-             main_subs.pl \
-             man.pl \
-             split_env.sh
-GROFFER_REST=roff2.man \
-             version.sh \
-             groffer.man \
-             groffer.pl \
-             roff2.pl
-
-groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
-       sed -f "$(SH_DEPS_SED_SCRIPT)" \
-           -e "s|@g@|$(g)|g" \
-           -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
-           -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
-           -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
-           -e "s|@VERSION@|$(version)$(revision)|g" \
-           -e "$(SH_SCRIPT_SED_CMD)" \
-            $(srcdir)/groffer.pl >$@; \
-       for f in $(ROFF2PROGS); do \
-         cp $(srcdir)/roff2.pl $$f; \
-       done; \
-       chmod +x $@
-       for m in $(ROFF2MODES); do \
-         cat $(srcdir)/roff2.man \
-           | sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man; \
-       done
-
-install_data: groffer
-       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-       $(RM) $(DESTDIR)$(bindir)/groffer
-       $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
-       for f in $(ROFF2PROGS); do \
-         $(RM) $(DESTDIR)$(bindir)/$$f; \
-         $(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f; \
-       done
-       -test -d $(DESTDIR)$(groffer_dir) \
-         || $(mkinstalldirs) $(DESTDIR)$(groffer_dir)
-       $(RM) $(DESTDIR)$(groffer_dir)/version.sh
-       $(INSTALL_DATA) $(srcdir)/version.sh $(DESTDIR)$(groffer_dir)/version.sh
-       for f in $(GROFFER_PERL); do \
-         $(RM) $(DESTDIR)$(groffer_dir)/$$f; \
-       done
-       for f in $(GROFFER_PERL); do \
-         $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(groffer_dir)/$$f; \
-       done;
-
-uninstall_sub:
-       $(RM) $(DESTDIR)$(bindir)/groffer
-       -for f in $(ROFF2PROGS); do $(RM) $(DESTDIR)$(bindir)/$$f; done
-       -for f in $(GROFFER_PERL) version.sh; do \
-         $(RM) $(DESTDIR)$(groffer_dir)/$$f;\
-       done
-       -test -d $(DESTDIR)$(libdir)/groff/groffer && \
-         rmdir $(DESTDIR)$(libdir)/groff/groffer
-
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/contrib/groffer/groffer.am b/contrib/groffer/groffer.am
new file mode 100644
index 0000000..f955017
--- /dev/null
+++ b/contrib/groffer/groffer.am
@@ -0,0 +1,106 @@
+# Automake rules for `groffer'
+
+# File position: <groff-source>/contrib/groffer/groffer.am
+
+# Copyright (C) 2001-2014
+#   Free Software Foundation, Inc.
+# Written by Werner Lemberg <address@hidden> and
+# Bernd Warken <address@hidden>.
+# Automake migration by Bertrand Garrigues
+
+# This file is part of `groffer' which is part of `groff'.
+
+# `groff' 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 of the License, or
+# (at your option) any later version.
+
+# `groff' 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, see
+# <http://www.gnu.org/licenses/gpl-2.0.html>.
+
+########################################################################
+
+groffer_srcdir = $(top_srcdir)/contrib/groffer
+# generated programs
+ROFF2PROGS = \
+  roff2dvi \
+  roff2html \
+  roff2pdf \
+  roff2ps \
+  roff2text \
+  roff2x
+
+# Generated man templates
+ROFF2MAN = \
+  contrib/groffer/roff2dvi.man \
+  contrib/groffer/roff2html.man \
+  contrib/groffer/roff2pdf.man \
+  contrib/groffer/roff2ps.man \
+  contrib/groffer/roff2text.man \
+  contrib/groffer/roff2x.man
+
+GROFFER_PERL = \
+  contrib/groffer/main_subs.pl \
+  contrib/groffer/man.pl \
+  contrib/groffer/split_env.sh \
+  contrib/groffer/subs.pl
+
+GROFFER_REST = \
+  contrib/groffer/roff2.man \
+  contrib/groffer/version.sh \
+  contrib/groffer/groffer.man \
+  contrib/groffer/groffer.pl \
+  contrib/groffer/roff2.pl
+
+EXTRA_DIST += $(GROFFER_PERL) $(GROFFER_REST) \
+  contrib/groffer/ChangeLog  \
+  contrib/groffer/README \
+  contrib/groffer/README_PERL
+
+# groffer_dir is set by a m4 macro
+grofferdir = $(groffer_dir)
+bin_SCRIPTS += groffer $(ROFF2PROGS)
+groffer_DATA = $(GROFFER_PERL) contrib/groffer/version.sh
+man1_MANS += \
+  contrib/groffer/groffer.n \
+  contrib/groffer/roff2dvi.n \
+  contrib/groffer/roff2html.n \
+  contrib/groffer/roff2pdf.n \
+  contrib/groffer/roff2ps.n \
+  contrib/groffer/roff2text.n \
+  contrib/groffer/roff2x.n
+MOSTLYCLEANFILES += $(ROFF2MAN)
+
+$(ROFF2PROGS): $(groffer_srcdir)/roff2.pl
+       cp $(groffer_srcdir)/roff2.pl $@;
+
+# we take roff2.man and replace the @ROFF2MODE@ by the type of file
+# (dvi, pdf, html etc ...)
+$(ROFF2MAN):  $(groffer_srcdir)/roff2.man
+       @$(MKDIR_P) contrib/groffer
+       FILEMODE=`echo $@ | sed 's|contrib/groffer/roff2\([a-z]\+\)\.man|\1|g'` 
\
+         && sed -e 's/address@hidden@]/'"$$FILEMODE"'/g' 
$(groffer_srcdir)/roff2.man > $@;
+
+groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
+       echo "Using perl version of groffer."; \
+       sed -f "$(SH_DEPS_SED_SCRIPT)" \
+          -e "s|address@hidden@]|$(g)|g" \
+          -e "s|address@hidden@]|$(DESTDIR)$(bindir)|g" \
+          -e "s|address@hidden@]|$(DESTDIR)$(libdir)|g" \
+          -e "s|address@hidden@]|$(DESTDIR)$(groffer_dir)|g" \
+          -e "s|address@hidden@]|$(VERSION)|g" \
+          -e "$(SH_SCRIPT_SED_CMD)" \
+           $(groffer_srcdir)/groffer.pl >$@; \
+       chmod +x $@;
+
+uninstall_groffdirs: uninstall-groffer-hook
+uninstall-groffer-hook:
+       if test -d $(DESTDIR)$(grofferdir); then \
+         rmdir $(DESTDIR)$(grofferdir); \
+       fi
diff --git a/mdate.sh b/mdate.sh
old mode 100644
new mode 100755



reply via email to

[Prev in Thread] Current Thread [Next in Thread]