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

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

Revision: 330
          http://sourceforge.net/p/javascriptlint/code/330
Author:   matthiasmiller
Date:     2013-10-03 19:16:44 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
Embed version number and revision.

Modified Paths:
--------------
    trunk/javascriptlint/conf.py
    trunk/javascriptlint/jsl.py
    trunk/setup.py

Added Paths:
-----------
    trunk/javascriptlint/version.py

Modified: trunk/javascriptlint/conf.py
===================================================================
--- trunk/javascriptlint/conf.py	2013-10-02 23:27:18 UTC (rev 329)
+++ trunk/javascriptlint/conf.py	2013-10-03 19:16:44 UTC (rev 330)
@@ -4,6 +4,7 @@
 
 import fs
 import util
+import version
 import warnings
 
 _DISABLED_WARNINGS = (
@@ -100,7 +101,7 @@
 # or "+process Folder\Path\*.htm".
 #
 """ % {
-    'version': '', # TODO
+    'version': version.version,
     'warnings': _getwarningsconf(),
 }
 

Modified: trunk/javascriptlint/jsl.py
===================================================================
--- trunk/javascriptlint/jsl.py	2013-10-02 23:27:18 UTC (rev 329)
+++ trunk/javascriptlint/jsl.py	2013-10-03 19:16:44 UTC (rev 330)
@@ -14,6 +14,7 @@
 import jsparse
 import lint
 import util
+import version
 
 _lint_results = {
     'warnings': 0,
@@ -48,8 +49,7 @@
     return paths or [path]
 
 def printlogo():
-    # TODO: Print version number.
-    print "JavaScript Lint"
+    print "JavaScript Lint %s" % version.version
     print "Developed by Matthias Miller (http://www.JavaScriptLint.com)"
 
 def _profile_enabled(func, *args, **kwargs):

Added: trunk/javascriptlint/version.py
===================================================================
--- trunk/javascriptlint/version.py	                        (rev 0)
+++ trunk/javascriptlint/version.py	2013-10-03 19:16:44 UTC (rev 330)
@@ -0,0 +1,19 @@
+import os.path
+import subprocess
+
+try:
+    from __svnversion__ import version
+except ImportError:
+    def _getrevnum():
+        path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        p = subprocess.Popen(['svnversion', path], stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = p.communicate()
+        if p.returncode != 0:
+            raise _BuildError('Error running svnversion: %s' % stderr)
+        version = stdout.strip().rstrip('M')
+        version = version.rpartition(':')[-1]
+        return int(version)
+
+    version = '0.5.0/r%i' % _getrevnum()
+

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2013-10-02 23:27:18 UTC (rev 329)
+++ trunk/setup.py	2013-10-03 19:16:44 UTC (rev 330)
@@ -7,20 +7,12 @@
 import subprocess
 import sys
 
+from javascriptlint import version
+
 class _BuildError(Exception):
     pass
 
-def _getrevnum():
-    path = os.path.dirname(os.path.abspath(__file__))
-    p = subprocess.Popen(['svnversion', path], stdin=subprocess.PIPE,
-                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    stdout, stderr = p.communicate()
-    if p.returncode != 0:
-        raise _BuildError('Error running svnversion: %s' % stderr)
-    version = stdout.strip().rstrip('M')
-    return int(version)
-
-if __name__ == '__main__':
+def _setup():
     cmdclass = {
         'build': distutils.command.build.build,
         'clean': distutils.command.clean.clean,
@@ -28,12 +20,12 @@
     args = {}
     args.update(
         name = 'javascriptlint',
-        version = '0.0.0.%i' % _getrevnum(),
+        version = version.version,
         author = 'Matthias Miller',
         author_email = 'in...@ja...',
         url = 'http://www.javascriptlint.com/',
         cmdclass = cmdclass,
-        description = 'JavaScript Lint (pyjsl beta r%i)' % _getrevnum(),
+        description = 'JavaScript Lint %s' % version.version,
         packages = ['javascriptlint'],
         scripts = ['jsl']
     )
@@ -64,3 +56,18 @@
         )
     setup(**args)
 
+def _main():
+    # Create a temporary __svnversion__.py to bundle the version
+    path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                        'javascriptlint', '__svnversion__.py')
+    with open(path, 'w') as f:
+        f.write('version = %r' % version.version)
+    try:
+        _setup()
+    finally:
+        os.unlink(path)
+        if os.path.exists(path + 'c'):
+            os.unlink(path + 'c')
+
+if __name__ == '__main__':
+    _main()

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