HADOOP-6407. Have a way to automatically update Eclipse .classpath file when new libs are added to the classpath through Ivy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@925465 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White
parent
637cf89e18
commit
b769d6463b
|
|
@ -1,44 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src/java"/>
|
||||
<classpathentry kind="src" path="src/test/aop"/>
|
||||
<classpathentry kind="src" path="src/test/core"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/avro-1.3.0.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/commons-cli-1.2.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/commons-codec-1.4.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/commons-el-1.0.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/commons-httpclient-3.0.1.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/commons-logging-1.1.1.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/commons-logging-api-1.1.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/commons-net-1.4.1.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/core-3.1.1.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/jackson-core-asl-1.0.1.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/jackson-mapper-asl-1.0.1.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/hsqldb-1.8.0.10.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/jasper-compiler-5.5.12.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/jasper-runtime-5.5.12.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/jets3t-0.7.1.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/jetty-6.1.14.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/jetty-util-6.1.14.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/jsp-2.1-6.1.14.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/jsp-api-2.1-6.1.14.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/junit-4.5.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/kfs-0.3.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/log4j-1.2.15.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/oro-2.0.8.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/servlet-api-2.5-6.1.14.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/slf4j-api-1.5.8.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/slf4j-log4j12-1.4.3.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/common/xmlenc-0.52.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/test/ftplet-api-1.0.0.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/test/ftpserver-core-1.0.0.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/test/ftpserver-deprecated-1.0.0-M2.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/test/mina-core-2.0.0-M5.jar"/>
|
||||
<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Core/test/mockito-all-1.8.0.jar"/>
|
||||
<classpathentry kind="lib" path="build/test/core/classes"/>
|
||||
<classpathentry kind="lib" path="build/classes"/>
|
||||
<classpathentry kind="lib" path="conf"/>
|
||||
<classpathentry kind="output" path="build/eclipse-classes"/>
|
||||
</classpath>
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
|
||||
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="compile-core-test,"/>
|
||||
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
|
||||
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="compile-core-test,"/>
|
||||
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
|
||||
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
|
||||
<listEntry value="/@PROJECT@/build.xml"/>
|
||||
</listAttribute>
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
|
||||
<listEntry value="1"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
|
||||
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
|
||||
<!-- Use Java 1.6 for ant; Eclipse may be running on 1.5. -->
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
|
||||
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/@PROJECT@/build.xml}"/>
|
||||
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,clean"/>
|
||||
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
|
||||
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
|
||||
</launchConfiguration>
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>@PROJECT@</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
|
||||
<triggers>full,incremental,</triggers>
|
||||
<arguments>
|
||||
<dictionary>
|
||||
<key>LaunchConfigHandle</key>
|
||||
<value><project>/.externalToolBuilders/Hadoop_Ant_Builder.launch</value>
|
||||
</dictionary>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
This directory contains templates for generating Eclipse files to configure
|
||||
Eclipse for Hadoop development.
|
||||
|
||||
For further information please consult
|
||||
|
||||
http://wiki.apache.org/hadoop/EclipseEnvironment
|
||||
|
|
@ -193,6 +193,9 @@ Trunk (unreleased changes)
|
|||
HADOOP-6591. HarFileSystem can handle paths with the whitespace characters.
|
||||
(Rodrigo Schmidt via dhruba)
|
||||
|
||||
HADOOP-6407. Have a way to automatically update Eclipse .classpath file
|
||||
when new libs are added to the classpath through Ivy. (tomwhite)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
HADOOP-6467. Improve the performance on HarFileSystem.listStatus(..).
|
||||
|
|
|
|||
65
build.xml
65
build.xml
|
|
@ -167,6 +167,12 @@
|
|||
|
||||
<property name="clover.jar" location="${clover.home}/lib/clover.jar"/>
|
||||
<available property="clover.present" file="${clover.jar}" />
|
||||
|
||||
<!-- Eclipse properties -->
|
||||
<property name="build.dir.eclipse" value="build/eclipse"/>
|
||||
<property name="build.dir.eclipse-main-classes" value="${build.dir.eclipse}/classes-main"/>
|
||||
<property name="build.dir.eclipse-test-classes" value="${build.dir.eclipse}/classes-test"/>
|
||||
<property name="build.dir.eclipse-test-generated-classes" value="${build.dir.eclipse}/classes-test-generated"/>
|
||||
|
||||
<!-- check if clover reports should be generated -->
|
||||
<condition property="clover.enabled">
|
||||
|
|
@ -1332,20 +1338,51 @@
|
|||
</exec>
|
||||
</target>
|
||||
|
||||
<target name="eclipse-files" depends="init"
|
||||
description="Generate files for Eclipse">
|
||||
<pathconvert property="eclipse.project">
|
||||
<path path="${basedir}"/>
|
||||
<regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
|
||||
</pathconvert>
|
||||
<copy todir="." overwrite="true">
|
||||
<fileset dir=".eclipse.templates">
|
||||
<exclude name="**/README.txt"/>
|
||||
</fileset>
|
||||
<filterset>
|
||||
<filter token="PROJECT" value="${eclipse.project}"/>
|
||||
</filterset>
|
||||
</copy>
|
||||
<condition property="ant-eclipse.jar.exists">
|
||||
<available file="${build.dir}/lib/ant-eclipse-1.0-jvm1.2.jar"/>
|
||||
</condition>
|
||||
|
||||
<target name="ant-eclipse-download" unless="ant-eclipse.jar.exists"
|
||||
description="Downloads the ant-eclipse binary.">
|
||||
<get src="http://downloads.sourceforge.net/project/ant-eclipse/ant-eclipse/1.0/ant-eclipse-1.0.bin.tar.bz2"
|
||||
dest="${build.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
|
||||
|
||||
<untar src="${build.dir}/ant-eclipse-1.0.bin.tar.bz2"
|
||||
dest="${build.dir}" compression="bzip2">
|
||||
<patternset>
|
||||
<include name="lib/ant-eclipse-1.0-jvm1.2.jar"/>
|
||||
</patternset>
|
||||
</untar>
|
||||
<delete file="${build.dir}/ant-eclipse-1.0.bin.tar.bz2" />
|
||||
</target>
|
||||
|
||||
<target name="eclipse"
|
||||
depends="init,ant-eclipse-download,ivy-retrieve-common,ivy-retrieve-test,compile-core-test"
|
||||
description="Create eclipse project files">
|
||||
<pathconvert property="eclipse.project">
|
||||
<path path="${basedir}"/>
|
||||
<regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
|
||||
</pathconvert>
|
||||
<taskdef name="eclipse"
|
||||
classname="prantl.ant.eclipse.EclipseTask"
|
||||
classpath="${build.dir}/lib/ant-eclipse-1.0-jvm1.2.jar" />
|
||||
<eclipse updatealways="true">
|
||||
<project name="${eclipse.project}" />
|
||||
<classpath>
|
||||
<source path="${java.src.dir}"
|
||||
output="${build.dir.eclipse-main-classes}" />
|
||||
<source path="${test.src.dir}/core"
|
||||
output="${build.dir.eclipse-test-classes}" />
|
||||
<source path="${test.src.dir}/aop"
|
||||
output="${build.dir.eclipse-test-classes}" />
|
||||
<source path="${test.generated.dir}"
|
||||
output="${build.dir.eclipse-test-generated-classes}" />
|
||||
<output path="${build.dir.eclipse-main-classes}" />
|
||||
<library pathref="ivy-common.classpath" exported="true" />
|
||||
<library pathref="ivy-test.classpath" exported="false" />
|
||||
<library path="${conf.dir}" exported="false" />
|
||||
</classpath>
|
||||
</eclipse>
|
||||
</target>
|
||||
|
||||
<target name="ivy-init-dirs">
|
||||
|
|
|
|||
Loading…
Reference in New Issue