[javascriptlint-commit] SF.net SVN: javascriptlint:[256] trunk

[<mat...@us...>]

Revision: 256
          http://javascriptlint.svn.sourceforge.net/javascriptlint/?rev=256&view=rev
Author:   matthiasmiller
Date:     2009-10-03 17:14:49 +0000 (Sat, 03 Oct 2009)

Log Message:
-----------
Move spidermonkey_ into a subdirectory to keep it from being installed.

Modified Paths:
--------------
    trunk/javascriptlint/spidermonkey.py
    trunk/setup.py

Added Paths:
-----------
    trunk/javascriptlint/pyspidermonkey_/
    trunk/javascriptlint/pyspidermonkey_/__init__.py

Removed Paths:
-------------
    trunk/javascriptlint/spidermonkey_.py


Property changes on: trunk/javascriptlint/pyspidermonkey_
___________________________________________________________________
Added: svn:ignore
   + *.pyc


Copied: trunk/javascriptlint/pyspidermonkey_/__init__.py (from rev 255, trunk/javascriptlint/spidermonkey_.py)
===================================================================
--- trunk/javascriptlint/pyspidermonkey_/__init__.py	                        (rev 0)
+++ trunk/javascriptlint/pyspidermonkey_/__init__.py	2009-10-03 17:14:49 UTC (rev 256)
@@ -0,0 +1,21 @@
+# vim: ts=4 sw=4 expandtab
+from distutils.core import setup, Extension
+import os
+import sys
+
+# Add the bin directory to the module search path
+def _get_lib_path():
+    import distutils.dist
+    import distutils.command.build
+    dist = distutils.dist.Distribution()
+    build = distutils.command.build.build(dist)
+    build.finalize_options()
+    return os.path.join(os.path.dirname(__file__), '..', '..',
+                        build.build_platlib, 'javascriptlint')
+
+sys.path.insert(0, _get_lib_path())
+try:
+    from pyspidermonkey import *
+finally:
+    sys.path.pop(0)
+

Modified: trunk/javascriptlint/spidermonkey.py
===================================================================
--- trunk/javascriptlint/spidermonkey.py	2009-10-03 16:53:02 UTC (rev 255)
+++ trunk/javascriptlint/spidermonkey.py	2009-10-03 17:14:49 UTC (rev 256)
@@ -4,7 +4,7 @@
 # import the development version first, and if that fails, it goes after the
 # real version.
 try:
-	from spidermonkey_ import *
+	from pyspidermonkey_ import *
 except ImportError:
 	from pyspidermonkey import *
 

Deleted: trunk/javascriptlint/spidermonkey_.py
===================================================================
--- trunk/javascriptlint/spidermonkey_.py	2009-10-03 16:53:02 UTC (rev 255)
+++ trunk/javascriptlint/spidermonkey_.py	2009-10-03 17:14:49 UTC (rev 256)
@@ -1,20 +0,0 @@
-# vim: ts=4 sw=4 expandtab
-from distutils.core import setup, Extension
-import os
-import sys
-
-# Add the bin directory to the module search path
-def _get_lib_path():
-    import distutils.dist
-    import distutils.command.build
-    dist = distutils.dist.Distribution()
-    build = distutils.command.build.build(dist)
-    build.finalize_options()
-    return os.path.join(os.path.dirname(__file__), '..', build.build_platlib, 'javascriptlint')
-
-sys.path.insert(0, _get_lib_path())
-try:
-    from pyspidermonkey import *
-finally:
-    sys.path.pop(0)
-

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2009-10-03 16:53:02 UTC (rev 255)
+++ trunk/setup.py	2009-10-03 17:14:49 UTC (rev 256)
@@ -59,7 +59,7 @@
         cmdclass = cmdclass,
         description = 'JavaScript Lint',
         ext_modules = [pyspidermonkey],
-        packages = ['javascriptlint', 'javascriptlint.pyjsl'],
+        packages = ['javascriptlint'],
         scripts = ['jsl']
     )
     try:
@@ -71,7 +71,7 @@
             console = ['jsl.py'],
             options = {
                 'py2exe': {
-                    'excludes': ['pyjsl.spidermonkey_'],
+                    'excludes': ['javascriptlint.spidermonkey_'],
                     'bundle_files': 1
                 }
             },


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.