gimp-help-2 r2648 - in trunk: . src

[ulfehlert svn gnome org]

Author: ulfehlert
Date: Sun Dec 28 12:03:00 2008
New Revision: 2648
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2648&view=rev

Log:
2008-12-28  Ulf-D. Ehlert  <ulfehlert svn gnome org>

	* .: changed svn:ignore properties: removed 'stamps', added 'log'

	* Makefile.GNU
	* Makefile.am: added html/image target; checked/fixed validate target;
	checked/fixed making HTML draft pages; minor changes in output

	* src/gimp.xml: temporarily disabled dictionary file(s), seems that
	we lost them when migrating


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/Makefile.GNU
   trunk/Makefile.am
   trunk/src/gimp.xml

Modified: trunk/Makefile.GNU
==============================================================================
--- trunk/Makefile.GNU	(original)
+++ trunk/Makefile.GNU	Sun Dec 28 12:03:00 2008
@@ -274,12 +274,11 @@
 en_XML_FILES = $(XML_FILES:$(xmldir)/%=$(xmlpodir)/en/%)
 $(en_XML_FILES): $(xmlpodir)/en ;
 
-# TODO: make relative link rather than absolute link(?)
-$(xmlpodir)/en: $(XML_FILES)
+# TODO: check: prerequisite, abs/rel link, touch
+$(xmlpodir)/en: $(xmldir)
 	$(cmd) src_dir=$$(cd $(srcdir)/$(xmldir) && pwd); \
-	poxml_dir=$(builddir)/$(xmlpodir); \
-	test -d $${poxml_dir} || $(mkdir_p) $${poxml_dir}; \
-	test -d $${poxml_dir}/en || $(ln_s) $${src_dir} $${poxml_dir}/en; \
+	test -d $(xmlpodir) || $(mkdir_p) $(xmlpodir); \
+	test -d $@ || $(ln_s) $${src_dir} $@; \
 	touch $@
 
 
@@ -297,15 +296,15 @@
 validate-%: xmllint-% ;
 xmllint: xmllint-en ;
 
-xmllint-%: $(logdir)/%-xmllint.log ;
+xmllint-%: $(logdir)/%-xmllint.log
 	@echo >&2 "Validating '$*' not implemented."
 
-xmllint-en: $(logdir)/en-xmllint.log ;
+xmllint-en: $(logdir)/en-xmllint.log $(xmlpodir)/en
 	$(cmd) test -s $< && cat $< || echo "No errors."
 
 $(logdir)/en-xmllint.log: $(logdir) $(XML_FILES)
 	$(cmd) if type $(XMLLINT) >/dev/null 2>&1; then \
-		echo "*** Validating XML for 'en' ... "; \
+		echo "*** Validating XML (en) ... "; \
 		$(XMLLINT) $(XMLLINTFLAGS) --xinclude $(xmlpodir)/en/gimp.xml \
 		| sed -e 's,xmlns:xi="http://www.w3.org/2001/XInclude";,,' \
 		| $(XMLLINT) $(XMLLINTFLAGS) --nonet --valid --noout - 2>$@ \
@@ -327,11 +326,10 @@
 # html-% -> index-% -> html/%/gimp-help.xml -> html/%/gimp-xrefs.xml -> html/%/index.html
 html-%: index-% ;
 
-$(htmldir)/%/index.html: $(xmlpodir)/% $(HTML_STYLESHEETS)
+$(htmldir)/%/index.html: $(xmlpodir)/% $(HTML_STYLESHEETS) $(htmldir)/images
 	$(msg) "*** Making html for $* ... "
 	$(cmd) rm -rf $(htmldir)/$*
 	$(cmd) $(mkdir_p) $(htmldir)/$*
-	$(cmd) test -h $(htmldir)/images || $(ln_s) ../images $(htmldir)/
 
 	$(cmd) $(XSLTPROC) \
 	  $(XSLTFLAGS) $(XSLTEXTRAFLAGS) \
