Imported Upstream version 1.5.7

15 files changed, 72 insertions, 6 deletions

diff --git a/scripts/burncd b/scripts/burncd
index bdd8b37..bdd8b37 100644..100755
--- a/scripts/burncd
+++ b/scripts/burncd
diff --git a/scripts/demotar b/scripts/demotar
index 9093b5b..9093b5b 100644..100755
--- a/scripts/demotar
+++ b/scripts/demotar
diff --git a/scripts/dlltar b/scripts/dlltar
index a93fb3c..a93fb3c 100644..100755
--- a/scripts/dlltar
+++ b/scripts/dlltar
diff --git a/scripts/eastonstar b/scripts/eastonstar
index ac3d71a..ac3d71a 100644..100755
--- a/scripts/eastonstar
+++ b/scripts/eastonstar
diff --git a/scripts/mhctar b/scripts/mhctar
index eea59c4..eea59c4 100644..100755
--- a/scripts/mhctar
+++ b/scripts/mhctar
diff --git a/scripts/mkcd b/scripts/mkcd
index c1a9ee0..c1a9ee0 100644..100755
--- a/scripts/mkcd
+++ b/scripts/mkcd
diff --git a/scripts/mksword b/scripts/mksword
deleted file mode 100644
index f853d1e..0000000
--- a/scripts/mksword
+++ /dev/null
@@ -1,6 +0,0 @@
-REV=`cd ..;basename \`pwd ..\`|cut -d\- -f2`
-chmod +x *
-chmod +x ../apps/X11/cheatah/configure
-chmod +x ../apps/X11/cheatah/missing
-cp sapphire.cpp ../src/modules/common
-cd ../..; tar -v -c -p -s -z --exclude sword-$REV/bin -X sword-$REV/modlist -f sword-$REV.tar.gz sword-$REV/*
diff --git a/scripts/mkswordbase b/scripts/mkswordbase
new file mode 100755
index 0000000..93f5931
--- /dev/null
+++ b/scripts/mkswordbase
@@ -0,0 +1,14 @@
+#!/bin/sh
+cd ..
+make distclean
+./usrinst.sh
+make
+
+echo
+echo Please execute the following commands
+echo su
+echo cd ..
+echo "make install; make distclean; exit"
+echo ./mkswordbase2
+echo
+
diff --git a/scripts/mkswordbase2 b/scripts/mkswordbase2
new file mode 100755
index 0000000..0609181
--- /dev/null
+++ b/scripts/mkswordbase2
@@ -0,0 +1,42 @@
+#!/bin/sh
+mkdir /tmp/$$
+cd /tmp/$$
+mkdir etc
+echo [Install] > etc/sword.conf
+echo DataPath=/usr/share/sword >> etc/sword.conf
+echo >> etc/sword.conf
+
+mkdir usr
+mkdir usr/include
+cp -r /usr/include/sword usr/include/sword
+
+mkdir usr/lib
+cp -r /usr/lib/libsword.a /usr/lib/libsword.la usr/lib
+
+mkdir usr/share
+mkdir usr/share/sword
+mkdir usr/share/sword/mods.d
+
+echo [Globals] > usr/share/sword/mods.d/globals.conf
+echo >> usr/share/sword/mods.d/globals.conf
+echo >> usr/share/sword/mods.d/globals.conf
+
+cp -r /usr/share/sword/locales.d usr/share/sword/locales.d
+
+mkdir usr/share/doc
+mkdir usr/share/doc/sword
+
+cd -
+cd ..
+cp -r doc/* /tmp/$$/usr/share/doc/sword/
+cp -r ChangeLog README INSTALL LICENSE examples samples /tmp/$$/usr/share/doc/sword/
+cd -
+cd /tmp/$$
+find . -name CVS -type d -exec rm -rf {} \;
+tar czfv swordbase.tar.gz *
+cd -
+mv /tmp/$$/swordbase.tar.gz ../../
+rm -rf /tmp/$$
+
+cd ../..
+echo swordbase.tar.gz in `pwd`
diff --git a/scripts/mkswordtar b/scripts/mkswordtar
new file mode 100755
index 0000000..28e4d14
--- /dev/null
+++ b/scripts/mkswordtar
@@ -0,0 +1,16 @@
+#!/bin/sh
+REV=`cd ..;basename \`pwd ..\`|cut -d\- -f2`
+SWORDVER=`grep "define SWORDVER" ../include/swversion.h |cut -f2 -d"\""`
+
+if test `echo $REV` == `echo $SWORDVER`; then 
+	chmod +x *
+	chmod +x ../apps/X11/cheatah/configure
+	chmod +x ../apps/X11/cheatah/missing
+	#cp sapphire.cpp ../src/modules/common
+	cd ..; ./autogen.sh
+	cd ..; tar -v -c -p -s -z --exclude sword-$REV/bin -X sword-$REV/modlist -f sword-$REV.tar.gz sword-$REV/*
+else
+	echo $"Directory version is $REV, but swversion.h has $SWORDVER"
+	exit 1
+
+fi
diff --git a/scripts/sapphire.cpp b/scripts/sapphire.cpp
index 63968a4..63968a4 100644..100755
--- a/scripts/sapphire.cpp
+++ b/scripts/sapphire.cpp
diff --git a/scripts/svetar b/scripts/svetar
index f6fad43..f6fad43 100644..100755
--- a/scripts/svetar
+++ b/scripts/svetar
diff --git a/scripts/swordenv b/scripts/swordenv
index 924c739..924c739 100644..100755
--- a/scripts/swordenv
+++ b/scripts/swordenv
diff --git a/scripts/vinestar b/scripts/vinestar
index 2783b7d..2783b7d 100644..100755
--- a/scripts/vinestar
+++ b/scripts/vinestar
diff --git a/scripts/webtar b/scripts/webtar
index db263f7..db263f7 100644..100755
--- a/scripts/webtar
+++ b/scripts/webtar