GNOME.org
 

planner r958 - in trunk: . docs docs/user-guide docs/user-guide/C libplanner src

Author: mvdpot
Date: Tue Apr 14 17:14:24 2009
New Revision: 958
URL: http://svn.gnome.org/viewvc/planner?rev=958&view=rev

Log:
2009-04-14  Maurice van der Pot  <griffon26 kfk4ever com>

	* Makefile.win32:
	* docs/Makefile.win32:
	* docs/user-guide/Makefile.win32:
	* docs/user-guide/C/Makefile.win32: Added makefiles for building and
	installing the user	guide on Windows. This requires docbook-xml and
	docbook-xsl to be installed under $(PREFIX)/src. There is room for
	improvement here, because the paths are currently hardcoded.
	Also fixed installer to include	libgio-2.0-0.dll.

	* docs/user-guide/C/planner.xml: Make images non-floating again.

	* libplanner/mrp-sql.c (mrp_sql_load_project),
	(mrp_sql_save_project): 
	* src/planner-sql-plugin.c (sql_get_tested_connection):
	Properly quoted timezone in SQL. It was causing problems with 
	PostgreSQL 8.0.x (bug #571801).



Added:
   trunk/docs/Makefile.win32
   trunk/docs/user-guide/C/Makefile.win32
   trunk/docs/user-guide/Makefile.win32
Modified:
   trunk/ChangeLog
   trunk/Makefile.win32
   trunk/docs/user-guide/C/planner.xml
   trunk/libplanner/mrp-sql.c
   trunk/src/planner-sql-plugin.c

Modified: trunk/Makefile.win32
==============================================================================
--- trunk/Makefile.win32	(original)
+++ trunk/Makefile.win32	Tue Apr 14 17:14:24 2009
@@ -2,7 +2,7 @@
 # Makefile.win32
 #
 
-SUBDIRS=libplanner src po
+SUBDIRS=docs libplanner src po
 INSTALLERTMP = installer/tmp
 
 VERSION := `sed <configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'`
@@ -141,6 +141,7 @@
 	libgailutil-18.dll		\
 	libgdk-win32-2.0-0.dll		\
 	libgdk_pixbuf-2.0-0.dll		\
+	libgio-2.0-0.dll		\
 	libglade-2.0-0.dll		\
 	libglib-2.0-0.dll		\
 	libgmodule-2.0-0.dll		\

Added: trunk/docs/Makefile.win32
==============================================================================
--- (empty file)
+++ trunk/docs/Makefile.win32	Tue Apr 14 17:14:24 2009
@@ -0,0 +1,47 @@
+#
+# Makefile.win32
+#
+
+SUBDIRS=user-guide
+
+ifeq ($(DESTDIR),)
+export DESTDIR=$(HOME)
+endif
+
+ifeq ($(PREFIX),)
+export PREFIX=/dev
+endif
+
+RECURSIVE_TARGETS = all-recursive clean-recursive install-recursive uninstall-recursive
+
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; version=$(VERSION); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) -f Makefile.win32 $$local_target VERSION=$$version) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) -f Makefile.win32 "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+all: all-recursive
+all-am:
+
+clean: clean-recursive
+clean-am:
+
+install: install-recursive
+install-am:
+
+uninstall: uninstall-recursive
+uninstall-am:
+