@@ -349,6 +347,11 @@
 		if [ -f $$file ]; then cp -fp $$file $(htmldir)/$*; fi; \
 	done
 
+# TODO: new image files structure
+$(htmldir)/images:
+	$(msg) "Making $@ ..."
+	$(cmd) test -d $(htmldir)/../images && $(ln_s) ../images $@
+
 # The xrefs file is a side effect of the HTML build
 $(htmldir)/%/gimp-xrefs.xml: $(htmldir)/%/index.html
 	$(cmd) touch $@
@@ -374,7 +377,7 @@
 ####            HTML draft (single page preview)                    ####
 ########################################################################
 
-%.draft: %.xml stylesheets/drafthtml.xsl
+%.draft: %.xml stylesheets/drafthtml.xsl $(htmldir)/images
 	@echo "Making draft page(s), ignore any XSLT complaints:"
 	$(cmd) id=`sed -e 's/.*id=.//; tmatch; d; :match; s/["'"'"'].*//; q' $<`; \
 	test -n "$$id" || id=noname; \
@@ -465,7 +468,7 @@
 ########################################################################
 
 AUTHORS: $(AUTHORS_STYLESHEET_XML) stylesheets/authors_text.xsl $(AUTHORS_DOCBOOK_XML)
-	$(msg) "**** Making $@ ... "
+	$(msg) "[DOC] $@"
 	$(cmd) $(XSLTPROC) \
 	  $(XSLTFLAGS) $(XSLTEXTRAFLAGS) \
 	  $(srcdir)/stylesheets/authors_text.xsl \
@@ -473,7 +476,7 @@
 	  > $@
 	
 $(AUTHORS_DOCBOOK_XML): $(AUTHORS_STYLESHEET_XML) stylesheets/authors_*.xsl
-	$(msg) "**** Making $@ ... "
+	$(msg) "[SRC] $@"
 	$(cmd) $(call make_target_dir,$@)
 	$(cmd) $(XSLTPROC) \
 	  $(XSLTFLAGS) $(XSLTEXTRAFLAGS) \

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Dec 28 12:03:00 2008
@@ -185,7 +185,7 @@
 ########################################################################
 
 AUTHORS: $(AUTHORS_STYLESHEET_XML) stylesheets/authors_text.xsl $(AUTHORS_DOCBOOK_XML)
-	@echo "Creating $@"
+	$(msg) "[DOC] $@"
 	$(cmd) $(XSLTPROC) \
 	  $(XSLTFLAGS) \
 	  $(srcdir)/stylesheets/authors_text.xsl \
@@ -193,7 +193,7 @@
 	  > $@
 	
 $(AUTHORS_DOCBOOK_XML): $(AUTHORS_STYLESHEET_XML) stylesheets/authors_*.xsl
