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

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

Revision: 278
          http://javascriptlint.svn.sourceforge.net/javascriptlint/?rev=278&view=rev
Author:   matthiasmiller
Date:     2009-10-13 01:29:52 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
Tweaks to the Windows build.

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

Modified: trunk/Makefile.SpiderMonkey
===================================================================
--- trunk/Makefile.SpiderMonkey	2009-10-08 14:06:47 UTC (rev 277)
+++ trunk/Makefile.SpiderMonkey	2009-10-13 01:29:52 UTC (rev 278)
@@ -20,7 +20,8 @@
 ORIG_LIB=$(SPIDERMONKEY_SRC)/$(OBJDIR)/$(JS_LIB)
 COPY_LIB=$(BUILD_DIR)/$(JS_LIB)
 ORIG_DLL=$(SPIDERMONKEY_SRC)/$(OBJDIR)/js32.dll
-COPY_DLL=$(DISTUTILS_DIR)/javascriptlint/js32.dll
+COPY_DLL_DIR=$(DISTUTILS_DIR)/javascriptlint
+COPY_DLL_PATH=$(COPY_DLL_DIR)/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
@@ -31,7 +32,7 @@
 endif
 
 ifeq ($(SPIDERMONKEY_OS),XP_WIN)
-ALL_TARGETS+=$(COPY_DLL)
+ALL_TARGETS+=$(COPY_DLL_PATH)
 endif
 
 all: $(ALL_TARGETS)
@@ -46,8 +47,9 @@
 $(COPY_LIB): $(BUILD_DIR) $(ORIG_LIB)
 	cp $(ORIG_LIB) $(COPY_LIB)
 
-$(COPY_DLL): $(ORIG_DLL)
-	cp $(ORIG_DLL) $(COPY_DLL)
+$(COPY_DLL_PATH): $(ORIG_DLL)
+	mkdir -p $(COPY_DLL_DIR)
+	cp $(ORIG_DLL) $(COPY_DLL_PATH)
 
 $(OS_HEADER): $(BUILD_DIR)
 	echo "#define $(SPIDERMONKEY_OS)" > $(OS_HEADER)

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2009-10-08 14:06:47 UTC (rev 277)
+++ trunk/setup.py	2009-10-13 01:29:52 UTC (rev 278)
@@ -17,9 +17,10 @@
     if target:
         args.append(target)
 
-    # First build SpiderMonkey.
+    # First build SpiderMonkey. Force it to link statically against the CRT to
+    # make deployment easier.
     ret = subprocess.call(['make', '-f', 'Makefile.ref', '-C',
-                           'spidermonkey/src'] + args)
+                           'spidermonkey/src', 'XCFLAGS=-MT'] + args)
     if ret != 0:
         raise _MakefileError, 'Error running make.'
 


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