Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 280688 | Differences between
and this patch

Collapse All | Expand All

(-)system-jars.csv (+46 lines)
Line 0 Link Here
1
plugins/org.apache.ant_*/bin/ant;/usr/share/ant/bin/ant
2
plugins/org.apache.ant_*/bin/antRun;/usr/share/ant/bin/antRun
3
plugins/org.apache.ant_*/bin/antRun.pl;/usr/share/ant/bin/antRun.pl
4
plugins/org.apache.ant_*/bin/complete-ant-cmd.pl;/usr/share/ant/bin/complete-ant-cmd.pl
5
plugins/org.apache.ant_*/bin/runant.pl;/usr/share/ant/bin/runant.pl
6
plugins/org.apache.ant_*/lib/ant-antlr.jar;/usr/share/java/ant-antlr.jar
7
plugins/org.apache.ant_*/lib/ant-apache-bcel.jar;/usr/share/java/ant-apache-bcel.jar
8
plugins/org.apache.ant_*/lib/ant-apache-bsf.jar;/usr/share/java/ant-apache-bsf.jar
9
plugins/org.apache.ant_*/lib/ant-apache-log4j.jar;/usr/share/java/ant-apache-log4j.jar
10
plugins/org.apache.ant_*/lib/ant-apache-oro.jar;/usr/share/java/ant-apache-oro.jar
11
plugins/org.apache.ant_*/lib/ant-apache-regexp.jar;/usr/share/java/ant-apache-regexp.jar
12
plugins/org.apache.ant_*/lib/ant-apache-resolver.jar;/usr/share/java/ant-apache-resolver.jar
13
plugins/org.apache.ant_*/lib/ant-commons-logging.jar;/usr/share/java/ant-commons-logging.jar
14
plugins/org.apache.ant_*/lib/ant-commons-net.jar;/usr/share/java/ant-commons-net.jar
15
plugins/org.apache.ant_*/lib/ant-jai.jar;/usr/share/java/ant-jai.jar
16
plugins/org.apache.ant_*/lib/ant-javamail.jar;/usr/share/java/ant-javamail.jar
17
plugins/org.apache.ant_*/lib/ant-jdepend.jar;/usr/share/java/ant-jdepend.jar
18
plugins/org.apache.ant_*/lib/ant-jmf.jar;/usr/share/java/ant-jmf.jar
19
plugins/org.apache.ant_*/lib/ant-jsch.jar;/usr/share/java/ant-jsch.jar
20
plugins/org.apache.ant_*/lib/ant-junit.jar;/usr/share/java/ant-junit.jar
21
plugins/org.apache.ant_*/lib/ant-launcher.jar;/usr/share/java/ant-launcher.jar
22
plugins/org.apache.ant_*/lib/ant-netrexx.jar;/usr/share/java/ant-netrexx.jar
23
plugins/org.apache.ant_*/lib/ant-nodeps.jar;/usr/share/java/ant-nodeps.jar
24
plugins/org.apache.ant_*/lib/ant-starteam.jar;/usr/share/java/ant-starteam.jar
25
plugins/org.apache.ant_*/lib/ant-stylebook.jar;/usr/share/java/ant-stylebook.jar
26
plugins/org.apache.ant_*/lib/ant-swing.jar;/usr/share/java/ant-swing.jar
27
plugins/org.apache.ant_*/lib/ant-trax.jar;/usr/share/java/ant-trax.jar
28
plugins/org.apache.ant_*/lib/ant-weblogic.jar;/usr/share/java/ant-weblogic.jar
29
plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
30
plugins/org.junit_3.*/junit.jar;/usr/share/java/junit-3.*.jar
31
plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
32
plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.1.jar
33
plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
34
plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
35
plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
36
plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
37
plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar
38
plugins/org.apache.commons.logging_*.jar;/usr/share/java/commons-logging.jar
39
plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
40
plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
41
plugins/org.hamcrest.core_*.jar;/usr/share/java/hamcrest-core.jar
42
plugins/org.junit4/junit.jar;/usr/share/java/junit4.jar
43
plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty6.jar
44
plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty6-util.jar
45
plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
46
plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar
(-)symlink-system-jars.sh (+70 lines)
Line 0 Link Here
1
#!/bin/sh
2
set -e
3
4
# File format for system-jars.csv:
5
# The column are separated with semicolons. Here is a description of each column:
6
# 1. The to-be-replaced jar file in the eclipse source directory
7
# 2. Comma separated list of locations, where the system jar files can be found
8
9
CSV_FILE=$(dirname $0)/system-jars.csv
10
if test -n "$2"; then
11
	CSV_FILE="$2"
12
fi
13
CSV_FILE_CONTENT=$(cat $CSV_FILE)
14
15
if test -n "$1"; then
16
	cd "$1"
