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

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

Revision: 261
          http://javascriptlint.svn.sourceforge.net/javascriptlint/?rev=261&view=rev
Author:   matthiasmiller
Date:     2009-10-05 06:04:04 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
Initial work to support py2exe on Windows.

Modified Paths:
--------------
    trunk/INSTALL
    trunk/Makefile.SpiderMonkey
    trunk/setup.py

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2009-10-03 19:20:23 UTC (rev 260)
+++ trunk/INSTALL	2009-10-05 06:04:04 UTC (rev 261)
@@ -3,11 +3,16 @@
 * Windows Prequisites:
  * Visual Studio 2003
  * Python
+ * py2exe
  * MozillaBuild (http://developer.mozilla.org/en/docs/Windows_Build_Prerequisites)
 
  Launch the MozillaBuild 7.1 batch file. (You may have to run this as an Administrator
  on Windows Vista.) Run the commands in that shell.
 
+ If you don't have a copy of Visual Studio 2003, you can download the Python
+ source code and compile it yourself. Python C extensions must be built with
+ the same compiler as the Python interpreter.
+
 On all platforms:
  $ python setup.py build
 

Modified: trunk/Makefile.SpiderMonkey
===================================================================
--- trunk/Makefile.SpiderMonkey	2009-10-03 19:20:23 UTC (rev 260)
+++ trunk/Makefile.SpiderMonkey	2009-10-05 06:04:04 UTC (rev 261)
@@ -46,7 +46,7 @@
 $(COPY_LIB): $(BUILD_DIR) $(ORIG_LIB)
 	cp $(ORIG_LIB) $(COPY_LIB)
 
-$(COPY_DLL): $(ORIG_LIB)
+$(COPY_DLL): $(ORIG_DLL)
 	cp $(ORIG_DLL) $(COPY_DLL)
 
 $(OS_HEADER): $(BUILD_DIR)

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2009-10-03 19:20:23 UTC (rev 260)
+++ trunk/setup.py	2009-10-05 06:04:04 UTC (rev 261)
@@ -11,24 +11,26 @@
     pass
 
 def _runmakefiles(distutils_dir, build_opt=1, args=[]):
+    args = ['BUILD_OPT=%i' % build_opt]
+    if distutils_dir:
+        args.append('DISTUTILS_DIR=%s' % distutils_dir)
+
     # First build SpiderMonkey.
     ret = subprocess.call(['make', '-f', 'Makefile.ref', '-C',
-                           'spidermonkey/src', 'BUILD_OPT=%i' % build_opt] + \
-                           args)
+                           'spidermonkey/src'] + args)
     if ret != 0:
         raise _MakefileError, 'Error running make.'
 
     # Then copy the files to the build directory.
-    env = dict(os.environ)
-    if distutils_dir:
-        env['DISTUTILS_DIR'] = distutils_dir
-    ret = subprocess.call(['make', '-f', 'Makefile.SpiderMonkey',
-                           'BUILD_OPT=%i' % build_opt] + args, env=env)
+    ret = subprocess.call(['make', '-f', 'Makefile.SpiderMonkey'] + args)
     if ret != 0:
         raise _MakefileError, 'Error running make.'
 
 class _MyBuild(distutils.command.build.build):
     def run(self):
+        # py2exe is calling reinitialize_command without finalizing.
+        self.ensure_finalized()
+
         _runmakefiles(self.build_platlib)
         distutils.command.build.build.run(self)
 
@@ -75,7 +77,7 @@
         pass
     else:
         args.update(
-            console = ['jsl.py'],
+            console = ['jsl'],
             options = {
                 'py2exe': {
                     'excludes': ['javascriptlint.spidermonkey_'],


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