Merge remote-tracking branch 'origin/master'

js-assembler/runtime-src/runtime.js

@@ -127,59 +127,10 @@
 
 
 
-    // This value will be dynamically determined.
+    // This value used to be dynamically determined, but something on iOS5
-    // See findStackLimit later in this file.
+    // breaks badly when I try this.
-    var STACK_LIMIT_ESTIMATE = 100;
+    // We're very conservative now.
-
+     var STACK_LIMIT_ESTIMATE = 200;
-    // Approximately find the stack limit.
-    // This function assumes, on average, five variables or
-    // temporaries per stack frame.
-    // This will never report a number greater than MAXIMUM_CAP.
-    var findStackLimit = function(after) {
-	var MAXIMUM_CAP = 32768;
-	var n = 1;
-	var limitDiscovered = false;
-	setTimeout(
-	    function() {
-		if(! limitDiscovered) {
-		    limitDiscovered = true;
-		    after(n);
-		}
-	    },
-	    0);
-        var loop1, loop2;
-	loop1 = function loop1(x, y, z, w, k) {
-	    // Ensure termination, just in case JavaScript ever
-	    // does eliminate stack limits.
-	    if (n >= MAXIMUM_CAP) { return; }
-	    n++;
-	    return 1 + loop2(y, z, w, k, x);
-	};
-	loop2 = function loop2(x, y, z, w, k) {
-	    n++;
-	    return 1 + loop1(y, z, w, k, x);
-	};
-	try {
-	    findStackLimit.dontCare = 1 + loop1(2, "seven", [1], {number: 8}, 2);
-	} catch (e) {
-	    // ignore exceptions.
-	}
-	if (! limitDiscovered) { 
-	    limitDiscovered = true;
-	    after(n);
-	}
-    };
-
-
-    // Schedule a stack limit estimation.  If it fails, no harm, no
-    // foul (hopefully!)
-    setTimeout(function() {
-	findStackLimit(function(v) {
-	    // Trying to be a little conservative.
-	    STACK_LIMIT_ESTIMATE = Math.floor(v / 10);
-	});
-    },
-	       0);
 
 
 

version.rkt

@@ -6,4 +6,4 @@
 
 (provide version)
 (: version String)
-(define version "1.66")
+(define version "1.71")

whalesong-cmd.rkt

@@ -63,6 +63,10 @@
    #:program "whalesong"
    #:argv (current-command-line-arguments)
    "The Whalesong command-line tool for compiling Racket to JavaScript"
+   ["version" "Print the current version"
+    "Print the current version"
+    #:args ()
+    (print-version)]
    ["build" "build a standalone html and javascript package" 
             "Builds a Racket program and its required dependencies into a .html and .js file."
             #:once-each

whalesong-helpers.rkt

@@ -11,6 +11,7 @@
          "resource/structs.rkt"
          "logger.rkt"
          "parameters.rkt"
+         planet/version
          (for-syntax racket/base))
 
 (provide (all-defined-out))
@@ -257,3 +258,7 @@
                (make-MainModuleSource 
                 (normalize-path (build-path filename))))
               (current-output-port)))))
+
+
+(define (print-version)
+  (printf "~a\n" (this-package-version)))

whalesong.rkt

@@ -2,7 +2,14 @@
 #lang racket/base
 
 (require racket/runtime-path
-         racket/path)
+         racket/path
+         planet/util)
+
+;; We do things this way to ensure that we're using the latest
+;; version of whalesong that's installed, and that the load-relative
+;; path is in terms of the normalized paths, to avoid a very strange
+;; low-level bug.
+(define whalesong.cmd
+  (resolve-planet-path '(planet dyoo/whalesong/whalesong-cmd)))
 
-(define-runtime-path whalesong.cmd "whalesong-cmd.rkt")
 (dynamic-require (normalize-path whalesong.cmd) #f)