diff options
| -rw-r--r-- | build.xml | 62 |
1 files changed, 31 insertions, 31 deletions
@@ -330,51 +330,51 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <fileset dir="${eclipse.location}/plugins" includes="${pluginName}_*" /> </pathconvert> - <pathconvert property="augment.src" setonempty="false" pathsep=" :: "> - <fileset dir="${eclipse.location}/plugins" includes="${pluginName}.source_*" /> - </pathconvert> + <fail unless="augment.bin"> + You do not have the eclipse plugin '${pluginName}'. I expected it to be in your eclipse plugins directory (followed by an underscore and a version number). + </fail> - <condition property="noSourceAvailable"> - <and> - <isset property="augment.bin" /> - <not><isset property="augment.src" /></not> - </and> + <condition property="multiples"> + <contains string="${augment.bin}" substring=" :: " /> </condition> - <condition property="multiples"> - <or> - <contains string="${augment.bin}" substring=" :: " /> - <contains string="${augment.src}" substring=" :: " /> - </or> + <condition property="augment.jar" value="${augment.bin}"> + <not><isset property="multiples" /></not> </condition> - <fail if="noSourceAvailable"> - You do not have sources for ${augment.bin}. I expect the sources to be in the same directory, but starting with '${prefix}.source_'. - </fail> + <input message="You have multiple versions of the same plugin. These are: ${augment.bin}. Please copy/paste the complete path to the one you want to use, press enter to abort:" addproperty="augment.jar" /> - <fail unless="augment.bin"> - You do not have the eclipse plugin '${pluginName}'. I expected it to be in your eclipse plugins directory (followed by an underscore and a version number). - </fail> + <condition property="emptyTarget"> + <equals arg1="${augment.jar}" arg2="" /> + </condition> - <fail if="multiples"> - You have multiple versions of the same plugin. You should probably delete everything except the one your eclipse actually uses. + <fail> + <condition> + <equals arg1="${augment.jar}" arg2="" /> + </condition> + </fail> - Binaries: ${augment.bin} + <pathconvert property="augment.src"> + <map from="${eclipse.location}/plugins/${pluginName}_" to="${eclipse.location}/plugins/${pluginName}.source_" /> + <fileset file="${augment.jar}" /> + </pathconvert> - Sources: ${augment.src} - </fail> + <available property="sourceAddition" file="${augment.src}" value=" sourcepath="${augment.src}"" /> + <property name="sourceAddition" value="" /> - <condition property="intentionallyBreakTheRegexp" value="" else="thisWontBeInClasspathFile"> - <isset property="augment.bin" /> + <condition property="sourceWarning" value="WARNING: No source available for this plugin!"> + <equals arg1="${sourceAddition}" arg2="" /> </condition> + <property name="sourceWarning" value="" /> <replaceregexp file=".classpath" flags="is" encoding="UTF-8"> - <regexp pattern="^(.*?)(.)${intentionallyBreakTheRegexp}(<classpathentry kind=.lib. path=)(.*)$" /> - <substitution expression="\1\2<classpathentry kind="lib" path="____AUGMENT_BIN____" sourcepath="____AUGMENT_SRC____"/>\${line.separator}\2\3\4" /> + <regexp pattern="^(.*?)(.)(<classpathentry kind=.lib. path=)(.*)$" /> + <substitution expression="\1\2<classpathentry kind="lib" path="____AUGMENT_BIN____"____AUGMENT_SRC____/>\${line.separator}\2\3\4" /> </replaceregexp> - <replace file=".classpath" token="____AUGMENT_BIN____" value="${augment.bin}" /> - <replace file=".classpath" token="____AUGMENT_SRC____" value="${augment.src}" /> - <echo>Added to project classpath from your eclipse installation: ${pluginName}.</echo> + <replace file=".classpath" token="____AUGMENT_BIN____" value="${augment.jar}" /> + <replace file=".classpath" token="____AUGMENT_SRC____" value="${sourceAddition}" /> + <echo>Added to project classpath from your eclipse installation: ${pluginName}. +${sourceWarning}</echo> </target> <target name="-test-compile" depends="ensureTestDeps, compile" unless="skipTests"> |