[master] 6472f9b - Fix build process of PDF docs on macOS and update .gitignore

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 6472f9b - Fix build process of PDF docs on macOS and update .gitignore "Albrecht Schlosser" 06:47 Sep 23 top right image
 
commit 6472f9b041d963436752b01373331e55a04bc99a
Author:     Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Fri Sep 23 15:27:05 2022 +0200
Commit:     Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Fri Sep 23 15:45:45 2022 +0200

    Fix build process of PDF docs on macOS and update .gitignore
    
    Note: the syntax of command/switch `sed -i` is slightly different
      on macOS vs. Linux and should not be used.
    
    Move .gitignore parts referring to /documentation/ to their own file
      'documentation/.gitignore' and add new generated file(s).

 .gitignore               | 37 +------------------------------------
 documentation/.gitignore | 45 +++++++++++++++++++++++++++++++++++++++++++++
 documentation/Makefile   | 21 ++++++++++++---------
 3 files changed, 58 insertions(+), 45 deletions(-)

diff --git .gitignore .gitignore
index fd256a7..09fe156 100644
--- .gitignore
+++ .gitignore
@@ -51,42 +51,7 @@ etc/FLTKConfig.cmake
 /cairo/*.dll
 
 # /documentation/
-/documentation/.xvpics
-/documentation/blocks.0
-/documentation/blocks.6
-/documentation/blocks.z
-/documentation/checkers.0
-/documentation/checkers.6
-/documentation/checkers.z
-/documentation/Doxybook
-/documentation/Doxyfile
-/documentation/fltk.0
-/documentation/fltk.3
-/documentation/fltk-config.0
-/documentation/fltk-config.1
-/documentation/fltk-config.z
-/documentation/fltk.d
-/documentation/fltk.pdf
-/documentation/fltk.z
-/documentation/fluid.0
-/documentation/fluid.1
-/documentation/fluid.z
-/documentation/html
-/documentation/latex
-/documentation/sudoku.0
-/documentation/sudoku.6
-/documentation/sudoku.z
-/documentation/*.bck
-/documentation/*.bak
-/documentation/*.log
-
-# /documentation/src/
-/documentation/src/*.0
-/documentation/src/*.1
-/documentation/src/*.3
-/documentation/src/*.6
-/documentation/src/*.z
-/documentation/src/fltk-book.tex
+# see documentation/.gitignore
 
 # /examples/
 # see examples/.gitignore
diff --git documentation/.gitignore documentation/.gitignore
new file mode 100644
index 0000000..44b0f2b
--- /dev/null
+++ documentation/.gitignore
@@ -0,0 +1,45 @@
+#
+# Files to be ignored by Git (do not commit)
+#
+
+# /documentation/
+.xvpics
+blocks.0
+blocks.6
+blocks.z
+checkers.0
+checkers.6
+checkers.z
+copyright.dox
+Doxybook
+Doxyfile
+fltk.0
+fltk.3
+fltk-config.0
+fltk-config.1
+fltk-config.z
+fltk.d
+fltk.pdf
+fltk.z
+fluid.0
+fluid.1
+fluid.z
+generated.dox
+html
+latex
+sudoku.0
+sudoku.6
+sudoku.z
+*.bck
+*.bak
+*.log
+
+# /documentation/src/
+src/*.0
+src/*.1
+src/*.3
+src/*.6
+src/*.z
+src/fltk-book.tex
+src/fltk-book.tex.in
+src/fltk-title.tex
diff --git documentation/Makefile documentation/Makefile
index 3ecd637..726ebdf 100644
--- documentation/Makefile
+++ documentation/Makefile
@@ -68,7 +68,7 @@ dist:	docs
 clean:
 	$(RM) Doxyfile Doxybook
 	$(RM) copyright.dox generated.dox
-	$(RM) fltk.pdf refman.pdf src/fltk-book.tex src/fltk-book.tex.in
+	$(RM) fltk.pdf refman.pdf src/fltk-title.tex src/fltk-book.tex.in src/fltk-book.tex
 	$(RMDIR) html latex
 	$(RM) *~ *.bck *.bak *.log
 	$(RM) $(MANPAGES) $(SRC_DOCDIR)/*.0
@@ -182,6 +182,16 @@ refman.pdf: $(HTMLFILES) Doxybook src/fltk-book.tex
 	$(DOXYDOC) Doxybook
 	./make_pdf
 
+src/fltk-title.tex: src/fltk-title.tex.in
+	echo "Generating $@ ..."
+	GIT_REVISION=`git rev-parse --short=10 HEAD`; \
+	sed -e"s/@GIT_REVISION@/$$GIT_REVISION/g" \
+	    < $< > $@
+
+src/fltk-book.tex.in: src/fltk-title.tex
+	echo "Generating $@ ..."
+	./make_header $< $@
+
 src/fltk-book.tex: src/fltk-book.tex.in
 	echo "Generating $@ ..."
 	DOXY_VERSION=`$(DOXYDOC) --version|cut -f1 -d' '`; \
@@ -189,14 +199,7 @@ src/fltk-book.tex: src/fltk-book.tex.in
 	sed -e"s/@YEAR@/$$YEAR/g" \
 	    -e"s/@FLTK_VERSION@/$(FLTK_VERSION)/g" \
 	    -e"s/@DOXY_VERSION@/$$DOXY_VERSION/g" \
-	< $< > $@
-
-src/fltk-book.tex.in: src/fltk-title.tex.in
-	echo "Generating $@ ..."
-	GIT_REVISION=`git rev-parse --short=10 HEAD`; \
-	./make_header $< $@; \
-	sed -i -e"s/@GIT_REVISION@/$$GIT_REVISION/g" $@
-
+	    < $< > $@
 
 generated.dox: generated.dox.in
 	echo "Generating $@ ..."
Direct Link to Message ]
 
bottom left image   bottom right image
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2022 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.