Attachment #152685 for bug #280688

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




	<uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" targetfile="testsunpack-stamp" />
	<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
	<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
	<uptodate property="symlinkSystemJARs.complete" srcfile="patch-stamp" targetfile="symlink-stamp" />
	<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
	<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
	<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />

		<echo file="patch-stamp" />
	</target>

	<target name="symlinkSystemJARs" depends="applyPatches" unless="symlinkSystemJARs.complete">
		<!-- symlink system jars -->
		<chmod perm="+x" file="symlink-system-jars" />
		<exec executable="./symlink-system-jars" failonerror="true">
			<arg line="${buildDirectory}" />
		</exec>
		<echo file="symlink-stamp" />
	</target>

	<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
		<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
		<patch patchfile="${basedir}/patches/tests-nostyletask.patch" dir="${testsBuildDirectory}" strip="0" />
		<echo file="testspatch-stamp" />
	</target>

	<target name="build" depends="symlinkSystemJARs,bootstrap,compilelibs" unless="build.complete">
		<echo message="build.xml:  eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
		<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
			<classpath>

				<filename name="org.eclipse.*.jar" />
			</fileset>
		</copy>
		<exec executable="./symlink-system-jars" failonerror="true">
			<arg line="${buildDirectory}/installation" />
		</exec>
		<echo file="provision.sdk-stamp" />
	</target>





#!/bin/sh
set -e

# File format for system-jars.csv:
# The column are separated with semicolons. Here is a description of each column:
# 1. The to-be-replaced jar file in the eclipse source directory
# 2. Comma separated list of locations, where the system jar files can be found

CVS_FILE=$(dirname $0)/system-jars.csv
if test -n "$2"; then
	CVS_FILE="$2"
fi
CVS_FILE_CONTENT=$(cat $CVS_FILE)

if test -n "$1"; then
	cd "$1"
fi

# Remove signatures for JARs
find \( -iname '*.sf' -o -iname '*.rsa' \) -delete

for line in $CVS_FILE_CONTENT; do
	if test "$(echo $line | cut -c 1)" != "#"; then
		COLUMN1=$(echo $line | sed "s/;/\n/g" | sed -n "1p")
		COLUMN2=$(echo $line | sed "s/;/\n/g" | sed -n "2p")

		if test -n "$VERBOSE"; then
			echo "I: line: $line"
			echo "I: column1: $COLUMN1"
			echo "I: column2: $COLUMN2"
		fi

		# sanity check if the to-be-replaced jar exits
		if ls $COLUMN1 > /dev/null 2>&1; then
			ECLIPSE_JAR=$(ls -1 $COLUMN1)
			if test ! -f "$ECLIPSE_JAR"; then
				echo "E: $COLUMN1 is ambiguous. Found following jar files:" > /dev/stdout
				echo "$ECLIPSE_JAR" > /dev/stdout
				exit 1
			fi
		else
			echo "E: No matching jar file for $COLUMN1 found." > /dev/stdout
			exit 2
		fi

		# search for system jars
		SYSTEM_JAR=$(ls -1 $(echo "$COLUMN2" | sed "s/,/ /g") 2> /dev/null || true)
		if test -z "$SYSTEM_JAR"; then
			echo "W: No system jar file found for $ECLIPSE_JAR."
		else
			if test ! -f "$SYSTEM_JAR"; then
				echo "E: $COLUMN2 is ambiguous. Found following system jar files:" > /dev/stdout
				echo "$SYSTEM_JAR" > /dev/stdout
				exit 3
			fi

			if test -n "$VERBOSE"; then
				echo "I: ln -sf $SYSTEM_JAR $ECLIPSE_JAR"
			fi
			# link to system jar file
			ln -sf $SYSTEM_JAR $ECLIPSE_JAR
		fi
	fi
done

# Make sure there are no jars left
JARS=$(find * -iname '*.jar' -type f | sort)
if test ! -z "$JARS"; then
	echo "W: These jars should be deleted and symlinked to system jars:\n$JARS"
fi




