From f57743eb372147270a93d877d5cd5784ad7edb18 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Sun, 23 Aug 2015 23:08:11 -0500 Subject: [PATCH] Remove jq.1.default and related content --- Makefile.am | 21 --------------------- docs/Rakefile | 4 ---- docs/default_manpage.md | 22 ---------------------- jq.1.default | 39 --------------------------------------- 4 files changed, 86 deletions(-) delete mode 100644 docs/default_manpage.md delete mode 100644 jq.1.default diff --git a/Makefile.am b/Makefile.am index 60d6de93..95042fbd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,33 +103,15 @@ TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND) ### Building the manpage -# If ENABLE_DOCS is not set, just copy jq.1.default to jq.1 -# The real_docs target succeeds (possibly after building jq.1) only if ENABLE_DOCS is set -# Thus, making "dist" depend on "real_docs" ensures that we never build a tarball with -# a stub manpage. - man_MANS = jq.1 -.PHONY: real_docs if ENABLE_DOCS jq.1: $(srcdir)/docs/content/3.manual/manual.yml $(AM_V_GEN) ( cd ${abs_srcdir}/docs; '$(BUNDLER)' exec rake manpage ) > $@ || { rm -f $@; false; } jq.1.prebuilt: jq.1 $(AM_V_GEN) cp $^ $@ || { rm -f $@; false; } -jq.1.default: $(srcdir)/docs/default_manpage.md - $(AM_V_GEN) ( cd ${abs_srcdir}/docs; '$(BUNDLER)' exec rake manpage_default ) > $@ || { rm -f $@; false; } -real_docs: jq.1 jq.1.prebuilt - @if cmp jq.1 $(srcdir)/jq.1.default > /dev/null; then\ - rm -f jq.1; $(MAKE) $(AM_MAKEFLAGS) jq.1;\ - fi else jq.1: $(srcdir)/jq.1.prebuilt $(AM_V_GEN) cp $^ $@ -real_docs: - @echo "Ruby dependencies not found, cannot build manpage." > /dev/stderr - @echo "Follow the instructions in docs/README.md to install them" > /dev/stderr - @echo "and then rerun ./configure" > /dev/stderr - @echo "A pre-built, possibly out-of-date manpage used." > /dev/stderr - false endif @@ -142,9 +124,6 @@ docs/site.yml: configure.ac install-binaries: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-exec -# Ensure "make dist" fails when we can't build the real manpage -dist-hook: real_docs - DOC_FILES = docs/content docs/public docs/templates docs/site.yml \ docs/Gemfile docs/Gemfile.lock docs/Rakefile docs/README.md \ docs/default_manpage.md jq.1.default diff --git a/docs/Rakefile b/docs/Rakefile index 8de64a7e..691a499a 100644 --- a/docs/Rakefile +++ b/docs/Rakefile @@ -127,10 +127,6 @@ task :manpage do end end -task :manpage_default => ["default_manpage.md"] do - puts Ronn::Document.new("default_manpage.md").convert('roff').gsub(/<\/?code>/,"") -end - task :mantests do load_manual['sections'].each do |section| (section['entries'] || []).each do |entry| diff --git a/docs/default_manpage.md b/docs/default_manpage.md deleted file mode 100644 index 49937821..00000000 --- a/docs/default_manpage.md +++ /dev/null @@ -1,22 +0,0 @@ -jq(1) -- Command-line JSON processor -==================================== - -## DESCRIPTION - -`jq` can transform JSON in various ways, by selecting, iterating, -reducing and otherwise mangling JSON documents. - -This version of `jq` was built without a manual, so this manpage is a -stub. For full documentation of the `jq` language, see: - - https://stedolan.github.io/jq - -## BUGS - -Presumably. Report them or discuss them at: - - https://github.com/stedolan/jq/issues - -## AUTHOR - -Stephen Dolan `` diff --git a/jq.1.default b/jq.1.default deleted file mode 100644 index d02466af..00000000 --- a/jq.1.default +++ /dev/null @@ -1,39 +0,0 @@ -.\" generated with Ronn/v0.7.3 -.\" http://github.com/rtomayko/ronn/tree/0.7.3 -. -.TH "JQ" "1" "August 2015" "" "" -. -.SH "NAME" -\fBjq\fR \- Command\-line JSON processor -. -.SH "DESCRIPTION" -\fBjq\fR can transform JSON in various ways, by selecting, iterating, reducing and otherwise mangling JSON documents\. -. -.P -This version of \fBjq\fR was built without a manual, so this manpage is a stub\. For full documentation of the \fBjq\fR language, see: -. -.IP "" 4 -. -.nf - -https://stedolan\.github\.io/jq -. -.fi -. -.IP "" 0 -. -.SH "BUGS" -Presumably\. Report them or discuss them at: -. -.IP "" 4 -. -.nf - -https://github\.com/stedolan/jq/issues -. -.fi -. -.IP "" 0 -. -.SH "AUTHOR" -Stephen Dolan \fB\fR