[maemo-commits] [maemo-commits] r9505 - in projects/haf/branches/hildon-libs/hildon-1: . doc examples

Thu Feb 1 11:34:02 EET 2007

Author: mdk
Date: 2007-02-01 11:34:00 +0200 (Thu, 01 Feb 2007)
New Revision: 9505

Added:
   projects/haf/branches/hildon-libs/hildon-1/doc/gtk-doc.make
   projects/haf/branches/hildon-libs/hildon-1/examples/hildon-time-editor-example.c
Removed:
   projects/haf/branches/hildon-libs/hildon-1/gtk-doc.make
Modified:
   projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2
   projects/haf/branches/hildon-libs/hildon-1/doc/Makefile.am
   projects/haf/branches/hildon-libs/hildon-1/examples/Makefile.am
Log:
Small adjustments to directory layout.
A new example for time editor.


Modified: projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2
===================================================================

--- projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2	2007-02-01 07:37:21 UTC (rev 9504)
+++ projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2	2007-02-01 09:34:00 UTC (rev 9505)
@@ -1,3 +1,12 @@
+2007-02-01  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	* doc/gtk-doc.make:
+	* doc/Makefile.am: Small adjustments to directory layout.
+
+	* examples/Makefile.am:
+	* examples/hildon-time-editor-example.c: A new example for time
+	editor.
+
 2007-01-31  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	* examples/hildon-caption-example.c: Adding checkbutton to the caption

Modified: projects/haf/branches/hildon-libs/hildon-1/doc/Makefile.am
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/doc/Makefile.am	2007-02-01 07:37:21 UTC (rev 9504)
+++ projects/haf/branches/hildon-libs/hildon-1/doc/Makefile.am	2007-02-01 09:34:00 UTC (rev 9505)
@@ -1,3 +1,5 @@
+EXTRA_DIST					= gtk-doc.make
+
 MAINTAINERCLEANFILES 				= Makefile.in				\
 						  hildon-sections.txt			\
 						  hildon-undocumented.txt		\
@@ -63,5 +65,5 @@
 
 FIXXREF_OPTIONS					=
 
-include $(top_srcdir)/gtk-doc.make
+include $(top_srcdir)/doc/gtk-doc.make
 

Copied: projects/haf/branches/hildon-libs/hildon-1/doc/gtk-doc.make (from rev 9493, projects/haf/branches/hildon-libs/hildon-1/gtk-doc.make)

Modified: projects/haf/branches/hildon-libs/hildon-1/examples/Makefile.am
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/examples/Makefile.am	2007-02-01 07:37:21 UTC (rev 9504)
+++ projects/haf/branches/hildon-libs/hildon-1/examples/Makefile.am	2007-02-01 09:34:00 UTC (rev 9505)
@@ -11,7 +11,8 @@
 					  hildon-time-picker-example	\
 					  hildon-color-chooser-example	\
 					  hildon-color-button-example	\
-					  hildon-login-dialog-example
+					  hildon-login-dialog-example	\
+					  hildon-time-editor-example
 
 # HIldon window
 hildon_window_example_LDADD		= $(HILDON_OBJ_LIBS)
@@ -38,6 +39,11 @@
 hildon_time_picker_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_time_picker_example_SOURCES	= hildon-time-picker-example.c
 
+# Hildon time editor
+hildon_time_editor_example_LDADD	= $(HILDON_OBJ_LIBS)
+hildon_time_editor_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
+hildon_time_editor_example_SOURCES	= hildon-time-editor-example.c
+
 # Hildon sort dialog
 hildon_sort_dialog_example_LDADD	= $(HILDON_OBJ_LIBS)
 hildon_sort_dialog_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)

Added: projects/haf/branches/hildon-libs/hildon-1/examples/hildon-time-editor-example.c
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/examples/hildon-time-editor-example.c	2007-02-01 07:37:21 UTC (rev 9504)
+++ projects/haf/branches/hildon-libs/hildon-1/examples/hildon-time-editor-example.c	2007-02-01 09:34:00 UTC (rev 9505)
@@ -0,0 +1,48 @@
+/*
+ * This file is a part of hildon examples
+ *
+ * Copyright (C) 2005, 2006, 2007 Nokia Corporation, all rights reserved.
+ *
+ * Author: Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include                                        <stdio.h>
+#include                                        <stdlib.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        "hildon.h"
+
+int
+main (int argc, char **args)
+{
+    gtk_init (&argc, &args);
+    
+    GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
+    HildonTimeEditor *time_editor = HILDON_TIME_EDITOR (hildon_time_editor_new ());
+
+    gtk_box_pack_start (GTK_BOX (dialog->vbox), GTK_WIDGET (time_editor), FALSE, FALSE, 0);
+    gtk_dialog_add_button (dialog, "Close", GTK_RESPONSE_CANCEL);
+
+    gtk_widget_show_all (GTK_WIDGET (dialog));
+    gtk_dialog_run (dialog);
+    
+    return 0;
+}
+
+

Deleted: projects/haf/branches/hildon-libs/hildon-1/gtk-doc.make
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/gtk-doc.make	2007-02-01 07:37:21 UTC (rev 9504)
+++ projects/haf/branches/hildon-libs/hildon-1/gtk-doc.make	2007-02-01 09:34:00 UTC (rev 9505)
@@ -1,155 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-else
-all-local:
-endif
-
-docs: html-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html 
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references' 
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -f tmpl/*.sgml* && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	fi
-
-uninstall-local:
-	rm -f $(DESTDIR)$(TARGET_DIR)/*
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	-cp $(srcdir)/html/* $(distdir)/html
-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
-	fi
-
-.PHONY : dist-hook-local docs


