Permalink
Browse files

Move node's temp into ./node_modules

  • Loading branch information...
1 parent fbac457 commit a667fa5d3b50c4bfe39ec564d687ff4428f03684 @yurydelendik yurydelendik committed Feb 19, 2014
Showing with 6 additions and 5 deletions.
  1. +2 −2 Makefile
  2. +2 −1 package.json
  3. +1 −1 src/avm2/bin/Makefile
  4. +1 −1 utils/Makefile
View
@@ -41,7 +41,7 @@ install-libs:
install-utils: check-system
npm install
- make -C utils/ install-closure install-avmshell install-js install-node-modules install-flex-sdk
+ make -C utils/ install-closure install-avmshell install-js
install-avmshell:
make -C utils/ install-avmshell
@@ -55,7 +55,7 @@ BASE ?= $(error ERROR: Specify BASE that points to the Shumway folder with insta
link-utils:
ln -s $(BASE)/node_modules .
- ln -s $(BASE)/utils/cc.jar $(BASE)/utils/tamarin-redux $(BASE)/utils/jsshell $(BASE)/utils/node_modules utils/
+ ln -s $(BASE)/utils/cc.jar $(BASE)/utils/tamarin-redux $(BASE)/utils/jsshell utils/
run-tamarin-sanity-tests:
make -C utils/ run-tamarin-sanity-tests
View
@@ -5,7 +5,8 @@
"grunt": "~0.4.2",
"grunt-contrib-jshint": "~0.7.2",
"grunt-exec": "~0.4.2",
- "grunt-contrib-watch": "~0.5.3"
+ "grunt-contrib-watch": "~0.5.3",
+ "temp": "0.5.0"
},
"description": "Shumway is an HTML5 technology experiment that explores building a faithful and efficient renderer for the SWF file format without native code assistance.",
"main": "Gruntfile.js",
View
@@ -22,7 +22,7 @@ JSSHELL ?= $(UTILS_HOME)/jsshell/js
THREADS ?= 8
TIMEOUT ?= 30000
-NODE_MODULES = ../../../utils/node_modules
+NODE_MODULES = ../../../node_modules
TEST_CMD = ASC=$(ASC) AVM=$(AVM) BUILTINABC=$(BUILTINABC) SHELLABC=$(SHELLABC) JSSHELL=$(JSSHELL) NODE_PATH=$(NODE_MODULES) node numbers.js -t $(TIMEOUT) -jo
View
@@ -155,7 +155,7 @@ $(APPARAT_HOME)/apparat.tar.gz:
install-node-modules:
mkdir -p node_modules
- npm install mocha@1.11.0 expect.js@0.2.0 temp@0.5.0 jshint@2.1.3
+ npm install mocha@1.11.0 expect.js@0.2.0 jshint@2.1.3
install-swfdec:
git clone git://anongit.freedesktop.org/swfdec/swfdec

0 comments on commit a667fa5

Please sign in to comment.