* Removed the finish-install collection, and the PLT/install scripts
* Made `make install' do the setup-plt thing svn: r2788
This commit is contained in:
Eli Barzilay
parent
c34c4e7abe
commit
a62fbc824f
|
|
@ -1,7 +0,0 @@
|
|||
|
||||
Finish Install is for Mac OS X and Windows.
|
||||
|
||||
The launcher (which does not embed a path to the original executable) runs the
|
||||
"install" script in the same directory as the launcher. The collection itself
|
||||
is used only to create the launcher, which does not depend on the collection so
|
||||
it is not included in the distribution.
|
||||
|
|
@ -1 +0,0 @@
|
|||
#Fn#
|
||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
|||
;; This file is never used
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
(module info (lib "infotab.ss" "setup")
|
||||
(define name "Finish Install")
|
||||
(define compile-omit-files '("finish-install.ss" "make.ss"))
|
||||
(define doc.txt "doc.txt"))
|
||||
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/sh
|
||||
#|
|
||||
exec mzscheme -mvt "$0" "$@"
|
||||
|#
|
||||
|
||||
(module make mzscheme
|
||||
(require (lib "launcher.ss" "launcher"))
|
||||
|
||||
(define tiny-program
|
||||
'(begin (use-compiled-file-paths '())
|
||||
(current-directory (build-path (collection-path "mzlib") 'up 'up))
|
||||
(load "install")
|
||||
(main '("install" "-i"))))
|
||||
(make-mred-launcher
|
||||
`("-mvq" "-e" ,(format "~s" tiny-program))
|
||||
(mred-program-launcher-path "Finish Install")
|
||||
(cons
|
||||
'(forget-exe? . #t)
|
||||
(build-aux-from-path
|
||||
(build-path (collection-path "finish-install") "finish-install")))))
|
||||
271
install
271
install
|
|
@ -1,271 +0,0 @@
|
|||
#!/bin/sh
|
||||
#| -*- scheme -*-
|
||||
# PLT software installer
|
||||
# ----------------------
|
||||
# Normally it'll use MzScheme (will search for it at the same place this script
|
||||
# is), but it can also be used with mred for graphic installations.
|
||||
# Run with `-h' for more information.
|
||||
|
||||
# Try to find where mzscheme is, usually where this script is being run from
|
||||
if [ -x install -a -d collects ]; then
|
||||
pltdir="."
|
||||
else
|
||||
# Try finding the installation directory...
|
||||
if [ -x "/bin/dirname" ]; then
|
||||
pltdir="`/bin/dirname \"$0\"`"
|
||||
elif [ -x "/usr/bin/dirname" ]; then
|
||||
pltdir="`/usr/bin/dirname \"$0\"`"
|
||||
else
|
||||
dirname="`which dirname`"
|
||||
if [ ! -z "$dirname" ]; then
|
||||
pltdir="$dirname"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -x "$pltdir/bin/mzscheme" ]; then
|
||||
mz="$pltdir/bin/mzscheme"
|
||||
elif [ -e "$pltdir/MzScheme.exe" ]; then
|
||||
# Note: with cygwin, `-x' doesn't work properly
|
||||
mz="$pltdir/MzScheme.exe"
|
||||
else
|
||||
echo "install: cannot find the mzscheme executable"
|
||||
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
||||
echo "!! Install incomplete! !!"
|
||||
echo "!! !!"
|
||||
echo "!! If you downloaded the source distribution, see !!"
|
||||
echo "!! src/README for build instructions. !!"
|
||||
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# mzscheme may be using shared libraries but in a standard place yet
|
||||
LD_LIBRARY_PATH="$pltdir/lib:$LD_LIBRARY_PATH"
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
exec "$mz" -qC "$0" "$@"
|
||||
|
||||
exit 1
|
||||
|#
|
||||
|
||||
(use-compiled-file-paths null)
|
||||
|
||||
(define plthome #f)
|
||||
(define this-script #f)
|
||||
(define install-mode? #f)
|
||||
|
||||
(when (or (getenv "OSX_PLT_INSTALL") (getenv "RPM_INSTALL_PREFIX"))
|
||||
(set! install-mode? #t))
|
||||
|
||||
(define (set-plthome this)
|
||||
(let-values ([(dir name dir?)
|
||||
(split-path
|
||||
(resolve-path
|
||||
(path->complete-path (simplify-path (resolve-path this)))))])
|
||||
(unless (path? dir) (error 'install "Bad pathname for install: ~s" this))
|
||||
(current-directory dir)
|
||||
(current-directory ".") ; avoid a "/" suffix
|
||||
(set! plthome (current-directory))
|
||||
(unless (and (directory-exists? "collects/mzlib") (file-exists? name))
|
||||
(error 'install
|
||||
"Can't find the PLT installation this script (~a) is part of"
|
||||
this))
|
||||
(set! this-script (path->string name))))
|
||||
|
||||
(define (setup-environment)
|
||||
(putenv "PLTHOME" (path->string plthome))
|
||||
(putenv "PLTCOLLECTS" "")
|
||||
(current-library-collection-paths (list (build-path plthome "collects"))))
|
||||
|
||||
(require (lib "cmdline.ss"))
|
||||
(define setup-flags (make-parameter '()))
|
||||
(define (process-command-line args)
|
||||
(define more-help
|
||||
(lambda (help)
|
||||
(display "This is the PLT installer.\nUsage: ")
|
||||
(display help)
|
||||
(exit 0)))
|
||||
(command-line this-script (list->vector args)
|
||||
(once-each
|
||||
(("-i")
|
||||
"Install mode.\n\
|
||||
This is a `one-time option' that is intended to be used with\n\
|
||||
installers or after retrieving a fresh plt tree. This will re-use\n\
|
||||
existing zos (making only missing ones), and recreate the launchers.\n\
|
||||
Also, use this if you move the PLT installation to a different place."
|
||||
(set! install-mode? #t)))
|
||||
(help-labels
|
||||
"Additional arguments (after a \"--\" are passed on to setup-plt")
|
||||
(=> (lambda (f . _) (setup-flags _))
|
||||
'("setup-flags")
|
||||
more-help)))
|
||||
|
||||
(define (tell title prompt)
|
||||
(printf ">>> ~a <<<\n~a\n[enter to continue]" title prompt)
|
||||
(flush-output)
|
||||
(read-line (current-input-port) 'any))
|
||||
|
||||
;; Set up GUI if we're using MrEd
|
||||
(define gui? (namespace-variable-value 'make-eventspace #t (lambda () #f)))
|
||||
(define error-message "INSTALLATION FAILED") ; used only for the GUI
|
||||
(when gui?
|
||||
;; no console input
|
||||
(current-input-port (open-input-string ""))
|
||||
(let ([evt (make-eventspace)] [orig-exit (exit-handler)])
|
||||
(parameterize ([current-eventspace evt])
|
||||
(define (do-callback thunk)
|
||||
(parameterize ([current-eventspace evt]) (queue-callback thunk #f)))
|
||||
(define (quit)
|
||||
(when (eq? 'ok (message-box "Stop Installation"
|
||||
"Ok to stop the installation?"
|
||||
f '(ok-cancel)))
|
||||
(exit 1)))
|
||||
(define (done msg exit-code)
|
||||
(do-callback
|
||||
(lambda ()
|
||||
(send e lock #f)
|
||||
(let* ([p1 (send e last-position)]
|
||||
[_ (send e insert msg p1)]
|
||||
[p2 (send e last-position)])
|
||||
(send e insert "\n(click button below to exit)" p2)
|
||||
(send e change-style
|
||||
(let ([d (make-object style-delta% 'change-bold)])
|
||||
(send d set-delta-foreground "red")
|
||||
d)
|
||||
p1 p2))
|
||||
(send e lock #t)
|
||||
(send b set-label "Quit Installation")
|
||||
(set! quit (lambda () (orig-exit exit-code)))))
|
||||
(semaphore-wait (make-semaphore)))
|
||||
(define f (make-object
|
||||
(class frame% ()
|
||||
(define/augment (can-close?) (quit) #f)
|
||||
(super-instantiate ("PLT Installer" #f 600 450)))))
|
||||
(define e (make-object text%))
|
||||
(define c (make-object editor-canvas% f e '(no-hscroll)))
|
||||
(define b (make-object button% "Stop Installation" f (lambda _ (quit))))
|
||||
(send c allow-tab-exit #t)
|
||||
(send e lock #t)
|
||||
(send e auto-wrap #t)
|
||||
(set! tell (lambda (title prompt) (message-box title prompt f)))
|
||||
(let ([out (make-output-port 'gui-output
|
||||
always-evt
|
||||
(lambda (bstring start end flush? breaks?)
|
||||
(do-callback (lambda ()
|
||||
(send e lock #f)
|
||||
(send e insert
|
||||
(bytes->string/utf-8
|
||||
(subbytes bstring start end))
|
||||
(send e last-position))
|
||||
(send e lock #t)))
|
||||
(- end start))
|
||||
void)])
|
||||
(current-output-port out)
|
||||
(current-error-port out))
|
||||
(send f center 'both)
|
||||
(send f show #t)
|
||||
(exit-handler
|
||||
(lambda (v)
|
||||
;; can use an explicit (exit 0) to show the output
|
||||
(done (if (zero? v) "Done" error-message) v)))
|
||||
(current-exception-handler
|
||||
(lambda (e)
|
||||
(if (exn:break? e)
|
||||
(orig-exit 1) ; don't lock up if the process is killed
|
||||
(done (format "~a: ~a"
|
||||
error-message (if (exn? e) (exn-message e) e))
|
||||
1))))
|
||||
(initial-exception-handler (current-exception-handler)))))
|
||||
|
||||
(define (check-version)
|
||||
(printf "Checking version...") (flush-output)
|
||||
(let ([r ((dynamic-require '(lib "check.ss" "version") 'check-version))])
|
||||
(if (eq? 'ok r)
|
||||
(printf " ok.\n")
|
||||
(case (and (pair? r) (car r))
|
||||
[(error)
|
||||
(printf " skipping due to error: ~a\n" (cadr r))
|
||||
(sleep 1)]
|
||||
[(ok-but)
|
||||
(printf " ok\n (note that there is a newer alpha version: ~a)"
|
||||
(cadr r))
|
||||
(sleep 2)]
|
||||
[(newer)
|
||||
(newline)
|
||||
(tell "Outdated Version"
|
||||
(string-append
|
||||
"The version you are installing is outdated,\n"
|
||||
"PLT v"(cadr r)" is now available from plt-scheme.org\n"
|
||||
(if (null? (cddr r))
|
||||
"" "(There is also an even newer alpha version)\n")))]
|
||||
[else (error 'check-version "internal error: ~e" r)]))))
|
||||
|
||||
(define (create-zos)
|
||||
(let/ec return
|
||||
(parameterize
|
||||
(;; Need a new namespace to ensure that all modules are compiled,
|
||||
;; including ones we've already loaded. We also need to re-enable
|
||||
;; compiled files, since cm.ss checks on that flag.
|
||||
[current-namespace (make-namespace)]
|
||||
[use-compiled-file-paths '("compiled")]
|
||||
[current-command-line-arguments
|
||||
(list->vector
|
||||
(append (if install-mode? '("-n" "--trust-zos" "--no-install") '())
|
||||
(setup-flags)))]
|
||||
;; setup will use `exit' when done, so catch these, and stop if
|
||||
;; non-zero
|
||||
[exit-handler
|
||||
(lambda (n)
|
||||
(if (zero? n)
|
||||
(return)
|
||||
(error 'install "Errors in compilation process! (~a)" n)))]
|
||||
;; also, protect `current-directory' since it will change
|
||||
[current-directory (current-directory)])
|
||||
(printf "Running setup...\n")
|
||||
(dynamic-require '(lib "setup.ss" "setup") #f))))
|
||||
|
||||
(define oldrun-plthome #f)
|
||||
;; This will change the `oldrun-plthome' definition in this file.
|
||||
(define (remember-this-path!)
|
||||
(let* ([in (open-input-file this-script)]
|
||||
[lines (let loop ([r '()])
|
||||
(let ([l (read-line in)])
|
||||
(if (eof-object? l)
|
||||
(reverse! r)
|
||||
(loop (cons l r)))))])
|
||||
(close-input-port in)
|
||||
(let ([out (open-output-file this-script 'truncate)]
|
||||
[oldrun-expr (format "~s" `(define oldrun-plthome
|
||||
,(path->string plthome)))]
|
||||
[oldrun-re "^ *\\(define oldrun-plthome .*\\) *$"])
|
||||
(for-each (lambda (l)
|
||||
(display (if (regexp-match oldrun-re l) oldrun-expr l) out)
|
||||
(newline out))
|
||||
lines))))
|
||||
|
||||
(define (main args)
|
||||
(set-plthome (car args))
|
||||
(when (regexp-match #rx"^[Ff]inish.[Ii]nstall($|\\.)" this-script)
|
||||
(set! install-mode? #t))
|
||||
(setup-environment)
|
||||
(process-command-line (cdr args))
|
||||
(when (and install-mode? (equal? (path->string plthome) oldrun-plthome))
|
||||
(for-each
|
||||
(lambda (x) (display x (current-error-port)))
|
||||
`("Run this again only when the PLT installation directory was moved.\n"
|
||||
"For normal installation tasks, use "
|
||||
,(if (eq? 'unix (system-type)) "bin/setup-plt" "Setup PLT")
|
||||
" instead.\n"))
|
||||
(set! error-message "No installation needed")
|
||||
(exit 1))
|
||||
(when install-mode? (check-version))
|
||||
(create-zos)
|
||||
(display "PLT installation done.\n")
|
||||
(cond [(not install-mode?)
|
||||
(when (file-exists? "bin/drscheme")
|
||||
(for-each display '("\nRun DrScheme as bin/drscheme.\nFor Help, "
|
||||
"select `Help Desk' from DrScheme's `Help' "
|
||||
"menu,\nor run bin/help-desk.\n")))
|
||||
;; if we're using GUI, and not in install mode, don't close the window
|
||||
(exit 0)]
|
||||
[this-script (when (file-exists? this-script) (remember-this-path!))]))
|
||||
50
install.bat
50
install.bat
|
|
@ -1,50 +0,0 @@
|
|||
@echo off
|
||||
|
||||
set PLTDIR=
|
||||
|
||||
if not "%OS%"=="Windows_NT" goto NoDPHack
|
||||
rem On Windows NT %~dp0 is expanded dir+path of %0
|
||||
set PLTDIR=%~dp0
|
||||
if not "%PLTDIR%"=="" goto FoundPLTDIR
|
||||
|
||||
:NoDPHack
|
||||
rem %~dp0 didn't work -- try to hack into our own directory
|
||||
cd "%0\.."
|
||||
if not exist "install" goto NoPathFound
|
||||
set PLTDIR=.
|
||||
goto FoundPLTDIR
|
||||
|
||||
:NoPathFound
|
||||
echo Cannot guess where this batch file is running from,
|
||||
echo Try to run it again from its own directory.
|
||||
pause
|
||||
goto done
|
||||
|
||||
:FoundPLTDir
|
||||
cd %PLTDIR%
|
||||
|
||||
rem Look for MrEd.exe
|
||||
if exist "%PLTDIR%\MrEd.exe" goto MrFound
|
||||
if exist "%PLTDIR%\MzScheme.exe" goto MzFound
|
||||
echo Could not find %PLTDIR%\MzScheme.exe or %PLTDIR%\MrEd.exe, abort.
|
||||
pause
|
||||
goto done
|
||||
:MrFound
|
||||
set MZMR=MrEd.exe
|
||||
goto exeFound
|
||||
:MzFound
|
||||
set MZMR=MzScheme.exe
|
||||
goto exeFound
|
||||
|
||||
:exeFound
|
||||
rem look for install
|
||||
if exist "%PLTDIR%\install" goto installFound
|
||||
echo %PLTDIR%\install not found, abort.
|
||||
pause
|
||||
goto done
|
||||
|
||||
:installFound
|
||||
echo Running %PLTDIR%\%MZMR%
|
||||
"%PLTDIR%\%MZMR%" -qC "%PLTDIR%\install" -i
|
||||
|
||||
:done
|
||||
|
|
@ -17,7 +17,7 @@ mred3m-stub: @MAKE_MRED3M@
|
|||
|
||||
install:
|
||||
$(MAKE) install-normal
|
||||
$(MAKE) finish-stub
|
||||
$(MAKE) setup-plt
|
||||
|
||||
install-normal:
|
||||
if [ ! -d $(prefix) ] ; then mkdir $(prefix) ; fi
|
||||
|
|
@ -30,16 +30,16 @@ copytree-stub: @MAKE_COPYTREE@
|
|||
|
||||
mredinstall-stub: @MAKE_MREDINSTALL@
|
||||
|
||||
finish-stub: @MAKE_FINISH@
|
||||
|
||||
setup-plt:
|
||||
$(BINDIR)/mzscheme -qM setup
|
||||
|
||||
install-3m:
|
||||
$(MAKE) install-normal
|
||||
$(MAKE) mzinstall3m
|
||||
$(MAKE) mredinstall3m-stub
|
||||
$(MAKE) finish-stub
|
||||
$(MAKE) setup-plt
|
||||
|
||||
mredinstall3m-stub: @MAKE_MREDINSTALL3M@
|
||||
mredinstall3m-stub: @MAKE_MREDINSTALL3M@
|
||||
|
||||
|
||||
clean:
|
||||
|
|
|
|||
|
|
@ -123,7 +123,6 @@ fi
|
|||
|
||||
if test "${prefix}" = "NONE" ; then
|
||||
prefix=`cd "${srcdir}/.." && pwd`
|
||||
MAKE_FINISH=inplace-finish
|
||||
else
|
||||
# Check whether ${prefix} is redundant, because
|
||||
# $prefix/src is $srcdir.
|
||||
|
|
@ -140,7 +139,6 @@ else
|
|||
echo "----> ${prefix}/man/..."
|
||||
echo "----> ${prefix}/notes/..."
|
||||
MAKE_COPYTREE=copytree
|
||||
MAKE_FINISH=copy-finish
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -1109,7 +1107,6 @@ AC_SUBST(MAKE_MREDINSTALL)
|
|||
AC_SUBST(MAKE_MREDINSTALL3M)
|
||||
AC_SUBST(MAKE_WBUILD)
|
||||
AC_SUBST(MAKE_COPYTREE)
|
||||
AC_SUBST(MAKE_FINISH)
|
||||
|
||||
AC_SUBST(WXPRECOMP)
|
||||
AC_SUBST(USE_WXPRECOMP)
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
|
||||
----------------------------------------------------
|
||||
>> run plt/install or plt/bin/setup-plt to finish <<
|
||||
----------------------------------------------------
|
||||
Loading…
Reference in New Issue
Block a user