Merge branch 'master' of github.com:gpujs/gpu.js

fuzzie360 · fuzzie360 · commit 76ef54e540df · 2016-02-24T16:10:37.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,23 @@
+language: node_js
+sudo: false
+
+node_js:
+- "0.10"
+
+git:
+    depth: 3
+
+branches:
+    only:
+        - master
+        - stable
+    
+addons:
+    apt:
+        sources:
+            - naturaldocs
+            - ant
+            
+script:
+- ant setup
+- ant build-docs
diff --git a/build.xml b/build.xml
@@ -22,7 +22,7 @@
 	<target name="build-docs">
 		<mkdir dir="doc/html"/>
 		<mkdir dir="doc/tmp"/>
-		<exec executable="NaturalDocs">
+		<exec executable="./doc/NaturalDocs/NaturalDocs">
 			<arg value="-i"/>
 			<arg value="./src"/>
 			<arg value="-o"/>
