From 37d50745f1dc2ee6b538e9fe11af93dc7b26a1ce Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 7 Aug 2015 17:22:18 +0530
Subject: [PATCH 1/2] sql-formatter is no lognger used. Exclude sql-parser
 instead

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 build.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 0e9c42bf19..b262bbc237 100644
--- a/build.xml
+++ b/build.xml
@@ -55,7 +55,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php,vendor,sql-formatter
+              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php,vendor,sql-parser
               --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
@@ -73,7 +73,7 @@
               --exclude libraries/phpseclib
               --exclude libraries/plugins/auth/recaptchalib.php
               --exclude libraries/plugins/auth/swekey/swekey.php
-              --exclude libraries/sql-formatter/
+              --exclude libraries/sql-parser
               ${source}" />
   </exec>
  </target>
@@ -91,7 +91,7 @@
               --exclude libraries/phpseclib
               --exclude libraries/plugins/auth/recaptchalib.php
               --exclude libraries/plugins/auth/swekey/swekey.php
-              --exclude libraries/sql-formatter/
+              --exclude libraries/sql-parser
               ${source}" />
   </exec>
  </target>
@@ -99,7 +99,7 @@
  <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries">
   <exec executable="phpcs">
    <arg line="
-              --ignore=*/php-gettext/*,*/vendor/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptcha/*,*/swekey/*,*/sql-formatter/*,*/sql-parser/*
+              --ignore=*/php-gettext/*,*/vendor/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptcha/*,*/swekey/*,*/sql-parser/*
               --report=checkstyle
               --extensions=php
               --report-file='${basedir}/build/logs/checkstyle.xml'

From 34ffea28c0c393e53b94f74a7408721096276ba4 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 7 Aug 2015 17:28:45 +0530
Subject: [PATCH 2/2] recaptchalib.php has also been moved

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index b262bbc237..4b95d93a8a 100644
--- a/build.xml
+++ b/build.xml
@@ -71,7 +71,7 @@
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
               --exclude libraries/phpseclib
-              --exclude libraries/plugins/auth/recaptchalib.php
+              --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
               --exclude libraries/plugins/auth/swekey/swekey.php
               --exclude libraries/sql-parser
               ${source}" />
@@ -89,7 +89,7 @@
               --exclude libraries/php-gettext
               --exclude libraries/bfShapeFiles
               --exclude libraries/phpseclib
-              --exclude libraries/plugins/auth/recaptchalib.php
+              --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
               --exclude libraries/plugins/auth/swekey/swekey.php
               --exclude libraries/sql-parser
               ${source}" />