Merge pull request #1035 from achlipala/master

Ur/Web: Version update

frameworks/Ur/urweb/README.md

@@ -1,7 +1,18 @@
 TechEmpower Framework Benchmark: Ur/Web
 =======================================
 
-http://www.impredicative.com/ur/
+This is a benchmark solution in the Ur/Web language:
+  http://www.impredicative.com/ur/
+
+Caveats, in Comparing with Other Frameworks
+===========================================
+
+Ur/Web is unusual in a few ways of favoring simplicity over performance, which has consequences for the results in this benchmark comparison.  For instance:
+* *Security*: The design of Ur/Web favors making common security mistakes impossible.  Most such mechanisms have no run-time costs, but some do.  For instance, the standard-library random number generator is cryptographically secure, which adds overhead to the benchmarks that generate many random numbers.
+* *Concurrency*: The concurrency model of Ur/Web is transactions.  An Ur/Web programmer never needs to think about an interleaving semantics for threads.  The implementation relies on the transaction features of SQL engines, which add an overhead (e.g., extra database round-trips to begin/end transactions) to those tests that most other solutions avoid by accepting more complex concurrency semantics.  (We hope there will be an explicit transactions test soon!)
+
+Code Structure & Build Instructions
+===================================
 
 To compile a standalone executable running on port 8080, run `urweb bench`.  See `setup.py` for fancier options.
 

frameworks/Ur/urweb/install.sh

@@ -1,3 +1,11 @@
 #!/bin/bash
 
-fw_depends urweb
+RETCODE=$(fw_exists /usr/local/bin/urweb)
+[ ! "$RETCODE" == 0 ] || { return 0; }
+
+fw_get http://www.impredicative.com/ur/urweb-20140819.tgz
+fw_untar urweb-20140819.tgz
+cd urweb-20140819
+./configure
+make
+sudo make install

toolset/setup/linux/languages/urweb.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-RETCODE=$(fw_exists /usr/local/bin/urweb)
-[ ! "$RETCODE" == 0 ] || { return 0; }
-
-fw_get http://www.impredicative.com/ur/urweb-20140704.tgz
-fw_untar urweb-20140704.tgz
-cd urweb-20140704
-./configure
-make
-sudo make install