From 23141a05bdaddacbb1e4c5878b39cd0c971c38af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Wed, 12 Jun 2013 10:41:49 +0200
Subject: [PATCH 1/3] Add PHP lint to build.xml

---
 build.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 5a383e68e7..a230311e7f 100644
--- a/build.xml
+++ b/build.xml
@@ -115,5 +115,16 @@
   </exec>
  </target>
 
- <target name="build" depends="clean,phpunit,pdepend,phpmd,phpcpd,phpcs,phpdoc,phploc,phpcb"/>
+ <target name="lint" description="Perform syntax check of sourcecode files">
+  <apply executable="php" failonerror="true">
+   <arg value="-l" />
+
+   <fileset dir="${basedir}">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+  </apply>
+ </target>
+
+ <target name="build" depends="clean,phpunit,pdepend,phpmd,phpcpd,phpcs,phpdoc,phploc,phpcb,lint,jshint"/>
 </project>

From f4736d054e8fd3a8052ead9284261753a7d07f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Wed, 12 Jun 2013 10:45:43 +0200
Subject: [PATCH 2/3] Use ant for travis ci builds

This allows us to share setup with jenkins
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a6135ed890..dd100316d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,8 @@ php:
   - "5.5"
   - "5.4"
   - "5.3"
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq ant
 before_script: ./scripts/generate-mo --quiet
-script: phpunit --configuration phpunit.xml.nocoverage
+script: ant phpunit-nocoverage lint

From 311af4c7e0bd3acacab188ae5a8c1e74bb956d99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Wed, 12 Jun 2013 10:50:09 +0200
Subject: [PATCH 3/3] Use apply for jshint call to avoid problems with spaces
 in path

---
 build.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index a230311e7f..1d84087bfd 100644
--- a/build.xml
+++ b/build.xml
@@ -4,9 +4,6 @@
  <property name="source" value="."/>
  <property name="source_comma_sep" value="."/>
 
- <fileset dir="${source}" includes="js/pmd/*.js,js/*.js" id="jsfiles" />
- <pathconvert pathsep=" " property="js-list" refid="jsfiles" />
-
  <target name="clean" description="Clean up and create artifact directories">
   <delete dir="${basedir}/build/api"/>
   <delete dir="${basedir}/build/code-browser"/>
@@ -110,9 +107,13 @@
  </target>
 
  <target name="jshint" description="Javascript checks">
-  <exec executable="jshint" output="${basedir}/build/logs/jslint.xml">
-   <arg line="--config ./.jshintrc --jslint-reporter ${js-list}" />
-  </exec>
+  <apply executable="jshint" output="${basedir}/build/logs/jslint.xml"  parallel="true">
+   <arg line="--config ./.jshintrc --jslint-reporter" />
+   <fileset dir="${basedir}">
+    <include name="js/pmd/*.js" />
+    <include name="js/*.js" />
+   </fileset>
+  </apply>
  </target>
 
  <target name="lint" description="Perform syntax check of sourcecode files">