scsh-conservatory
/
sunet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ Install example scripts 

+ Use library search path to find SUnet in example scripts
+ Add option to install without SSAX
This commit is contained in:
mainzelm 2004-02-03 13:51:51 +00:00
parent 1fe7ec1e6f
commit 0a7ada489d
5 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -6,14 +6,14 @@ distname = sunet-$(version_id)
distdir = /tmp distdir = /tmp
DISTFILES = COPYING README RELEASE \ DISTFILES = COPYING README RELEASE \
pkg-def.scm install-lib-module.scm install-lib.scm install-pkg \ pkg-def.scm install-lib-module.scm install-lib.scm install-pkg \
Makefile scheme/packages.scm \ Makefile scheme/packages.scm \
start-web-server \ start-web-server start-extended-web-server start-surflet-server \
scheme/httpd/*.scm scheme/httpd/surflets/*.scm \ scheme/httpd/*.scm scheme/httpd/surflets/*.scm \
scheme/ftpd/*.scm scheme/lib/*.scm \ scheme/ftpd/*.scm scheme/lib/*.scm \
doc/pdf/sunet.pdf doc/html \ doc/pdf/sunet.pdf doc/html \
doc/latex/*.tex doc/latex/*.sty doc/latex/*.t2p doc/latex/*.hdir \ doc/latex/*.tex doc/latex/*.sty doc/latex/*.t2p doc/latex/*.hdir \
web-server web-server
sunet-$(version_id).tar.gz: sunet-$(version_id).tar.gz:

40
pkg-def.scm
View File

@ -1,17 +1,29 @@
(define-package "sunet" (2 1) () (define-package "sunet" (2 1)
(install-directory-contents "scheme" 'scheme) ((options (with-surflets "Install with SUrflets (requires SSAX)" "<yes/no>" #t #t #t
(install-directory "web-server" 'misc-shared) ,parse-boolean ,show-boolean)))
(install-directory-contents "doc" 'doc) (let ((surflets? (get-option-value 'with-surflets)))
(install-directory-contents "scheme" 'scheme)
(install-directory "web-server" 'misc-shared)
(install-file "start-web-server" 'misc-shared "web-server")
(install-file "start-extended-web-server" 'misc-shared "web-server")
(if surflets?
(install-file "start-surflet-server" 'misc-shared "web-server"))
(install-directory-contents "doc" 'doc)
(let ((doc-dir (get-directory 'doc #t)) (let ((doc-dir (get-directory 'doc #t))
(misc-shared-dir (get-directory 'misc-shared #t))) (misc-shared-dir (get-directory 'misc-shared #t)))
(create-symlink (string-append doc-dir "/html") (create-symlink (string-append doc-dir "/html")
(string-append misc-shared-dir "/web-server/root/htdocs/sunet-manual"))) (string-append misc-shared-dir
"/web-server/root/htdocs/sunet-manual")))
(let ((scheme-dir (get-directory 'scheme #t))) (let ((scheme-dir (get-directory 'scheme #t)))
(write-to-load-script (write-to-load-script
`((user) `((user)
(config) (config)
(load ,(string-append scheme-dir "/packages.scm")) (load ,(string-append scheme-dir "/packages.scm"))
(user)))) ,@(if surflets?
`((load ,(string-append scheme-dir "/httpd/surflets/packages.scm")))
'())
(user)))))
) )

4
start-extended-web-server
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
echo "Loading..." echo "Loading..."
exec scsh +lpsd -ll packages.scm -dm -o http-test -e main -s "$0" "$@" exec scsh -lel sunet-2.1/load.scm -dm -o http-test -e main -s "$0" "$@"
!# !#
(define-structure http-test (define-structure http-test
@ -160,4 +160,4 @@ exec scsh +lpsd -ll packages.scm -dm -o http-test -e main -s "$0" "$@"
;;; Local Variables: ;;; Local Variables:
;;; mode:scheme ;;; mode:scheme
;;; End: ;;; End:

7
start-surflet-server
View File

@ -1,12 +1,7 @@
#!/bin/sh #!/bin/sh
echo "Loading..." echo "Loading..."
# $sunetscheme is either $SUNET/scheme or $PWD/scheme
# Kind of a hack, I know. We're still waiting for this library
#installing system.
sunetscheme=${SUNET:-$PWD}/scheme
ssaxhome=${SSAX:-../SSAX} # path to SSAX
exec scsh -lm $sunetscheme/packages.scm -lm $ssaxhome/lib/packages.scm -lm $sunetscheme/httpd/surflets/packages.scm -dm -o surflet-server -e main -s "$0" "$@" exec scsh -lel sunet-2.1/load.scm -lel ssax/load.scm -dm -o surflet-server -e main -s "$0" "$@"
!# !#
(define-structure surflet-server (define-structure surflet-server

4
start-web-server
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
echo "Loading..." echo "Loading..."
exec scsh +lpsd -ll packages.scm -dm -o http-test -e main -s "$0" "$@" exec scsh -lel sunet-2.1/load.scm -dm -o http-test -e main -s "$0" "$@"
!# !#
(define-structure http-test (define-structure http-test
@ -137,4 +137,4 @@ exec scsh +lpsd -ll packages.scm -dm -o http-test -e main -s "$0" "$@"
;;; Local Variables: ;;; Local Variables:
;;; mode:scheme ;;; mode:scheme
;;; End: ;;; End: