- Compile SDK to 1.5 bytecode and disable 1.6 plugins.
This commit is contained in:
parent
afd8c47066
commit
7395e6b69a
14
eclipse.spec
14
eclipse.spec
@ -23,7 +23,7 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 15%{?dist}
|
Release: 16%{?dist}
|
||||||
License: Eclipse Public License
|
License: Eclipse Public License
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -556,7 +556,6 @@ sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
|
|||||||
find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
|
find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{gcj_support}
|
|
||||||
# remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
|
# remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
|
||||||
for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
|
for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
|
||||||
version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
|
version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
|
||||||
@ -570,7 +569,6 @@ for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
|
|||||||
linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
|
linenum=$(grep -no "value=\"org.eclipse.$plugin" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
|
||||||
sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
|
sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
|
||||||
done
|
done
|
||||||
%endif
|
|
||||||
|
|
||||||
# link to the jsch jar
|
# link to the jsch jar
|
||||||
rm plugins/com.jcraft.jsch_0.1.31.jar
|
rm plugins/com.jcraft.jsch_0.1.31.jar
|
||||||
@ -672,17 +670,10 @@ ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejd
|
|||||||
# Build the rest of Eclipse
|
# Build the rest of Eclipse
|
||||||
export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH
|
export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH
|
||||||
export JAVA_HOME=%{java_home}
|
export JAVA_HOME=%{java_home}
|
||||||
%if %{gcj_support}
|
|
||||||
ant \
|
ant \
|
||||||
-Dnobootstrap=true \
|
-Dnobootstrap=true \
|
||||||
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
|
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
|
||||||
-Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn"
|
-Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn"
|
||||||
%else
|
|
||||||
ant \
|
|
||||||
-Dnobootstrap=true \
|
|
||||||
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
|
|
||||||
-Dlibsconfig=true -DcompilerArg="-encoding ISO-8859-1 -nowarn"
|
|
||||||
%endif
|
|
||||||
|
|
||||||
## Build the FileInitializer application
|
## Build the FileInitializer application
|
||||||
SDK=$(cd eclipse && pwd)
|
SDK=$(cd eclipse && pwd)
|
||||||
@ -1573,6 +1564,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 06 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-16
|
||||||
|
- Compile SDK to 1.5 bytecode and disable 1.6 plugins.
|
||||||
|
|
||||||
* Wed Sep 05 2007 Andrew Overholt <overholt@redhat.com> 3.3.0-15
|
* Wed Sep 05 2007 Andrew Overholt <overholt@redhat.com> 3.3.0-15
|
||||||
- Update tomcat5, commons-el, and commons-logging to required releases
|
- Update tomcat5, commons-el, and commons-logging to required releases
|
||||||
with proper OSGi manifests.
|
with proper OSGi manifests.
|
||||||
|
Loading…
Reference in New Issue
Block a user