Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2014-11-05 11:43:58 +0300
committerMichal Čihař <michal@cihar.com>2014-11-05 11:43:58 +0300
commit88ba587db8de5318d385ed744d8230c758ad5f69 (patch)
tree4dde67f932938ce5b3ee8dcc64068614daab6acb /build.xml
parent56b7e749c04bde734addd1de6024ddcaaa2ed90e (diff)
parent1ce3aa607c6993fce128d5a75d7409ff566730ce (diff)
Merge branch 'QA_4_2'
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index e4289a115e..cbd3e2827d 100644
--- a/build.xml
+++ b/build.xml
@@ -120,8 +120,19 @@
</exec>
</target>
- <target name="jshint" description="Javascript checks">
- <apply executable="jshint" output="${basedir}/build/logs/jslint.xml" parallel="true">
+<target name="jshint" description="Javascript checks">
+ <apply executable="jshint" output="${basedir}/build/logs/jshint-jslint.xml" parallel="true">
+ <arg line="--config ./.jshintrc --reporter=jslint" />
+ <fileset dir="${basedir}">
+ <include name="js/pmd/*.js" />
+ <include name="js/*.js" />
+ <include name="setup/*.js" />
+ </fileset>
+ </apply>
+ </target>
+
+ <target name="jshint-checkstyle" description="Javascript checks">
+ <apply executable="jshint" output="${basedir}/build/logs/jshint-checkstyle.xml" parallel="true">
<arg line="--config ./.jshintrc --reporter=checkstyle" />
<fileset dir="${basedir}">
<include name="js/pmd/*.js" />