rpms/eclipse/devel eclipse-copy-platform.sh, 1.7, 1.8 eclipse-memorypermsizeandjvmcrash.patch, 1.4, 1.5 eclipse-pdebuild.sh, 1.2, 1.3 eclipse.spec, 1.574, 1.575
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Tue Aug 5 22:22:24 UTC 2008
- Previous message (by thread): rpms/eclipse-cdt/devel eclipse-cdt.spec,1.95,1.96
- Next message (by thread): rpms/pdfmerge/devel import.log, NONE, 1.1 pdfmerge.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: overholt
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26691
Modified Files:
eclipse-copy-platform.sh
eclipse-memorypermsizeandjvmcrash.patch eclipse-pdebuild.sh
eclipse.spec
Log Message:
* Tue Aug 05 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-16
- Ensure %{_datadir}/eclipse/dropins gets watched in eclipse.ini
- Move JDT and SDK bits to dropins/{jdt,sdk}/eclipse for consistency
- Update copy-platform to add %{_datadir}/dropins
Index: eclipse-copy-platform.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-copy-platform.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-copy-platform.sh 31 Jul 2008 00:38:20 -0000 1.7
+++ eclipse-copy-platform.sh 5 Aug 2008 22:21:54 -0000 1.8
@@ -20,13 +20,15 @@
if [ $# -lt 2 ]; then
echo "Usage: copy-platform where eclipse_base optional_directories"
- echo "For example: copy-plaform ~/SDK /usr/share/eclipse cdt pydev jdt"
+ echo "For example: copy-plaform ~/SDK /usr/lib/eclipse cdt pydev jdt"
exit 1
fi
where=$1; shift
eclipse=$1; shift
+datadir=/usr/share/eclipse
+
mkdir -p $where/plugins $where/features
cd $where
@@ -46,13 +48,29 @@
ln -s $eclipse/dropins/$f/eclipse/$g $g
done
else
- (cd $eclipse/dropins; ls -d plugins/* features/*) |
+ (cd $eclipse/dropins/$f; ls -d plugins/* features/*) |
while read g; do
[ ! -e $g ] && \
ln -s $eclipse/dropins/$g $g
done
fi
done
+ (cd $datadir/dropins; ls -d *"$optional"*) |
+ while read f; do
+ if [ -e $datadir/dropins/$f/eclipse ]; then
+ (cd $datadir/dropins/$f/eclipse; ls -d plugins/* features/*) |
+ while read g; do
+ [ ! -e $g ] && \
+ ln -s $datadir/dropins/$f/eclipse/$g $g
+ done
+ else
+ (cd $datadir/dropins/$f; ls -d plugins/* features/*) |
+ while read g; do
+ [ ! -e $g ] && \
+ ln -s $datadir/dropins/$g $g
+ done
+ fi
+ done
done
fi
eclipse-memorypermsizeandjvmcrash.patch:
Index: eclipse-memorypermsizeandjvmcrash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-memorypermsizeandjvmcrash.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-memorypermsizeandjvmcrash.patch 1 Aug 2008 20:11:03 -0000 1.4
+++ eclipse-memorypermsizeandjvmcrash.patch 5 Aug 2008 22:21:54 -0000 1.5
@@ -7,7 +7,7 @@
diff -u -r1.3 eclipse.ini
--- gtk/eclipse.ini 3 Jun 2008 20:55:37 -0000 1.3
+++ gtk/eclipse.ini 31 Jul 2008 00:28:29 -0000
-@@ -4,4 +4,9 @@
+@@ -4,4 +4,10 @@
256m
-vmargs
-Xms40m
@@ -18,3 +18,4 @@
+-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
+-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate
+-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
++-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins
Index: eclipse-pdebuild.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pdebuild.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-pdebuild.sh 29 Jul 2008 13:40:46 -0000 1.2
+++ eclipse-pdebuild.sh 5 Aug 2008 22:21:54 -0000 1.3
@@ -76,7 +76,7 @@
SDK=$buildDir/SDK
homeDir=$buildDir/home
datadir=`rpm --eval "%{_libdir}"`
-pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
+pdeBuildDir=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
featureId=
dependencies=
@@ -183,7 +183,7 @@
-DbaseLocation=$SDK \
-DsourceDirectory=$sourceDir \
-DbuildDirectory=$buildDir \
--Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+-Dbuilder=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
-DorbitDepsDir="$orbitDepsDir" \
$additionalArgs \
-f $pdeBuildDir/scripts/build.xml \
@@ -202,7 +202,7 @@
-DbaseLocation=$SDK \
-DsourceDirectory=$sourceDir \
-DbuildDirectory=$buildDir \
- -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+ -Dbuilder=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
-DorbitDepsDir=\""$orbitDepsDir"\" \
$additionalArgs \
-f $pdeBuildDir/scripts/build.xml \
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- eclipse.spec 4 Aug 2008 06:17:59 -0000 1.574
+++ eclipse.spec 5 Aug 2008 22:21:54 -0000 1.575
@@ -27,7 +27,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 15%{?dist}
+Release: 16%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -705,8 +705,16 @@
install -d -m 755 $sdkDir
install -d -m 755 $sdkDir/plugins
install -d -m 755 $sdkDir/features
+# 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
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/dropins
+
+# 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
@@ -861,13 +869,13 @@
fi
done
dropins=$provisionDir/dropins
-mkdir $dropins/jdt $dropins/sdk
-mv $jdtDir/features $dropins/jdt
-mv $jdtDir/plugins $dropins/jdt
+mkdir -p $dropins/jdt/eclipse $dropins/sdk/eclipse
+mv $jdtDir/features $dropins/jdt/eclipse
+mv $jdtDir/plugins $dropins/jdt/eclipse
mv $jdtMetadata/content.xml $dropins/jdt
-mv $sdkDir/features $dropins/sdk
-mv $sdkDir/plugins $dropins/sdk
+mv $sdkDir/features $dropins/sdk/eclipse
+mv $sdkDir/plugins $dropins/sdk/eclipse
mv $sdkMetadata/content.xml $dropins/sdk
rm -rf $metadataDir $jdtDir $sdkDir $installDir
mv $provisionDir $sdkDir
@@ -890,6 +898,8 @@
cp -p features/org.eclipse.platform/gtk/eclipse.ini.patched \
$sdkDir/eclipse.ini
+# We have /usr/share/eclipse/dropins in eclipse.ini
+sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
# Add a compatibility symlink to startup.jar
pushd $sdkDir
@@ -956,10 +966,11 @@
done
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}" > \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/links/datadir.link
+ $sdkDir/links/datadir.link
# Ensure the launcher binary has the correct permissions
chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
@@ -992,9 +1003,10 @@
popd
# Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac"
-JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
+JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/eclipse/plugins \
+ | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-ln -s %{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \
+ln -s %{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \
$RPM_BUILD_ROOT%{_javadir}/eclipse-ecj-%{version}.jar
ln -s %{_javadir}/eclipse-ecj-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
@@ -1048,11 +1060,11 @@
cp -p copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-for p in $(ls -d dropins/jdt/plugins/*); do
+for p in $(ls -d dropins/jdt/eclipse/plugins/*); do
plugin=$(basename $p)
echo $p | sed -e"s,^\(.*\),[ ! -e plugins/$plugin ] \&\& ln -s \$eclipse/\1 plugins/$plugin," >> $copyPlatform
done
-for p in $(ls -d dropins/sdk/plugins/*); do
+for p in $(ls -d dropins/sdk/eclipse/plugins/*); do
plugin=$(basename $p)
echo $p | sed -e"s,^\(.*\),[ ! -e plugins/$plugin ] \&\& ln -s \$eclipse/\1 plugins/$plugin," >> $copyPlatform
done
@@ -1061,7 +1073,7 @@
# Install the PDE Build wrapper script.
install -p -D -m0755 %{SOURCE21} \
$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
-PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
+PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/eclipse/plugins \
| grep org.eclipse.pde.build_ | \
sed 's/org.eclipse.pde.build_//')
sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
@@ -1072,11 +1084,11 @@
ln -s %{_javadir}/org.sat4j.core_* plugins/
ln -s %{_javadir}/org.sat4j.pb_* plugins/
-ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
+ASMPLUGINVERSION=$(ls dropins/sdk/eclipse/plugins | grep org.objectweb.asm_ | \
sed 's/org.objectweb.asm_//')
-rm dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
+rm dropins/sdk/eclipse/plugins/org.objectweb.asm_$ASMPLUGINVERSION
ln -s %{_javadir}/objectweb-asm/asm-all.jar \
- dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
+ dropins/sdk/eclipse/plugins/org.objectweb.asm_$ASMPLUGINVERSION
## BEGIN ANT ##
ANTDIR=plugins/$(ls plugins | grep org.apache.ant_)
@@ -1114,7 +1126,7 @@
rm plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty_$JETTYPLUGINVERSION
-pushd dropins/jdt
+pushd dropins/jdt/eclipse
build-jar-repository -s -p plugins/org.junit_* junit
JUNIT4VERSION=$(ls plugins | grep org.junit4_ | sed 's/org.junit4_//')
@@ -1196,9 +1208,9 @@
%defattr(-,root,root)
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/dropins
-%dir %{_libdir}/%{name}/dropins/jdt
-%dir %{_libdir}/%{name}/dropins/jdt/plugins
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*
+%dir %{_libdir}/%{name}/dropins/jdt/eclipse
+%dir %{_libdir}/%{name}/dropins/jdt/eclipse/plugins
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.core_*
%{_javadir}/eclipse-ecj*.jar
%{_javadir}/jdtcore*.jar
%{_javadir}/ecj*.jar
@@ -1279,6 +1291,7 @@
%{_datadir}/icons/*/*/apps/*
%{_libdir}/%{name}/eclipse
%dir %{_libdir}/%{name}/dropins
+%dir %{_datadir}/%{name}/dropins
%{_libdir}/%{name}/features/org.eclipse.platform_*
%{_libdir}/%{name}/plugins/com.jcraft.jsch_*
%{_libdir}/%{name}/plugins/javax.servlet_*
@@ -1406,26 +1419,26 @@
%defattr(-,root,root)
%{_bindir}/efj
%{_libdir}/%{name}/dropins/jdt/content.xml
-%{_libdir}/%{name}/dropins/jdt/features
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.ant.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit4.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.launching_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit4_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.doc.user_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/features
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.ant.ui_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.apt.core_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.apt.ui_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.apt.pluggable.core_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.compiler.apt_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.compiler.tool_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.core_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.core.manipulation_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.debug.ui_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.debug_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.junit_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.junit.runtime_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.junit4.runtime_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.launching_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.ui_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.junit_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.junit4_*
+%{_libdir}/%{name}/dropins/jdt/eclipse/plugins/org.eclipse.jdt.doc.user_*
%files pde
%defattr(-,root,root)
@@ -1435,6 +1448,11 @@
%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Tue Aug 05 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-16
+- Ensure %%{_datadir}/eclipse/dropins gets watched in eclipse.ini
+- Move JDT and SDK bits to dropins/{jdt,sdk}/eclipse for consistency
+- Update copy-platform to add %%{_datadir}/dropins
+
* Mon Aug 04 2008 Sean Flanigan <sflaniga at redhat.com> 3.4.0-15
- Removed buildroot from path in datadir.link
- Previous message (by thread): rpms/eclipse-cdt/devel eclipse-cdt.spec,1.95,1.96
- Next message (by thread): rpms/pdfmerge/devel import.log, NONE, 1.1 pdfmerge.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list