James LewisMoss's patch.

Build info updates, .cvsignore update, check for popt
in configure.in, more stuff for make-gnucash-patch, and
a dtd for the xml save format.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3355 57a11ea4-9604-0410-9ed3-97b8803252fd

Makefile.am

@@ -44,7 +44,7 @@ make-gnucash-patch: make-gnucash-patch.in
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
-CLEANFILES += cscope.files etags.files make-gnucash-patch
+DISTCLEANFILES += cscope.files cscope.out etags.files make-gnucash-patch
 
 cscope.files:
 	find . -name '*.[ch]' > cscope.files

configure.in

@@ -300,6 +300,15 @@ AC_SUBST(GUPPI_LIBS)
 AC_SUBST(GUPPI_CFLAGS)
 
 
+### --------------------------------------------------------------------------
+### popt
+
+AC_CHECK_LIB(popt, poptStrippedArgv,, AC_MSG_ERROR([
+
+  popt 1.5 or newer is required to build gnucash. You can download
+  the latest version from ftp://people.redhat.com/sopwith/popt/
+]))
+
 ### --------------------------------------------------------------------------
 ## For now, we just presume you're using the GNOME version.  The other
 ## UI's haven't been carried over during the automake transition.  At

debian/changelog

@@ -1,4 +1,4 @@
-gnucash (1.5.2.cvs20001218-0.1) unstable; urgency=low
+gnucash (1.5.2.cvs20001227-0.1) unstable; urgency=low
 
   * local compile
 

doc-tools/.cvsignore

@@ -2,3 +2,5 @@ Makefile
 Makefile.in
 build-help-index
 dbadd
+.deps
+.libs

make-gnucash-patch.in

@@ -15,6 +15,15 @@ use strict;
 
 use File::Basename;
 
+$::ask_description = 1;
+$::should_uuencode = 1;
+
+my $rcfile = $ENV{"HOME"} . "/.gnucash-patch.rc";
+
+if (-f $rcfile) {
+  require $rcfile;
+}
+
 ###########################################################
 # This section must be configured for your own setup.     #
 ###########################################################
@@ -67,6 +76,9 @@ chdir $gnc_home . "/" . $new or die "Can't cd!\n";
 # Start out with our basic makepatch arguments
 my @args = ('-verbose', '-diff', 'diff -u', '-exclude-vc');
 
+if (not $::ask_description) {
+  push(@args, '-description', '');
+}
 # Add in the exclude patterns from the __DATA__ section
 push_exclusions(\@args);
 
@@ -123,11 +135,14 @@ if (-f "diffs/$outfilename") {
 
 # UU encode the compressed patch
 # 'gnucash.diff.gz.uue' is the file you send.
-if (-f "diffs/$outfilename.gz") {
+if (-f "diffs/$outfilename.gz" and $::should_uuencode) {
   system("uuencode diffs/$outfilename.gz $outfilename.gz > diffs/$outfilename.gz.uue");
+  print "diffs/$outfilename.gz.uue\n";
+}
+else {
+  print "diffs/$outfilename.gz\n";
 }
 
-print "diffs/$outfilename.gz.uue\n";
 
 exit(0);
 

src/engine/io-gncxml-version1.dtd

@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!DOCTYPE gnc [
+  <!ELEMENT gnc (version, defaults*, preferences*,
+                 ledger-data*, prices*, recurring-transactions*)>
+
+  <!-- top level elements -->
+  <!ELEMENT defaults ANY>
+  <!ELEMENT preferences ANY>
+  <!ELEMENT ledger-data (commodity*, account*, transaction*)>
+  <!ELEMENT prices ANY>
+  <!ELEMENT recurring-transactions ANY>
+
+
+  <!-- elements for ledger-data -->
+  <!ELEMENT version (#PCDATA)>
+  <!ELEMENT commodity (restore | new)>
+  <!-- used in two contexts.  As near toplevel account and as guid in -->
+  <!-- split for the account it's associated with -->
+  <!ELEMENT account ( #PCDATA | restore | new )*>
+  <!ELEMENT transaction (restore | new)>
+
+  <!ENTITY % commodity-restore
+            "( space, id, name, xcode?, fraction )">
+  <!ENTITY % account-restore
+            "( name, guid, type, currency, security?, slots?, parent? )">
+  <!ENTITY % transaction-restore
+            "( guid, num?, date-posted, date-entered, description?,
+             slots?, split+)">
+  <!ENTITY % combined-restores "%commodity-restore; | %account-restore; | %transaction-restore;">
+  <!ENTITY % currency-type "(space, id)">
+  <!ENTITY % commodity-new "ANY">
+  <!ENTITY % account-new "ANY">
+  <!ENTITY % transaction-new "ANY">
+  <!ENTITY % combined-news "%commodity-new; | %account-new; | %transaction-new;">
+
+  <!ENTITY % slot-types
+            "string | integer | double | etc">
+  <!ELEMENT string (#PCDATA)>
+  <!ELEMENT integer (#PCDATA)>
+  <!ELEMENT double (#PCDATA)>
+  <!ELEMENT etc (#PCDATA)> <!-- placeholder for other slot types -->
+
+  <!ELEMENT parent (guid)>
+  <!ELEMENT space (#PCDATA)>
+  <!ELEMENT id (#PCDATA)>
+  <!ELEMENT name (#PCDATA)>
+  <!ELEMENT xcode (#PCDATA)>
+  <!ELEMENT fraction (#PCDATA)>
+
+  <!ELEMENT guid (#PCDATA)>
+  <!ELEMENT type (#PCDATA)>
+  <!ELEMENT security %currency-type;>
+  <!ELEMENT currency %currency-type;>
+  <!ELEMENT slots (s+)>
+
+  <!-- used in two contexts as item in slots list and as a date in -->
+  <!-- date-entered and date-posted. -->
+  <!ELEMENT s (#PCDATA | k | %slot-types;)+>
+
+  <!ELEMENT k (#PCDATA)>
+  <!ELEMENT num (#PCDATA)>
+  <!ELEMENT date-posted (s)>
+  <!ELEMENT ns (#PCDATA)>
+  <!ELEMENT date-entered (s, ns?)>
+
+  <!ELEMENT description (#PCDATA)>
+
+  <!ELEMENT split (guid, memo?, reconcile-state, reconcile-date?, value, quantity, account)>
+
+  <!ELEMENT reconcile-date (s)>
+
+  <!ELEMENT memo (#PCDATA)>
+  <!ELEMENT reconcile-state (#PCDATA)>
+  <!ELEMENT value (#PCDATA)>
+  <!ELEMENT quantity (#PCDATA)>
+
+  <!ELEMENT restore (%combined-restores;)>
+  <!ELEMENT new (%combined-news;)>
+]>