Mercurial > hg > mercurial
changeset 357:55e8947b54ee remote-run/TW-19984
Regenerate build script
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Fri, 27 Jan 2012 19:39:41 +0400 |
parents | 53b430731041 |
children | ba67101fc876 4300c345e6ef |
files | mercurial.xml |
diffstat | 1 files changed, 23 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial.xml Fri Jan 27 19:34:03 2012 +0400 +++ b/mercurial.xml Fri Jan 27 19:39:41 2012 +0400 @@ -38,13 +38,15 @@ <exclude name="**/*~/**"/> <exclude name="**/__pycache__/**"/> <exclude name="**/.bundle/**"/> + <exclude name="**/*.rbc/**"/> </patternset> <patternset id="library.patterns"> + <include name="*.war"/> + <include name="*.ear"/> + <include name="*.apk"/> <include name="*.zip"/> - <include name="*.war"/> + <include name="*.swc"/> <include name="*.egg"/> - <include name="*.ear"/> - <include name="*.swc"/> <include name="*.jar"/> </patternset> <patternset id="compiler.resources"> @@ -64,26 +66,30 @@ <!-- JDK definitions --> - <property name="jdk.bin.1.5" value="${jdk.home.1.5}/bin"/> - <path id="jdk.classpath.1.5"> - <fileset dir="${jdk.home.1.5}"> - <include name="jre/lib/rt.jar"/> + <property name="jdk.bin.1.6" value="${jdk.home.1.6}/bin"/> + <path id="jdk.classpath.1.6"> + <fileset dir="${jdk.home.1.6}"> + <include name="jre/lib/plugin.jar"/> + <include name="jre/lib/deploy.jar"/> + <include name="jre/lib/alt-rt.jar"/> + <include name="jre/lib/resources.jar"/> + <include name="jre/lib/javaws.jar"/> <include name="jre/lib/jce.jar"/> - <include name="jre/lib/deploy.jar"/> - <include name="jre/lib/javaws.jar"/> + <include name="jre/lib/rt.jar"/> + <include name="jre/lib/charsets.jar"/> <include name="jre/lib/jsse.jar"/> - <include name="jre/lib/charsets.jar"/> - <include name="jre/lib/plugin.jar"/> + <include name="jre/lib/alt-string.jar"/> + <include name="jre/lib/management-agent.jar"/> + <include name="jre/lib/ext/dnsns.jar"/> + <include name="jre/lib/ext/sunjce_provider.jar"/> <include name="jre/lib/ext/localedata.jar"/> <include name="jre/lib/ext/sunpkcs11.jar"/> - <include name="jre/lib/ext/sunjce_provider.jar"/> - <include name="jre/lib/ext/dnsns.jar"/> </fileset> </path> - <property name="project.jdk.home" value="${jdk.home.1.5}"/> - <property name="project.jdk.bin" value="${jdk.bin.1.5}"/> - <property name="project.jdk.classpath" value="jdk.classpath.1.5"/> + <property name="project.jdk.home" value="${jdk.home.1.6}"/> + <property name="project.jdk.bin" value="${jdk.bin.1.6}"/> + <property name="project.jdk.classpath" value="jdk.classpath.1.6"/> <!-- Project Libraries --> @@ -101,6 +107,7 @@ <path id="library.jmock.classpath"> <pathelement location="${basedir}/mercurial-tests/lib/hamcrest-core-1.1.jar"/> + <pathelement location="${basedir}/mercurial-tests/lib/hamcrest-integration-1.1.jar"/> <pathelement location="${basedir}/mercurial-tests/lib/hamcrest-library-1.1.jar"/> <pathelement location="${basedir}/mercurial-tests/lib/jmock-2.5.1.jar"/> <pathelement location="${basedir}/mercurial-tests/lib/jmock-SNAPSHOT.jar"/>