[sword-svn] r2327 - in trunk: . bindings bindings/bcppmake bindings/corba/java/src/org/crosswire bindings/corba/java/src/org/crosswire/util bindings/gsoap bindings/swig bindings/swig/examples examples examples/classes examples/cmdline icu include lib scripts src/mgr src/utilfuns tests tests/cppunit tests/testsuite tests/tmp utilities utilities/diatheke utilities/perl
scribe at crosswire.org
scribe at crosswire.org
Wed Apr 22 04:42:33 MST 2009
Author: scribe
Date: 2009-04-22 04:42:33 -0700 (Wed, 22 Apr 2009)
New Revision: 2327
Added:
trunk/utilities/sub.c
Removed:
trunk/.cvsignore
trunk/bindings/corba/java/src/org/crosswire/web/
trunk/bindings/gsoap/soapcpp
trunk/bindings/gsoap/stdsoap.o
trunk/examples/.cvsignore
trunk/examples/cmdline/.cvsignore
trunk/icu/.cvsignore
trunk/include/.cvsignore
trunk/lib/.cvsignore
trunk/scripts/backupmake.sh
trunk/scripts/restoremake.sh
trunk/scripts/sapphire.cpp
trunk/src/utilfuns/sub.c
trunk/tests/.cvsignore
trunk/tests/testsuite/.cvsignore
trunk/tests/tmp/.cvsignore
trunk/utilities/.cvsignore
trunk/utilities/diatheke/.cvsignore
Modified:
trunk/arminst.sh
trunk/bindings/bcppmake/MainCLXTest.cpp
trunk/bindings/bcppmake/MainTest.cpp
trunk/bindings/bcppmake/clxtest.cpp
trunk/bindings/bcppmake/sword.c
trunk/bindings/bcppmake/test.cpp
trunk/bindings/corba/java/src/org/crosswire/util/Base64.java
trunk/bindings/swig/examples/mod2zmod.pl
trunk/bindings/swig/sword.pl
trunk/bindings/usrinst.sh
trunk/buildtest.cpp
trunk/examples/classes/ciphercng.cpp
trunk/examples/classes/swmgrex.cpp
trunk/examples/cmdline/listoptions.cpp
trunk/examples/cmdline/lookup.cpp
trunk/examples/cmdline/outplain.cpp
trunk/examples/cmdline/outrender.cpp
trunk/examples/cmdline/search.cpp
trunk/examples/cmdline/threaded_search.cpp
trunk/examples/cmdline/verserangeparse.cpp
trunk/examples/simple.cpp
trunk/include/Makefile.am
trunk/src/mgr/Makefile.am
trunk/src/mgr/curlhttpt.cpp
trunk/tests/cppunit/main.cpp
trunk/tests/testsuite/listtest.sh
trunk/tests/testsuite/runall.sh
trunk/tests/testsuite/runtest.sh
trunk/tests/testsuite/versekeytest.sh
trunk/tests/testsuite/versemgrtest.sh
trunk/tests/testsuite/verseparsing-utf8.sh
trunk/tests/testsuite/verseparsing.sh
trunk/tests/testsuite/xmltag.sh
trunk/usrinst.sh
trunk/utilities/installmgr.cpp
trunk/utilities/lexdump.c
trunk/utilities/no13.c
trunk/utilities/perl/cipherkeygen.pl
trunk/utilities/perl/linkvers.pl
trunk/utilities/perl/localecap.pl
trunk/utilities/perl/mkvsmod.pl
Log:
Added new file to make system
Cleaned up for packaging per Dmitrijs Ledkovs (Dima)'s feedback
Deleted: trunk/.cvsignore
===================================================================
--- trunk/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,21 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-sword.conf
-sword.pc
-sword.spec
-testlib
Modified: trunk/arminst.sh
===================================================================
--- trunk/arminst.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/arminst.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,24 @@
#!/bin/sh
+#******************************************************************************
+# Convenience script specifying ARM options to ./configure
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+#
OPTIONS="--host=arm-linux $OPTIONS"
Modified: trunk/bindings/bcppmake/MainCLXTest.cpp
===================================================================
--- trunk/bindings/bcppmake/MainCLXTest.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/bindings/bcppmake/MainCLXTest.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,24 @@
+/******************************************************************************
+ * This is part of a program to test CLX bindings
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
//---------------------------------------------------------------------------
#include <vcl.h>
Modified: trunk/bindings/bcppmake/MainTest.cpp
===================================================================
--- trunk/bindings/bcppmake/MainTest.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/bindings/bcppmake/MainTest.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,24 @@
+/******************************************************************************
+ * This is part of a program to test CLX bindings
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
//---------------------------------------------------------------------------
#include <vcl.h>
Modified: trunk/bindings/bcppmake/clxtest.cpp
===================================================================
--- trunk/bindings/bcppmake/clxtest.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/bindings/bcppmake/clxtest.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,24 @@
+/******************************************************************************
+ * This is part of a program to test CLX bindings
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
//---------------------------------------------------------------------------
#include <vcl.h>
Modified: trunk/bindings/bcppmake/sword.c
===================================================================
--- trunk/bindings/bcppmake/sword.c 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/bindings/bcppmake/sword.c 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,24 @@
+/******************************************************************************
+ * This is part of a program to test CLX bindings
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
//---------------------------------------------------------------------------
#include <windows.h>
@@ -28,4 +49,4 @@
return 1;
}
//---------------------------------------------------------------------------
-
\ No newline at end of file
+
Modified: trunk/bindings/bcppmake/test.cpp
===================================================================
--- trunk/bindings/bcppmake/test.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/bindings/bcppmake/test.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,24 @@
+/******************************************************************************
+ * This is part of a program to test CLX bindings
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
//---------------------------------------------------------------------------
#include <vcl.h>
Modified: trunk/bindings/corba/java/src/org/crosswire/util/Base64.java
===================================================================
--- trunk/bindings/corba/java/src/org/crosswire/util/Base64.java 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/bindings/corba/java/src/org/crosswire/util/Base64.java 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,6 +1,17 @@
package org.crosswire.util;
/**
+ * <p>
+ * I am placing this code in the Public Domain. Do with it as you will.
+ * This software comes with no guarantees or warranties but with
+ * plenty of well-wishing instead!
+ * Please visit <a href="http://iharder.net/xmlizable">http://iharder.net/xmlizable</a>
+ * periodically to check for updates or to contribute improvements.
+ * </p>
+ *
+ * @author Robert Harder
+ * @author rob at iharder.net
+ * @version 1.3.4
* Changed last char from '/' to '-' because cookies can't use '/' so we're not really a BASE64
* standard encoder anymore
* Changed package name. --crosswire.
@@ -18,17 +29,6 @@
* <li>v1.3.3 - Fixed I/O streams which were totally messed up.</li>
* </ul>
*
- * <p>
- * I am placing this code in the Public Domain. Do with it as you will.
- * This software comes with no guarantees or warranties but with
- * plenty of well-wishing instead!
- * Please visit <a href="http://iharder.net/xmlizable">http://iharder.net/xmlizable</a>
- * periodically to check for updates or to contribute improvements.
- * </p>
- *
- * @author Robert Harder
- * @author rob at iharder.net
- * @version 1.3.4
*/
public class Base64
{
Deleted: trunk/bindings/gsoap/soapcpp
===================================================================
(Binary files differ)
Deleted: trunk/bindings/gsoap/stdsoap.o
===================================================================
(Binary files differ)
Modified: trunk/bindings/swig/examples/mod2zmod.pl
===================================================================
--- trunk/bindings/swig/examples/mod2zmod.pl 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/bindings/swig/examples/mod2zmod.pl 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,8 +1,26 @@
#!/usr/bin/perl
-
+#******************************************************************************
+#
# This program converts a given module into a compressed module of the same type.
# This is just an example to demomstrate the power of the Perl Sword bindings.
# The code is almost written the same way the C++ of mod2zmod.cpp code was written
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
use Sword;
use strict;
Modified: trunk/bindings/swig/sword.pl
===================================================================
--- trunk/bindings/swig/sword.pl 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/bindings/swig/sword.pl 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,25 @@
#!/usr/bin/perl
+#******************************************************************************
+#
+# This looks like a test program to check binding functionality :)
+# Someone update me otherwise
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
use Sword;
Modified: trunk/bindings/usrinst.sh
===================================================================
--- trunk/bindings/usrinst.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/bindings/usrinst.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,24 @@
#!/bin/sh
+#******************************************************************************
+# Convenience script specifying most common options to ./configure
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+#
OPTIONS="--prefix=/usr $OPTIONS"
OPTIONS="--enable-corba $OPTIONS"
Modified: trunk/buildtest.cpp
===================================================================
--- trunk/buildtest.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/buildtest.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,25 @@
+/******************************************************************************
+ * This is a dumby program which does nothing useful but links to the
+ * SWORD engine to confirm basic things were built ok.
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
#include <iostream>
#include <versekey.h>
#include <rawtext.h>
Deleted: trunk/examples/.cvsignore
===================================================================
--- trunk/examples/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-
Modified: trunk/examples/classes/ciphercng.cpp
===================================================================
--- trunk/examples/classes/ciphercng.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/classes/ciphercng.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -4,6 +4,23 @@
* The change is only in effect for this run. This DOES NOT change the
* cipherkey in the module's .conf file.
*
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
*/
#include <iostream>
Modified: trunk/examples/classes/swmgrex.cpp
===================================================================
--- trunk/examples/classes/swmgrex.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/classes/swmgrex.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -11,6 +11,22 @@
* ModMap consists of: FIRST : SWBuf moduleName
* SECOND: SWModule *module
*
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
*/
#include <iostream>
Deleted: trunk/examples/cmdline/.cvsignore
===================================================================
--- trunk/examples/cmdline/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/cmdline/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-lookup
-search
-threaded_search
\ No newline at end of file
Modified: trunk/examples/cmdline/listoptions.cpp
===================================================================
--- trunk/examples/cmdline/listoptions.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/cmdline/listoptions.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,24 @@
+/******************************************************************************
+ * Simple example to show how to see which options are available from the
+ * installed set of modules and their possible settings.
+ *
+ * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
#include <iostream>
#include <swmgr.h>
Modified: trunk/examples/cmdline/lookup.cpp
===================================================================
--- trunk/examples/cmdline/lookup.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/cmdline/lookup.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,24 @@
+/******************************************************************************
+ * Simple example of how to retrieve an entry from a SWORD module
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
#include <stdio.h>
#include <iostream>
#include <stdlib.h>
Modified: trunk/examples/cmdline/outplain.cpp
===================================================================
--- trunk/examples/cmdline/outplain.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/cmdline/outplain.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,7 @@
/******************************************************************************
+ * This example show how to output the plain text entries from a SWORD module.
+ * This is also good for speed tests
+ *
* Class SWMgr manages installed modules for a frontend.
* SWMgr reads a mods.conf file to discover its information.
* It then instantiates the correct decendent of SWModule for each
@@ -11,8 +14,39 @@
* ModMap consists of: FIRST : SWBuf moduleName
* SECOND: SWModule *module
*
+ * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
*/
+/******************************************************************************
+ * Class SWMgr manages installed modules for a frontend.
+ * SWMgr reads a mods.conf file to discover its information.
+ * It then instantiates the correct decendent of SWModule for each
+ * module entry in mods.conf
+ * The developer may use this class to query what modules are installed
+ * and to retrieve an (SWModule *) for any one of these modules
+ *
+ * SWMgr makes its modules available as an STL Map.
+ * The Map definition is typedef'ed as ModMap
+ * ModMap consists of: FIRST : SWBuf moduleName
+ * SECOND: SWModule *module
+ *
+ */
+
#include <iostream>
#include <swmgr.h>
@@ -38,6 +72,6 @@
cout << "$$$";
if (vk) cout << vk->getOSISRef();
else cout << book.getKeyText();
- cout << "\n" << book.RenderText() << "\n\n";
+ cout << "\n" << book.StripText() << "\n\n";
}
}
Modified: trunk/examples/cmdline/outrender.cpp
===================================================================
--- trunk/examples/cmdline/outrender.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/cmdline/outrender.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,7 @@
/******************************************************************************
+ * This example show how to choose an output render markup and render
+ * entries from a SWORD module.
+ *
* Class SWMgr manages installed modules for a frontend.
* SWMgr reads a mods.conf file to discover its information.
* It then instantiates the correct decendent of SWModule for each
@@ -11,6 +14,22 @@
* ModMap consists of: FIRST : SWBuf moduleName
* SECOND: SWModule *module
*
+ * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
*/
#include <iostream>
Modified: trunk/examples/cmdline/search.cpp
===================================================================
--- trunk/examples/cmdline/search.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/cmdline/search.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,24 @@
+/******************************************************************************
+ * This simple example shows how to perform a search on a SWORD module
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
#include <stdio.h>
#include <rawtext.h>
#include <swmgr.h>
Modified: trunk/examples/cmdline/threaded_search.cpp
===================================================================
--- trunk/examples/cmdline/threaded_search.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/cmdline/threaded_search.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,23 @@
+/******************************************************************************
+ * This example shows how to do a thread search
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
#include <stdio.h>
#include <rawtext.h>
#include <swmgr.h>
Modified: trunk/examples/cmdline/verserangeparse.cpp
===================================================================
--- trunk/examples/cmdline/verserangeparse.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/cmdline/verserangeparse.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -2,6 +2,23 @@
* This example shows:
* How to parse a verse reference
* How to persist a custom range key in a book
+ *
+ * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
*/
#include <iostream>
Modified: trunk/examples/simple.cpp
===================================================================
--- trunk/examples/simple.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/examples/simple.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -14,6 +14,22 @@
*
* SWMgr library(0, 0, true, new MarkupFilterMgr(FMT_HTMLHREF));
*
+ * $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
*/
#include <swmgr.h>
Deleted: trunk/icu/.cvsignore
===================================================================
--- trunk/icu/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/icu/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.res
\ No newline at end of file
Deleted: trunk/include/.cvsignore
===================================================================
--- trunk/include/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/include/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,2 +0,0 @@
-config.h.in
-stamp-h1
Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/include/Makefile.am 2009-04-22 11:42:33 UTC (rev 2327)
@@ -5,6 +5,7 @@
pkginclude_HEADERS += $(swincludedir)/canon.h
pkginclude_HEADERS += $(swincludedir)/cipherfil.h
pkginclude_HEADERS += $(swincludedir)/curlftpt.h
+pkginclude_HEADERS += $(swincludedir)/curlhttpt.h
pkginclude_HEADERS += $(swincludedir)/defs.h
pkginclude_HEADERS += $(swincludedir)/echomod.h
pkginclude_HEADERS += $(swincludedir)/encfiltmgr.h
Deleted: trunk/lib/.cvsignore
===================================================================
--- trunk/lib/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/lib/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,6 +0,0 @@
-*.lo
-Makefile
-Makefile.in
-libsword.la
-.deps
-.libs
Deleted: trunk/scripts/backupmake.sh
===================================================================
--- trunk/scripts/backupmake.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/scripts/backupmake.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,5 +0,0 @@
-#!/bin/sh
-cp Makefile Makefile.sw
-cp lib/Makefile lib/Makefile.sw
-cp tests/Makefile tests/Makefile.sw
-cp utilities/Makefile utilities/Makefile.sw
Deleted: trunk/scripts/restoremake.sh
===================================================================
--- trunk/scripts/restoremake.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/scripts/restoremake.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,5 +0,0 @@
-#!/bin/sh
-cp Makefile.sw Makefile
-cp lib/Makefile.sw lib/Makefile
-cp tests/Makefile.sw tests/Makefile
-cp utilities/Makefile.sw utilities/Makefile
Deleted: trunk/scripts/sapphire.cpp
===================================================================
--- trunk/scripts/sapphire.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/scripts/sapphire.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,65 +0,0 @@
-/******************************************************************************
- *
- * Placeholder for the REAL SAPPHIRE II Stream Cipher Files
- *
- * The SAPPHIRE II package may be obtained from within the United States or
- * Canada from:
- *
- * http://cryptography.org/cgi-bin/crypto.cgi/libraries/sapphire.zip
- *
- *
- * These files must be placed accordingly:
- *
- * .../sword/include/sapphire.h
- * .../sword/src/modules/common/sapphire.cpp
- *
- * If you are outside of these countries, you will have to obtain this package
- * elsewhere.
- *
- */
-
-
-unsigned char sapphire::keyrand(int limit,
- unsigned char *user_key,
- unsigned char keysize,
- unsigned char *rsum,
- unsigned *keypos)
- {
- return keysize;
- }
-
-void sapphire::initialize(unsigned char *key, unsigned char keysize)
- {
- }
-
-void sapphire::hash_init(void)
- {
- }
-
-sapphire::sapphire(unsigned char *key, unsigned char keysize)
- {
- }
-
-void sapphire::burn(void)
- {
- }
-
-sapphire::~sapphire()
- {
- }
-
-unsigned char sapphire::encrypt(unsigned char b)
- {
- return b;
- }
-
-unsigned char sapphire::decrypt(unsigned char b)
- {
- return b;
- }
-
-void sapphire::hash_final(unsigned char *hash, // Destination
- unsigned char hashlength) // Size of hash.
- {
- }
-
Modified: trunk/src/mgr/Makefile.am
===================================================================
--- trunk/src/mgr/Makefile.am 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/src/mgr/Makefile.am 2009-04-22 11:42:33 UTC (rev 2327)
@@ -11,6 +11,7 @@
if WITHCURL
FTP_SOURCES = $(mgrdir)/curlftpt.cpp
+FTP_SOURCES += $(mgrdir)/curlhttpt.cpp
else
FTP_SOURCES = $(mgrdir)/ftplibftpt.cpp
endif
Modified: trunk/src/mgr/curlhttpt.cpp
===================================================================
--- trunk/src/mgr/curlhttpt.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/src/mgr/curlhttpt.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -41,8 +41,8 @@
};
-int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream);
-int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
+int my_httpfwrite(void *buffer, size_t size, size_t nmemb, void *stream);
+int my_httpfprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
static CURLHTTPTransport_init _CURLHTTPTransport_init;
@@ -55,7 +55,7 @@
// curl_global_cleanup();
}
-int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) {
+int my_httpfwrite(void *buffer, size_t size, size_t nmemb, void *stream) {
struct FtpFile *out=(struct FtpFile *)stream;
if (out && !out->stream && !out->destBuf) {
/* open file for writing */
@@ -73,7 +73,7 @@
}
-int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) {
+int my_httpfprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) {
if (clientp) {
((StatusReporter *)clientp)->statusUpdate(dltotal, dlnow);
}
@@ -81,7 +81,7 @@
}
-static int my_trace(CURL *handle, curl_infotype type, unsigned char *data, size_t size, void *userp) {
+static int myhttp_trace(CURL *handle, curl_infotype type, unsigned char *data, size_t size, void *userp) {
SWBuf header;
(void)userp; /* prevent compiler warning */
(void)handle; /* prevent compiler warning */
@@ -129,13 +129,13 @@
SWBuf credentials = u + ":" + p;
curl_easy_setopt(session, CURLOPT_USERPWD, credentials.c_str());
- curl_easy_setopt(session, CURLOPT_WRITEFUNCTION, my_fwrite);
+ curl_easy_setopt(session, CURLOPT_WRITEFUNCTION, my_httpfwrite);
if (!passive)
curl_easy_setopt(session, CURLOPT_FTPPORT, "-");
curl_easy_setopt(session, CURLOPT_NOPROGRESS, 0);
curl_easy_setopt(session, CURLOPT_PROGRESSDATA, statusReporter);
- curl_easy_setopt(session, CURLOPT_PROGRESSFUNCTION, my_fprogress);
- curl_easy_setopt(session, CURLOPT_DEBUGFUNCTION, my_trace);
+ curl_easy_setopt(session, CURLOPT_PROGRESSFUNCTION, my_httpfprogress);
+ curl_easy_setopt(session, CURLOPT_DEBUGFUNCTION, myhttp_trace);
/* Set a pointer to our struct to pass to the callback */
curl_easy_setopt(session, CURLOPT_FILE, &ftpfile);
Deleted: trunk/src/utilfuns/sub.c
===================================================================
--- trunk/src/utilfuns/sub.c 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/src/utilfuns/sub.c 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,36 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-
-main(int argc, char **argv)
-{
- FILE *fp;
- char *buf;
- int size;
-
- if ((argc < 3) || (argc > 4)) {
- fprintf(stderr, "usage: %s <string> <substitute string> [filename]\n", *argv);
- exit(-1);
- }
-
- if (argc > 3)
- fp = fopen(argv[3], "r");
- else fp = stdin;
-
- size = strlen(argv[1]);
- buf = (char *)calloc(size + 1, 1);
-
- while ((buf[size - 1] = fgetc(fp)) != EOF) {
- if (!strcmp(buf, argv[1])) {
- printf("\n%s", argv[2]);
- memset(buf, 0, size);
- continue;
- }
- if (*buf) {
- printf("%c", *buf);
- }
- memmove(buf, &buf[1], size);
- }
- buf[size - 1] = 0;
- printf("%s", buf);
-}
Deleted: trunk/tests/.cvsignore
===================================================================
--- trunk/tests/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,34 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-casttest
-complzss
-compnone
-compzip
-configtest
-filtertest
-genbooktest
-indextest
-introtest
-keycast
-keytest
-lextest
-listtest
-localetest
-mgrtest
-modtest
-parsekey
-rawldidxtest
-romantest
-swaptest
-swbuftest
-testblocks
-treeidxtest
-webiftest
-xmltest
-nt
-nt.vss
-ot
-ot.vss
-test1.conf
\ No newline at end of file
Modified: trunk/tests/cppunit/main.cpp
===================================================================
--- trunk/tests/cppunit/main.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/cppunit/main.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,24 @@
-//LibSword tests
+/******************************************************************************
+ *
+ * LibSword tests
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
//CppUnit includes
#include <cppunit/extensions/TestFactoryRegistry.h>
Deleted: trunk/tests/testsuite/.cvsignore
===================================================================
--- trunk/tests/testsuite/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/testsuite/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1 +0,0 @@
-verseparsing.try
\ No newline at end of file
Modified: trunk/tests/testsuite/listtest.sh
===================================================================
--- trunk/tests/testsuite/listtest.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/testsuite/listtest.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,21 @@
#!/bin/sh
+#******************************************************************************
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
../listtest
Modified: trunk/tests/testsuite/runall.sh
===================================================================
--- trunk/tests/testsuite/runall.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/testsuite/runall.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,24 @@
#!/bin/sh
+#******************************************************************************
+#
+# Runs entire test suite
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
TESTSUITE=`for i in *.good; do basename $i .good; done`
Modified: trunk/tests/testsuite/runtest.sh
===================================================================
--- trunk/tests/testsuite/runtest.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/testsuite/runtest.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,24 @@
#!/bin/sh
+#******************************************************************************
+#
+# Runs a single test
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
if [ "$1" = "" ]; then
echo usage: $0 "<test_to_run (no .sh)>"
Modified: trunk/tests/testsuite/versekeytest.sh
===================================================================
--- trunk/tests/testsuite/versekeytest.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/testsuite/versekeytest.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,21 @@
#!/bin/sh
+#******************************************************************************
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
../versekeytest
Modified: trunk/tests/testsuite/versemgrtest.sh
===================================================================
--- trunk/tests/testsuite/versemgrtest.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/testsuite/versemgrtest.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,2 +1,21 @@
#!/bin/sh
+#******************************************************************************
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+
../versemgrtest KJV
Modified: trunk/tests/testsuite/verseparsing-utf8.sh
===================================================================
--- trunk/tests/testsuite/verseparsing-utf8.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/testsuite/verseparsing-utf8.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,5 +1,24 @@
#!/bin/sh
+#******************************************************************************
+#
# This only works if --with-icu was passed to configure
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
### German test keys
../parsekey "Matthäus 2:3-12" "de"
Modified: trunk/tests/testsuite/verseparsing.sh
===================================================================
--- trunk/tests/testsuite/verseparsing.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/testsuite/verseparsing.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,22 @@
#!/bin/sh
+#******************************************************************************
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
../parsekey "1jn.2.3"
../parsekey "1 jn.2.3"
Modified: trunk/tests/testsuite/xmltag.sh
===================================================================
--- trunk/tests/testsuite/xmltag.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/testsuite/xmltag.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,22 @@
#!/bin/sh
+#******************************************************************************
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
# Just let it run the default
../xmltest
Deleted: trunk/tests/tmp/.cvsignore
===================================================================
--- trunk/tests/tmp/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/tests/tmp/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,2 +0,0 @@
-lextest.dat
-lextest.idx
\ No newline at end of file
Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/usrinst.sh 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,24 @@
#!/bin/sh
+#******************************************************************************
+# Convenience script specifying most common options to ./configure
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+#
OPTIONS="--prefix=/usr $OPTIONS"
OPTIONS="--libdir=/usr/lib64 $OPTIONS"
Deleted: trunk/utilities/.cvsignore
===================================================================
--- trunk/utilities/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/utilities/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,31 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-addgb
-addld
-addvs
-cipherraw
-ciphertest
-ciphertest2
-emptyvss
-gbfidx
-imp2gbs
-imp2ld
-imp2vs
-installmgr
-lexdump
-mkfastmod
-mod2imp
-mod2osis
-mod2vpl
-mod2zmod
-modwrite
-osis2mod
-step2vpl
-stepdump
-thml2gbs
-txt2sword
-vpl2mod
-vs2osisref
-xml2gbs
Deleted: trunk/utilities/diatheke/.cvsignore
===================================================================
--- trunk/utilities/diatheke/.cvsignore 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/utilities/diatheke/.cvsignore 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-diatheke
Modified: trunk/utilities/installmgr.cpp
===================================================================
--- trunk/utilities/installmgr.cpp 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/utilities/installmgr.cpp 2009-04-22 11:42:33 UTC (rev 2327)
@@ -37,13 +37,48 @@
SWBuf confPath;
+class MyInstallMgr : public InstallMgr {
+public:
+ MyInstallMgr(const char *privatePath = "./") : InstallMgr(privatePath) {}
+
+virtual bool isUserDisclaimerConfirmed() const {
+ static bool confirmed = false;
+ if (!confirmed) {
+ cout << "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n";
+ cout << " -=+* WARNING *+=- -=+* WARNING *+=-\n\n\n";
+ cout << "Although Install Manager provides a convenient way for installing\n";
+ cout << "and upgrading SWORD components, it also uses a systematic method\n";
+ cout << "for accessing sites which gives packet sniffers a target to lock\n";
+ cout << "into for singling out users. \n\n\n";
+ cout << "IF YOU LIVE IN A PERSECUTED COUNTRY AND DO NOT WISH TO RISK DETECTION,\n";
+ cout << "YOU SHOULD *NOT* USE INSTALL MANAGER'S REMOTE SOURCE FEATURES.\n\n\n";
+ cout << "Also, Remote Sources other than CrossWire may contain less than\n";
+ cout << "quality modules, modules with unorthodox content, or even modules\n";
+ cout << "which are not legitimately distributable. Many repositories\n";
+ cout << "contain wonderfully useful content. These repositories simply\n";
+ cout << "are not reviewed or maintained by CrossWire and CrossWire\n";
+ cout << "cannot be held responsible for their content. CAVEAT EMPTOR.\n\n\n";
+ cout << "If you understand this and are willing to enable remote source features\n";
+ cout << "then type yes at the prompt\n\n";
+ cout << "enable? [no] ";
+
+ char prompt[10];
+ fgets(prompt, 9, stdin);
+ confirmed = (!strcmp(prompt, "yes\n"));
+ }
+ return confirmed;
+}
+
+};
+
+
void init() {
mgr = new SWMgr();
- char *envhomedir = getenv ("HOME");
- SWBuf baseDir = (envhomedir) ? envhomedir : ".";
+ SWBuf baseDir = mgr->getHomeDir();
+ if (baseDir.length() < 1) baseDir = ".";
baseDir += "/.sword/InstallMgr";
confPath = baseDir + "/InstallMgr.conf";
- installMgr = new InstallMgr(baseDir);
+ installMgr = new MyInstallMgr(baseDir);
}
@@ -77,30 +112,6 @@
}
-bool showDisclaimer() {
- cout << "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n";
- cout << " -=+* WARNING *+=- -=+* WARNING *+=-\n\n\n";
- cout << "Although Install Manager provides a convenient way for installing\n";
- cout << "and upgrading SWORD components, it also uses a systematic method\n";
- cout << "for accessing sites which gives packet sniffers a target to lock\n";
- cout << "into for singling out users. \n\n\n";
- cout << "IF YOU LIVE IN A PERSECUTED COUNTRY AND DO NOT WISH TO RISK DETECTION,\n";
- cout << "YOU SHOULD *NOT* USE INSTALL MANAGER'S REMOTE SOURCE FEATURES.\n\n\n";
- cout << "Also, Remote Sources other than CrossWire may contain less than\n";
- cout << "quality modules, module with unorthodox content, or even modules\n";
- cout << "which are not legitimately distributable. Many repositories\n";
- cout << "contain wonderfully useful content. These repositories simply\n";
- cout << "are not reviewed or maintained by CrossWire and CrossWire\n";
- cout << "cannot be held responsible for their content. CAVEAT EMPTOR.\n\n\n";
- cout << "If you understand this and are willing to enable remote source features\n";
- cout << "then type yes at the prompt\n\n";
- cout << "enable? [no] ";
- char prompt[10];
- fgets(prompt, 9, stdin);
- return (!strcmp(prompt, "yes\n"));
-}
-
-
void createBasicConfig(bool enableRemote, bool addCrossWire) {
FileMgr::createParent(confPath.c_str());
@@ -119,9 +130,10 @@
config.Save();
}
+
void initConfig() {
- bool enable = showDisclaimer();
+ bool enable = installMgr->isUserDisclaimerConfirmed();
createBasicConfig(enable, true);
@@ -132,7 +144,7 @@
void syncConfig() {
- if (!showDisclaimer()) { // assert disclaimer is accepted
+ if (!installMgr->isUserDisclaimerConfirmed()) { // assert disclaimer is accepted
cout << "\n\nDisclaimer not accepted. Aborting.";
return;
}
@@ -143,8 +155,6 @@
init(); // re-init with InstallMgr which uses our new config
}
- installMgr->setUserDisclaimerConfirmed(true);
-
if (!installMgr->refreshRemoteSourceConfiguration())
cout << "\nSync'd config file with master remote source list.\n";
else cout << "\nFailed to sync config file with master remote source list.\n";
@@ -199,9 +209,6 @@
finish(-3);
}
- // since a remote source is in the config files, we've already confirmed
- installMgr->setUserDisclaimerConfirmed(true);
-
if (!installMgr->refreshRemoteSource(source->second))
cout << "Remote Source Refreshed\n";
else cerr << "Error Refreshing Remote Source\n";
@@ -264,8 +271,6 @@
}
module = it->second;
- installMgr->setUserDisclaimerConfirmed(true);
-
int error = installMgr->installModule(mgr, 0, module->Name(), is);
if (error) {
cout << "Error installing module: [" << module->Name() << "] (write permissions?)\n";
Modified: trunk/utilities/lexdump.c
===================================================================
--- trunk/utilities/lexdump.c 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/utilities/lexdump.c 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,24 @@
+/******************************************************************************
+ * This utility outputs a specified ordinal entry from a lex
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
#include <ctype.h>
#include <stdio.h>
#include <fcntl.h>
Modified: trunk/utilities/no13.c
===================================================================
--- trunk/utilities/no13.c 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/utilities/no13.c 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,3 +1,23 @@
+/******************************************************************************
+ * Strips ascii 13 chars out of a file
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
#include <fcntl.h>
#include <stdio.h>
Modified: trunk/utilities/perl/cipherkeygen.pl
===================================================================
--- trunk/utilities/perl/cipherkeygen.pl 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/utilities/perl/cipherkeygen.pl 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,10 +1,28 @@
#!/usr/bin/perl
-
+#******************************************************************************
+#
# cipherkeygen.pl
-
+#
# generates a cipher key of the format \d{4}[a-zA-Z]{4}\d{4}[a-zA-Z]{4}.
# because I'm lazy and not random enough.
# and because the utilities/perl directory is kinda bare...
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
# let's get a base key of \d{4}[A-Z]{4}\d{4}[A-Z]{4}
Modified: trunk/utilities/perl/linkvers.pl
===================================================================
--- trunk/utilities/perl/linkvers.pl 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/utilities/perl/linkvers.pl 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,22 @@
#!/usr/bin/perl
+#******************************************************************************
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
$vplfile = $ARGV[0];
Modified: trunk/utilities/perl/localecap.pl
===================================================================
--- trunk/utilities/perl/localecap.pl 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/utilities/perl/localecap.pl 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,7 +1,26 @@
#!/usr/bin/perl
-
+#******************************************************************************
+#
# This tool is only for locales in Latin-1, not UTF-8 (should such locales be supported at a later date)
+#
+# $Id$
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+# CrossWire Bible Society
+# P. O. Box 2528
+# Tempe, AZ 85280-2528
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation version 2.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+
use locale;
$abbrevs = 0;
Modified: trunk/utilities/perl/mkvsmod.pl
===================================================================
--- trunk/utilities/perl/mkvsmod.pl 2009-04-22 08:53:04 UTC (rev 2326)
+++ trunk/utilities/perl/mkvsmod.pl 2009-04-22 11:42:33 UTC (rev 2327)
@@ -1,4 +1,23 @@
#!/usr/bin/perl
+#******************************************************************************
+#*
+#* $Id$
+#*
+#* Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#* CrossWire Bible Society
+#* P. O. Box 2528
+#* Tempe, AZ 85280-2528
+#*
+#* This program is free software; you can redistribute it and/or modify it
+#* under the terms of the GNU General Public License as published by the
+#* Free Software Foundation version 2.
+#*
+#* This program is distributed in the hope that it will be useful, but
+#* WITHOUT ANY WARRANTY; without even the implied warranty of
+#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#* General Public License for more details.
+#*
+#*/
open (INF, $ARGV[0]);
Copied: trunk/utilities/sub.c (from rev 2326, trunk/src/utilfuns/sub.c)
===================================================================
--- trunk/utilities/sub.c (rev 0)
+++ trunk/utilities/sub.c 2009-04-22 11:42:33 UTC (rev 2327)
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * This little utility substitutes all occurances of a string with another
+ * string. Is this useful? Maybe not. But it's been here since r2 so
+ * it seems a shame to remove it :) Currently not built by build system
+ *
+ * $Id$
+ *
+ * Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+main(int argc, char **argv)
+{
+ FILE *fp;
+ char *buf;
+ int size;
+
+ if ((argc < 3) || (argc > 4)) {
+ fprintf(stderr, "usage: %s <string> <substitute string> [filename]\n", *argv);
+ exit(-1);
+ }
+
+ if (argc > 3)
+ fp = fopen(argv[3], "r");
+ else fp = stdin;
+
+ size = strlen(argv[1]);
+ buf = (char *)calloc(size + 1, 1);
+
+ while ((buf[size - 1] = fgetc(fp)) != EOF) {
+ if (!strcmp(buf, argv[1])) {
+ printf("\n%s", argv[2]);
+ memset(buf, 0, size);
+ continue;
+ }
+ if (*buf) {
+ printf("%c", *buf);
+ }
+ memmove(buf, &buf[1], size);
+ }
+ buf[size - 1] = 0;
+ printf("%s", buf);
+}
Property changes on: trunk/utilities/sub.c
___________________________________________________________________
Added: svn:keywords
+ author date id
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
More information about the sword-cvs
mailing list