17
fi
18
19
# Remove signatures for JARs
20
find \( -iname '*.sf' -o -iname '*.rsa' \) -delete
21
22
for line in $CSV_FILE_CONTENT; do
23
	if test "$(echo $line | cut -c 1)" != "#"; then
24
		COLUMN1=$(echo $line | sed "s/;/\n/g" | sed -n "1p")
25
		COLUMN2=$(echo $line | sed "s/;/\n/g" | sed -n "2p")
26
27
		if test -n "$VERBOSE"; then
28
			echo "I: line: $line"
29
			echo "I: column1: $COLUMN1"
30
			echo "I: column2: $COLUMN2"
31
		fi
32
33
		# sanity check if the to-be-replaced jar exits
34
		if ls $COLUMN1 > /dev/null 2>&1; then
35
			ECLIPSE_JAR=$(ls -1 $COLUMN1)
36
			if test ! -f "$ECLIPSE_JAR"; then
37
				echo "E: $COLUMN1 is ambiguous. Found following jar files:" > /dev/stdout
38
				echo "$ECLIPSE_JAR" > /dev/stdout
39
				exit 1
40
			fi
41
		else
42
			echo "E: No matching jar file for $COLUMN1 found." > /dev/stdout
43
			exit 2
44
		fi
45
46
		# search for system jars
47
		SYSTEM_JAR=$(ls -1 $(echo "$COLUMN2" | sed "s/,/ /g") 2> /dev/null || true)
48
		if test -z "$SYSTEM_JAR"; then
49
			echo "W: No system jar file found for $ECLIPSE_JAR."
50
		else
51
			if test ! -f "$SYSTEM_JAR"; then
52
				echo "E: $COLUMN2 is ambiguous. Found following system jar files:" > /dev/stdout
53
				echo "$SYSTEM_JAR" > /dev/stdout
54
				exit 3
55
			fi
56
57
			if test -n "$VERBOSE"; then
58
				echo "I: ln -sf $SYSTEM_JAR $ECLIPSE_JAR"
59
			fi
60
			# link to system jar file
61
			ln -sf $SYSTEM_JAR $ECLIPSE_JAR
62
		fi
63
	fi
64
done
65
66
# Make sure there are no jars left
67
JARS=$(find * -iname '*.jar' -type f | sort)
68
if test ! -z "$JARS"; then
69
	echo "W: These jars should be deleted and symlinked to system jars:\n$JARS"
70
fi
(-)build.xml (-1 / +14 lines)
Lines 30-35 Link Here
30
	<uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" targetfile="testsunpack-stamp" />
30
	<uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" targetfile="testsunpack-stamp" />
31
	<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
31
	<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
32
	<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
32
	<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
33
	<uptodate property="symlinkSystemJARs.complete" srcfile="patch-stamp" targetfile="symlink-stamp" />
33
	<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
34
	<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
34
	<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
35
	<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
35
	<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
36
	<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
Lines 264-276 Link Here
264
		<echo file="patch-stamp" />
265
		<echo file="patch-stamp" />
265
	</target>
266
	</target>
266
267
268
	<target name="symlinkSystemJARs" depends="applyPatches" unless="symlinkSystemJARs.complete">
269
		<!-- symlink system jars -->
270
		<chmod perm="+x" file="symlink-system-jars" />
271
		<exec executable="./symlink-system-jars" failonerror="true">
272
			<arg line="${buildDirectory}" />
273
		</exec>
274
		<echo file="symlink-stamp" />
275
	</target>
276
267
	<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
277
	<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
268
		<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
278
		<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
269
		<patch patchfile="${basedir}/patches/tests-nostyletask.patch" dir="${testsBuildDirectory}" strip="0" />
279
		<patch patchfile="${basedir}/patches/tests-nostyletask.patch" dir="${testsBuildDirectory}" strip="0" />
270
		<echo file="testspatch-stamp" />
280
		<echo file="testspatch-stamp" />
271
	</target>
281
	</target>
272
282
273
	<target name="build" depends="applyPatches,bootstrap,compilelibs" unless="build.complete">
283
	<target name="build" depends="symlinkSystemJARs,bootstrap,compilelibs" unless="build.complete">
274
		<echo message="build.xml:  eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
284
		<echo message="build.xml:  eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
275
		<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
285
		<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
276
			<classpath>
286
			<classpath>
Lines 572-577 Link Here
572
				<filename name="org.eclipse.*.jar" />
582
				<filename name="org.eclipse.*.jar" />
573
			</fileset>
583
			</fileset>
574
		</copy>
584
		</copy>
585
		<exec executable="./symlink-system-jars" failonerror="true">
586
			<arg line="${buildDirectory}/installation" />
587
		</exec>
575
		<echo file="provision.sdk-stamp" />
588
		<echo file="provision.sdk-stamp" />
576
	</target>
589
	</target>
577
590

Return to bug 280688