-	@echo "Creating $@"
+	$(msg) "[SRC] $@"
 	$(cmd) f=$@; d=$${f%/*}; test -d $$d || $(mkdir_p) $$d
 	$(cmd) $(XSLTPROC) \
 	  $(XSLTFLAGS) \
@@ -341,7 +341,7 @@
 	$(cmd) src_dir=$$(cd $(srcdir)/$(xmldir) && pwd); \
 	poxml_dir=$(xmlpodir); \
 	test -d $${poxml_dir} || $(mkdir_p) $${poxml_dir}; \
-	test -d $${poxml_dir}/en || $(LN_S) $(abs_builddir)/$${src_dir} $${poxml_dir}/en; \
+	test -d $${poxml_dir}/en || $(LN_S) $${src_dir} $${poxml_dir}/en; \
 	touch $@
 
 # Special case: en
@@ -356,15 +356,15 @@
 validate-%: xmllint-% ;
 xmllint: xmllint-en ;
 
-xmllint-%: $(logdir)/%-xmllint.log ;
+xmllint-%: $(logdir)/%-xmllint.log
 	@echo >&2 "Validating '$*' not implemented."
 
-xmllint-en: $(logdir)/en-xmllint.log ;
+xmllint-en: $(logdir)/en-xmllint.log $(xmlpodir)/en
 	$(cmd) test -s $< && cat $< || echo "No errors."
 
 $(logdir)/en-xmllint.log: $(logdir) $(XML_FILES)
 	$(cmd) if type $(XMLLINT) >/dev/null 2>&1; then \
-		echo "*** Validating XML for 'en' ... "; \
+		echo "*** Validating XML (en) ... "; \
 		$(XMLLINT) $(XMLLINTFLAGS) --xinclude $(xmlpodir)/en/gimp.xml \
 		| sed -e 's,xmlns:xi="http://www.w3.org/2001/XInclude";,,' \
 		| $(XMLLINT) $(XMLLINTFLAGS) --nonet --valid --noout - 2>$@ \
@@ -391,7 +391,6 @@
 	$(msg) "*** Making html for $* ... "
 	$(cmd) rm -rf $(htmldir)/$*
 	$(cmd) $(mkdir_p) $(htmldir)/$*
-	$(cmd) test -h $(htmldir)/images || $(LN_S) ../images $(htmldir)/
 
 	$(cmd) test "$*" = "no" && lang="nb" || lang="$*"; \
 	$(XSLTPROC) \
@@ -410,6 +409,11 @@
 		if [ -f $$file ]; then cp -fp $$file $(htmldir)/$*; fi; \
 	done
 
+# TODO: new image files structure
+$(htmldir)/images:
+	$(msg) "Making $@ ..."
+	$(cmd) test -d $(htmldir)/../images && $(LN_S) ../images $@
+
 # The xrefs file is a side effect of the HTML build
 $(htmldir)/%/gimp-xrefs.xml: $(htmldir)/%/index.html
 	$(cmd) touch $@
@@ -490,25 +494,11 @@
 endif
 
 
-## TODO OR NOT TODO ## #### HTML preview
-
-## TODO OR NOT TODO ## preview: html index
-## TODO OR NOT TODO ## 	rm -rf preview
-## TODO OR NOT TODO ## 	$(mkdir_p) preview
-## TODO OR NOT TODO ## 	cd preview && $(LN_S) ../html/* .
-## TODO OR NOT TODO ## 	cd preview && $(LN_S) $(abs_top_srcdir)/images .
-
-## TODO OR NOT TODO ## preview-%: html/%/index.html html/%/gimp-help.xml
-## TODO OR NOT TODO ## 	rm -rf preview-$*
-## TODO OR NOT TODO ## 	$(mkdir_p) preview-$*
-## TODO OR NOT TODO ## 	cd preview-$* && $(LN_S) ../html/$* .
-## TODO OR NOT TODO ## 	cd preview-$* && $(LN_S) $(abs_top_srcdir)/images .
-
 ########################################################################
 ####            HTML draft (single page preview)                    ####
 ########################################################################
 
-%.draft: %.xml stylesheets/drafthtml.xsl
+%.draft: %.xml stylesheets/drafthtml.xsl $(htmldir)/images
 	@echo "Making draft page(s), ignore any XSLT complaints:"
 	$(cmd) id=`sed -e 's/.*id=.//; tmatch; d; :match; s/["'"'"'].*//; q' $<`; \
 	test -n "$$id" || id=noname; \

Modified: trunk/src/gimp.xml
==============================================================================
--- trunk/src/gimp.xml	(original)
+++ trunk/src/gimp.xml	Sun Dec 28 12:03:00 2008
@@ -252,7 +252,9 @@
     <xi:include href="key-reference.xml"/>
   </part>
   <xi:include href="glossary/glossary.xml"/>
+<!--
   <xi:include href="dictionary/dictionary.xml"/>
+-->
   <xi:include href="appendix/bibliography.xml"/>
   <xi:include href="appendix/history.xml"/>
   <xi:include href="appendix/bugs.xml"/>