[sword-svn] r1789 - in trunk: . include
scribe at crosswire.org
scribe at crosswire.org
Sun May 1 12:56:30 MST 2005
Author: scribe
Date: 2005-05-01 12:56:29 -0700 (Sun, 01 May 2005)
New Revision: 1789
Added:
trunk/buildtest.cpp
Removed:
trunk/testlib.cpp
Modified:
trunk/Makefile.am
trunk/README
trunk/configure.ac
trunk/include/config.h
trunk/sword.kdevprj
Log:
renamed testlib.cpp to a more aptly titled buildtest.cpp
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-05-01 06:41:19 UTC (rev 1788)
+++ trunk/Makefile.am 2005-05-01 19:56:29 UTC (rev 1789)
@@ -94,14 +94,14 @@
-rm -f sword.conf
endif
-noinst_PROGRAMS = testlib
-testlib_SOURCES = testlib.cpp
+noinst_PROGRAMS = buildtest
+buildtest_SOURCES = buildtest.cpp
if ICU
iculibs = -licui18n -licuuc
endif
-testlib_LDADD = $(top_builddir)/lib/libsword.la
+buildtest_LDADD = $(top_builddir)/lib/libsword.la
include locales.d/Makefile.am
include samples/Makefile.am
Modified: trunk/README
===================================================================
--- trunk/README 2005-05-01 06:41:19 UTC (rev 1788)
+++ trunk/README 2005-05-01 19:56:29 UTC (rev 1789)
@@ -15,7 +15,7 @@
(sword/apps), in the tree. The apps each have their own make system,
so look for a ./configure or a README.
- ./testlib.cpp compiles to the executable 'testlib' as a test to
+ ./buildtest.cpp compiles to the executable 'buildtest' as a test to
see if the libs have compiled and can be linked against successfully.
This is NOT the final target of the build, nor does anything useful.
:)
Copied: trunk/buildtest.cpp (from rev 1784, trunk/testlib.cpp)
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-05-01 06:41:19 UTC (rev 1788)
+++ trunk/configure.ac 2005-05-01 19:56:29 UTC (rev 1789)
@@ -5,7 +5,7 @@
# Version change: Change line 8 only !
# Change it immediately after a release
-AC_INIT(sword, 1.5.8, sword-bugs at crosswire.org)
+AC_INIT(sword, 1.5.7.102, sword-bugs at crosswire.org)
AC_CONFIG_SRCDIR(sword.bmp)
AC_PREREQ(2.52)
AC_REVISION($Revision: 1.45 $)
@@ -272,9 +272,6 @@
# ---------------------------------------------------------------------
# Final output
# ---------------------------------------------------------------------
-AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile \
- utilities/Makefile examples/Makefile \
- examples/cmdline/Makefile \
- utilities/diatheke/Makefile icu/Makefile sword.pc sword.spec)
+AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile icu/Makefile sword.pc sword.spec)
AC_OUTPUT
Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h 2005-05-01 06:41:19 UTC (rev 1788)
+++ trunk/include/config.h 2005-05-01 19:56:29 UTC (rev 1789)
@@ -44,19 +44,19 @@
#define PACKAGE_NAME "sword"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "sword 1.5.7.100"
+#define PACKAGE_STRING "sword 1.5.7.102"
/* 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.7.100"
+#define PACKAGE_VERSION "1.5.7.102"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.5.7.100"
+#define VERSION "1.5.7.102"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
Modified: trunk/sword.kdevprj
===================================================================
--- trunk/sword.kdevprj 2005-05-01 06:41:19 UTC (rev 1788)
+++ trunk/sword.kdevprj 2005-05-01 19:56:29 UTC (rev 1789)
@@ -33,7 +33,7 @@
groups=Header,Quellen,Benutzerschnittstelle,Andere
[Makefile.am]
-files=sword.kdevprj,testlib.cpp
+files=sword.kdevprj,buildtest.cpp
sub_dirs=sword,include,src,tests
type=static_library
@@ -1844,7 +1844,7 @@
sub_dirs=
type=normal
-[testlib.cpp]
+[buildtest.cpp]
dist=true
install=false
install_location=
Deleted: trunk/testlib.cpp
===================================================================
--- trunk/testlib.cpp 2005-05-01 06:41:19 UTC (rev 1788)
+++ trunk/testlib.cpp 2005-05-01 19:56:29 UTC (rev 1789)
@@ -1,61 +0,0 @@
-#include <iostream>
-#include <versekey.h>
-#include <rawtext.h>
-//#include <zcom.h>
-#include <rawcom.h>
-//#include <rawgbf.h>
-//#include <rawfiles.h>
-#ifndef NO_SWORD_NAMESPACE
-using sword::VerseKey;
-using sword::RawText;
-using sword::RawCom;
-using sword::SWKey;
-#endif
-using std::cout;
-
-int main(int argc, char **argv)
-{
- int loop;
- int max;
- VerseKey mykey;
-// RawText text("src/modules/texts/rawtext/sve/", "Sven Text", "Sven Text");
- RawText text("src/modules/texts/rawtext/webster/", "Webster", "Webster Text");
-// RawText text("src/modules/texts/rawtext/orthjbc/", "Webster", "Webster Text");
-// RawGBF text("src/modules/texts/rawgbf/newtext/", "WEB", "World English Bible");
-// RawText text("src/modules/texts/rawtext/kjv/", "KJV", "KJV Text");
-// RawText text("src/modules/texts/rawtext/vnt/", "VNT", "Valera Spanish NT");
-// RawCom commentary("src/modules/comments/rawcom/rwp/", "RWP", "Robertson's Word Pictures");
- RawCom commentary("src/modules/comments/rawcom/mhc/", "MHC", "Matthew Henry's Commentary on the Whole Bible");
-// RawFiles commentary("src/modules/comments/rawfiles/personal/", "MHC", "Matthew Henry's Commentary on the Whole Bible");
-
-
- if (argc > 3)
- mykey.AutoNormalize(0); // Turn off autonormalize if 3 args to allow for intros
- // This is kludgy but at lease you can try it
- // with something like: sword "Matthew 1:0" 1 1
-
-
- mykey = (argc < 2) ? "James 1:19" : argv[1];
- mykey.Persist(1);
- text.setKey(mykey);
- commentary.setKey(mykey);
-
-
- max = (argc < 3) ? 1 : atoi(argv[2]);
-
-
- cout << "\n";
-
-
- for (loop = 0; loop < max; loop++) {
- cout << (SWKey &)text << ":\n";
- text.Display();
- cout << "\n";
- cout << "-------------\n";
- commentary.Display();
- cout << "\n";
- cout << "==========================\n";
- mykey++;
- }
- cout << "\n\n";
-}
More information about the sword-cvs
mailing list