Commits

Matthew Turk committed 632bff5

Switching:

* Deploy only a zip file of the ExtJS + Leaflet + XTK javascript
* Switch get_enzotools to get_ytproject
* Output how to download the zip if you don't have it

Comments (0)

Files changed (4)

doc/install_script.sh

     sleep 60
 fi
 
-function get_enzotools
+function get_ytproject
 {
     echo "Downloading $1 from yt-project.org"
     [ -e $1 ] && return
 echo '44eea803870a66ff0bab08d13a8b3388b5578ebc1c807d1d9dca0a93e6371e91b15d02917a00b3b20dc67abb5a21dabaf9b6e9257a561f85eeff2147ac73b478  PyX-0.11.1.tar.gz' > PyX-0.11.1.tar.gz.sha512
 echo '1a754d560bfa433f0960ab3b5a62edb5f291be98ec48cf4e5941fa5b84139e200b87a52efbbd6fa4a76d6feeff12439eed3e7a84db4421940d1bbb576f7a684e  Python-2.7.2.tgz' > Python-2.7.2.tgz.sha512
 echo 'c017d3d59dd324ac91af0edc178c76b60a5f90fbb775cf843e39062f95bd846238f2c53705f8890ed3f34bc0e6e75671a73d13875eb0287d6201cb45f0a2d338  bzip2-1.0.5.tar.gz' > bzip2-1.0.5.tar.gz.sha512
-echo '445de41f63a03bf1c098e36b5658590d8837a80ecd3ce8ff6544d30653cc64ce2521e6354016ca3b56a35a8416c33567506db8acec29ea3d9d97ae5f2e7eca02  ext-4.1.0-gpl.zip' > ext-4.1.0-gpl.zip.sha512
+echo 'a296dfcaef7e853e58eed4e24b37c4fa29cfc6ac688def048480f4bb384b9e37ca447faf96eec7b378fd764ba291713f03ac464581d62275e28eb2ec99110ab6  reason-js-20120623.zip' > reason-js-20120623.zip.sha512
 echo 'b519218f93946400326e9b656669269ecb3e5232b944e18fbc3eadc4fe2b56244d68aae56d6f69042b4c87c58c881ee2aaa279561ea0f0f48d5842155f4de9de  freetype-2.4.4.tar.gz' > freetype-2.4.4.tar.gz.sha512
 echo '1531789e0a77d4829796d18552a4de7aecae7e8b63763a7951a8091921995800740fe03e72a7dbd496a5590828131c5f046ddead695e5cba79343b8c205148d1  h5py-2.0.1.tar.gz' > h5py-2.0.1.tar.gz.sha512
 echo '9644896e4a84665ad22f87eb885cbd4a0c60a5c30085d5dd5dba5f3c148dbee626f0cb01e59a7995a84245448a3f1e9ba98687d3f10250e2ee763074ed8ddc0e  hdf5-1.8.7.tar.gz' > hdf5-1.8.7.tar.gz.sha512
 echo '57fa5e57dfb98154a42d2d477f29401c2260ae7ad3a8128a4098b42ee3b35c54367b1a3254bc76b9b3b14b4aab7c3e1135858f68abc5636daedf2f01f9b8a3cf  tornado-2.2.tar.gz' > tornado-2.2.tar.gz.sha512
 
 # Individual processes
-[ -z "$HDF5_DIR" ] && get_enzotools hdf5-1.8.7.tar.gz
-[ $INST_ZLIB -eq 1 ] && get_enzotools zlib-1.2.3.tar.bz2 
-[ $INST_BZLIB -eq 1 ] && get_enzotools bzip2-1.0.5.tar.gz
-[ $INST_PNG -eq 1 ] && get_enzotools libpng-1.2.43.tar.gz
-[ $INST_FTYPE -eq 1 ] && get_enzotools freetype-2.4.4.tar.gz
-[ $INST_SQLITE3 -eq 1 ] && get_enzotools sqlite-autoconf-3070500.tar.gz
-[ $INST_PYX -eq 1 ] && get_enzotools PyX-0.11.1.tar.gz
-[ $INST_0MQ -eq 1 ] && get_enzotools zeromq-2.2.0.tar.gz
-[ $INST_0MQ -eq 1 ] && get_enzotools pyzmq-2.1.11.tar.gz
-[ $INST_0MQ -eq 1 ] && get_enzotools tornado-2.2.tar.gz
-get_enzotools Python-2.7.2.tgz
-get_enzotools numpy-1.6.1.tar.gz
-get_enzotools matplotlib-1.1.0.tar.gz
-get_enzotools mercurial-2.2.2.tar.gz
-get_enzotools ipython-0.12.tar.gz
-get_enzotools h5py-2.0.1.tar.gz
-get_enzotools Cython-0.16.tar.gz
-get_enzotools ext-4.1.0-gpl.zip
+[ -z "$HDF5_DIR" ] && get_ytproject hdf5-1.8.7.tar.gz
+[ $INST_ZLIB -eq 1 ] && get_ytproject zlib-1.2.3.tar.bz2 
+[ $INST_BZLIB -eq 1 ] && get_ytproject bzip2-1.0.5.tar.gz
+[ $INST_PNG -eq 1 ] && get_ytproject libpng-1.2.43.tar.gz
+[ $INST_FTYPE -eq 1 ] && get_ytproject freetype-2.4.4.tar.gz
+[ $INST_SQLITE3 -eq 1 ] && get_ytproject sqlite-autoconf-3070500.tar.gz
+[ $INST_PYX -eq 1 ] && get_ytproject PyX-0.11.1.tar.gz
+[ $INST_0MQ -eq 1 ] && get_ytproject zeromq-2.2.0.tar.gz
+[ $INST_0MQ -eq 1 ] && get_ytproject pyzmq-2.1.11.tar.gz
+[ $INST_0MQ -eq 1 ] && get_ytproject tornado-2.2.tar.gz
+get_ytproject Python-2.7.2.tgz
+get_ytproject numpy-1.6.1.tar.gz
+get_ytproject matplotlib-1.1.0.tar.gz
+get_ytproject mercurial-2.2.2.tar.gz
+get_ytproject ipython-0.12.tar.gz
+get_ytproject h5py-2.0.1.tar.gz
+get_ytproject Cython-0.16.tar.gz
+get_ytproject reason-js-20120623.zip
 
 if [ $INST_BZLIB -eq 1 ]
 then

yt/gui/reason/extdirect_repl.py

     debug = False
     _heartbeat_timer = None
 
-    def __init__(self, base_extjs_path, locals=None,
+    def __init__(self, reasonjs_path, locals=None,
                  use_pyro=False):
         # First we do the standard initialization
-        self.extjs_file = zipfile.ZipFile(os.path.join(
-            base_extjs_path, "ext-4.1.0-gpl.zip"), 'r')
+        self.reasonjs_file = zipfile.ZipFile(reasonjs_path, 'r')
         ProgrammaticREPL.__init__(self, locals)
         # Now, since we want to only preroute functions we know about, and
         # since they have different arguments, and most of all because we only
                               _myapi = ("/ext-repl-api.js", "GET"),
                               _session_py = ("/session.py", "GET"),
                               _highlighter_css = ("/highlighter.css", "GET"),
-                              _extjs = ("/resources/extjs-4.1.0/:path#.+#", "GET"),
+                              _reasonjs = ("/reason-js/:path#.+#", "GET"),
                               _app = ("/reason/:path#.+#", "GET"),
                               )
         for v, args in preroute_table.items():
         root = os.path.join(local_dir, "html")
         return static_file("help.html", root)
 
-    def _extjs(self, path):
-        pp = os.path.join("extjs-4.1.0", path)
+    def _reasonjs(self, path):
+        pp = os.path.join("reason-js", path)
         try:
-            f = self.extjs_file.open(pp)
+            f = self.reasonjs_file.open(pp)
         except KeyError:
             response.status = 404
             return

yt/gui/reason/html/index.html

     <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Inconsolata">
 
     <!-- LIBS -->
-    <link rel="stylesheet" type="text/css" href="resources/extjs-4.1.0/resources/css/ext-all-gray.css">
+    <link rel="stylesheet" type="text/css" href="reason-js/resources/css/ext-all-gray.css">
     <link rel="stylesheet" type="text/css" href="reason/resources/css/style.css">
     <link rel="stylesheet" type="text/css" href="reason/resources/css/CheckHeader.css">
     <link rel="stylesheet" type="text/css" href="highlighter.css">
 
-    <script type="text/javascript" src="resources/extjs-4.1.0/ext-all-debug.js"></script>
+    <script type="text/javascript" src="reason-js/ext-all.js"></script>
     <script type="text/javascript" src="reason/app.js"></script>
     <script type="text/javascript" src="ext-repl-api.js"></script>
 
     <script type="text/javascript" src="reason/resources/ux/CheckColumn.js"></script>
 
     <!-- LEAFLET STUFF -->
-    <script type="text/javascript" src="reason/resources/leaflet/leaflet.js"></script>
-    <link rel="stylesheet" href="reason/resources/leaflet/leaflet.css" />
+    <script type="text/javascript" src="reason-js/leaflet/leaflet.js"></script>
+    <link rel="stylesheet" href="reason-js/leaflet/leaflet.css" />
 
     <!-- XTK STUFF -->
-    <script type="text/javascript" src="reason/xtk_edge.js"></script>
+    <script type="text/javascript" src="reason-js/xtk_edge.js"></script>
 
 </head>
 <body>

yt/utilities/command_line.py

             except ValueError:
                 print "Please try a number next time."
                 return 1
-        base_extjs_path = os.path.join(os.environ["YT_DEST"], "src")
-        if not os.path.isfile(os.path.join(base_extjs_path, "ext-resources", "ext-all.js")):
+        fn = "reason-js-20120623.zip"
+        reasonjs_path = os.path.join(os.environ["YT_DEST"], "src", fn)
+        if not os.path.isfile(reasonjs_path):
             print
-            print "*** You are missing the ExtJS support files. You  ***"
+            print "*** You are missing the Reason support files. You ***"
             print "*** You can get these by either rerunning the     ***"
             print "*** install script installing, or downloading     ***"
             print "*** them manually.                                ***"
+            print "***                                               ***"
+            print "*** FOR INSTANCE:                                 ***"
+            print
+            print "cd %s" % os.path.join(os.environ["YT_DEST"], "src")
+            print "wget http://yt-project.org/dependencies/reason-js-20120623.zip"
             print
             sys.exit(1)
         from yt.config import ytcfg;ytcfg["yt","__withinreason"]="True"
         import yt.utilities.bottle as bottle
         from yt.gui.reason.extdirect_repl import ExtDirectREPL
         from yt.gui.reason.bottle_mods import uuid_serve_functions, PayloadHandler
-        hr = ExtDirectREPL(base_extjs_path, use_pyro=args.use_pyro)
+        hr = ExtDirectREPL(reasonjs_path, use_pyro=args.use_pyro)
         hr.debug = PayloadHandler.debug = args.debug
         command_line = ["pfs = []"]
         if args.find:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.