Added: trunk/docs/user-guide/C/Makefile.win32
==============================================================================
--- (empty file)
+++ trunk/docs/user-guide/C/Makefile.win32	Tue Apr 14 17:14:24 2009
@@ -0,0 +1,71 @@
+#
+# Makefile.win32
+#
+
+#
+# PATHS
+#
+
+TOPDIR=../../..
+
+# Compiler Options
+
+ifeq ($(DESTDIR),)
+DESTDIR=$(HOME)
+endif
+
+ifeq ($(PREFIX),)
+export PREFIX=/dev
+endif
+
+##
+## RULES
+##
+
+
+##
+## TARGET DEFINITIONS
+##
+
+.PHONY: all clean
+
+all: \
+	$(TOPDIR)/config.h \
+	planner.chm
+
+$(TOPDIR)/config.h: $(TOPDIR)/config.h.win32
+	cp $(TOPDIR)/config.h.win32 $(TOPDIR)/config.h
+
+##
+## BUILD CHM
+##
+
+planner.chm: planner.hhp
+	if hhc planner.hhp; then false; else true; fi
+
+planner.hhp: planner.xml
+	SGML_CATALOG_FILES=$(PREFIX)/src/docbkx412/docbook.cat \
+		xsltproc --noout --catalogs \
+			--stringparam htmlhelp.chm planner.chm \
+			--stringparam htmlhelp.hhp planner.hhp \
+			--nonet $(PREFIX)/src/docbook-xsl-1.74.3/htmlhelp/htmlhelp.xsl planner.xml
+
+
+##
+## CLEAN RULES
+##
+
+clean:
+	rm -f *.chm
+	rm -f *.html
+	rm -f *.hhp
+	rm -f *.hhk
+	rm -f *.hhc
+
+install: all
+	-mkdir -p $(DESTDIR)/planner
+	cp planner.chm $(DESTDIR)/planner
+
+uninstall:
+	rm -f $(DESTDIR)/planner/planner.chm
+

Modified: trunk/docs/user-guide/C/planner.xml
==============================================================================
--- trunk/docs/user-guide/C/planner.xml	(original)
+++ trunk/docs/user-guide/C/planner.xml	Tue Apr 14 17:14:24 2009
@@ -305,7 +305,7 @@
 	  more detail for each task.
         </para>
         <para>
-          <figure id="task-view" float="1">
+          <figure id="task-view">
             <title>&app; Task View</title>
             <screenshot>
               <graphic fileref="figures/task-view.png" format="PNG"></graphic>
@@ -352,7 +352,7 @@
 	  allows the user to see the project data.
         </para>
         <para>
-          <figure id="gantt-view" float="1">
+          <figure id="gantt-view">
             <title>&app; Gantt View</title>
             <screenshot>
               <graphic fileref="figures/gantt-view.png" format="PNG"></graphic>
@@ -386,7 +386,7 @@
     </sect2>
     <sect2 id="mrp-resource-view">
 	<title>Resource View</title> 
-          <figure id="resource-view" float="1">
+          <figure id="resource-view">
             <title>&app; Resource View</title>
             <screenshot>
               <graphic fileref="figures/resource-editor.png" format="PNG"></graphic>
@@ -409,7 +409,7 @@
     </sect2>
     <sect2 id="mrp-resource-usage-view">
 	<title>Resource Usage View</title> 
-          <figure id="resource-usage-view" float="1">
+          <figure id="resource-usage-view">
             <title>&app; Resource Usage View</title>
             <screenshot>
               <graphic fileref="figures/resource-usage-view.png" format="PNG"></graphic>
@@ -557,7 +557,7 @@
 	  <xref linkend="several-projects"/>.
       </para>
       <para>
-       <figure float="1" id="several-projects">
+       <figure id="several-projects">
        <title>Several projects at the same time</title>
         <screenshot>
 	  <mediaobject> 
@@ -849,7 +849,7 @@
 	  information on calendars.
         </para>
         <para>
-          <figure id="project-properties" float="1">
+          <figure id="project-properties">
             <title>Project Properties</title>
             <screenshot>
               <graphic fileref="figures/project-properties.png" format="PNG" ></graphic>
@@ -863,7 +863,7 @@
 	  </guibutton> button.
 	</para>
 	<para>
-          <figure id="project-properties-custom" float="1">
+          <figure id="project-properties-custom">
             <title>Custom Project Properties</title>
             <screenshot>
               <graphic fileref="figures/project-properties-custom.png" format="PNG" ></graphic>
@@ -876,7 +876,7 @@
 	  value field of the Custom project properties dialog.
 	</para>
 	<para>
-          <figure id="project-properties-custom-add" float="1">
+          <figure id="project-properties-custom-add">
             <title>Custom Project Properties Add Dialog</title>
             <screenshot>
               <graphic fileref="figures/project-properties-custom-add.png" format="PNG" ></graphic>
@@ -933,7 +933,7 @@
 	  </itemizedlist>
         </para>
         <para>
