diff --git a/.gitignore b/.gitignore index 335e6f9..1eebebc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ecjsrc-4.2.1.jar +SOURCES/ecjsrc-4.4.2.jar diff --git a/.rh-java-common-ecj.metadata b/.rh-java-common-ecj.metadata index 3e59eca..34fc9ce 100644 --- a/.rh-java-common-ecj.metadata +++ b/.rh-java-common-ecj.metadata @@ -1 +1 @@ -cbbac0b172bf383e633269c1967e1ef2b32e7051 SOURCES/ecjsrc-4.2.1.jar +903e8c2cb521cc91636eccae66b8594435516ff5 SOURCES/ecjsrc-4.4.2.jar diff --git a/SOURCES/MANIFEST.MF b/SOURCES/MANIFEST.MF new file mode 100644 index 0000000..532d8da --- /dev/null +++ b/SOURCES/MANIFEST.MF @@ -0,0 +1,28 @@ +Manifest-Version: 1.0 +Main-Class: org.eclipse.jdt.internal.compiler.batch.Main +Bundle-ManifestVersion: 2 +Bundle-Name: Eclipse Compiler for Java(TM) +Bundle-SymbolicName: org.eclipse.jdt.core.compiler.batch +Bundle-Version: 3.10.0.qualifier +Bundle-ClassPath: . +Bundle-Vendor: Eclipse.org +Export-Package: org.eclipse.jdt.core, + org.eclipse.jdt.core.compiler, + org.eclipse.jdt.internal.antadapter;x-internal:=true, + org.eclipse.jdt.internal.compiler;x-internal:=true, + org.eclipse.jdt.internal.compiler.apt.dispatch;x-internal:=true, + org.eclipse.jdt.internal.compiler.apt.model;x-internal:=true, + org.eclipse.jdt.internal.compiler.apt.util;x-internal:=true, + org.eclipse.jdt.internal.compiler.ast;x-internal:=true, + org.eclipse.jdt.internal.compiler.batch;x-internal:=true, + org.eclipse.jdt.internal.compiler.classfmt;x-internal:=true, + org.eclipse.jdt.internal.compiler.codegen;x-internal:=true, + org.eclipse.jdt.internal.compiler.env;x-internal:=true, + org.eclipse.jdt.internal.compiler.flow;x-internal:=true, + org.eclipse.jdt.internal.compiler.impl;x-internal:=true, + org.eclipse.jdt.internal.compiler.lookup;x-internal:=true, + org.eclipse.jdt.internal.compiler.parser;x-internal:=true, + org.eclipse.jdt.internal.compiler.parser.diagnose;x-internal:=true, + org.eclipse.jdt.internal.compiler.problem;x-internal:=true, + org.eclipse.jdt.internal.compiler.util;x-internal:=true, + org.eclipse.jdt.internal.compiler.tool;x-internal:=true diff --git a/SOURCES/core-3.3.0-v_771.pom b/SOURCES/core-3.3.0-v_771.pom deleted file mode 100644 index 69f33ec..0000000 --- a/SOURCES/core-3.3.0-v_771.pom +++ /dev/null @@ -1,13 +0,0 @@ - - 4.0.0 - org.eclipse.jdt - core - Java Development Tools Core - 3.3.0-v_771 - - - Eclipse Public License - v 1.0 - http://www.eclipse.org/org/documents/epl-v10.html - - - \ No newline at end of file diff --git a/SOURCES/ecj-4.4.2.pom b/SOURCES/ecj-4.4.2.pom new file mode 100644 index 0000000..c782b6f --- /dev/null +++ b/SOURCES/ecj-4.4.2.pom @@ -0,0 +1,62 @@ + + + + 4.0.0 + org.eclipse.jdt.core.compiler + ecj + 4.4.2 + jar + Eclipse ECJ + Eclipse JDT Core Batch Compiler + http://www.eclipse.org/jdt/ + + UTF-8 + UTF-8 + + + + Eclipse Public License v1.0 + http://www.eclipse.org/org/documents/epl-v10.php + repo + + + + http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/ + :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse + + + + + Ralph Schaer + ralphschaer@gmail.com + + + + + + org.apache.ant + ant + 1.9.4 + true + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.1 + + -Xdoclint:none + + + + + + diff --git a/SOURCES/ecj-defaultto1.5.patch b/SOURCES/ecj-defaultto1.5.patch deleted file mode 100644 index 3444386..0000000 --- a/SOURCES/ecj-defaultto1.5.patch +++ /dev/null @@ -1,22 +0,0 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.jdt.core -Index: compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java,v -retrieving revision 1.203 -diff -u -r1.203 CompilerOptions.java ---- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java 14 Apr 2008 19:41:33 -0000 1.203 -+++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java 15 Dec 2008 19:50:02 -0000 -@@ -1145,9 +1145,9 @@ - - // by default only lines and source attributes are generated. - this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES; -- this.complianceLevel = this.originalComplianceLevel = ClassFileConstants.JDK1_4; // by default be compliant with 1.4 -- this.sourceLevel = this.originalSourceLevel = ClassFileConstants.JDK1_3; //1.3 source behavior by default -- this.targetJDK = ClassFileConstants.JDK1_2; // default generates for JVM1.2 -+ this.complianceLevel = this.originalComplianceLevel = ClassFileConstants.JDK1_5; -+ this.sourceLevel = this.originalSourceLevel = ClassFileConstants.JDK1_5; -+ this.targetJDK = ClassFileConstants.JDK1_5; - - this.defaultEncoding = null; // will use the platform default encoding - diff --git a/SOURCES/ecj-generatedebuginfo.patch b/SOURCES/ecj-generatedebuginfo.patch deleted file mode 100644 index 2b7c3aa..0000000 --- a/SOURCES/ecj-generatedebuginfo.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ./build.xml.sav ./build.xml ---- ./build.xml.sav 2009-03-11 13:30:38.000000000 -0400 -+++ ./build.xml 2009-03-11 13:30:34.000000000 -0400 -@@ -10,7 +10,7 @@ - - - -@@ -18,7 +18,7 @@ - - - diff --git a/SOURCES/ecj-include-props.patch b/SOURCES/ecj-include-props.patch index 990442c..f1b3110 100644 --- a/SOURCES/ecj-include-props.patch +++ b/SOURCES/ecj-include-props.patch @@ -1,7 +1,7 @@ ---- a/build.xml 2012-10-09 13:56:47.695928242 -0400 -+++ b/build.xml 2012-10-09 13:57:06.822893233 -0400 -@@ -46,6 +46,7 @@ - +--- build.xml 2014-05-01 09:36:51.417339328 +0300 ++++ build.xml 2014-05-01 09:38:36.330493400 +0300 +@@ -49,6 +49,7 @@ + + diff --git a/SPECS/ecj.spec b/SPECS/ecj.spec index 9f84e2c..44517d2 100644 --- a/SPECS/ecj.spec +++ b/SPECS/ecj.spec @@ -4,31 +4,30 @@ Epoch: 1 -%global debug_package %{nil} -%global qualifier 201209141800 +%global qualifier R-4.4.2-201502041700 Summary: Eclipse Compiler for Java Name: %{?scl_prefix}ecj -Version: 4.2.1 -Release: 8.13%{?dist} +Version: 4.4.2 +Release: 2.1%{?dist} URL: http://www.eclipse.org License: EPL -Group: Development/Languages -Source0: http://download.eclipse.org/eclipse/downloads/drops4/R-%{version}-%{qualifier}/%{pkg_name}src-%{version}.jar + +Source0: http://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/ecjsrc-%{version}.jar Source1: ecj.sh.in -#Patched from http://repo2.maven.org/maven2/org/eclipse/jdt/core/3.3.0-v_771/core-3.3.0-v_771.pom -# No dependencies are needed for ecj, dependencies are for using of jdt.core which makes no sense outside of eclipse -Source2: core-3.3.0-v_771.pom +Source3: https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/%{version}/ecj-%{version}.pom +Source4: http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/plain/org.eclipse.jdt.core/scripts/binary/META-INF/MANIFEST.MF + # Always generate debug info when building RPMs (Andrew Haley) Patch0: %{pkg_name}-rpmdebuginfo.patch -Patch1: %{pkg_name}-defaultto1.5.patch -Patch2: %{pkg_name}-generatedebuginfo.patch # build.xml fails to include a necessary .props file in the built ecj.jar -Patch3: %{pkg_name}-include-props.patch +Patch1: %{pkg_name}-include-props.patch -BuildRequires: %{?scl_prefix}ant -BuildRequires: %{?scl_prefix}javapackages-tools +BuildArch: noarch +BuildRequires: gzip +BuildRequires: %{?scl_prefix}ant +BuildRequires: %{?scl_prefix}javapackages-local %description ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as @@ -39,56 +38,64 @@ the JDT Core batch compiler. %{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} set -e -x %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch1 -b .sav -cp %{SOURCE2} pom.xml +sed -i -e 's|debuglevel=\"lines,source\"|debug=\"yes\"|g' build.xml +sed -i -e "s/Xlint:none/Xlint:none -encoding cp1252/g" build.xml -# Remove bits of JDT Core we don't want to build -rm -r org/eclipse/jdt/internal/compiler/tool -rm -r org/eclipse/jdt/internal/compiler/apt -rm -f org/eclipse/jdt/core/BuildJarIndex.java +cp %{SOURCE3} pom.xml +mkdir -p scripts/binary/META-INF/ +cp %{SOURCE4} scripts/binary/META-INF/MANIFEST.MF # JDTCompilerAdapter isn't used by the batch compiler rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java + +# No dep on ant needed +%pom_remove_dep org.apache.ant:ant + +# Symlinks and aliases +%mvn_file :ecj ecj eclipse-ecj jdtcore +%mvn_alias org.eclipse.jdt.core.compiler:ecj \ + org.eclipse.jdt:org.eclipse.jdt.core org.eclipse.jdt:org.eclipse.jdt.compiler.apt \ + org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt \ + org.eclipse.jetty.orbit:org.eclipse.jdt.core \ + org.eclipse.jdt:core %{?scl:EOF} %build %{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} set -e -x ant +gzip ecj.1 %{?scl:EOF} %install %{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} set -e -x -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -a *.jar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}.jar -pushd $RPM_BUILD_ROOT%{_javadir} -ln -s %{pkg_name}.jar eclipse-%{pkg_name}.jar -ln -s %{pkg_name}.jar jdtcore.jar -popd +%mvn_artifact pom.xml ecj.jar +%mvn_install # Install the ecj wrapper script install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/ecj sed --in-place "s:@JAVADIR@:%{_javadir}:" $RPM_BUILD_ROOT%{_bindir}/ecj -# poms -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 pom.xml \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{pkg_name}.pom - -%add_maven_depmap -a "org.eclipse.tycho:org.eclipse.jdt.core,org.eclipse.jdt.core.compiler:ecj" JPP-%{pkg_name}.pom %{pkg_name}.jar +# Install manpage +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 644 -p ecj.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1.gz %{?scl:EOF} %files -f .mfiles %doc about.html -%{_bindir}/%{pkg_name} -%{_javadir}/eclipse-%{pkg_name}.jar -%{_javadir}/jdtcore.jar +%{_bindir}/ecj +%{_mandir}/man1/ecj.1.gz %changelog +* Thu Jul 02 2015 Mat Booth - 1:4.4.2-2.1 +- Rebase to version 4.4.2 + +* Wed Jun 10 2015 Michal Srb - 1:4.2.1-8.14 +- Make this package noarch + * Tue Jan 13 2015 Michael Simacek - 1:4.2.1-8.13 - Mass rebuild 2015-01-13