Permalink
Browse files

Merge remote-tracking branch 'dstockto/cs_apiv1test' into apiv1-phpcs

Conflicts:
	build.xml
  • Loading branch information...
2 parents e2a2930 + 8cc7b56 commit fdd9995aca620c55813cb4ca52514121dade7a0b @lornajane lornajane committed Feb 24, 2013
Showing with 474 additions and 319 deletions.
  1. +3 −0 build.xml
  2. +471 −319 doc/apiv1_tester/apiv1_tester.php
View
@@ -3,6 +3,7 @@
<project name="joindin" default="build" basedir=".">
<property name="source" value="src/system/application/"/>
<property name="apiv2source" value="src/api-v2/" />
+ <property name="apiv1tester" value="doc/apiv1_tester" />
<property name="basedir" value="."/>
<target name="clean" description="Clean up and create artifact directories">
@@ -53,6 +54,8 @@
<exclude name="views/**"/>
<exclude name="libraries/Template.php" />
</fileset>
+ <fileset dir="${apiv1tester}">
+ </fileset>
<formatter type="checkstyle" outfile="${basedir}/build/logs/checkstyle.xml" />
</phpcodesniffer>
</target>
Oops, something went wrong.

0 comments on commit fdd9995

Please sign in to comment.