[pypy-commit] jitviewer default: Get jitviewer to install correctly -- move static and template folders into a package so that they really are package data, add qwebview.py to list of scripts to install, mark jitviewer package as zip unsafe in setup.py (since it relies on its package being at a real filesystem path).

hodgestar noreply at buildbot.pypy.org
Wed Jul 6 21:19:49 CEST 2011


Author: Simon Cross <hodgestar at gmail.com>
Branch: 
Changeset: r136:97161ab5adfd
Date: 2011-07-06 21:28 +0200
http://bitbucket.org/pypy/jitviewer/changeset/97161ab5adfd/

Log:	Get jitviewer to install correctly -- move static and template
	folders into a package so that they really are package data, add
	qwebview.py to list of scripts to install, mark jitviewer package as
	zip unsafe in setup.py (since it relies on its package being at a
	real filesystem path).

diff --git a/static/DroidSansMono.ttf b/_jitviewer/static/DroidSansMono.ttf
rename from static/DroidSansMono.ttf
rename to _jitviewer/static/DroidSansMono.ttf
diff --git a/static/jquery-1.2.6.min.js b/_jitviewer/static/jquery-1.2.6.min.js
rename from static/jquery-1.2.6.min.js
rename to _jitviewer/static/jquery-1.2.6.min.js
diff --git a/static/jquery.min.js b/_jitviewer/static/jquery.min.js
rename from static/jquery.min.js
rename to _jitviewer/static/jquery.min.js
diff --git a/static/jquery.scrollTo-1.4.1.js b/_jitviewer/static/jquery.scrollTo-1.4.1.js
rename from static/jquery.scrollTo-1.4.1.js
rename to _jitviewer/static/jquery.scrollTo-1.4.1.js
diff --git a/static/jquery.scrollTo-1.4.2-min.js b/_jitviewer/static/jquery.scrollTo-1.4.2-min.js
rename from static/jquery.scrollTo-1.4.2-min.js
rename to _jitviewer/static/jquery.scrollTo-1.4.2-min.js
diff --git a/static/loop.js b/_jitviewer/static/loop.js
rename from static/loop.js
rename to _jitviewer/static/loop.js
diff --git a/static/pygments.css b/_jitviewer/static/pygments.css
rename from static/pygments.css
rename to _jitviewer/static/pygments.css
diff --git a/static/qt_workaround.css b/_jitviewer/static/qt_workaround.css
rename from static/qt_workaround.css
rename to _jitviewer/static/qt_workaround.css
diff --git a/static/script.js b/_jitviewer/static/script.js
rename from static/script.js
rename to _jitviewer/static/script.js
diff --git a/static/style.css b/_jitviewer/static/style.css
rename from static/style.css
rename to _jitviewer/static/style.css
diff --git a/templates/index.html b/_jitviewer/templates/index.html
rename from templates/index.html
rename to _jitviewer/templates/index.html
diff --git a/templates/loop.html b/_jitviewer/templates/loop.html
rename from templates/loop.html
rename to _jitviewer/templates/loop.html
diff --git a/bin/jitviewer.py b/bin/jitviewer.py
--- a/bin/jitviewer.py
+++ b/bin/jitviewer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env pypy-c
+#!/usr/bin/env pypy
 """ A web-based browser of your log files. Run by
 
     jitviewer.py <path to your log file> [port] [--server]
@@ -175,8 +175,7 @@
 
 
 def main():
-    PATH = os.path.join(os.path.dirname(
-        os.path.dirname(_jitviewer.__file__)))
+    PATH = os.path.join(os.path.dirname((_jitviewer.__file__)))
     print PATH
     if not '__pypy__' in sys.builtin_module_names:
         print "Please run it using pypy-c"
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,8 @@
       author_email='fijall at gmail.com',
       url='http://pypy.org',
       packages=['_jitviewer'],
-      scripts=['bin/jitviewer.py'],
+      scripts=['bin/jitviewer.py', 'bin/qwebview.py'],
       install_requires=['flask', 'pygments', 'simplejson'],
       include_package_data=True,
-      package_data={'': ['templates/*.html', 'static/*']})
+      package_data={'': ['templates/*.html', 'static/*']},
+      zip_safe=False)


More information about the pypy-commit mailing list