update to 4.7.2 [release 4.7.2-1mamba;Sat Dec 23 2017]

This commit is contained in:
Silvan Calarco 2024-01-05 22:02:01 +01:00
parent 4bb32def7a
commit c1c6f0232e
3 changed files with 34 additions and 153 deletions

View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!-- originally downloaded here:
ftp://rm.mirror.garr.it/mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/
ftp://rm.mirror.garr.it/mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/ecj-3.5.2.jar
ftp://rm.mirror.garr.it/mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/ecjsrc-3.5.2.zip
-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<version>3.6</version>
<packaging>jar</packaging>
<name>Eclipse ECJ</name>
<url>http://www.eclipse.org/jdt/</url>
<licenses>
<license>
<name>Eclipse Public License v1.0</name>
<url>http://www.eclipse.org/org/documents/epl-v10.php</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/</url>
</scm>
</project>

View File

@ -1,4 +0,0 @@
#!/bin/sh
CLASSPATH=@JAVADIR@/eclipse-ecj.jar${CLASSPATH:+:}$CLASSPATH \
gij org.eclipse.jdt.internal.compiler.batch.Main "$@"

View File

@ -1,130 +1,81 @@
%define antlib %(echo $ANT_HOME/lib)
%define gcjbootstrap 0
%define javahome %{_jvmdir}/jdk
Name: eclipse-ecj Name: eclipse-ecj
Version: 3.6 Version: 4.7.2
Release: 6mamba Release: 1mamba
Summary: Eclipse Compiler for Java Summary: Eclipse Compiler for Java
Group: Development/Languages Group: Development/Languages
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: gil <puntogil@libero.it> Packager: Automatic Build System <autodist@mambasoft.it>
URL: http://www.eclipse.org URL: http://www.eclipse.org
Source0: ftp://rm.mirror.garr.it/mirrors/eclipse/eclipse/downloads/drops/R-%{version}-201006080911/ecjsrc-%{version}.zip #Source: http://mirrors.ibiblio.org/eclipse/eclipse/downloads/drops4/R-%{version}-201309111000/ecjsrc-%{version}.jar
#Source0: http://download.eclipse.org/eclipse/downloads/drops/R-%{version}-200902111700/ecjsrc-%{version}.zip Source: http://ftp.fau.de/eclipse/eclipse/downloads/drops4/R-%{version}-201711300510/ecjsrc-%{version}.jar
#Source: ftp://rm.mirror.garr.it/mirrors/eclipse/eclipse/downloads/drops/R-%{version}-201002111343/ecjsrc-%{version}.zip
#Source: http://download.eclipse.org/eclipse/downloads/drops/R-%{version}-200906111540/ecjsrc-%{version}.zip
Source1: java-ecj.sh.in Source1: java-ecj.sh.in
# cvs -d:pserver:anonymous@sourceware.org:/cvs/rhug export -r eclipse_r34_1 eclipse-gcj # cvs -d:pserver:anonymous@sourceware.org:/cvs/rhug export -r eclipse_r34_1 eclipse-gcj
# tar cjf java-ecj-gcj.tar.bz2 eclipse-gcj # tar cjf java-ecj-gcj.tar.bz2 eclipse-gcj
Source2: java-ecj-gcj.tar.bz2 Source2: java-ecj-gcj.tar.bz2
Source3: jdtcoresrc.tar.gz Source3: jdtcoresrc.tar.gz
Source4: eclipse-ecj-%{version}-OSGi_MANIFEST.tar.gz
# from http://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1.pom
Source5: eclipse-ecj-%{version}.pom
Source6: eclipse-ecj.sh.in
Patch0: java-ecj-3.4.2-rpmdebuginfo.patch Patch0: java-ecj-3.4.2-rpmdebuginfo.patch
Patch1: java-ecj-3.4.2-defaultto1.5.patch Patch1: java-ecj-3.4.2-defaultto1.5.patch
Patch2: java-ecj-3.4.2-generatedebuginfo.patch Patch2: java-ecj-3.4.2-generatedebuginfo.patch
License: Eclipse Public License Version 1.0 License: Eclipse Public License
BuildRequires: apache-ant BuildRequires: apache-ant
%if %gcjbootstrap
BuildRequires: fastjar
BuildRequires: gcc-java
%endif
BuildRequires: java-gcj-compat BuildRequires: java-gcj-compat
BuildRequires: java-junit3 BuildRequires: java-junit3
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
BuildRequires: zip
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description %description
ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as the JDT Core batch compiler. ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as the JDT Core batch compiler.
%package gcj
Summary: GCJ %{name} support
Group: System/Libraries/Java
BuildRequires: java-gcj-compat
BuildRequires: libgcj4-devel
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
Requires: java-gcj-compat
Requires: jpackage-utils
%description gcj
Eclipse Compiler for Java.
This package contains GCJ %{name} support.
%prep %prep
%setup -q -c -n %{name}-%{version} %setup -q -c -n %{name}-%{version}
%patch0 -p1 %patch0 -p1
#%patch1 -p1 #%patch1 -p1
%patch2 -p1 #%patch2 -p1
tar jxf %{S:2} tar jxf %{S:2}
tar zxf %{S:3} tar zxf %{S:3}
# Use ECJ for GCJ's bytecode compiler # Use ECJ for GCJ's bytecode compiler
cp -pr eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java org/eclipse/jdt/internal/compiler/batch/ mv eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java org/eclipse/jdt/internal/compiler/batch/
mkdir -p jdtcoresrc/src/org/eclipse/jdt/internal/compiler/batch/
mv eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java jdtcoresrc/src/org/eclipse/jdt/internal/compiler/batch/
cat eclipse-gcj/gcc.properties >> org/eclipse/jdt/internal/compiler/batch/messages.properties cat eclipse-gcj/gcc.properties >> org/eclipse/jdt/internal/compiler/batch/messages.properties
rm -rf eclipse-gcj rm -rf eclipse-gcj
# JDTCompilerAdapter isn't used by the batch compiler # JDTCompilerAdapter isn't used by the batch compiler
rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
%build %build
unset JAVA_HOME ORIGCLASSPATH=$CLASSPATH
export JAVA_HOME=%javahome ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
%if %gcjbootstrap
for f in `find -name '*.java' | cut -c 3- | LC_ALL=C sort`; do
gcj -Wno-deprecated -C $f
done
find -name '*.class' -or -name '*.properties' -or -name '*.rsc' | xargs fastjar cf ecj-%{version}.jar
%else
ORIGCLASSPATH=$CLASSPATH
ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
# 2. Use this ecj to rebuild itself # 2. Use this ecj to rebuild itself
export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcore.xml ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" -buildfile jdtcoresrc/compilejdtcore.xml
%endif
mkdir temp
cd temp
%javahome/bin/jar -xf ../ecj.jar
rm -rf ../ecj.jar META-INF
cp -pr ../org/eclipse/jdt/internal/compiler/batch/messages.properties org/eclipse/jdt/internal/compiler/batch/
%javahome/bin/jar -cMf ../ecj.jar *
cd ..
tar -xf %{S:4}
touch META-INF/MANIFEST.MF
touch META-INF/services/javax.tools.JavaCompiler
zip -u ecj.jar META-INF/MANIFEST.MF META-INF/services/javax.tools.JavaCompiler
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
mkdir -p %{buildroot}%{_javadir} mkdir -p %{buildroot}%{_javadir}
install -m 644 ecj.jar %{buildroot}%{_javadir}/ecj-%{version}.jar install -m 644 ecj.jar %{buildroot}%{_javadir}/ecj-%{version}.jar
mkdir -p %{buildroot}%{antlib} mkdir -p %{buildroot}/opt/java/ant/lib
pushd %{buildroot}%{_javadir} pushd %{buildroot}%{_javadir}
# ln -s ecj-%{version}.jar ecj.jar # ln -s ecj-%{version}.jar ecj.jar
ln -s ecj-%{version}.jar eclipse-ecj-%{version}.jar ln -s ecj-%{version}.jar eclipse-ecj-%{version}.jar
ln -s eclipse-ecj-%{version}.jar eclipse-ecj.jar ln -s eclipse-ecj-%{version}.jar eclipse-ecj.jar
ln -s ecj-%{version}.jar jdtcore.jar ln -s ecj-%{version}.jar jdtcore.jar
ln -s ../../java/ecj-%{version}.jar %{buildroot}%{antlib}/ecj-%{version}.jar ln -s ecj-%{version}.jar %{buildroot}/opt/java/ant/lib/ecj-%{version}.jar
popd popd
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
install -pm 755 %{S:6} %{buildroot}%{_bindir}/ecj install -pm 755 %{S:1} \
%{buildroot}%{_bindir}/ecj
sed -i "s:@JAVADIR@:%{_javadir}:" %{buildroot}%{_bindir}/ecj sed -i "s:@JAVADIR@:%{_javadir}:" %{buildroot}%{_bindir}/ecj
mkdir -p %{buildroot}%{_datadir}/maven2/poms #%{_bindir}/aot-compile-rpm
install -m 644 %{S:5} %{buildroot}%{_datadir}/maven2/poms/JPP-eclipse-ecj.pom
%add_to_maven_depmap org.eclipse.jdt.core.compiler ecj %{version} JPP eclipse-ecj
%{_bindir}/aot-compile-rpm
%clean %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -137,60 +88,26 @@ install -m 644 %{S:5} %{buildroot}%{_datadir}/maven2/poms/JPP-eclipse-ecj.pom
%{_javadir}/eclipse-ecj-%{version}.jar %{_javadir}/eclipse-ecj-%{version}.jar
%{_javadir}/eclipse-ecj.jar %{_javadir}/eclipse-ecj.jar
%{_javadir}/jdtcore.jar %{_javadir}/jdtcore.jar
%{antlib}/ecj-%{version}.jar /opt/java/ant/lib/ecj-%{version}.jar
%{_mavendepmapfragdir}
%{_datadir}/maven2/poms
%doc about.html %doc about.html
%post gcj
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
%postun gcj
/sbin/ldconfig
if [ -x %{_bindir}/rebuild-gcj-db ]; then
%{_bindir}/rebuild-gcj-db
fi
%files gcj
%defattr(-,root,root)
%{_libdir}/gcj/eclipse-ecj/ecj-*.jar.db
%{_libdir}/gcj/eclipse-ecj/ecj-*.jar.so
%changelog %changelog
* Fri Feb 25 2011 gil <puntogil@libero.it> 3.6-6mamba * Sat Dec 23 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 4.7.2-1mamba
- rebuilt with java-gcj-compat 1.0.80-20mamba support - update to 4.7.2
* Thu Jan 06 2011 gil <puntogil@libero.it> 3.6-5mamba * Tue Oct 29 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 4.3.1-1mamba
- rebuilt - update to 4.3.1
* Thu Jan 06 2011 gil <puntogil@libero.it> 3.6-4mamba * Fri Jul 22 2011 Automatic Build System <autodist@mambasoft.it> 3.7-1mamba
- edit spec file - update to 3.7
* Thu Jan 06 2011 gil <puntogil@libero.it> 3.6-3mamba * Fri Sep 17 2010 Automatic Build System <autodist@mambasoft.it> 3.6-1mamba
- edit eclipse-ecj.sh.in
* Sun Nov 28 2010 gil <puntogil@libero.it> 3.6-2mamba
- rebuilt devel
* Sat Jul 10 2010 gil <puntogil@libero.it> 3.6-1mamba
- update to 3.6 - update to 3.6
* Wed May 19 2010 gil <puntogil@libero.it> 3.5.2-4mamba * Fri Jun 11 2010 Automatic Build System <autodist@mambasoft.it> 3.5.2-1mamba
- edit script
* Wed May 19 2010 gil <puntogil@libero.it> 3.5.2-3mamba
- added: maven pom
* Thu Apr 22 2010 gil <puntogil@libero.it> 3.5.2-2mamba
- added: OSGi MANIFEST
* Wed Mar 17 2010 gil <puntogil@libero.it> 3.5.2-1mamba
- update to 3.5.2 - update to 3.5.2
* Sun Sep 13 2009 gil <puntogil@libero.it> 3.5-1mamba * Sat Sep 12 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 3.5-1mamba
- update to 3.5 - update to 3.5
* Sat Apr 04 2009 gil <puntogil@libero.it> 3.4.2-2mamba * Sat Apr 04 2009 gil <puntogil@libero.it> 3.4.2-2mamba