GNOME.org
 

gtkmm-documentation r44 - in trunk: . docs/tutorial docs/tutorial/C docs/tutorial/C/figures docs/tutorial/C/icons docs/tutorial/figures docs/tutorial/icons

Author: murrayc
Date: Fri Apr 25 17:02:45 2008
New Revision: 44
URL: http://svn.gnome.org/viewvc/gtkmm-documentation?rev=44&view=rev

Log:
2008-04-25  Murray Cumming  <murrayc murrayc com>

* autogen.sh:
* configure.in:
* docs/tutorial/Makefile.am: Use the gnome-doc-utils structure/build 
so that the tutorial can be translated easily.
We still generate a html directory at the top-level, for uploading 
to the website, and maybe for installing like before.
* docs/tutorial/gtkmm-tut.xml: moved to:
* docs/tutorial/C/gtkmm-tut.xml:
* docs/tutorial/figures/: moved to 
* docs/tutorial/C/figures/
* docs/tutorial/icons/: moved to 
* docs/tutorial/C/icons/

Added:
   trunk/docs/tutorial/C/
   trunk/docs/tutorial/C/figures/
      - copied from r43, /trunk/docs/tutorial/figures/
   trunk/docs/tutorial/C/gtkmm-tut.xml
      - copied, changed from r43, /trunk/docs/tutorial/gtkmm-tut.xml
   trunk/docs/tutorial/C/icons/
      - copied from r43, /trunk/docs/tutorial/icons/
Removed:
   trunk/docs/tutorial/figures/
   trunk/docs/tutorial/gtkmm-tut.xml
   trunk/docs/tutorial/icons/
Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/configure.in
   trunk/docs/tutorial/Makefile.am

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Fri Apr 25 17:02:45 2008
@@ -97,6 +97,7 @@
 $set_xtrace -x
 
 "$libtoolize" $LIBTOOLIZE_FLAGS	|| exit 1
+gnome-doc-prepare --force --copy || exit 1
 "$aclocal" $ACLOCAL_FLAGS	|| exit 1
 #"$autoheader"			|| exit 1
 "$automake" $AUTOMAKE_FLAGS	|| exit 1

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Apr 25 17:02:45 2008
@@ -251,7 +251,8 @@
 
 # Evaluate the --enable-warnings=level option.
 GTKMM_ARG_ENABLE_WARNINGS()
-	
+
+GNOME_DOC_INIT([0.9.0])
 
 AC_ARG_ENABLE(examples, [AC_HELP_STRING([--enable-examples],
                                         [build the included examples [default=yes]])],,
@@ -391,8 +392,6 @@
       docs/FAQ/Makefile
       docs/images/Makefile
       docs/tutorial/Makefile
-        docs/tutorial/figures/Makefile
-        docs/tutorial/icons/Makefile
   ])
 else
   DOCS_SUBDIR=""

Copied: trunk/docs/tutorial/C/gtkmm-tut.xml (from r43, /trunk/docs/tutorial/gtkmm-tut.xml)
==============================================================================
--- /trunk/docs/tutorial/gtkmm-tut.xml	(original)
+++ trunk/docs/tutorial/C/gtkmm-tut.xml	Fri Apr 25 17:02:45 2008
@@ -6,7 +6,9 @@
   <!ENTITY url_refdocs_base_gtk_html "../../reference/html/">
   <!ENTITY url_refdocs_base_gtk "../../reference/html/classGtk_1_1">
   <!ENTITY url_refdocs_base_gtk_namespace "../../reference/html/namespaceGtk_1_1">
-  <!ENTITY url_figures_base "../figures/"> 
+  <!ENTITY url_figures_base "figures/"> 
+  <!ENTITY path_examples_others_base "../../examples/others/">
+  <!ENTITY url_examples_others_base "../&path_examples_others_base;">
   <!ENTITY path_examples_base "../../examples/book/">
   <!ENTITY url_examples_base "../&path_examples_base;">
   <!ENTITY gtkmm "<application>gtkmm</application>">
@@ -316,14 +318,7 @@
 program possible. This program will create an empty 200 x 200 pixel window.
 </para>
 
-<para>
-Source location: examples/others/base/base.cc
-</para>
-
-<programlisting>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="../../examples/others/base/base.cc" parse="text"/>
-</programlisting>
+<para><ulink url="&url_examples_others_base;base">Source Code</ulink></para>
 
 <para>We will now explain each line of the example</para>
 <programlisting>#include &lt;gtkmm.h&gt;</programlisting>
@@ -9083,7 +9078,6 @@
 
 <sect2 id="gmmproc-method-macros">
 <title>Method macros</title>
-<para></para>
 
 <sect3 id="gmmproc-wrap-method">
 <title>_WRAP_METHOD</title>

Modified: trunk/docs/tutorial/Makefile.am
==============================================================================
--- trunk/docs/tutorial/Makefile.am	(original)
+++ trunk/docs/tutorial/Makefile.am	Fri Apr 25 17:02:45 2008
@@ -2,11 +2,11 @@
 
 gtkmm_tut_path = $(web_path_docs)tutorial
 
