Use eclipse-build jdkandsdkindropins branch

This commit is contained in:
Andrew Overholt 2010-08-18 09:43:16 -04:00
parent fa9fba6172
commit 7d39eab1c8
2 changed files with 32 additions and 396 deletions

View File

@ -1 +0,0 @@
.* = *.so

View File

@ -8,7 +8,7 @@ Epoch: 1
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%global eclipse_micro 0
%global initialize 1
%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/
%global download_url http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build/3.6.x_Helios/
%global bootstrap 0
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
@ -27,27 +27,17 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 4%{?dist}
Release: 6%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
Source0: %{download_url}eclipse-build-0.6.1RC0.tar.bz2
Source0: %{download_url}eclipse-build-0.6.1RC2.tar.bz2
Source1: %{download_url}eclipse-3.6.0-src.tar.bz2
Source2: eclipse.sh.in
Source17: efj.sh.in
# This file contains the types of files we'd like to extract from the jars
# when using the FileInitializer
Source19: %{name}-filenamepatterns.txt
# This script copies the platform sub-set of the SDK for generating metadata
Source28: %{name}-mv-Platform.sh
# Make sure the shipped target platform templates are looking in the
# correct location for source bundles (see RHBZ # 521969). This does not
# need to go upstream.
Patch0: %{name}-target-platform-template.patch
# make o.e.swt.gtk.linux.ppc64 version to match ppc
Patch1: %{name}-swt-ppc64-version.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant ant-nodeps
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@ -186,7 +176,7 @@ Eclipse Plugin Development Environment. This package is required for
developing Eclipse plugins.
%prep
%setup -q -n eclipse-build-0.6.1RC0
%setup -q -n eclipse-build-0.6.0.andrew
cp %{SOURCE1} .
ant -DbuildArch=%{eclipse_arch} applyPatches
pushd build/eclipse-%{version}-src
@ -207,7 +197,7 @@ sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
plugins/org.eclipse.pde.doc.user/pdeOptions.txt
# FIXME: do this as part of Linux distros project
# FIXME: do this as part of eclipse-build
#
# the swt version is set to HEAD on s390x but shouldn't be
# get swt version
@ -233,29 +223,22 @@ if [ ! -z "$JARS" ]; then
fi
%endif
# target platform template patch
#%patch0 -p0
# make o.e.swt.gtk.linux.ppc64 version to match ppc
#%patch1
popd
%build
export JAVA_HOME=%{java_home}
ant
ant provision.cvs
%install
rm -rf $RPM_BUILD_ROOT
# Get swt version
SWT_MAJ_VER=$(grep maj_ver build/eclipse-%{version}-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
SWT_MIN_VER=$(grep min_ver build/eclipse-%{version}-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -Dmultilib=true installSDKinDropins
ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} -Dmultilib=true install
# We don't need icon.xpm
# https://bugs.eclipse.org/292472
rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
rm -f eclipse.ini
ln -s $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
popd
# This symlink is actually provided by the icu4j-eclipse package
rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/com.ibm.icu_*.jar
# Set GDK_NATIVE_WINDOWS=true
# https://bugzilla.redhat.com/531675 (https://bugs.eclipse.org/290395)
@ -264,197 +247,10 @@ install -p -D -m0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
sed --in-place "s:/usr/lib:%{_libdir}:" \
$RPM_BUILD_ROOT%{_bindir}/%{name}
cp $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini eclipse.ini-real
# Some directories we need
sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name}
# FIXME: We can probably get rid of the links directory (for the
# datadir.link file) when we ensure all plugins are installing into
# dropins (either in libdir or datadir).
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
# FIXME: Please don't install stuff to these directories. They're only
# still here for legacy plugins (which probably won't function in 3.4).
# We'll remove these later.
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/features
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
installDir=$sdkDir-Platform
metadataDir=$installDir/metadata-Platform
provisionDir=$installDir-provisioned
profileId=PlatformProfile
# Copy just the platform
mkdir $installDir
pushd $installDir
sh %{SOURCE28} $sdkDir
mv plugins/*.source* $sdkDir/plugins
popd
# Generate metadata for the platform
java \
-cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
org.eclipse.core.launcher.Main \
-application \
org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
-metadataRepository file:$metadataDir \
-artifactRepository file:$metadataDir \
-source $installDir \
-root "Eclipse Platform" \
-rootVersion %{version} \
-flavor tooling \
-publishArtifacts \
-append \
-artifactRepositoryName "Eclipse Platform" \
-metadataRepositoryName "Eclipse Platform" \
-debug -consolelog
# JDT
jdtDir=$sdkDir-JDT
jdtMetadata=$jdtDir/metadata-JDT
mkdir $jdtDir
pushd $jdtDir
mkdir features plugins
mv $sdkDir/features/org.eclipse.jdt_* features
for plugin in org.eclipse.jdt \
org.eclipse.ant.ui \
org.eclipse.jdt.apt.core \
org.eclipse.jdt.apt.ui \
org.eclipse.jdt.apt.pluggable.core \
org.eclipse.jdt.compiler.apt \
org.eclipse.jdt.compiler.tool \
org.eclipse.jdt.core \
org.eclipse.jdt.core.manipulation \
org.eclipse.jdt.debug.ui \
org.eclipse.jdt.debug \
org.eclipse.jdt.junit \
org.eclipse.jdt.junit.runtime \
org.eclipse.jdt.junit4.runtime \
org.eclipse.jdt.launching \
org.eclipse.jdt.ui \
org.eclipse.jdt.doc.user \
org.hamcrest.core \
org.junit \
org.junit4 ; do
mv $sdkDir/plugins/${plugin}_* plugins
done
popd
# Debugging? Add -debug and -consolelog
# Provision with director
java \
-Declipse.p2.data.area=file:$provisionDir/p2 \
-Declipse.p2.MD5Check=false \
-cp $installDir/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
org.eclipse.core.launcher.Main \
-application \
org.eclipse.equinox.p2.director \
-debug -consolelog \
-flavor tooling \
-installIU "Eclipse Platform" \
-p2.os linux \
-p2.ws gtk \
-p2.arch %{eclipse_arch} \
-roaming \
-profile $profileId \
-profileProperties org.eclipse.update.install.features=true \
-metadataRepository file:$metadataDir \
-artifactRepository file:$metadataDir \
-destination $provisionDir \
-bundlepool $provisionDir
# Stuff in JDT, PDE, SDK
for f in about.html about_files \.eclipseproduct epl-v10.html notice.html readme; do
if [ -e $installDir/$f ]; then
mv $installDir/$f $provisionDir
fi
done
# FIXME: should add artifacts.xml here
dropins=$provisionDir/dropins
mkdir -p $dropins/jdt $dropins/sdk
mv $jdtDir/features $dropins/jdt
mv $jdtDir/plugins $dropins/jdt
mv $sdkDir/features $dropins/sdk
mv $sdkDir/plugins $dropins/sdk
rm -rf $metadataDir $jdtDir $sdkDir $installDir
mv $provisionDir $sdkDir
# Fix paths in p2 data
rm -rf $sdkDir/p2/org.eclipse.equinox.p2.core/cache
rm -rf $sdkDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml
sed -i "s|file\:$provisionDir/\ -\ bundle\ pool|Eclipse Platform|g" \
$sdkDir/artifacts.xml
profileDir=$sdkDir/p2/org.eclipse.equinox.p2.engine/profileRegistry
pushd $profileDir
sed -i "s|$provisionDir|%{_libdir}/%{name}|g" \
PlatformProfile.profile/*
sed -i "s|$RPM_BUILD_ROOT||g" PlatformProfile.profile/*
sed -i "s|eclipse-Platform|eclipse|g" PlatformProfile.profile/*
popd
sed --in-place "s|SDKProfile|PlatformProfile|" \
$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
# Add a compatibility symlink to startup.jar
pushd $sdkDir
LAUNCHERNAME=$(ls plugins | grep equinox.launcher_)
ln -s plugins/$LAUNCHERNAME startup.jar
popd
# Remove the unnecessary configuration data
rm -r $sdkDir/configuration/org.eclipse.update
%if %{initialize}
# FIXME: investigate why it doesn't work to set this -- configuration data is
# always written to /usr/share/eclipse/configuration, even with
# -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
# Note (2006-12-05): upon looking at this again, we (bkonrath, overholt) don't
# know what we're doing with $libdir_path :) It requires some investigation.
#
# Extract .so files
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
pushd $RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins $RPM_BUILD_ROOT/dropins
mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///')
java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT$libdir_path/configuration \
-cp $libdir_path/startup.jar \
org.eclipse.core.launcher.Main \
-debug -consolelog \
-metadataRepository file:$metadataDir \
-artifactRepository file:$metadataDir \
-application org.eclipse.equinox.initializer.configInitializer \
-fileInitializer %{SOURCE19}
popd
rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
mv $RPM_BUILD_ROOT/dropins $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
# Do this again after we've run the file initializer
rm -rf $sdkDir/p2/org.eclipse.equinox.p2.core/cache
rm -rf $sdkDir/p2/org.eclipse.equinox.p2.director/rollback/content.xml
rm -rf $sdkDir/p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs
rm -rf $sdkDir/p2/org.eclipse.equinox.p2.engine/profileRegistry/PlatformProfile.profile/.data/.settings
pushd $profileDir
sed -i "s|$RPM_BUILD_ROOT||g" *.profile/*
popd
# Remove the unnecessary configuration data
rm -r $sdkDir/configuration/org.eclipse.core.runtime
rm -r $sdkDir/configuration/org.eclipse.equinox.app
rm -rf $sdkDir/configuration/*.log
dataDirs=$(find $sdkDir/configuration \
-type d -name data)
for dataDir in $dataDirs; do
rm -rf `dirname $dataDir`
done
pushd $sdkDir
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
# Create file listings for the extracted shared libraries
echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install;
for id in `ls configuration/org.eclipse.osgi/bundles`; do
@ -466,29 +262,16 @@ for id in `ls configuration/org.eclipse.osgi/bundles`; do
done
popd
# Install symlinks to the SWT JNI shared libraries in %%{_libdir}/eclipse
# Symlinks to the SWT JNI shared libraries in %%{_libdir}/eclipse
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
for lib in $(find configuration -name libswt\*.so); do
ln -s $lib `basename $lib`
done
popd
# Ensure the shared libraries have the correct permissions
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
for lib in `find configuration -name \*.so`; do
chmod 755 $lib
done
popd
%endif
cp -p eclipse.ini-real \
$RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
# Temporary fix until https://bugs.eclipse.org/294877 is resolved
sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
sed -i "s|-Xmx256m|-Xmx512m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
sed -i "s|-Xmx384m|-Xmx512m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
echo "" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
@ -497,22 +280,8 @@ echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOM
echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/links
# FIXME: We can probably get rid of the links file when we ensure all
# plugins are installing into dropins (either in libdir or datadir).
# Set up an extension location and a link file for the arch-independent dir
echo "path:%{_datadir}" > \
$sdkDir/links/datadir.link
# Ensure the launcher binary has the correct permissions
chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
# Install the SWT jar symlinks in libdir
SWTJARVERSION=$(grep %{version} build/eclipse-%{version}-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
# SWT JAR symlink in libdir
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
ln -s plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt.jar
ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar
popd
@ -521,8 +290,6 @@ install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj
sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
$RPM_BUILD_ROOT%{_bindir}/efj
rm -rf $installDir
# A sanity check.
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
@ -549,9 +316,6 @@ for p in $(ls -d dropins/sdk/plugins/*); do
done
popd
sed --in-place "s|file\\\:$RPM_BUILD_ROOT%{_libdir}/eclipse-Platform/p2|@config.dir/../p2/|" \
$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
# Install the PDE Build wrapper script.
install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
@ -561,145 +325,6 @@ PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
%if ! %{bootstrap}
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
pushd dropins/jdt
build-jar-repository -s -p plugins/org.junit_3* junit
JUNIT4VERSION=$(ls plugins | grep org.junit_4 | sed 's/org.junit_//')
rm plugins/org.junit_$JUNIT4VERSION/junit.jar
ln -s %{_javadir}/junit4.jar plugins/org.junit_$JUNIT4VERSION/junit.jar
popd
# link to the icu4j stuff
ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
rm plugins/com.ibm.icu_*.jar
SAT4JVERSION=$(ls plugins | grep org.sat4j.core_ | \
sed 's/org.sat4j.core_//')
rm plugins/org.sat4j*
ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_$SAT4JVERSION
ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_$SAT4JVERSION
ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
sed 's/org.objectweb.asm_//')
rm dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
ln -s %{_javadir}/objectweb-asm/asm-all.jar \
dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
# Duplicate junit4
rm -rf dropins/sdk/plugins/org.junit4
# link to hamcrest-core
HAMCRESTCOREVERSION=$(ls dropins/jdt/plugins | grep org.hamcrest.core_ | \
sed 's/org.hamcrest.core_//')
rm dropins/jdt/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
ln -s %{_javadir}/hamcrest/core.jar \
dropins/jdt/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
JSCHVERSION=$(ls plugins | grep com.jcraft.jsch_ | sed 's/com.jcraft.jsch_//')
rm plugins/com.jcraft.jsch_$JSCHVERSION
ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
# link to lucene
LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
sed 's/org.apache.lucene_//')
rm plugins/org.apache.lucene_*
ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_$LUCENEVERSION
rm plugins/org.apache.lucene.analysis_*
ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar \
plugins/org.apache.lucene.analysis_$LUCENEVERSION
# link to commons-logging
COMMONSLOGGINGVERSION=$(ls plugins | grep commons.logging_ | \
sed 's/org.apache.commons.logging_//')
rm plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION
ln -s %{_javadir}/commons-logging.jar \
plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION
# link to commons-el
COMMONSELVERSION=$(ls plugins | grep commons.el_ | \
sed 's/org.apache.commons.el_//')
rm plugins/org.apache.commons.el_$COMMONSELVERSION
ln -s %{_javadir}/commons-el.jar \
plugins/org.apache.commons.el_$COMMONSELVERSION
# link to commons-codec
COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \
sed 's/org.apache.commons.codec_//')
rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION
ln -s %{_javadir}/commons-codec.jar \
plugins/org.apache.commons.codec_$COMMONSCODECVERSION
# link to commons-httpclient
COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \
sed 's/org.apache.commons.httpclient_//')
rm plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
ln -s %{_javadir}/commons-httpclient.jar \
plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
# link to servlet-api
SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \
sed 's/javax.servlet_//')
rm plugins/javax.servlet_*
ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
plugins/javax.servlet_$SERVLETAPIVERSION
# link to jsp-api
JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \
sed 's/javax.servlet.jsp_//')
rm plugins/javax.servlet.jsp_*
ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \
plugins/javax.servlet.jsp_$JSPAPIVERSION
## BEGIN ANT ##
ANTDIR=plugins/$(ls plugins | grep org.apache.ant_)
rm $ANTDIR/lib/*
ANTDIR=$ANTDIR/lib
ln -s %{_javadir}/ant/ant-antlr.jar $ANTDIR/ant-antlr.jar
ln -s %{_javadir}/ant/ant-apache-bcel.jar $ANTDIR/ant-apache-bcel.jar
ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar
ln -s %{_javadir}/ant/ant-apache-log4j.jar $ANTDIR/ant-apache-log4j.jar
ln -s %{_javadir}/ant/ant-apache-oro.jar $ANTDIR/ant-apache-oro.jar
ln -s %{_javadir}/ant/ant-apache-regexp.jar $ANTDIR/ant-apache-regexp.jar
ln -s %{_javadir}/ant/ant-apache-resolver.jar $ANTDIR/ant-apache-resolver.jar
ln -s %{_javadir}/ant/ant-commons-logging.jar $ANTDIR/ant-commons-logging.jar
ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar
#ln -s %{_javadir}/ant/ant-jai.jar $ANTDIR/ant-jai.jar
ln -s %{_javadir}/ant.jar $ANTDIR/ant.jar
ln -s %{_javadir}/ant/ant-javamail.jar $ANTDIR/ant-javamail.jar
ln -s %{_javadir}/ant/ant-jdepend.jar $ANTDIR/ant-jdepend.jar
#ln -s %{_javadir}/ant/ant-jmf.jar $ANTDIR/ant-jmf.jar
ln -s %{_javadir}/ant/ant-jsch.jar $ANTDIR/ant-jsch.jar
ln -s %{_javadir}/ant/ant-junit.jar $ANTDIR/ant-junit.jar
ln -s %{_javadir}/ant-launcher.jar $ANTDIR/ant-launcher.jar
#ln -s %{_javadir}/ant/ant-netrexx.jar $ANTDIR/ant-netrexx.jar
ln -s %{_javadir}/ant/ant-nodeps.jar $ANTDIR/ant-nodeps.jar
#ln -s %{_javadir}/ant/ant-starteam.jar $ANTDIR/ant-starteam.jar
#ln -s %{_javadir}/ant/ant-stylebook.jar $ANTDIR/ant-stylebook.jar
ln -s %{_javadir}/ant/ant-swing.jar $ANTDIR/ant-swing.jar
ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar
#ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
## END ANT ##
popd
%endif
# Be sure that we have a symlink to /etc/eclipse.ini
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
rm -f eclipse.ini
ln -s %{_sysconfdir}/eclipse.ini
popd
%clean
rm -rf $RPM_BUILD_ROOT
@ -752,11 +377,10 @@ fi
%if %{bootstrap}
%{_libdir}/%{name}/plugins/com.ibm.icu_*
%endif
%config %{_libdir}/%{name}/configuration
%dir %{_libdir}/%{name}/configuration
%config %{_libdir}/%{name}/configuration/config.ini
%config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
%dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator
%{_libdir}/%{name}/links
%ifnarch ppc ppc64
%{_libdir}/%{name}/about.html
%endif
@ -801,6 +425,7 @@ fi
%endif
%defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/%{name}
%{_libdir}/%{name}/.eclipseproduct
%config %{_libdir}/%{name}/eclipse.ini
%config %{_sysconfdir}/eclipse.ini
%ifnarch ppc ppc64
@ -953,10 +578,22 @@ fi
%defattr(-,root,root)
%{_libdir}/%{name}/buildscripts
%{_libdir}/%{name}/dropins/sdk
# FIXME: where should this go?
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
* Tue Aug 17 2010 Andrew Overholt <overholt@redhat.com> 1:3.6.0-6
- Update to eclipse-build 0.6.1RC2.
- List a few files that were missing but should be installed.
- Finally remove %%{_datadir}/%%{name}/{features,plugins} as nothing is
installed in there and shouldn't be.
- Use new eclipse-build targets provision.sdk and installSDKinDropins.
- Remove filenamepatterns.txt as it's now part of eclipse-build.
- Update download URL.
- Remove unused patches.
* Tue Aug 10 2010 Andrew Overholt <overholt@redhat.com> 1:3.6.0-5
- Update to eclipse-build 0.6.0 final.
* Fri Aug 06 2010 Andrew Overholt <overholt@redhat.com> 1:3.6.0-4
- Move epl-v10.html and notice.html to SWT sub-package.