plugins/org.apache.ant_*/lib/ant-antlr.jar;/usr/share/java/ant-antlr.jar,uieiuo,uiao
plugins/org.apache.ant_*/lib/ant-apache-bcel.jar;/usr/share/java/ant-apache-bcel.jar
plugins/org.apache.ant_*/lib/ant-apache-bsf.jar;/usr/share/java/ant-apache-bsf.jar
plugins/org.apache.ant_*/lib/ant-apache-log4j.jar;/usr/share/java/ant-apache-log4j.jar
plugins/org.apache.ant_*/lib/ant-apache-oro.jar;/usr/share/java/ant-apache-oro.jar
plugins/org.apache.ant_*/lib/ant-apache-regexp.jar;/usr/share/java/ant-apache-regexp.jar
plugins/org.apache.ant_*/lib/ant-apache-resolver.jar;/usr/share/java/ant-apache-resolver.jar
plugins/org.apache.ant_*/lib/ant-commons-logging.jar;/usr/share/java/ant-commons-logging.jar
plugins/org.apache.ant_*/lib/ant-commons-net.jar;/usr/share/java/ant-commons-net.jar
plugins/org.apache.ant_*/lib/ant-jai.jar;/usr/share/java/ant-jai.jar
plugins/org.apache.ant_*/lib/ant-javamail.jar;/usr/share/java/ant-javamail.jar
plugins/org.apache.ant_*/lib/ant-jdepend.jar;/usr/share/java/ant-jdepend.jar
plugins/org.apache.ant_*/lib/ant-jmf.jar;/usr/share/java/ant-jmf.jar
plugins/org.apache.ant_*/lib/ant-jsch.jar;/usr/share/java/ant-jsch.jar
plugins/org.apache.ant_*/lib/ant-junit.jar;/usr/share/java/ant-junit.jar
plugins/org.apache.ant_*/lib/ant-launcher.jar;/usr/share/java/ant-launcher.jar
plugins/org.apache.ant_*/lib/ant-netrexx.jar;/usr/share/java/ant-netrexx.jar
plugins/org.apache.ant_*/lib/ant-nodeps.jar;/usr/share/java/ant-nodeps.jar
plugins/org.apache.ant_*/lib/ant-starteam.jar;/usr/share/java/ant-starteam.jar
plugins/org.apache.ant_*/lib/ant-stylebook.jar;/usr/share/java/ant-stylebook.jar
plugins/org.apache.ant_*/lib/ant-swing.jar;/usr/share/java/ant-swing.jar
plugins/org.apache.ant_*/lib/ant-trax.jar;/usr/share/java/ant-trax.jar
plugins/org.apache.ant_*/lib/ant-weblogic.jar;/usr/share/java/ant-weblogic.jar
plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
plugins/org.junit_3.*/junit.jar;/usr/share/java/junit-3.*.jar
plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.1.jar
plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar
plugins/org.apache.commons.logging_*.jar;/usr/share/java/commons-logging.jar
plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
plugins/org.hamcrest.core_*.jar;/usr/share/java/hamcrest-core.jar
plugins/org.junit4/junit.jar;/usr/share/java/junit4.jar
plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty6.jar
plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty6-util.jar
plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar

Return to bug 280688

Lines 30-35 Link Here

(-)eclipse-3.5.1+repack.orig/build.xml (-1 / +14 lines)
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 265-277 Link Here
265	<echo file="patch-stamp" />	266	<echo file="patch-stamp" />
266	</target>	267	</target>
267		268
		269	<target name="symlinkSystemJARs" depends="applyPatches" unless="symlinkSystemJARs.complete">
		270	<!-- symlink system jars -->
		271	<chmod perm="+x" file="symlink-system-jars" />
		272	<exec executable="./symlink-system-jars" failonerror="true">
		273	<arg line="${buildDirectory}" />
		274	</exec>
		275	<echo file="symlink-stamp" />
		276	</target>
		277
268	<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">	278	<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
269	<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />	279	<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
270	<patch patchfile="${basedir}/patches/tests-nostyletask.patch" dir="${testsBuildDirectory}" strip="0" />	280	<patch patchfile="${basedir}/patches/tests-nostyletask.patch" dir="${testsBuildDirectory}" strip="0" />
271	<echo file="testspatch-stamp" />	281	<echo file="testspatch-stamp" />
272	</target>	282	</target>
273		283
274	<target name="build" depends="applyPatches,bootstrap,compilelibs" unless="build.complete">	284	<target name="build" depends="symlinkSystemJARs,bootstrap,compilelibs" unless="build.complete">
275	<echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />	285	<echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
276	<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">	286	<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
277	<classpath>	287	<classpath>
Lines 573-578 Link Here
573	<filename name="org.eclipse.*.jar" />	583	<filename name="org.eclipse.*.jar" />
574	</fileset>	584	</fileset>
575	</copy>	585	</copy>
		586	<exec executable="./symlink-system-jars" failonerror="true">
		587	<arg line="${buildDirectory}/installation" />
		588	</exec>