-SUBDIRS = figures icons
+SUBDIRS =
 
 DOCBOOK_PHPWEBNOTES_TRANSFORM = docbook_phpwebnotes.xsl
 
-EXTRA_DIST = README insert_example_code.pl gtkmm-tut.xml gtkmm-tut-with-examples.xml style.css html $(DOCBOOK_PHPWEBNOTES_TRANSFORM)
+EXTRA_DIST = README insert_example_code.pl C/gtkmm-tut.xml C/gtkmm-tut-with-examples.xml style.css $(DOCBOOK_PHPWEBNOTES_TRANSFORM)
 
 DOCBOOK_STYLESHEET ?= http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
 XMLLINT = xmllint
@@ -14,57 +14,93 @@
 DB2PDF = docbook2pdf
 
 # Create a DocBook source file that doesn't have the examples' comments blocks:
-gtkmm-tut-with-examples.xml: gtkmm-tut.xml insert_example_code.pl
+C/gtkmm-tut-with-examples.xml: C/gtkmm-tut.xml insert_example_code.pl
 	$(PERL_PATH) $(srcdir)/insert_example_code.pl $(top_srcdir)/examples/book $< >$@
 
-# The new XML DocBook way:
+
+include $(top_srcdir)/scripts/gnome-doc-utils.make
+dist-hook: doc-dist-hook
+
+DOC_MODULE = gtkmm-tut-with-examples
+DOC_ENTITIES =
+DOC_INCLUDES =
+DOC_FIGURES = \
+	figures/alignment.png figures/aspectframe.png \
+	figures/box_packing1.png figures/box_packing2.png figures/box_packing3.png \
+	figures/buttonbox.png figures/buttons.png figures/checkbutton.png \
+	figures/clipboard_simple.png figures/clipboard_ideal.png \
+	figures/combo.png figures/combobox_complex.png figures/combobox_text.png figures/comboboxentry_complex.png figures/comboboxentry_text.png figures/custom_container.png \
+	figures/dialogs_about.png figures/dialogs_colorselectiondialog.png figures/dialogs_filechooser.png figures/dialogs_fontselectiondialog.png \
+	figures/dialogs_messagedialog.png figures/dialogs_simple.png \
+	figures/drag_and_drop.png figures/drawingarea_arcs.png figures/drawingarea_curve.png figures/drawingarea_lines.png figures/drawingarea_text.png \
+	figures/entry.png figures/eventbox.png figures/expander.png figures/filechooserbutton.png figures/frame.png \
+	figures/helloworld.png figures/helloworld2.png figures/idle.png figures/label.png \
+	figures/main_menu.png figures/menu_popup.png \
+	figures/menus_menubar.png figures/menus_menu.png figures/menus_and_toolbars.png \
+	figures/notebook.png \
+	figures/paned.png printing.png figures/progressbar.png figures/radiobuttons.png \
+	figures/range_widgets.png figures/recentchooserdialog.png \
+	figures/scrolledwindow.png figures/socket.png socket-fail.png figures/spinbutton.png \
+	figures/table.png toolbar.png figures/textview.png \
+	figures/treeview_list.png figures/treeview_tree.png figures/treeview_editablecells.png figures/treeview_combo_renderer.png \
+        figures/treeview_draganddrop.png figures/treeview_popup.png \
+        figures/devcpp_project_options.png figures/cairo_clock.png figures/cairo_joins.png  \
+        figures/update_ui.png \
+        figures/msvc_add_existing_property_sheet.png figures/msvc_new_project_menu.png figures/msvc_properties_subsystem_windows.png \
+        figures/msvc_application_settings.png figures/msvc_project_created.png msvc_property_files.png \
+        figures/msvc_corrected_main.png figures/msvc_project_properties.png figures/msvc_property_manager.png \
+        figures/msvc_corrected_stdafx.png figures/msvc_properties_maincrtstartup.png figures/msvc_property_manager_with_gtkmm_properties.png \
+        figures/msvc_main_program.png figures/msvc_properties_noinherit.png \
+        figures/msvc_new_project_dialog.png figures/msvc_properties_remove_warning_4250.png
+
+DOC_LINGUAS = de
+
+
+# Create a html generation of the C locale's version of the DocBook, 
+# using our custom stylesheet and graphics:
 # Set the use.id.as.filename param so that we don't use the chapter / section
 # number as the filename, otherwise the url will change every time anything is
 # re-ordered or inserted in the documentation
-html/index.html: gtkmm-tut-with-examples.xml Makefile.am
+html/index.html: C/gtkmm-tut-with-examples.xml Makefile.am
 	rm -rf html
 	$(mkinstalldirs) html
+	cp -r C/figures html/
+	cp -r C/icons html/
 	$(XSLTPROC) \
 		--param toc.section.depth 1	\
-		--stringparam html.stylesheet "style.css"	\
+		--stringparam html.stylesheet "../style.css"	\
 		--stringparam admon.graphics 1	\
