~ chicken-core (chicken-5) c1d42682b8d19e9a66f08c0679ef167ab54bb0b1
commit c1d42682b8d19e9a66f08c0679ef167ab54bb0b1
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Nov 15 16:34:56 2016 +0100
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Tue Nov 15 16:34:56 2016 +0100
dropped deployment
diff --git a/chicken-install.mdoc b/chicken-install.mdoc
index eba97ed9..5ef99d91 100644
--- a/chicken-install.mdoc
+++ b/chicken-install.mdoc
@@ -98,8 +98,6 @@ initialize empty alternative repository
update export database
.It Fl repository
print path used for egg installation
-.It Fl deploy
-build extensions for deployment
.It Fl trunk
build trunk instead of tagged version
.Pq only local
diff --git a/csc.mdoc b/csc.mdoc
index f02d192b..52e26b58 100644
--- a/csc.mdoc
+++ b/csc.mdoc
@@ -234,8 +234,6 @@ link extension with compiled executable
require extension and import in compiled code
.It Fl dll, Fl library
compile multiple units into a dynamic library
-.It Fl deploy
-deploy self-contained application bundle
.El
.Pp
Options to other passes:
diff --git a/csc.scm b/csc.scm
index 54b57dde..e976e888 100644
--- a/csc.scm
+++ b/csc.scm
@@ -213,7 +213,6 @@
(define show-libs #f)
(define dry-run #f)
(define gui #f)
-(define deploy #f)
(define deployed #f)
(define rpath #f)
(define ignore-repository #f)
@@ -468,7 +467,6 @@ Usage: #{csc} FILENAME | OPTION ...
code
-dll -library compile multiple units into a dynamic
library
- -deploy deploy self-contained application bundle
Options to other passes:
@@ -601,8 +599,6 @@ EOF
(pathname-replace-extension (first scheme-files) shared-library-extension)
(pathname-replace-extension (first scheme-files) executable-extension) ) ) )
(run-translation) ] )
- (when (and deploy (not shared))
- (use-private-repository))
(unless translate-only
(run-compilation)
(unless compile-only
@@ -708,9 +704,6 @@ EOF
(set! link-options
(cons* "-lkernel32" "-luser32" "-lgdi32" "-mwindows"
link-options)))]
- ((-deploy)
- (set! deploy #t)
- (set! deployed #t))
((-deployed)
(set! deployed #t))
[(-framework)
@@ -954,23 +947,6 @@ EOF
(let* ((files (map quotewrap object-files))
(target (quotewrap target-filename))
(targetdir #f))
- (when deploy
- (set! targetdir (pathname-strip-extension target-filename))
- (when (and osx gui)
- (set! targetdir (make-pathname #f targetdir "app"))
- (command (sprintf "mkdir -p ~a" (quotewrap (make-pathname targetdir "Contents/MacOS"))))
- (command (sprintf "mkdir -p ~a" (quotewrap (make-pathname targetdir "Contents/Resources")))))
- (set! target-filename
- (make-pathname
- targetdir
- (if (and osx gui)
- (string-append "Contents/MacOS/" (pathname-file target-filename))
- (pathname-file target-filename))))
- (set! target (quotewrap target-filename))
- (unless (directory-exists? targetdir)
- (when verbose
- (print "mkdir " targetdir))
- (create-directory targetdir)))
(command
(string-intersperse
(cons* (cond (cpp-mode c++-linker)
@@ -993,17 +969,8 @@ EOF
lib))))
" "
target) )
- (when (and gui (not deploy))
+ (when gui
(rez target)))
- (when (and deploy (not (or static static-libs)))
- (copy-libraries
- (if (and osx gui)
- (make-pathname targetdir "Contents/MacOS")
- targetdir))
- (when (and osx gui)
- (create-mac-bundle
- (pathname-file target-filename)
- targetdir)))
(unless keep-files (for-each $delete-file generated-object-files)) ) )
(define (lib-path)
@@ -1022,17 +989,6 @@ EOF
tdir
(lib-path)))))
-(define (copy-libraries targetdir)
- (let ((lib (make-pathname
- (target-lib-path)
- dynamic-libchicken
- (cond (osx "dylib")
- ((or mingw cygwin) "dll")
- (else (string-append
- "so."
- (number->string BINARY_VERSION)))))))
- (copy-files lib targetdir)))
-
(define (copy-files from to)
(command
(sprintf "~a ~a ~a"
@@ -1130,40 +1086,6 @@ EOF
(quotewrap file)
(quotewrap (make-pathname home "mac.r")))))
-(define (create-mac-bundle prg dname)
- (let* ((d0 (make-pathname dname "Contents"))
- (d (make-pathname dname "Contents/MacOS"))
- (d2 (make-pathname dname "Contents/Resources")))
- (let ((icons (make-pathname d2 "CHICKEN.icns")))
- (unless (file-exists? icons)
- (copy-files
- (make-pathname home "chicken/CHICKEN.icns")
- d2)))
- (let ((pl (make-pathname d0 "Info.plist")))
- (unless (file-exists? pl)
- (when verbose (print "generating " pl))
- (with-output-to-file pl
- (cut print #<#EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleIconFile</key>
- <string>CHICKEN.icns</string>
- <key>CFBundleGetInfoString</key>
- <string>Created by CHICKEN</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleExecutable</key>
- <string>#{prg}</string>
-</dict>
-</plist>
-EOF
-)))
- d)))
-
(define (create-win-manifest prg rcfname)
(when verbose (print "generating " rcfname))
(with-output-to-file rcfname
diff --git a/manual/Extensions b/manual/Extensions
index 79b5e9cd..ffe5a5ad 100644
--- a/manual/Extensions
+++ b/manual/Extensions
@@ -569,7 +569,6 @@ Available options:
; {{-i -init DIRECTORY}} : initialize empty alternative repository
; {{-u -update-db}} : update export database
; {{-repository}} : print path to extension repository
-; {{-deploy}} : install extension in the application directory for a deployed application (see [[Deployment]] for more information)
; {{-trunk}} : build trunk instead of tagged version (only local)
; {{-D -feature FEATURE}} : pass this on to subinvocations of {{csi}} and {{csc}} (when done via {{compile}} or {{(run (csc ...))}})
; {{-debug}} : print full call-trace when encountering errors in the setup script
@@ -590,7 +589,6 @@ Available options:
; {{-force}} : don't ask, delete whatever matches
; {{-s -sudo}} : use external command to elevate privileges for deleting files
; {{-p -prefix PREFIX}} : change installation prefix to {{PREFIX}}
-; {{-deploy}} : uninstall extension from the application directory for a deployed application (see [[Deployment]] for more information)
; {{-host}} : when cross-compiling, remove extensions for host system only
; {{-target}} : when cross-compiling, remove extensions for target system only
; {{-exact}} : match extension-name exactly (do not match as pattern)
@@ -603,7 +601,6 @@ Available options:
; {{-host}} : when cross-compiling, show extensions for host system only
; {{-target}} : when cross-compiling, show extensions for target system only
; {{-p -prefix PREFIX}} : change installation prefix to {{PREFIX}}
-; {{-deploy}} : look for extensions in the application directory for a deployed application (see [[Deployment]] for more information)
; {{-exact}} : match extension-name exactly (do not match as pattern)
; {{-list}} : list installed egg version in format suitable for {{chicken-install -override}}
diff --git a/manual/Getting started b/manual/Getting started
index eed44026..83872cf1 100644
--- a/manual/Getting started
+++ b/manual/Getting started
@@ -120,7 +120,7 @@ Some of the features supported by CHICKEN:
* Compiled C files can be easily distributed
* Allows the creation of fully self-contained statically linked executables
* On systems that support it, compiled code can be loaded dynamically
-* Built-in support for cross-compilation and deployment
+* Built-in support for cross-compilation
CHICKEN has been used in many environments ranging from embedded
systems through desktop machines to large-scale server deployments.
diff --git a/tests/runtests.bat b/tests/runtests.bat
index 888c71a6..469003ab 100644
--- a/tests/runtests.bat
+++ b/tests/runtests.bat
@@ -602,7 +602,4 @@ del /f /q /s rev-app rev-app-2 reverser\*.import.* reverser\*.so
rem echo ======================================== reinstall tests
rem currently disabled for windows
-rem echo ======================================== deployment tests
-rem currently disabled for windows
-
echo ======================================== done.
diff --git a/tests/runtests.sh b/tests/runtests.sh
index 62667156..915a9201 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -508,22 +508,4 @@ CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
-reinstall -force -csi ${TEST_DIR}/../csi
CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY $interpret -bnq rev-app.scm 1.0
-if test $OS_NAME != AIX -a $OS_NAME != SunOS -a $OS_NAME != GNU; then
- echo "======================================== deployment tests"
- mkdir rev-app
- TARGET_LIB_PATH=${TEST_DIR}/.. CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
- CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -csi ${TEST_DIR}/../csi -t local -l $TEST_DIR reverser
- TARGET_LIB_PATH=${TEST_DIR}/.. CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
- CSI_OPTIONS=$SETUP_PREFIX $compile2 -deploy rev-app.scm
- TARGET_LIB_PATH=${TEST_DIR}/.. CHICKEN_REPOSITORY=$CHICKEN_REPOSITORY CSC_OPTIONS=$COMPILE_OPTIONS \
- CSI_OPTIONS=$SETUP_PREFIX $CHICKEN_INSTALL -csi ${TEST_DIR}/../csi -deploy -prefix rev-app -t local -l $TEST_DIR reverser
- unset LD_LIBRARY_PATH DYLD_LIBRARY_PATH CHICKEN_REPOSITORY
- # An absolute path is required on NetBSD with $ORIGIN, hence `pwd`
- `pwd`/rev-app/rev-app 1.1
- mv rev-app rev-app-2
- `pwd`/rev-app-2/rev-app 1.1
-else
- echo "Skipping deployment tests: deployment is currently unsupported on your platform."
-fi
-
echo "======================================== done."
Trap