r20444: WEB Application framework / SWAT.

We're now at the stage where the web application framework should build and
install automatically.

Derrell
(This used to be commit 0201baef46c1701007e0a4cdd95edee287939318)

2 files changed, 52 insertions, 38 deletions

diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh
deleted file mode 100644
index 549c11da35..0000000000
--- a/source4/script/installswat.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-SWATDIR=$1
-SRCDIR=$2
-
-echo Installing swat files in $SWATDIR
-
-cd $SRCDIR/../swat || exit 1
-
-mkdir -p $SWATDIR || exit 1
-
-installdir() {
-    for f in $*; do
-	dname=`dirname $f`
-	echo "Installing $f in $dname"
-	test -d $SWATDIR/$dname || mkdir -p $SWATDIR/$dname || exit 1
-	cp $f $SWATDIR/$dname/ || exit 1
-	chmod 0644 $SWATDIR/$f || exit 1
-    done
-}
-
-installdir `find . -name '*.html'`
-installdir `find . -name '*.js'`
-installdir `find . -name '*.esp'`
-installdir `find . -name '*.css'`
-installdir `find . -name '*.png'`
-installdir `find . -name '*.ico'`
-installdir `find . -name '*.gif'`
-installdir `find . -name '*.ejs'`
-
-cat << EOF
-======================================================================
-The swat files have been installed. 
-======================================================================
-EOF
-
-exit 0
-
diff --git a/source4/script/installwebapps.sh b/source4/script/installwebapps.sh
new file mode 100644
index 0000000000..c763d6b089
--- /dev/null
+++ b/source4/script/installwebapps.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+WEBAPPSDIR=$1
+SRCDIR=$2
+
+echo Installing web application files in $WEBAPPSDIR
+
+cd $SRCDIR/../webapps/swat || exit 1
+make build || exit 1
+
+mkdir -p $WEBAPPSDIR || exit 1
+
+installdir() {
+    for f in $*; do
+	dname=`dirname $f`
+	echo "Installing $f in $dname"
+	test -d $WEBAPPSDIR/$dname || mkdir -p $WEBAPPSDIR/$dname || exit 1
+	cp $f $WEBAPPSDIR/$dname/ || exit 1
+	chmod 0644 $WEBAPPSDIR/$f || exit 1
+    done
+}
+
+# install our web application
+cd build
+installdir `find . -type f -print`
+cd ..
+
+# install all .esp files (there are none in the webapp build dir)
+installdir `find . -name '*.esp'`
+
+# install .js and .esp files from the scripting dir
+cd ..
+installdir `find scripting -name '*.js'`
+installdir `find scripting -name '*.esp'`
+
+# install .css files from the style dir
+installdir `find style -name '*.css'`
+
+# install files from the images dir
+installdir `find images -type f -print`
+
+# install the login script, for authentication of static pages
+installdir `find . -name 'login.esp'`
+
+cat << EOF
+======================================================================
+The web application files have been installed. 
+======================================================================
+EOF
+
+exit 0
+