Bibliotheken aktualisiert und Upgrade auf Requirejs2.0

mjswa · Jul 7, 2012 · 67b64e9 · 67b64e9
1 parent ad4c571
commit 67b64e9
Show file tree

Hide file tree

Showing 29 changed files with 35,579 additions and 29,177 deletions.
diff --git a/html5build.xml b/html5build.xml
@@ -41,8 +41,8 @@
         <java classpathref="classpathId" classname="org.mozilla.javascript.tools.shell.Main">
             <arg line="${basedir}/misc/requirejs/r.js -o"/>
             <arg line="baseUrl=src/main/webapp name=lib/almond"/>
-            <arg line="include=main.js out=${outputDir}/main.js"/>
-            <arg line="optimize=none"/>
+            <arg line="include=main mainConfigFile=src/main/webapp/main.js"/>
+            <arg line="out=${outputDir}/main.js waitSeconds=60 optimize=none"/>
         </java>
     </target>
 

diff --git a/jstd-server.sh b/jstd-server.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -jar misc/JsTestDriver-1.3.2.jar --port 9876 --runnerMode INFO
+java -jar misc/JsTestDriver.jar --port 9876 --runnerMode INFO
diff --git a/jstd-ui.sh b/jstd-ui.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -jar misc/JsTestDriver-1.3.2.jar --config jstd-ui.conf --reset --tests all --testOutput target/jstd-reports
+java -jar misc/JsTestDriver.jar --config jstd-ui.conf --reset --tests all --testOutput target/jstd-reports
diff --git a/jstd-unit.sh b/jstd-unit.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -jar misc/JsTestDriver-1.3.2.jar --config jstd-unit.conf --reset --tests all --testOutput target/jstd-reports
+java -jar misc/JsTestDriver.jar --config jstd-unit.conf --reset --tests all --testOutput target/jstd-reports
diff --git a/misc/JsTestDriver.jar b/misc/JsTestDriver.jar
diff --git a/misc/JsTestDriver.version.txt b/misc/JsTestDriver.version.txt
@@ -0,0 +1 @@
+1.3.4.b
diff --git a/misc/install.sh b/misc/install.sh
@@ -0,0 +1 @@
+mvn install:install-file -Dfile=JsTestDriver.jar -DgroupId=com.google.jstestdriver -DartifactId=jstestdriver -Dversion=1.3.4.b -Dpackaging=jar