-		--stringparam admon.graphics.path "../icons/"	\
+		--stringparam admon.graphics.path "icons/"	\
 		--stringparam admon.graphics.extension ".png"	\
 		--stringparam chunker.output.indent yes	\
 		--stringparam chunker.output.encoding UTF-8	\
 		--stringparam navig.graphics yes	\
 		--stringparam navig.graphics.extension ".png"	\
-		--stringparam navig.graphics.path "../icons/"	\
+		--stringparam navig.graphics.path "icons/"	\
 		--stringparam toc.list.type "ul"	\
 		--stringparam use.id.as.filename "1" \
 		-o html/ --xinclude --catalogs $(DOCBOOK_STYLESHEET)	\
 		$<
 
-
-# Create a version of the tutorial that has phpwebnotes code in it.
-html_withcomments/index.php: gtkmm-tut-with-examples.xml $(DOCBOOK_PHPWEBNOTES_TRANSFORM)
-	rm -rf html_withcomments
-	$(XSLTPROC) -o html_withcomments/ --xinclude --catalogs $(DOCBOOK_PHPWEBNOTES_TRANSFORM) $<
-
 validate_original: gtkmm-tut.xml
 	$(XMLLINT) --xinclude --postvalid --noout $<
 
-validate: gtkmm-tut-with-examples.xml
+validate: C/gtkmm-tut-with-examples.xml
 	$(XMLLINT) --xinclude --postvalid --noout $<
 
 gtkmm-tut-html.tar.gz: html/index.html
-	tar cf - figures html | gzip -c --best >$@
+	tar cf - C/figures html | gzip -c --best >$@
 
 post-html: html/index.html style.css pdf
-	rsync $(rsync_args) figures/*.png $$USER $(web_host):$(gtkmm_tut_path)/figures/
-	rsync $(rsync_args) icons/*.png $$USER $(web_host):$(gtkmm_tut_path)/icons/
+	rsync $(rsync_args) C/figures/*.png $$USER $(web_host):$(gtkmm_tut_path)/figures/
+	rsync $(rsync_args) C/icons/*.png $$USER $(web_host):$(gtkmm_tut_path)/icons/
 	rsync $(rsync_args) -r html/ $$USER $(web_host):$(gtkmm_tut_path)/html/
 	rsync $(rsync_args) *.css $$USER $(web_host):$(gtkmm_tut_path)/html/
 	rsync $(rsync_args) -r pdf/ $$USER $(web_host):$(gtkmm_tut_path)/pdf/
 
 # we need to produce a full examples with all of the XIncludes done so that it
 # can processed for PDF
-programming-with-gtkmm.xml: gtkmm-tut-with-examples.xml
+C/programming-with-gtkmm-pdf.xml: C/gtkmm-tut-with-examples.xml
 	rm -rf html
 	$(mkinstalldirs) html
 	$(XMLLINT) --xinclude --postvalid $< -o $@
@@ -72,39 +108,17 @@
 # We have to generate the pdf in a subdirectory (e.g. pdf/) because the tutorial
 # specifies the path to the figures as '../figures' so if we build it in this
 # directory, it won't find the images.
-pdf/programming-with-gtkmm.pdf: programming-with-gtkmm.xml
+pdf/programming-with-gtkmm-pdf.pdf: C/programming-with-gtkmm-pdf.xml
 	$(DB2PDF) --output pdf $<
 
-pdf : pdf/programming-with-gtkmm.pdf
+pdf : pdf/programming-with-gtkmm-pdf.pdf
 
 doc-clean:
-	-rm -rf html
-	-rm -rf html_withcomments
-	-rm -f gtkmm-tut-with-examples.xml gtkmm-tut-html.tar.gz programming-with-gtkmm.xml
+	-rm -f C/gtkmm-tut-with-examples.xml gtkmm-tut-html.tar.gz C/programming-with-gtkmm-pdf.xml
 	-rm -rf pdf
 
 tutorialdir = $(gtkmm_docdir)/tutorial/html
 
-install-tutorial: html/index.html style.css
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(tutorialdir)
-	@dir='$(<D)'; for p in $$dir/*.html ; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(tutorialdir)/$$f"; \
-	  $(INSTALL_DATA) $$p $(DESTDIR)$(tutorialdir)/$$f; \
-	done
-	$(INSTALL_DATA) $(srcdir)/style.css $(DESTDIR)$(tutorialdir)
-
-uninstall-tutorial: html/index.html style.css
-	@$(NORMAL_UNINSTALL)
-	@dir='$(<D)'; for p in $$dir/*.html ; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(tutorialdir)/$$f"; \
-	  rm -f $(DESTDIR)$(tutorialdir)/$$f; \
-	done
-	rm -f $(DESTDIR)$(tutorialdir)/style.css
-	rm -f $(DESTDIR)$(tutorialdir)/icons
-
 all-local: html/index.html
 
 install-data-local: install-tutorial
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]