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

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

Revision: 272
          http://javascriptlint.svn.sourceforge.net/javascriptlint/?rev=272&view=rev
Author:   matthiasmiller
Date:     2009-10-08 08:25:11 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
Updating build instructions for Windows.

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

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2009-10-08 06:53:09 UTC (rev 271)
+++ trunk/INSTALL	2009-10-08 08:25:11 UTC (rev 272)
@@ -1,20 +1,21 @@
 
 BUILDING FROM THE SUBVERSION TRUNK
 * Windows Prequisites:
- * Visual Studio 2003
- * Python
+ * Visual Studio 2008 Express
+ * Python 2.6
  * 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.
+ Launch the MozillaBuild MSVC 9 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
 
 To install on Unix:
  $ sudo python setup.py install
+
+WEBSITE
+ * Windows: http://pypi.python.org/pypi/Markdown/1.7
+ * Linux: $ sudo apt-get install python-markdown
+

Modified: trunk/Makefile.SpiderMonkey
===================================================================
--- trunk/Makefile.SpiderMonkey	2009-10-08 06:53:09 UTC (rev 271)
+++ trunk/Makefile.SpiderMonkey	2009-10-08 08:25:11 UTC (rev 272)
@@ -20,7 +20,7 @@
 ORIG_LIB=$(SPIDERMONKEY_SRC)/$(OBJDIR)/$(JS_LIB)
 COPY_LIB=$(BUILD_DIR)/$(JS_LIB)
 ORIG_DLL=$(SPIDERMONKEY_SRC)/$(OBJDIR)/js32.dll
-COPY_DLL=$(DISTUTILS_DIR)/js32.dll
+COPY_DLL=$(DISTUTILS_DIR)/javascriptlint/js32.dll
 OS_HEADER=$(BUILD_DIR)/js_operating_system.h
 ORIG_JSAUTOCFG_H=$(SPIDERMONKEY_SRC)/$(OBJDIR)/jsautocfg.h
 COPY_JSAUTOCFG_H=$(BUILD_DIR)/jsautocfg.h

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2009-10-08 06:53:09 UTC (rev 271)
+++ trunk/setup.py	2009-10-08 08:25:11 UTC (rev 272)
@@ -10,10 +10,12 @@
 class _MakefileError(Exception):
     pass
 
-def _runmakefiles(distutils_dir, build_opt=1, args=[]):
+def _runmakefiles(distutils_dir, build_opt=1, target=None):
     args = ['BUILD_OPT=%i' % build_opt]
     if distutils_dir:
         args.append('DISTUTILS_DIR=%s' % distutils_dir)
+    if target:
+        args.append(target)
 
     # First build SpiderMonkey.
     ret = subprocess.call(['make', '-f', 'Makefile.ref', '-C',
@@ -36,7 +38,7 @@
 
 class _MyClean(distutils.command.clean.clean):
     def run(self):
-        _runmakefiles(None, args=['clean'])
+        _runmakefiles(None, target='clean')
         distutils.command.clean.clean.run(self)
 
 if __name__ == '__main__':


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