-          <figure id="calendar" float="1">
+          <figure id="calendar">
             <title>Project Calendar Editor</title>
             <screenshot>
               <graphic fileref="figures/calendar.png" format="PNG" ></graphic>
@@ -974,7 +974,7 @@
 	  </itemizedlist>
 	  </para>
 	  <para>
-          <figure id="calendar-new" float="1">
+          <figure id="calendar-new">
             <title>New Calendar Dialog</title>
             <screenshot>
               <graphic fileref="figures/calendar-new.png" format="PNG" ></graphic>
@@ -994,7 +994,7 @@
 	    </guibutton> to save your changes.
 	  </para>
 	  <para>
-          <figure id="calendar-week" float="1">
+          <figure id="calendar-week">
             <title>Default Week Dialog</title>
             <screenshot>
               <graphic fileref="figures/calendar-week.png" format="PNG" ></graphic>
@@ -1014,7 +1014,7 @@
 	    would be entered as 17:00).
 	  </para>
 	  <para>
-          <figure id="calendar-working-time" float="1">
+          <figure id="calendar-working-time">
             <title>Working Time Dialog</title>
             <screenshot>
               <graphic fileref="figures/calendar-working-time.png" format="PNG" ></graphic>
@@ -1033,7 +1033,7 @@
 	    "Working" and "Nonworking".
 	  </para>
 	  <para>
-          <figure id="day-types" float="1">
+          <figure id="day-types">
             <title>Day Types Dialog</title>
             <screenshot>
               <graphic fileref="figures/day-types.png" format="PNG" ></graphic>

Added: trunk/docs/user-guide/Makefile.win32
==============================================================================
--- (empty file)
+++ trunk/docs/user-guide/Makefile.win32	Tue Apr 14 17:14:24 2009
@@ -0,0 +1,47 @@
+#
+# Makefile.win32
+#
+
+SUBDIRS=C
+
+ifeq ($(DESTDIR),)
+export DESTDIR=$(HOME)
+endif
+
+ifeq ($(PREFIX),)
+export PREFIX=/dev
+endif
+
+RECURSIVE_TARGETS = all-recursive clean-recursive install-recursive uninstall-recursive
+
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; version=$(VERSION); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) -f Makefile.win32 $$local_target VERSION=$$version) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) -f Makefile.win32 "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+all: all-recursive
+all-am:
+
+clean: clean-recursive
+clean-am:
+
+install: install-recursive
+install-am:
+
+uninstall: uninstall-recursive
+uninstall-am:
+

Modified: trunk/libplanner/mrp-sql.c
==============================================================================
--- trunk/libplanner/mrp-sql.c	(original)
+++ trunk/libplanner/mrp-sql.c	Tue Apr 14 17:14:24 2009
@@ -2276,7 +2276,7 @@
 	}
 	gda_dict_set_connection (data->dict, data->con);
 
-	success = sql_execute_command (data->con, "SET TIME ZONE UTC"); 
+	success = sql_execute_command (data->con, "SET TIME ZONE 'UTC'"); 
 	if (!success) {
 		g_warning ("SET TIME ZONE command failed: %s.",
 				sql_get_last_error (data->con));
@@ -3715,7 +3715,7 @@
 	}
 	gda_dict_set_connection (data->dict, data->con);
 
-	success = sql_execute_command (data->con, "SET TIME ZONE UTC"); 
+	success = sql_execute_command (data->con, "SET TIME ZONE 'UTC'"); 
 
 	if (!success) {
 		g_warning ("SET TIME ZONE command failed: %s.",

Modified: trunk/src/planner-sql-plugin.c
==============================================================================
--- trunk/src/planner-sql-plugin.c	(original)
+++ trunk/src/planner-sql-plugin.c	Tue Apr 14 17:14:24 2009
@@ -699,7 +699,7 @@
 
 	if (conn != NULL) {
 
-		success = sql_execute_command (conn, "SET TIME ZONE UTC"); 
+		success = sql_execute_command (conn, "SET TIME ZONE 'UTC'"); 
 		if (!success) {
 			g_warning ("SET TIME ZONE command failed: %s.",
 					sql_get_last_error (conn));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]