diff options
| author | Derrell Lipman <derrell@samba.org> | 2007-01-03 21:11:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:36:10 -0500 |
| commit | d0d846cd9bf1ea5439922ec2cedd445dc3195098 (patch) | |
| tree | 25e038ca295915b4c29c4d0d795b60d34d795876 /source4/script | |
| parent | eab632c31e376a3f3a2e18f89083cf9055d63a9f (diff) | |
| download | samba-d0d846cd9bf1ea5439922ec2cedd445dc3195098.tar.gz samba-d0d846cd9bf1ea5439922ec2cedd445dc3195098.tar.bz2 samba-d0d846cd9bf1ea5439922ec2cedd445dc3195098.zip | |
r20519: Web Application Framework
- No path given to web server means use old scripts (missed check-in)
- Build Web Application (qooxdoo stuff) from autogen.sh since python isn't
available or is differently-configured on various build-farm machines
- Don't continually check in generated files
- Properly identify SWAT "Statistics" module as "Status and Statistics"
(This used to be commit 9d89b7663af218ee6ed941ac6c0597fab93cd03b)
Diffstat (limited to 'source4/script')
| -rw-r--r-- | source4/script/installwebapps.sh | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/source4/script/installwebapps.sh b/source4/script/installwebapps.sh index c763d6b089..25a43dba24 100644 --- a/source4/script/installwebapps.sh +++ b/source4/script/installwebapps.sh @@ -6,7 +6,9 @@ SRCDIR=$2 echo Installing web application files in $WEBAPPSDIR cd $SRCDIR/../webapps/swat || exit 1 -make build || exit 1 + +# building the web application framework is now done by autogen.sh +#make build || exit 1 mkdir -p $WEBAPPSDIR || exit 1 @@ -21,26 +23,23 @@ installdir() { } # install our web application -cd build +cd build || exit 1 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 .. +# install files from the 'scripting', 'style' and 'images' directories +cd ../.. || exit 1 installdir `find scripting -name '*.js'` installdir `find scripting -name '*.esp'` - -# install .css files from the style dir installdir `find style -name '*.css'` +installdir `find images -name '*.png'` +installdir `find images -name '*.gif'` +installdir `find images -name '*.ico'` -# install files from the images dir -installdir `find images -type f -print` +# install the old installation scripts, since there's no replacement yet +installdir `find install -name '*.esp'` -# install the login script, for authentication of static pages -installdir `find . -name 'login.esp'` +# install top-level scripts +installdir index.esp login.esp logout.esp menu.js cat << EOF ====================================================================== |