- Timestamp:
- 01/07/09 23:51:40 (11 years ago)
- Location:
- chicken/trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
chicken/trunk/Makefile.mingw
r12937 r12956 128 128 echo /* generated */ >$@ 129 129 echo #define C_BUILD_TAG "$(BUILD_TAG)" >>$@ 130 echo #define C_CHICKEN_PROGRAM "chicken.exe" >>$@ 131 echo #define C_WINDOWS_SHELL 1 >>$@ 130 132 echo #ifndef C_INSTALL_CC >>$@ 131 133 echo # define C_INSTALL_CC "$(C_COMPILER)" >>$@ … … 167 169 echo # define C_DEFAULT_TARGET_STACK_SIZE $(NURSERY) >>$@ 168 170 echo #endif >>$@ 171 echo #ifndef C_DEFAULT_TARGET_HEAP_SIZE >>$@ 172 echo # define C_DEFAULT_TARGET_HEAP_SIZE 0 >>$@ 173 echo #endif >>$@ 169 174 echo #ifndef C_STACK_GROWS_DOWNWARD >>$@ 170 175 echo # define C_STACK_GROWS_DOWNWARD $(STACKDIRECTION) >>$@ … … 191 196 echo # define C_CROSS_CHICKEN $(CROSS_CHICKEN) >>$@ 192 197 echo #endif >>$@ 198 echo #ifndef C_TARGET_BIN_HOME >>$@ 199 echo # define C_TARGET_BIN_HOME "$(TARGET_PREFIX)/bin" >>$@ 200 echo #endif >>$@ 193 201 echo #ifndef C_TARGET_LIB_HOME >>$@ 194 202 echo # define C_TARGET_LIB_HOME "$(TARGET_PREFIX)/lib" >>$@ … … 206 214 echo # define C_TARGET_STATIC_LIB_HOME "$(TARGET_PREFIX)/lib" >>$@ 207 215 echo #endif >>$@ 216 echo #ifndef C_CSC_PROGRAM" >>$@ 217 echo # define C_CSC_PROGRAM "$(CSC_PROGRAM)" >>$@ 218 echo #endif" >>$@ 219 echo #ifndef C_CSI_PROGRAM" >>$@ 220 echo # define C_CSI_PROGRAM "$(CSI_PROGRAM)" >>$@ 221 echo #endif" >>$@ 222 echo #ifndef C_CHICKEN_BUG_PROGRAM" >>$@ 223 echo # define C_CHICKEN_BUG_PROGRAM "$(CHICKEN_BUG_PROGRAM)" >>$@ 224 echo #endif" >>$@ 208 225 echo #ifndef C_BINARY_VERSION >>$@ 209 226 echo # define C_BINARY_VERSION $(BINARYVERSION) >>$@ -
chicken/trunk/chicken-bug.scm
r12937 r12956 26 26 27 27 (require-extension srfi-13 posix tcp data-structures utils extras) 28 29 30 #>31 #ifndef C_TARGET_CC32 # define C_TARGET_CC C_INSTALL_CC33 #endif34 35 #ifndef C_TARGET_CXX36 # define C_TARGET_CXX C_INSTALL_CXX37 #endif38 <#39 28 40 29 -
chicken/trunk/chicken-install.scm
r12934 r12956 28 28 (require-library srfi-1 posix data-structures utils ports regex ports extras 29 29 srfi-13 files) 30 31 32 (foreign-declare #<<EOF33 #ifndef C_INSTALL_BIN_HOME34 # define C_INSTALL_BIN_HOME NULL35 #endif36 EOF37 )38 30 39 31 … … 89 81 (define *default-location* #f) 90 82 (define *default-transport* 'http) 83 (define *windows-shell* (foreign-value "C_WINDOWS_SHELL" bool)) 91 84 92 85 (define-constant +module-db+ "modules.db") … … 107 100 (define (init-repository dir) 108 101 (let ((src (repository-path)) 109 (copy (if (or (feature? 'mingw32) (feature? 'msvc))102 (copy (if *windows-shell* 110 103 "copy" 111 104 "cp -r"))) … … 113 106 (for-each 114 107 (lambda (f) 115 ( system* "~a ~a ~a" copy (make-pathname src f) dir))108 ($system (sprintf "~a ~a ~a" copy (shellpath (make-pathname src f)) (shellpath dir)))) 116 109 +default-repository-files+))) 117 110 118 111 (define (ext-version x) 119 112 (cond ((or (eq? x 'chicken) … … 285 278 (shellpath (make-pathname (cdr e+d) (car e+d) "setup"))))) 286 279 (print " " cmd) 287 ( system* "~a" cmd)280 ($system cmd)) 288 281 (when (and *run-tests* 289 282 (file-exists? "tests") … … 293 286 (let ((cmd (sprintf "~a -s run.scm ~a" *csi* (car e+d)))) 294 287 (print " " cmd) 295 ( system* "~a" cmd))))) )288 ($system cmd))))) 296 289 *eggs+dirs*))) 297 290 … … 334 327 (remove-directory tmpdir)))) 335 328 329 (define ($system str) 330 (let ((r (system 331 (if *windows-shell* 332 (string-append "\"" str "\"") 333 str)))) 334 (unless (zero? r) 335 (error "shell command terminated with nonzero exit code" r str)))) 336 336 337 (define (usage code) 337 338 (print #<<EOF -
chicken/trunk/compiler.scm
r12948 r12956 252 252 (unit compiler) 253 253 (disable-warning var) ) 254 255 #>256 #ifndef C_INSTALL_SHARE_HOME257 # define C_INSTALL_SHARE_HOME NULL258 #endif259 260 #ifndef C_DEFAULT_TARGET_STACK_SIZE261 # define C_DEFAULT_TARGET_STACK_SIZE 0262 #endif263 264 #ifndef C_DEFAULT_TARGET_HEAP_SIZE265 # define C_DEFAULT_TARGET_HEAP_SIZE 0266 #endif267 <#268 254 269 255 -
chicken/trunk/csc.scm
r12937 r12956 30 30 (uses data-structures ports srfi-1 srfi-13 utils files extras)) 31 31 32 #>33 #ifndef C_TARGET_CC34 # define C_TARGET_CC C_INSTALL_CC35 #endif36 37 #ifndef C_TARGET_CXX38 # define C_TARGET_CXX C_INSTALL_CXX39 #endif40 41 #ifndef C_TARGET_CFLAGS42 # define C_TARGET_CFLAGS C_INSTALL_CFLAGS43 #endif44 45 #ifndef C_TARGET_LDFLAGS46 # define C_TARGET_LDFLAGS C_INSTALL_LDFLAGS47 #endif48 49 #ifndef C_TARGET_BIN_HOME50 # define C_TARGET_BIN_HOME C_INSTALL_BIN_HOME51 #endif52 53 #ifndef C_TARGET_LIB_HOME54 # define C_TARGET_LIB_HOME C_INSTALL_LIB_HOME55 #endif56 57 #ifndef C_TARGET_STATIC_LIB_HOME58 # define C_TARGET_STATIC_LIB_HOME C_INSTALL_STATIC_LIB_HOME59 #endif60 61 #ifndef C_TARGET_INCLUDE_HOME62 # define C_TARGET_INCLUDE_HOME C_INSTALL_INCLUDE_HOME63 #endif64 65 #ifndef C_TARGET_SHARE_HOME66 # define C_TARGET_SHARE_HOME C_INSTALL_SHARE_HOME67 #endif68 69 #ifndef C_TARGET_RUN_LIB_HOME70 # define C_TARGET_RUN_LIB_HOME C_TARGET_LIB_HOME71 #endif72 73 #ifndef C_CHICKEN_PROGRAM74 # define C_CHICKEN_PROGRAM "chicken"75 #endif76 <#77 78 32 (define-foreign-variable INSTALL_BIN_HOME c-string "C_INSTALL_BIN_HOME") 79 33 (define-foreign-variable INSTALL_CC c-string "C_INSTALL_CC") … … 100 54 (define-foreign-variable TARGET_RUN_LIB_HOME c-string "C_TARGET_RUN_LIB_HOME") 101 55 (define-foreign-variable CHICKEN_PROGRAM c-string "C_CHICKEN_PROGRAM") 56 (define-foreign-variable WINDOWS_SHELL bool "C_WINDOWS_SHELL") 102 57 103 58 … … 151 106 (define default-translation-optimization-options '()) 152 107 (define pic-options (if (or mingw msvc) '("-DPIC") '("-fPIC" "-DPIC"))) 108 (define windows-shell WINDOWS_SHELL) 153 109 154 110 (define default-library (string-append … … 159 115 library-extension)) 160 116 161 (define cleanup-filename 162 (if (not mingw) 163 (lambda (s) (quotewrap s)) ; allow filenames w/ whitespace 164 (lambda (s) s))) 117 (define cleanup-filename quotewrap) 165 118 166 119 (define default-compilation-optimization-options (string-split (if host-mode INSTALL_CFLAGS TARGET_CFLAGS))) … … 919 872 (define ($system str) 920 873 (when verbose (print str)) 921 (set! last-exit-code 922 (if dry-run 923 0 924 (if (zero? (system str)) 925 0 926 1))) 927 (unless (zero? last-exit-code) 928 (printf "*** Shell command terminated with exit status ~S: ~A~%" last-exit-code str) ) 929 last-exit-code) 874 (let ((str (if windows-shell 875 (string-append "\"" str "\"") 876 str))) 877 (set! last-exit-code 878 (if dry-run 879 0 880 (system str))) 881 (unless (zero? last-exit-code) 882 (printf "Error: shell command terminated with non-zero exit status ~S: ~A~%" last-exit-code str) ) 883 last-exit-code)) 930 884 931 885 (define ($delete-file str) -
chicken/trunk/defaults.make
r12936 r12956 354 354 echo "/* generated */" >$@ 355 355 echo "#define C_BUILD_TAG \"$(BUILD_TAG)\"" >>$@ 356 echo "#define C_CHICKEN_PROGRAM \"chicken.exe\"" >>$@ 356 357 echo "#define C_SVN_REVISION $(shell cat buildsvnrevision)" >>$@ 357 358 echo "#ifndef C_INSTALL_CC" >>$@ … … 394 395 echo "# define C_DEFAULT_TARGET_STACK_SIZE $(NURSERY)" >>$@ 395 396 echo "#endif" >>$@ 397 echo "#ifndef C_DEFAULT_TARGET_HEAP_SIZE" >>$@ 398 echo "# define C_DEFAULT_TARGET_HEAP_SIZE 0" >>$@ 399 echo "#endif" >>$@ 396 400 echo "#ifndef C_STACK_GROWS_DOWNWARD" >>$@ 397 401 echo "# define C_STACK_GROWS_DOWNWARD $(STACKDIRECTION)" >>$@ … … 418 422 echo "# define C_CROSS_CHICKEN $(CROSS_CHICKEN)" >>$@ 419 423 echo "#endif" >>$@ 424 echo "#ifndef C_TARGET_BIN_HOME" >>$@ 425 echo "# define C_TARGET_BIN_HOME \"$(TARGET_PREFIX)/bin\"" >>$@ 426 echo "#endif" >>$@ 420 427 echo "#ifndef C_TARGET_LIB_HOME" >>$@ 421 428 echo "# define C_TARGET_LIB_HOME \"$(TARGET_PREFIX)/lib\"" >>$@ … … 445 452 echo "# define C_CHICKEN_BUG_PROGRAM \"$(CHICKEN_BUG_PROGRAM)\"" >>$@ 446 453 echo "#endif" >>$@ 454 echo "#ifndef C_WINDOWS_SHELL" >>$@ 455 ifdef WINDOWS_SHELL 456 echo "# define C_WINDOWS_SHELL 1" >>$@ 457 else 458 echo "# define C_WINDOWS_SHELL 0" >>$@ 459 endif 460 echo "#endif" >>$@ 447 461 echo "#ifndef C_BINARY_VERSION" >>$@ 448 462 echo "# define C_BINARY_VERSION $(BINARYVERSION)" >>$@ -
chicken/trunk/manual/Acknowledgements
r12949 r12956 13 13 Cuervo, Linh Dang, Brian Denheyer, dgym, Don, Chris Double, Brown 14 14 Dragon, Jarod Eells, Petter Egesund, Steve Elkins, Daniel B. Faken, 15 Will Farr, Graham Fawcett, Marc Feeley, Fizzie, Kimura Fuyuki, Tony16 Garnock-Jones, Martin Gasbichler, Joey Gibson, Stephen C. Gilardi, 17 Joshua Griffith, Johannes Groedem, Damian Gryski, Mario Domenech 18 Goulart, Andreas Gustafsson, Sven Hartrumpf, Jun-ichiro itojun Hagino, 19 Ahdi Hargo, Matthias Heiler, Karl M. Hegbloom, William P. Heinemann, 20 Bill Hoffman, Bruce Hoult, Hans Huebner, Markus Huelsmann, Goetz 21 Isenmann, Paulo Jabardo, Wietse Jacobs, David Janssens, Christian 22 Ja eger, Dale Jordan, Valentin Kamyshenko, Daishi Kato, Peter Keller,23 Brad Kind, Ron Kneusel, Matthias Koeppe, Krysztof Kowałczyk, 24 Andre Kuehne, Todd R. Kueny Sr, Goran Krampe, David Krentzlin, Ben 25 K urtz, Micky Latowicki, John Lenz, Kirill Lisovsky, Juergen Lorenz,26 Kon Lovett, Dennis Marti, Charles Martin, Bob McIsaac, Alain Mellan,27 Eric Merrit, Perry Metzger, Scott G. Miller, Mikael, Bruce Mitchener,28 Chris Moline, Eric E. Moore, Julian Morrison, Dan Muresan, Lars 29 Nilsson, Ian Oversby, o.t., Gene Pavlovsky, Levi Pearson, Nicolas 30 Pe lletier, Carlos Pita, Robin Lee Powell, Pupeno, Davide Puricelli,31 D oug Quale, Eric Raible, Ivan Raikov, Joel Reymont, Eric Rochester,32 Andreas Rottman, David Rush, Lars Rustemeier, Daniel Sadilek, Oskar 33 S chirmer, Burton Samograd, Reed Sheridan, Ronald Schroeder, Spencer34 Sch umann, Ivan Shcheklein, Alex Shinn, Ivan Shmakov, Shmul, Tony35 S idaway, Jeffrey B. Siegal, Andrey Sidorenko, Michele Simionato,36 Volker Stolz, Jon Strait, Dorai Sitaram, Robert Skeels, Jason 37 S onghurst, Clifford Stein, Sunnan, Zbigniew Szadkowski, Rick Taube,38 Nathan Thern, Mike Thomas, Minh Thu, Christian Tismer, Andre van 39 Tonder, John Tobey, Henrik Tramberend, Vladimir Tsichevsky, Neil van 40 Dyke, Sander Vesik, Jaques Vidrine, Panagiotis Vossos, Shawn Wagner, 41 Peter Wang, Ed Watkeys, Brad Watson, Thomas Weidner, Goeran Weinholt, 42 Matthew Welland, Drake Wilson, Joerg Wittenberger, Peter Wright, Mark 43 W utka, Richard Zidlicky and Houman Zolfaghari for bug-fixes, tips and44 suggestions.15 Will Farr, Graham Fawcett, Marc Feeley, Fizzie, Matthew Flatt, Kimura 16 Fuyuki, Tony Garnock-Jones, Martin Gasbichler, Joey Gibson, Stephen 17 C. Gilardi, Joshua Griffith, Johannes Groedem, Damian Gryski, Mario 18 Domenech Goulart, Andreas Gustafsson, Sven Hartrumpf, Jun-ichiro 19 itojun Hagino, Ahdi Hargo, Matthias Heiler, Karl M. Hegbloom, William 20 P. Heinemann, Bill Hoffman, Bruce Hoult, Hans Huebner, Markus 21 Huelsmann, Goetz Isenmann, Paulo Jabardo, Wietse Jacobs, David 22 Janssens, Christian Jaeger, Dale Jordan, Valentin Kamyshenko, Daishi 23 Kato, Peter Keller, Brad Kind, Ron Kneusel, Matthias Koeppe, Krysztof 24 Kowałczyk, Andre Kuehne, Todd R. Kueny Sr, Goran Krampe, David 25 Krentzlin, Ben Kurtz, Micky Latowicki, John Lenz, Kirill Lisovsky, 26 Juergen Lorenz, Kon Lovett, Dennis Marti, Charles Martin, Bob McIsaac, 27 Alain Mellan, Eric Merrit, Perry Metzger, Scott G. Miller, Mikael, 28 Bruce Mitchener, Chris Moline, Eric E. Moore, Julian Morrison, Dan 29 Muresan, Lars Nilsson, Ian Oversby, o.t., Gene Pavlovsky, Levi 30 Pearson, Nicolas Pelletier, Carlos Pita, Robin Lee Powell, Pupeno, 31 Davide Puricelli, Doug Quale, Eric Raible, Ivan Raikov, Joel Reymont, 32 Eric Rochester, Andreas Rottman, David Rush, Lars Rustemeier, Daniel 33 Sadilek, Oskar Schirmer, Burton Samograd, Reed Sheridan, Ronald 34 Schroeder, Spencer Schumann, Ivan Shcheklein, Alex Shinn, Ivan 35 Shmakov, Shmul, Tony Sidaway, Jeffrey B. Siegal, Andrey Sidorenko, 36 Michele Simionato, Volker Stolz, Jon Strait, Dorai Sitaram, Robert 37 Skeels, Jason Songhurst, Clifford Stein, Sunnan, Zbigniew Szadkowski, 38 Rick Taube, Nathan Thern, Mike Thomas, Minh Thu, Christian Tismer, 39 Andre van Tonder, John Tobey, Henrik Tramberend, Vladimir Tsichevsky, 40 Neil van Dyke, Sander Vesik, Jaques Vidrine, Panagiotis Vossos, Shawn 41 Wagner, Peter Wang, Ed Watkeys, Brad Watson, Thomas Weidner, Goeran 42 Weinholt, Matthew Welland, Drake Wilson, Joerg Wittenberger, Peter 43 Wright, Mark Wutka, Richard Zidlicky and Houman Zolfaghari for 44 bug-fixes, tips and suggestions. 45 45 46 46 CHICKEN uses the "irregex" regular expression package written by Alex Shinn. -
chicken/trunk/setup-api.scm
r12934 r12956 62 62 ;;; Constants, variables and parameters 63 63 64 #>65 #ifndef C_INSTALL_BIN_HOME66 # define C_INSTALL_BIN_HOME NULL67 #endif68 69 #ifndef C_INSTALL_SHARE_HOME70 # define C_INSTALL_SHARE_HOME NULL71 #endif72 73 #ifndef C_INSTALL_CC74 # ifdef _MSC_VER75 # define C_INSTALL_CC "cl"76 # else77 # ifdef __GNUC__78 # define C_INSTALL_CC "gcc"79 # else80 # define C_INSTALL_CC "cc"81 # endif82 # endif83 #endif84 85 #ifndef C_TARGET_CC86 # define C_TARGET_CC C_INSTALL_CC87 #endif88 89 #ifndef C_TARGET_CXX90 # define C_TARGET_CXX C_INSTALL_CXX91 #endif92 93 #ifndef C_TARGET_CFLAGS94 # define C_TARGET_CFLAGS C_INSTALL_CFLAGS95 #endif96 97 #ifndef C_TARGET_MORE_LIBS98 # define C_TARGET_MORE_LIBS C_INSTALL_LIB_HOME99 #endif100 101 #ifndef C_TARGET_LIB_HOME102 # define C_TARGET_LIB_HOME C_INSTALL_LIB_HOME103 #endif104 105 #ifndef C_CHICKEN_PROGRAM106 # define C_CHICKEN_PROGRAM "chicken"107 #endif108 109 #ifndef C_CSC_PROGRAM110 # define C_CSC_PROGRAM "csc"111 #endif112 113 #ifndef C_CSI_PROGRAM114 # define C_CSI_PROGRAM "csi"115 #endif116 117 #ifndef C_CHICKEN_BUG_PROGRAM118 # define C_CHICKEN_BUG_PROGRAM "chicken-bug"119 #endif120 <#121 122 123 64 (define-constant setup-file-extension "setup-info") 124 65 … … 135 76 (define *target-lib-home* (foreign-value "C_TARGET_LIB_HOME" c-string)) 136 77 (define *sudo* #f) 78 (define *windows-shell* (foreign-value "C_WINDOWS_SHELL" bool)) 137 79 138 80 (define *windows* 139 81 (and (eq? (software-type) 'windows) 140 82 (build-platform) ) ) 141 142 (define *windows-shell* (or (eq? *windows* 'mingw32)143 (eq? *windows* 'msvc)))144 83 145 84 (register-feature! 'chicken-setup) … … 251 190 (lambda (dir) 252 191 (verb dir) 253 ( system* "mkdir -p ~a" (shellpath dir) ) ) ) ) )192 ($system (sprintf "mkdir -p ~a" (shellpath dir) ) ) ) ) ) ) 254 193 255 194 (define abort-setup … … 285 224 (let ((tmp (create-temporary-file))) 286 225 (patch (list tmp tmp) rx subst) 287 (system* "~A ~A ~A" *move-command* (shellpath tmp) 288 (shellpath which))))) 226 ($system 227 (sprintf "~A ~A ~A" *move-command* (shellpath tmp) 228 (shellpath which)))))) 289 229 290 230 (define run-verbose (make-parameter #t)) … … 318 258 (lambda (cmd) 319 259 (when (run-verbose) (printf " ~A~%~!" cmd)) 320 ( system* "~a" cmd))260 ($system cmd)) 321 261 (map smooth explist) ) ) 322 262 … … 676 616 cmd) ) ) ) ) 677 617 (when verb (print (if (zero? r) "succeeded." "failed."))) 678 ( system (sprintf "~A ~A" *remove-command* (shellpath fname)))618 ($system (sprintf "~A ~A" *remove-command* (shellpath fname))) 679 619 (zero? r) ) ) 680 620 … … 761 701 #f)) 762 702 (*sudo* 763 ( system* "sudo rm -fr '~a'" dir))703 ($system (sprintf "sudo rm -fr ~a" (shellpath dir)))) 764 704 (else 765 705 (let walk ((dir dir)) … … 780 720 (remove-file* (make-pathname (repository-path) egg "setup-info"))) 781 721 722 (define ($system str) 723 (let ((r (system 724 (if *windows-shell* 725 (string-append "\"" str "\"") ; double quotes, yes - thanks to Matthew Flatt 726 str)))) 727 (unless (zero? r) 728 (error "shell command failed with nonzero exit status" r str)))) 729 782 730 )
Note: See TracChangeset
for help on using the changeset viewer.