[sword-svn] r2410 - in trunk: . doc include scripts src/utilfuns

[scribe at crosswire.org]

Author: scribe
Date: 2009-05-14 00:38:07 -0700 (Thu, 14 May 2009)
New Revision: 2410

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/doc/Doxyfile
   trunk/include/config.h
   trunk/scripts/mkswordtar
   trunk/src/utilfuns/Makefile.am
Log:
final commits for 1.6.0


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-05-14 07:24:47 UTC (rev 2409)
+++ trunk/ChangeLog	2009-05-14 07:38:07 UTC (rev 2410)
@@ -2,6 +2,9 @@
 
 * Release 1.6.0 *
 
+14-May-2009	Troy A. Griffitts <scribe at crosswire.org>
+	General cleanup and prep for release
+
 04-May-2009	Troy A. Griffitts <scribe at crosswire.org>
 	Added ability for (SWBuf("xxx") == (const char *)0) to
 		return false;
@@ -32,8 +35,8 @@
 		getEntryForKey(const char *key)
 			- get the index for the given key
 	Updated strongsPad to work with keys with a prefix of G or H
-	Fixed a bug in SWMgr which would load certain files in the mods.d
-		directory which shouldn't have been loaded.
+	Fixed a bug in SWMgr which would load certain files in the
+		mods.d directory which shouldn't have been loaded.
 	Fix for divineName with non-ascii text in OSISHTMLHREF filter
 
 07-Feb-2009	Troy A. Griffitts <scribe at crosswire.org>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-05-14 07:24:47 UTC (rev 2409)
+++ trunk/Makefile.am	2009-05-14 07:38:07 UTC (rev 2410)
@@ -6,6 +6,8 @@
 
 legalexport := no
 
+ACLOCAL_AMFLAGS = -I m4
+
 ##### Customizable stuff. Set it how you like it #####
 
 # if building dll with gcc on windoze (www.mingw.org)

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-05-14 07:24:47 UTC (rev 2409)
+++ trunk/configure.ac	2009-05-14 07:38:07 UTC (rev 2410)
@@ -5,7 +5,7 @@
 # Version change: Change line 8 only !
 # Change it immediately after a release
 
-AC_INIT(sword, 1.5.11.103, sword-bugs at crosswire.org)
+AC_INIT(sword, 1.6.0, sword-bugs at crosswire.org)
 AC_CONFIG_SRCDIR(sword.bmp)
 AC_PREREQ(2.52)
 AC_REVISION($Revision: 1.45 $)
@@ -15,6 +15,7 @@
 
 AM_CONFIG_HEADER(include/config.h)
 
+AC_CONFIG_MACRO_DIR([m4])
 
 # ---------------------------------------------------------------------
 # Check Programs

Modified: trunk/doc/Doxyfile
===================================================================
--- trunk/doc/Doxyfile	2009-05-14 07:24:47 UTC (rev 2409)
+++ trunk/doc/Doxyfile	2009-05-14 07:38:07 UTC (rev 2410)
@@ -55,7 +55,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = "1.6.0RC2"
+PROJECT_NUMBER = "1.6.0"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h	2009-05-14 07:24:47 UTC (rev 2409)
+++ trunk/include/config.h	2009-05-14 07:38:07 UTC (rev 2410)
@@ -54,19 +54,19 @@
 #define PACKAGE_NAME "sword"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "sword 1.5.11.103"
+#define PACKAGE_STRING "sword 1.6.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "sword"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.11.103"
+#define PACKAGE_VERSION "1.6.0"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.5.11.103"
+#define VERSION "1.6.0"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

Modified: trunk/scripts/mkswordtar
===================================================================
--- trunk/scripts/mkswordtar	2009-05-14 07:24:47 UTC (rev 2409)
+++ trunk/scripts/mkswordtar	2009-05-14 07:38:07 UTC (rev 2410)
@@ -8,7 +8,7 @@
 REV=`cd ..;basename \`pwd ..\`|cut -d\- -f2`
 SWORDVER=`grep "define VERSI" ../include/config.h |cut -f2 -d"\""`
 
-sed -i "s/^\(PROJECT_NUMBER\).*/\1 = \"$REV\"/" ../doc/Doxyfile
+sed -i "s/^\(PROJECT_NUMBER\).*/\1 = \"$SWORDVER\"/" ../doc/Doxyfile
 
 if test `echo $REV` == `echo $SWORDVER`; then 
 	chmod +x *

Modified: trunk/src/utilfuns/Makefile.am
===================================================================
--- trunk/src/utilfuns/Makefile.am	2009-05-14 07:24:47 UTC (rev 2409)
+++ trunk/src/utilfuns/Makefile.am	2009-05-14 07:38:07 UTC (rev 2410)
@@ -1,7 +1,7 @@
 
 if HAVE_VSNPRINTF 
 else
-CXXFLAGS += -DNO_VSNPRINTF
+AM_CXXFLAGS += -DNO_VSNPRINTF
 endif
 
 utilfunsdir = $(top_srcdir)/src/utilfuns