summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2006-10-23 18:09:38 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2006-10-23 18:09:38 +0000
commitabac7397674b255ecac7fd65b98bcabaf65f68c8 (patch)
tree58e09e73b6aa1f3ed4f82dcf3d4a8b62ef5ad5cf
parent97f2af25532846f5dc72f6d3265cd9f5ff333610 (diff)
downloadrockbox-abac7397674b255ecac7fd65b98bcabaf65f68c8.tar.gz
rockbox-abac7397674b255ecac7fd65b98bcabaf65f68c8.tar.bz2
rockbox-abac7397674b255ecac7fd65b98bcabaf65f68c8.zip
Manual Makefile tweaks:
- remove html output folder on "make clean" - fix "make manual" that was broken for some targets (e.g. h100) when configured for normal / sim build - add manual-txt target to generate a plain text version. Requires links. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11319 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--manual/Makefile11
-rw-r--r--manual/Makefile.pdflatex14
-rwxr-xr-xtools/configure47
3 files changed, 50 insertions, 22 deletions
diff --git a/manual/Makefile b/manual/Makefile
index ac7fd628b3..233ab374d2 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -7,20 +7,27 @@ manual-prep: rockbox.tex
@mkdir -p $(OBJDIR)
@cp -R * $(OBJDIR)
@perl credits.pl < ../docs/CREDITS | iconv -f utf-8 -t iso-8859-1 > $(OBJDIR)/CREDITS.tex
- @echo "\newcommand{\platform}{${ARCHOS}}" > $(OBJDIR)/rockbox-build.tex
+ @echo "\newcommand{\platform}{${MANUALDEV}}" > $(OBJDIR)/rockbox-build.tex
@echo "\newcommand{\buildversion}{$(VERSION)}" >> $(OBJDIR)/rockbox-build.tex
@echo "\input{rockbox.tex}" >> $(OBJDIR)/rockbox-build.tex
@mv $(OBJDIR)/Makefile.pdflatex $(OBJDIR)/Makefile
manual-pdf: manual-prep rockbox.tex
- $(MAKE) -C $(OBJDIR)
+ $(MAKE) -C $(OBJDIR) buildmanual
manual-html: manual-prep rockbox.tex
$(MAKE) -C $(OBJDIR) buildhtml
+manual-txt: manual-html
+ $(MAKE) -C $(OBJDIR) buildtxt
+
+manual-txt-zip: manual-txt
+ $(MAKE) -C $(OBJDIR) txtzip
+
manual-zip: manual-html
$(MAKE) -C $(OBJDIR) htmlzip
clean:
@if [ "$(OBJDIR)" == "" ]; then echo Run make in you build directory!; false; fi
@rm -rf $(OBJDIR)/manual $(OBJDIR)/*.pdf
+ @rm -rf $(OBJJDIR)/html $(OBJDIR)/txt
diff --git a/manual/Makefile.pdflatex b/manual/Makefile.pdflatex
index 2e132211e0..2048423f5c 100644
--- a/manual/Makefile.pdflatex
+++ b/manual/Makefile.pdflatex
@@ -9,7 +9,7 @@ HTOPTS3 := "-dhtml/"
.PHONY: all cleaner buildmanual output
-buildmanual: rockbox-build.tex
+buildmanual: rockbox-build.tex pdf
@cp $(OBJDIR)/rockbox-build.pdf $(OBJDIR)/../rockbox-$(ARCHOS)-$(VERSION).pdf
buildhtml: rockbox-build.tex
@@ -22,8 +22,20 @@ buildhtml: rockbox-build.tex
@cp --parent `cat $(OBJDIR)/html/*.html | sed -e '/[pj][np]g/!d;s/.*\"\(.*\.[pj][np]g\)\".*/\1/g;/</d'` $(OBJDIR)/html
@cp -r $(OBJDIR)/html $(OBJDIR)/../
+buildtxt: buildhtml
+ @mkdir -p $(OBJDIR)/txt
+ @(cd $(OBJDIR)/txt; for i in $(OBJDIR)/html/*.html; do \
+ links -dump -no-numbering -no-references $$i > `basename $$i html`txt; \
+ done)
+ @cp -r $(OBJDIR)/txt $(OBJDIR)/../
htmlzip: buildhtml
@(cd $(OBJDIR); \
zip -r $(OBJDIR)/rockbox-manual.zip html; \
cp $(OBJDIR)/rockbox-manual.zip $(OBJDIR)/../ )
+
+txtzip: buildtxt
+ @(cd $(OBJDIR); \
+ zip -r $(OBJDIR)/rockbox-manual-txt.zip txt; \
+ cp $(OBJDIR)/rockbox-manual-txt.zip $(OBJDIR)/../ )
+
diff --git a/tools/configure b/tools/configure
index f9ef9803e2..3d457881ad 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1191,22 +1191,6 @@ fi
toolsdir=$firmdir;
toolset='';
apps="manual"
- case $archos in
- fmrecorder)
- archos="recorderv2fm"
- ;;
- recorderv2)
- archos="recorderv2fm"
- ;;
- h1??)
- archos="h1xx"
- ;;
- ipodmini2g)
- archos="ipodmini"
- ;;
- *)
- ;;
- esac
echo "Manual build selected"
;;
*)
@@ -1215,6 +1199,24 @@ fi
;;
esac
+ # to be able running "make manual" from non-manual configuration
+ case $archos in
+ fmrecorder)
+ manualdev="recorderv2fm"
+ ;;
+ recorderv2)
+ manualdev="recorderv2fm"
+ ;;
+ h1??)
+ manualdev="h1xx"
+ ;;
+ ipodmini2g)
+ manualdev="ipodmini"
+ ;;
+ *)
+ manualdev=$archos
+ ;;
+ esac
if [ -z "$debug" ]; then
GCCOPTS="$GCCOPTS $GCCOPTIMIZE"
@@ -1409,6 +1411,7 @@ sed > Makefile \
-e "s,@TOOLSET@,${toolset},g" \
-e "${simmagic1}" \
-e "${simmagic2}" \
+ -e "s,@MANUALDEV@,${manualdev},g" \
<<EOF
## Automaticly generated. http://www.rockbox.org/
@@ -1467,6 +1470,7 @@ export LDOPTS=@LDOPTS@
export GCCVER=@GCCVER@
export GCCNUM=@GCCNUM@
export UNAME=@UNAME@
+export MANUALDEV=@MANUALDEV@
# Do not print "Entering directory ..."
MAKEFLAGS += --no-print-directory
@@ -1494,7 +1498,8 @@ clean:
\$(SILENT)echo Cleaning build directory
\$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.[ch]\
manual *.pdf *.a credits.raw @OUTPUT@ bitmaps pluginbitmaps \
- @ARCHOSROM@ @FLASHFILE@ UI256.bmp rockbox-full.zip
+ @ARCHOSROM@ @FLASHFILE@ UI256.bmp rockbox-full.zip \
+ html txt rockbox-manual*.zip
tools:
\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@
@@ -1534,10 +1539,13 @@ gzip: tar
manual: manual-pdf
manual-pdf:
\$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual manual-pdf
-
manual-html:
\$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual manual-html
-
+manual-zhtml: manual-zip
+manual-txt:
+ \$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual manual-txt
+manual-ztxt:
+ \$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual manual-txt-zip
manual-zip:
\$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual manual-zip
@@ -1551,6 +1559,7 @@ help:
@echo "manual - builds a manual"
@echo "manual-html - HTML manual"
@echo "manual-zip - HTML manual (zipped)"
+ @echo "manual-txt - txt manual"
@echo "fullzip - creates a rockbox.zip of your build with fonts"
@echo "zip - creates a rockbox.zip of your build (no fonts)"
@echo "gzip - creates a rockbox.tar.gz of your build (no fonts)"