Package: eclipse-emf / 2.5.0-2

Fedora-eclipse-emf-symlinked-classpath.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
Description: Correct classpath for javadoc generation.
Origin: Fedora, http://cvs.fedoraproject.org/viewvc/rpms/eclipse-emf/devel/
Author: 2009, Mat Booth <fedora@matbooth.co.uk>

Index: eclipse-emf/org.eclipse.emf.doc/build/antJavadoc.sh
===================================================================
--- eclipse-emf.orig/org.eclipse.emf.doc/build/antJavadoc.sh	2010-02-14 16:52:33.206306654 +0100
+++ eclipse-emf/org.eclipse.emf.doc/build/antJavadoc.sh	2010-02-14 16:52:39.077283293 +0100
@@ -94,13 +94,13 @@
 # The directory of the plugins in the order they were built
 excludes="resources.jar";
 includes="${pluginName}";
-pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
+pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
 
 ### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
 ### so that all classes/packages (and thus @links) can be resolved
 
 # All the jars in the plugins directory
-classpath=`find $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`; 
+classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`; 
 if [[ $debug -gt 1 ]]; then echo "Got classpath: "; echo $classpath | perl -pe "s#:#\n\t:#g"; fi
 
 # Calculates the packagesets and the calls to copyDocFiles (used in ${antScript}.template)
Index: eclipse-emf/org.eclipse.xsd.doc/build/antJavadoc.sh
===================================================================
--- eclipse-emf.orig/org.eclipse.xsd.doc/build/antJavadoc.sh	2010-02-14 16:52:33.206306654 +0100
+++ eclipse-emf/org.eclipse.xsd.doc/build/antJavadoc.sh	2010-02-14 16:52:39.077283293 +0100
@@ -72,13 +72,13 @@
 # The directory of the plugins in the order they were built
 excludes="resources.jar";
 includes="org.eclipse.xsd|org.eclipse.emf.mapping.xsd2ecore";
-pluginDirs=`find $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
+pluginDirs=`find -L $eclipseDir/plugins -name @dot -printf '%T@ %p\n' | sort -n | egrep "$includes" | egrep -v "$excludes" | cut -f2 -d' ' | sed -e 's/\(\/.*\)\/.*/\1/'`
 
 ### TODO: missing emf/xsd plugins (?) in $eclipseDir - need to copy them over or reference source (?)
 ### so that all classes/packages (and thus @links) can be resolved
 
 # All the jars in the plugins directory
-classpath=`find $eclipseDir/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`; 
+classpath=`find -L $eclipseDir/plugins $eclipseDir/SDK/plugins \( -name "*.jar" -type f \) -o \( -name '@dot' -type d \) | tr '\n' ':'`; 
 if [ $debug -gt 1 ]; then echo "Got classpath: "; echo $classpath | perl -pe "s#:#\n\t:#g"; fi
 
 # Calculates the packagesets and the calls to copyDocFiles (used in ${antScript}.template)