576	<echo file="provision.sdk-stamp" />	589	<echo file="provision.sdk-stamp" />
577	</target>	590	</target>
578		591

Added Link Here

(-) (+70 lines)
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	CVS_FILE=$(dirname $0)/system-jars.csv
10	if test -n "$2"; then
11	CVS_FILE="$2"
12	fi
13	CVS_FILE_CONTENT=$(cat $CVS_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 $CVS_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

Added Link Here

(-) (+41 lines)
1	plugins/org.apache.ant_*/lib/ant-antlr.jar;/usr/share/java/ant-antlr.jar,uieiuo,uiao
2	plugins/org.apache.ant_*/lib/ant-apache-bcel.jar;/usr/share/java/ant-apache-bcel.jar
3	plugins/org.apache.ant_*/lib/ant-apache-bsf.jar;/usr/share/java/ant-apache-bsf.jar
4	plugins/org.apache.ant_*/lib/ant-apache-log4j.jar;/usr/share/java/ant-apache-log4j.jar
5	plugins/org.apache.ant_*/lib/ant-apache-oro.jar;/usr/share/java/ant-apache-oro.jar
6	plugins/org.apache.ant_*/lib/ant-apache-regexp.jar;/usr/share/java/ant-apache-regexp.jar
7	plugins/org.apache.ant_*/lib/ant-apache-resolver.jar;/usr/share/java/ant-apache-resolver.jar
8	plugins/org.apache.ant_*/lib/ant-commons-logging.jar;/usr/share/java/ant-commons-logging.jar
9	plugins/org.apache.ant_*/lib/ant-commons-net.jar;/usr/share/java/ant-commons-net.jar
10	plugins/org.apache.ant_*/lib/ant-jai.jar;/usr/share/java/ant-jai.jar
11	plugins/org.apache.ant_*/lib/ant-javamail.jar;/usr/share/java/ant-javamail.jar
12	plugins/org.apache.ant_*/lib/ant-jdepend.jar;/usr/share/java/ant-jdepend.jar
13	plugins/org.apache.ant_*/lib/ant-jmf.jar;/usr/share/java/ant-jmf.jar
14	plugins/org.apache.ant_*/lib/ant-jsch.jar;/usr/share/java/ant-jsch.jar
15	plugins/org.apache.ant_*/lib/ant-junit.jar;/usr/share/java/ant-junit.jar
16	plugins/org.apache.ant_*/lib/ant-launcher.jar;/usr/share/java/ant-launcher.jar
17	plugins/org.apache.ant_*/lib/ant-netrexx.jar;/usr/share/java/ant-netrexx.jar
18	plugins/org.apache.ant_*/lib/ant-nodeps.jar;/usr/share/java/ant-nodeps.jar
19	plugins/org.apache.ant_*/lib/ant-starteam.jar;/usr/share/java/ant-starteam.jar
20	plugins/org.apache.ant_*/lib/ant-stylebook.jar;/usr/share/java/ant-stylebook.jar
21	plugins/org.apache.ant_*/lib/ant-swing.jar;/usr/share/java/ant-swing.jar
22	plugins/org.apache.ant_*/lib/ant-trax.jar;/usr/share/java/ant-trax.jar
23	plugins/org.apache.ant_*/lib/ant-weblogic.jar;/usr/share/java/ant-weblogic.jar
24	plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
25	plugins/org.junit_3./junit.jar;/usr/share/java/junit-3..jar
26	plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
27	plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.1.jar
28	plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
29	plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
30	plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
31	plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
32	plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar
33	plugins/org.apache.commons.logging_*.jar;/usr/share/java/commons-logging.jar
34	plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
35	plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
36	plugins/org.hamcrest.core_*.jar;/usr/share/java/hamcrest-core.jar
37	plugins/org.junit4/junit.jar;/usr/share/java/junit4.jar
38	plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty6.jar
39	plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty6-util.jar
40	plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
41	plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar