Ensure svn properties are set on the build xml files, and they have consistent line endings

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1631469 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2014-10-13 16:47:46 +00:00
parent 5c40484b1f
commit 0980f4971c
2 changed files with 108 additions and 108 deletions

View File

@ -1,33 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src/java"/> <classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="src/testcases"/> <classpathentry kind="src" path="src/testcases"/>
<classpathentry kind="src" path="src/resources/main"/> <classpathentry kind="src" path="src/resources/main"/>
<classpathentry kind="src" path="src/ooxml/java"/> <classpathentry kind="src" path="src/ooxml/java"/>
<classpathentry kind="src" path="src/ooxml/testcases"/> <classpathentry kind="src" path="src/ooxml/testcases"/>
<classpathentry kind="src" path="src/resources/ooxml"/> <classpathentry kind="src" path="src/resources/ooxml"/>
<classpathentry kind="src" path="src/scratchpad/src"/> <classpathentry kind="src" path="src/scratchpad/src"/>
<classpathentry kind="src" path="src/scratchpad/testcases"/> <classpathentry kind="src" path="src/scratchpad/testcases"/>
<classpathentry kind="src" path="src/resources/scratchpad"/> <classpathentry kind="src" path="src/resources/scratchpad"/>
<classpathentry kind="src" path="src/contrib/poi-ruby/java"/> <classpathentry kind="src" path="src/contrib/poi-ruby/java"/>
<classpathentry kind="src" path="src/examples/src"/> <classpathentry kind="src" path="src/examples/src"/>
<classpathentry kind="src" path="src/excelant/java"/> <classpathentry kind="src" path="src/excelant/java"/>
<classpathentry kind="src" path="src/excelant/testcases"/> <classpathentry kind="src" path="src/excelant/testcases"/>
<classpathentry kind="src" path="src/excelant/resources"/> <classpathentry kind="src" path="src/excelant/resources"/>
<classpathentry kind="lib" path="lib/ant-1.9.4.jar"/> <classpathentry kind="lib" path="lib/ant-1.9.4.jar"/>
<classpathentry kind="lib" path="lib/ant-launcher-1.9.4.jar"/> <classpathentry kind="lib" path="lib/ant-launcher-1.9.4.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/> <classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/> <classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/> <classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
<classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/> <classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/> <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/junit-4.11.jar"/> <classpathentry kind="lib" path="lib/junit-4.11.jar"/>
<classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.1.jar" sourcepath="ooxml-lib/ooxml-schemas-src-1.1.jar"/> <classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.1.jar" sourcepath="ooxml-lib/ooxml-schemas-src-1.1.jar"/>
<classpathentry kind="lib" path="ooxml-lib/ooxml-encryption-1.2.jar" sourcepath="ooxml-lib/ooxml-encryption-src-1.2.jar"/> <classpathentry kind="lib" path="ooxml-lib/ooxml-encryption-1.2.jar" sourcepath="ooxml-lib/ooxml-encryption-src-1.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.7.jar"/> <classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.7.jar"/>
<classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.51.jar"/> <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.51.jar"/>
<classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.51.jar"/> <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.51.jar"/>
<classpathentry kind="lib" path="compile-lib/xmlsec-2.0.1.jar"/> <classpathentry kind="lib" path="compile-lib/xmlsec-2.0.1.jar"/>
<classpathentry kind="output" path="build/eclipse"/> <classpathentry kind="output" path="build/eclipse"/>
</classpath> </classpath>

150
patch.xml
View File

@ -1,75 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership. this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0 The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<!-- <!--
======================================================================= =======================================================================
Use Apache Ant to generate a patch file. Use Apache Ant to generate a patch file.
======================================================================= =======================================================================
--> -->
<project name="create-patch" default="patchpackage" basedir="."> <project name="create-patch" default="patchpackage" basedir=".">
<property environment="env"/> <property environment="env"/>
<property name="patch.package" value="patch.tar.gz"/> <property name="patch.package" value="patch.tar.gz"/>
<property name="patch.file" value="patch.txt"/> <property name="patch.file" value="patch.txt"/>
<condition property="svn.found"> <condition property="svn.found">
<or> <or>
<available file="svn" filepath="${env.PATH}"/> <available file="svn" filepath="${env.PATH}"/>
<available file="svn.exe" filepath="${env.PATH}"/> <available file="svn.exe" filepath="${env.PATH}"/>
<available file="svn.exe" filepath="${env.Path}"/> <available file="svn.exe" filepath="${env.Path}"/>
</or> </or>
</condition> </condition>
<target name="createpatch"> <target name="createpatch">
<fail unless="svn.found" message="You need a version of svn to create the patch"/> <fail unless="svn.found" message="You need a version of svn to create the patch"/>
<exec executable="svn" output="${patch.file}"> <exec executable="svn" output="${patch.file}">
<arg value="diff"/> <arg value="diff"/>
</exec> </exec>
</target> </target>
<target name="newfiles"> <target name="newfiles">
<exec executable="svn" output="${patch.file}.tmp"> <exec executable="svn" output="${patch.file}.tmp">
<arg value="status"/> <arg value="status"/>
</exec> </exec>
<!-- prepare the list of files to include in patch.tar.gz --> <!-- prepare the list of files to include in patch.tar.gz -->
<loadfile srcfile="${patch.file}.tmp" property="tar.file.list"> <loadfile srcfile="${patch.file}.tmp" property="tar.file.list">
<filterchain> <filterchain>
<!-- capture any new files --> <!-- capture any new files -->
<linecontainsregexp> <linecontainsregexp>
<regexp pattern="^(\?|A)......"/> <regexp pattern="^(\?|A)......"/>
</linecontainsregexp> </linecontainsregexp>
<!-- filter out the first six characters --> <!-- filter out the first six characters -->
<tokenfilter> <tokenfilter>
<replaceregex pattern="^(.......)" replace=""/> <replaceregex pattern="^(.......)" replace=""/>
</tokenfilter> </tokenfilter>
<!--remove line breaks --> <!--remove line breaks -->
<striplinebreaks/> <striplinebreaks/>
</filterchain> </filterchain>
</loadfile> </loadfile>
</target> </target>
<target name="patchpackage" depends="createpatch,newfiles"> <target name="patchpackage" depends="createpatch,newfiles">
<delete file="${patch.package}"/> <delete file="${patch.package}"/>
<tar includes="${tar.file.list}" <tar includes="${tar.file.list}"
destfile="${patch.package}" destfile="${patch.package}"
basedir="." basedir="."
compression="gzip" > compression="gzip" >
</tar> </tar>
<delete file="${patch.file}.tmp"/> <delete file="${patch.file}.tmp"/>
</target> </target>
</project> </project>