Author: rwhitcomb Date: Tue Sep 15 21:18:41 2015 New Revision: 1703293 URL: http://svn.apache.org/r1703293 Log: Code cleanup: After the last change to copy some more of the resources into place so tutorials and tests can run directly, that broke the .jar packaging (caught by the Jenkins jar signing task) because there are now lots of duplicate files. So, exclude these files in the "ant-bin" subdirectories from the .jar packaging (they come from the source directories instead).
This is a merge of revision 1703292 from branches/2.0.x to trunk. Modified: pivot/trunk/ (props changed) pivot/trunk/build.xml Propchange: pivot/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 15 21:18:41 2015 @@ -1 +1 @@ -/pivot/branches/2.0.x:1388236,1388681,1391496,1392533,1446780,1447977,1448356,1458918,1459950,1460982,1461332,1479613,1505062,1523284,1538840,1542170,1551768,1551992,1580958,1602230,1602233,1692157,1703276 +/pivot/branches/2.0.x:1388236,1388681,1391496,1392533,1446780,1447977,1448356,1458918,1459950,1460982,1461332,1479613,1505062,1523284,1538840,1542170,1551768,1551992,1580958,1602230,1602233,1692157,1703276,1703292 Modified: pivot/trunk/build.xml URL: http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1703293&r1=1703292&r2=1703293&view=diff ============================================================================== --- pivot/trunk/build.xml (original) +++ pivot/trunk/build.xml Tue Sep 15 21:18:41 2015 @@ -224,6 +224,9 @@ limitations under the License. </manifest> <fileset dir="@{project}/${folder.bin}"> <exclude name="**/test/**"/> + <exclude name="**/*.bxml"/> + <exclude name="**/*.json"/> + <exclude name="**/*.png"/> </fileset> <fileset dir="@{project}/src"> <exclude name="**/*.java"/> @@ -526,8 +529,8 @@ limitations under the License. </compile> <copy todir="tests/${folder.bin}"> <fileset dir="tests/src" includes="**/*.bxml"/> - <fileset dir="tests/src" includes="**/*.png"/> <fileset dir="tests/src" includes="**/*.json"/> + <fileset dir="tests/src" includes="**/*.png"/> </copy> </target> @@ -535,8 +538,8 @@ limitations under the License. <compile project="tutorials"/> <copy todir="tutorials/${folder.bin}"> <fileset dir="tutorials/src" includes="**/*.bxml"/> - <fileset dir="tutorials/src" includes="**/*.png"/> <fileset dir="tutorials/src" includes="**/*.json"/> + <fileset dir="tutorials/src" includes="**/*.png"/> </copy> </target>