Fixes documentation and report install issues.
diff --git a/build/autogen.sh b/build/autogen.sh
index 91e75f901..9b5885d3b 100755
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -27,8 +27,11 @@ rm -f config.*
rm -f configure
rm -f stamp-h1
+echo "Running autoupdate..."
+autoupdate
+
echo "Running autoreconf..."
echo "(This replaces aclocal, autoheader, automake, autoconf, and autopoint)"
-autoreconf -i
+autoreconf -if
cd $SAVEDIR
diff --git a/build/cscope.sh b/build/cscope.sh
new file mode 100755
index 000000000..0ca587156
--- /dev/null
+++ b/build/cscope.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# This script will build and use an index of LifeLines source code using the
+# CScope program. See http://cscope.sourceforge.net/.
+
+# Determine root of repository
+if [ ! -f configure.ac ]
+then
+ echo "ERROR: Must be run from the root of the source tree!"
+ exit 1
+else
+ ROOTDIR=`pwd`
+fi
+
+CSDIR=$ROOTDIR/build/cscope
+
+# Create directory for cscope database
+if [ ! -d $CSDIR ]
+then
+ mkdir $CSDIR
+fi
+
+# Find files
+find $ROOTDIR -name \*.c -o -name \*.h > $CSDIR/cscope.files
+
+# Generate database
+cd $CSDIR
+cscope -b -q -k
+cd $ROOTDIR
+
+# Use database
+cd $CSDIR
+cscope -d
+cd $ROOTDIR
+
diff --git a/build/cscout.sh b/build/cscout.sh
old mode 100644
new mode 100755
index bcb6735bb..5fbc06892
--- a/build/cscout.sh
+++ b/build/cscout.sh
@@ -1,31 +1,38 @@
#!/bin/sh
-# This script will build and analyze the LifeLIines source code using the
+# This script will build and analyze the LifeLiines source code using the
# CScout program. See http://www.spinellis.gr/cscout/
# Determine root of repository
if [ ! -f configure.ac ]
then
- if [ ! -f ../configure.ac ]
- then
- echo "ERROR: Must be run from either the root of the source tree or the build/ directory!"
- exit 1
- else
- ROOTDIR=..
- fi
+ echo "ERROR: Must be run from the root of the source tree!"
+ exit 1
else
- ROOTDIR=.
+ ROOTDIR=`pwd`
fi
-SAVEDIR=`pwd`
+CSDIR=$ROOTDIR/build/cscout
-cd $ROOTDIR
+# Create directory for cscout database
+if [ ! -d $CSDIR ]
+then
+ mkdir $CSDIR
+fi
+
+# Run configure if needed
+if [ ! -f config.h ]
+then
+ build/autogen.sh
+ ./configure
+fi
+
+# Compile workspace
+cswc build/lifelines.cscout > $CSDIR/lifelines.cs
+
+# Run Web Daemon
+cscout $CSDIR/lifelines.cs
-build/autogen.sh
-./configure
-csmake
-cscout make.cs
-# goes into daemon mode until killed
-rm make.cs
+# Clean up
+rm $CSDIR/lifelines.cs
-cd $SAVEDIR
diff --git a/build/lifelines.cscout b/build/lifelines.cscout
new file mode 100644
index 000000000..861227772
--- /dev/null
+++ b/build/lifelines.cscout
@@ -0,0 +1,94 @@
+workspace lifelines {
+ cd "src"
+ ro_prefix "/usr/include"
+ define HAVE_CONFIG_H
+ project lifelines {
+ directory arch {
+ ipath "../.."
+ ipath "../hdrs"
+ }
+ directory btree {
+ ipath "../.."
+ ipath "../hdrs"
+ file addkey.c block.c btrec.c
+ file file.c index.c opnbtree.c
+ file traverse.c utils.c
+ }
+ directory gedlib {
+ ipath "../.."
+ ipath "../hdrs"
+ file brwslist.c
+ file charmaps.c charprops.c
+ file choose.c codesets.c dispfmt.c
+ file datei.c dateparse.c dateprint.c
+ file dbcontext.c dbfuncs.c dblist.c
+ file editmap.c editvtab.c equaliso.c
+ file gedcom.c gengedc.c gstrings.c
+ file indiseq.c init.c intrface.c
+ file keytonod.c locales.c
+ file lldatabase.c llgettext.c lloptions.c
+ file messages.c misc.c
+ file names.c node.c
+ file nodechk.c nodeio.c nodeutls.c
+ file place.c property.c
+ file record.c refns.c remove.c replace.c
+ file soundex.c spltjoin.c translat.c
+ file valid.c valtable.c
+ file xlat.c xreffile.c
+ }
+ directory interp {
+ ipath "../.."
+ ipath "../hdrs"
+ file alloc.c builtin.c builtin_list.c
+ file eval.c functab.c heapused.c
+ file interp.c intrpseq.c lex.c
+ file more.c progerr.c
+ file pvalalloc.c pvalmath.c pvalue.c
+ file rassa.c rptsort.c rptui.c
+ file symtab.c write.c yacc.c
+ }
+ directory liflines {
+ ipath "../.."
+ ipath "../hdrs"
+ file add.c advedit.c
+ file ask.c askgedc.c askprogram.c
+ file browse.c brwsmenu.c cscurses.c
+ file delete.c dynmenu.c
+ file edit.c error.c export.c
+ file import.c interact.c
+ file lbrowse.c lines_usage.c listui.c llexec.c loadsave.c
+ file main.c menuset.c merge.c miscutls.c
+ file newrecs.c pedigree.c
+ file scan.c screen.c searchui.c selectdb.c show.c swap.c
+ file tandem.c valgdcom.c
+ }
+ directory stdlib {
+ ipath "../.."
+ ipath "../hdrs"
+ file appendstr.c array.c
+ file dirs.c
+ file environ.c errlog.c
+ file fileops.c fpattern.c
+ file generic.c hashtab.c icvt.c
+ file list.c listener.c log.c
+ file llabort.c lldate.c llstrcmp.c
+ file mychar_funcs.c mychar_tables.c mystring.c
+ file memalloc.c norm_charmap.c object.c
+ file path.c proptbls.c rbtree.c
+ file sequence.c signals.c sprintpic.c stack.c
+ file stdlib.c stdstrng.c stralloc.c strapp.c
+ file strcvt.c strset.c strutf8.c strwhite.c
+ file table.c version.c vtable.c zstr.c
+ }
+ }
+ project tools {
+ directory tools {
+ ipath "../.."
+ ipath "../hdrs"
+ file btedit.c dbverify.c lldump.c
+ file dispcode.c xterm_decode.c
+ file lltest.c
+ file misc.c prettytt.c wprintf.c
+ }
+ }
+}
diff --git a/build/ll.magic b/build/ll.magic
new file mode 100644
index 000000000..05e5f5593
--- /dev/null
+++ b/build/ll.magic
@@ -0,0 +1,17 @@
+# LifeLines Genealogy KEY File
+0 long x
+>4 long x
+>8 long x
+>12 string LifeLines\ Keyfile LifeLines Key File,
+>32 long 0x12345678 little endian,
+>32 long 0x78563412 big endian,
+>36 long 0x1 version 1
+
+# LifeLines Genealogy INDEX File
+0 long x
+>4 short 0x1 LifeLines INDEX File
+
+# LifeLines Genealogy BLOCK File
+0 long x
+>4 short 0x2 LifeLines BLOCK File
+
diff --git a/build/msvc6/btedit/btedit.rc b/build/msvc6/btedit/btedit.rc
index a0dbd6cb9..3fa4bbddd 100644
--- a/build/msvc6/btedit/btedit.rc
+++ b/build/msvc6/btedit/btedit.rc
@@ -63,8 +63,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1,26076
- PRODUCTVERSION 3,1,1,26076
+ FILEVERSION 3,2,0,29260
+ PRODUCTVERSION 3,2,0,29260
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x29L
@@ -79,17 +79,17 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "http://marcno.github.io/lifelines/\0"
+ VALUE "Comments", "https://lifelines.github.io/lifelines/\0"
VALUE "CompanyName", "LifeLines\0"
VALUE "FileDescription", "btedit.exe\0"
- VALUE "FileVersion", "3, 1, 1, 26076\0"
+ VALUE "FileVersion", "3, 2, 0, 29260\0"
VALUE "InternalName", "btedit\0"
VALUE "LegalCopyright", "Copyright © 1991-2006\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "btedit.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "LifeLines Genealogical DB and Programming System\0"
- VALUE "ProductVersion", "3, 1, 1, 26076\0"
+ VALUE "ProductVersion", "3, 2, 0, 29260\0"
VALUE "SpecialBuild", "Win32 version by Perry Rapp\0"
END
END
diff --git a/build/msvc6/dbverify/dbVerify.rc b/build/msvc6/dbverify/dbVerify.rc
index 4361672b8..4889d8c1e 100644
--- a/build/msvc6/dbverify/dbVerify.rc
+++ b/build/msvc6/dbverify/dbVerify.rc
@@ -63,8 +63,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1,26076
- PRODUCTVERSION 3,1,1,26076
+ FILEVERSION 3,2,0,29260
+ PRODUCTVERSION 3,2,0,29260
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
@@ -79,17 +79,17 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "http://marcno.github.io/lifelines/\0:
+ VALUE "Comments", "https://lifelines.github.io/lifelines/\0:
VALUE "CompanyName", "LifeLines\0"
VALUE "FileDescription", "dbverify.exe\0"
- VALUE "FileVersion", "3, 1, 1, 26076\0"
+ VALUE "FileVersion", "3, 2, 0, 29260\0"
VALUE "InternalName", "dbverify\0"
VALUE "LegalCopyright", "Copyright © 1991-2006\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "dbverify.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "LifeLines Genealogical DB and Programming System\0"
- VALUE "ProductVersion", "3, 1, 1, 26076\0"
+ VALUE "ProductVersion", "3, 2, 0, 29260\0"
VALUE "SpecialBuild", "Win32 version by Perry Rapp\0"
END
END
diff --git a/build/msvc6/llexec/llexec.rc b/build/msvc6/llexec/llexec.rc
index d1c3cbec5..deacc0969 100644
--- a/build/msvc6/llexec/llexec.rc
+++ b/build/msvc6/llexec/llexec.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1,26076
- PRODUCTVERSION 3,1,1,26076
+ FILEVERSION 3,2,0,29260
+ PRODUCTVERSION 3,2,0,29260
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
@@ -44,17 +44,17 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "http://marcno.github.io/lifelines/\0"
+ VALUE "Comments", "https://lifelines.github.io/lifelines/\0"
VALUE "CompanyName", "LifeLines\0"
VALUE "FileDescription", "llexec\0"
- VALUE "FileVersion", "3, 1, 1, 26076\0"
+ VALUE "FileVersion", "3, 2, 0, 29260\0"
VALUE "InternalName", "llexec\0"
VALUE "LegalCopyright", "Copyright © 2002-2006\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "llexec.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "LifeLines Genealogical DB and Programming System\0"
- VALUE "ProductVersion", "3, 1, 1, 26076\0"
+ VALUE "ProductVersion", "3, 2, 0, 29260\0"
VALUE "SpecialBuild", "Win32 version by Perry Rapp\0"
END
END
diff --git a/build/msvc6/llines/llines.rc b/build/msvc6/llines/llines.rc
index 9969873b7..267c2a63c 100644
--- a/build/msvc6/llines/llines.rc
+++ b/build/msvc6/llines/llines.rc
@@ -63,8 +63,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1,26076
- PRODUCTVERSION 3,1,1,26076
+ FILEVERSION 3,2,0,29260
+ PRODUCTVERSION 3,2,0,29260
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x21L
@@ -79,17 +79,17 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "http://marcno.github.io/lifelines/\0"
+ VALUE "Comments", "https://lifelines.github.io/lifelines/\0"
VALUE "CompanyName", "LifeLines\0"
VALUE "FileDescription", "Lines\0"
- VALUE "FileVersion", "3, 1, 1, 26076\0"
+ VALUE "FileVersion", "3, 2, 0, 29260\0"
VALUE "InternalName", "Lines\0"
VALUE "LegalCopyright", "Copyright © 1991-2006\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Lines.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "LifeLines Genealogical DB and Programming System\0"
- VALUE "ProductVersion", "3, 1, 1, 26076\0"
+ VALUE "ProductVersion", "3, 2, 0, 29260\0"
VALUE "SpecialBuild", "Win32 version by Perry Rapp\0"
END
END
diff --git a/build/rpm/lifelines.spec b/build/rpm/lifelines.spec
index 85b78ce3f..92a4f52ef 100644
--- a/build/rpm/lifelines.spec
+++ b/build/rpm/lifelines.spec
@@ -9,7 +9,7 @@
# Add comment to top of comments at bottom if you revise this file.
#
-%define lifelines_version 3.1.1
+%define lifelines_version 3.2.0
%define reports_dir /usr/local/share/lifelines-%{lifelines_version}/reports
%define tt_dir /usr/local/share/lifelines-%{lifelines_version}/tt
@@ -19,8 +19,8 @@ Version: %{lifelines_version}
Release: 1
License: X11
Group: Utilities/System
-Source: http://download.sourceforge.net/lifelines/lifelines-%{lifelines_version}.tar.gz
-URL: http://marcno.github.io/lifelines/
+Source: https://github.com/lifelines/lifelines/releases/download/%{lifelines_version}/lifelines-%{lifelines_version}.tar.gz
+URL: https://lifelines.github.io/lifelines/
Packager: Marc Nozell