From a33882e9f9769ad0567eebfecac15425373ec928 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 23 2015 08:13:09 +0000 Subject: import rh-java-common-ecj-4.2.1-8.13.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..335e6f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/ecjsrc-4.2.1.jar diff --git a/.rh-java-common-ecj.metadata b/.rh-java-common-ecj.metadata new file mode 100644 index 0000000..3e59eca --- /dev/null +++ b/.rh-java-common-ecj.metadata @@ -0,0 +1 @@ +cbbac0b172bf383e633269c1967e1ef2b32e7051 SOURCES/ecjsrc-4.2.1.jar diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/core-3.3.0-v_771.pom b/SOURCES/core-3.3.0-v_771.pom new file mode 100644 index 0000000..69f33ec --- /dev/null +++ b/SOURCES/core-3.3.0-v_771.pom @@ -0,0 +1,13 @@ + + 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-defaultto1.5.patch b/SOURCES/ecj-defaultto1.5.patch new file mode 100644 index 0000000..3444386 --- /dev/null +++ b/SOURCES/ecj-defaultto1.5.patch @@ -0,0 +1,22 @@ +### 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 new file mode 100644 index 0000000..2b7c3aa --- /dev/null +++ b/SOURCES/ecj-generatedebuginfo.patch @@ -0,0 +1,21 @@ +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 new file mode 100644 index 0000000..990442c --- /dev/null +++ b/SOURCES/ecj-include-props.patch @@ -0,0 +1,10 @@ +--- 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 @@ + + + ++ + + + diff --git a/SOURCES/ecj-rpmdebuginfo.patch b/SOURCES/ecj-rpmdebuginfo.patch new file mode 100644 index 0000000..e2727a1 --- /dev/null +++ b/SOURCES/ecj-rpmdebuginfo.patch @@ -0,0 +1,39 @@ +### Eclipse Workspace Patch 1.0 +#P org.eclipse.jdt.core +Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v +retrieving revision 1.327 +diff -u -r1.327 Main.java +--- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 21 Apr 2008 15:00:59 -0000 1.327 ++++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Nov 2008 19:26:57 -0000 +@@ -2609,6 +2609,29 @@ + this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED); + } + ++ { ++ // If we're building an RPM, force full debugging info to ++ // be generated, no matter what options have been passed ++ // by Ant. This is something of a kludge, but it is far ++ // better than the alternative, which is having class ++ // files with debug info mysteriously missing. ++ ++ String RpmPackageName = System.getenv("RPM_PACKAGE_NAME"); ++ String RpmArch = System.getenv("RPM_ARCH"); ++ String RpmBuildRoot = System.getenv("RPM_BUILD_ROOT"); ++ if (RpmPackageName != null && RpmArch != null && RpmBuildRoot != null) { ++ this.options.put( ++ CompilerOptions.OPTION_LocalVariableAttribute, ++ CompilerOptions.GENERATE); ++ this.options.put( ++ CompilerOptions.OPTION_LineNumberAttribute, ++ CompilerOptions.GENERATE); ++ this.options.put( ++ CompilerOptions.OPTION_SourceFileAttribute, ++ CompilerOptions.GENERATE); ++ } ++ } ++ + this.logger.logCommandLineArguments(newCommandLineArgs); + this.logger.logOptions(this.options); + diff --git a/SOURCES/ecj.sh.in b/SOURCES/ecj.sh.in new file mode 100644 index 0000000..3ca7c0d --- /dev/null +++ b/SOURCES/ecj.sh.in @@ -0,0 +1,4 @@ +#!/bin/sh + +CLASSPATH=@JAVADIR@/ecj.jar:${CLASSPATH=.} \ +java org.eclipse.jdt.internal.compiler.batch.Main "$@" diff --git a/SPECS/ecj.spec b/SPECS/ecj.spec new file mode 100644 index 0000000..9f84e2c --- /dev/null +++ b/SPECS/ecj.spec @@ -0,0 +1,272 @@ +%global pkg_name ecj +%{?scl:%scl_package %{pkg_name}} +%{?java_common_find_provides_and_requires} + +Epoch: 1 + +%global debug_package %{nil} +%global qualifier 201209141800 + +Summary: Eclipse Compiler for Java +Name: %{?scl_prefix}ecj +Version: 4.2.1 +Release: 8.13%{?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 +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 +# 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 + +BuildRequires: %{?scl_prefix}ant +BuildRequires: %{?scl_prefix}javapackages-tools + + +%description +ECJ is the Java bytecode compiler of the Eclipse Platform. It is also known as +the JDT Core batch compiler. + +%prep +%setup -q -c +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +set -e -x +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +cp %{SOURCE2} pom.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 + +# JDTCompilerAdapter isn't used by the batch compiler +rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +set -e -x +ant +%{?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 + +# 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 +%{?scl:EOF} + +%files -f .mfiles +%doc about.html +%{_bindir}/%{pkg_name} +%{_javadir}/eclipse-%{pkg_name}.jar +%{_javadir}/jdtcore.jar + +%changelog +* Tue Jan 13 2015 Michael Simacek - 1:4.2.1-8.13 +- Mass rebuild 2015-01-13 + +* Fri Jan 09 2015 Michal Srb - 1:4.2.1-8.12 +- Mass rebuild 2015-01-09 + +* Wed Jan 07 2015 Michal Srb - 4.2.1-8.11 +- Migrate to .mfiles + +* Tue Dec 16 2014 Mikolaj Izdebski - 1:4.2.1-8.10 +- Migrate requires and build-requires to rh-java-common + +* Mon Dec 15 2014 Mikolaj Izdebski - 1:4.2.1-8.9 +- Mass rebuild 2014-12-15 + +* Mon Dec 15 2014 Mikolaj Izdebski - 1:4.2.1-8.8 +- Rebuild for rh-java-common collection + +* Mon Jun 2 2014 Mikolaj Izdebski - 1:4.2.1-8.7 +- Disable debuginfo + +* Mon May 26 2014 Mikolaj Izdebski - 1:4.2.1-8.6 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 1:4.2.1-8.5 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 1:4.2.1-8.4 +- Mass rebuild 2014-02-18 + +* Tue Feb 18 2014 Mikolaj Izdebski - 1:4.2.1-8.3 +- Remove requires on java + +* Mon Feb 17 2014 Mikolaj Izdebski - 1:4.2.1-8.2 +- SCL-ize build-requires + +* Thu Feb 13 2014 Michal Srb - 1:4.2.1-8.1 +- First maven30 software collection build + +* Fri Jan 24 2014 Daniel Mach - 1:4.2.1-8 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1:4.2.1-7 +- Mass rebuild 2013-12-27 + +* Tue Apr 09 2013 Mikolaj Izdebski - 1:4.2.1-6 +- Add depmap for org.eclipse.jdt.core.compiler:ecj +- Resolves: rhbz#951064 + +* Fri Apr 05 2013 Jon VanAlten 1:4.2.1-6 +- Remove gcj entry point, native subpackage, and gcj bootstrap entirely (fixes RHBZ927665). + +* Wed Mar 06 2013 Karsten Hopp 1:4.2.1-5 +- add BR java-devel for !with_gcjbootstrap + +* Wed Feb 13 2013 Fedora Release Engineering - 1:4.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Oct 29 2012 Jon VanAlten 1:4.2.1-3 +- Patch GCCMain to avoid dummy symbols. + +* Wed Oct 10 2012 Krzysztof Daniel 1:4.2.1-2 +- Add depmap satysfying Tycho req. + +* Wed Jul 31 2012 Jon VanAlten 1:4.2.1-1 +- Update to 4.2.1 upstream version. + +* Wed Jul 18 2012 Fedora Release Engineering - 1:3.4.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 18 2012 Alexander Kurtakov 1:3.4.2-13 +- Add missing epoch to native subpackage requires. + +* Tue Apr 17 2012 Alexander Kurtakov 1:3.4.2-12 +- Separate gcj in subpackage. + +* Mon Jan 16 2012 Alexander Kurtakov 1:3.4.2-11 +- Patch pom file to better represent ecj and not jdt.core . +- Guidelines fixes. + +* Fri Jan 13 2012 Fedora Release Engineering - 1:3.4.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 1:3.4.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Nov 26 2010 Stanislav Ochotnicky - 1:3.4.2-8 +- Fix add_to_maven_depmap call (Resolves rhbz#655796) + +* Mon Dec 21 2009 Deepak Bhole - 1:3.4.2-7 +- Fix RHBZ# 490936. If CLASSPATH is not set, add . to default classpath. + +* Wed Sep 9 2009 Alexander Kurtakov 1:3.4.2-6 +- Add maven pom and depmaps. + +* Fri Jul 24 2009 Fedora Release Engineering - 1:3.4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Mar 11 2009 Deepak Bhole 1:3.4.2-4 +- Add patch to generate full debuginfo for ecj itself + +* Tue Mar 10 2009 Deepak Bhole 1:3.4.2-3 +- Add BR for aot-compile-rpm + +* Tue Mar 10 2009 Deepak Bhole 1:3.4.2-2 +- Add BR for ant + +* Fri Mar 6 2009 Andrew Overholt 1:3.4.2-1 +- 3.4.2 + +* Tue Dec 9 2008 Andrew Overholt 1:3.4.1-1 +- 3.4.1 +- Don't conditionalize building of gcj AOT bits (we're only building + this for gcj and IcedTea bootstrapping). + +* Mon Jan 22 2007 Andrew Overholt 3.2.1-1 +- Add eclipse-ecj-gcj.patch. + +* Fri Jan 12 2007 Andrew Overholt 3.2.1-1 +- First version for Fedora 7. +- Add BR: java-devel for jar. + +* Thu Nov 02 2006 Andrew Overholt 1:3.2.1-1jpp +- First version for JPackage. + +* Mon Jul 24 2006 Andrew Overholt 1:3.2.0-1 +- Add versionless ecj.jar symlink in /usr/share/java. + +* Wed Jul 19 2006 Andrew Overholt 1:3.2.0-1 +- 3.2.0. + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Mar 07 2005 Andrew Overholt 1:3.1.0.M4.9 +- Don't build for ppc or ia64. + +* Sun Feb 20 2005 Andrew Overholt 1:3.1.0.M4.6 +- Upgrade back to 3.1M4. +- Don't build for i386 and x86_64. +- Provide eclipse-ecj until we can deprecate this package. + +* Fri Jan 14 2005 Andrew Overholt 3.1.0.M4.4 +- build for all but x86 + +* Thu Jan 13 2005 Andrew Overholt 3.1.0.M4.3 +- build for ppc exclusively + +* Wed Jan 12 2005 Andrew Overholt 3.1.0.M4.2 +- Add RPM_OPT_FLAGS workaround. + +* Tue Jan 11 2005 Andrew Overholt 3.1.0.M4.1 +- New version. + +* Mon Sep 27 2004 Gary Benson 2.1.3-5 +- Rebuild with new katana. + +* Fri Jul 22 2004 Gary Benson 2.1.3-4 +- Build without bootstrap-ant. +- Split out lib-org-eclipse-jdt-internal-compiler.so. + +* Tue Jul 6 2004 Gary Benson 2.1.3-3 +- Fix ecj-devel's dependencies. + +* Wed Jun 9 2004 Gary Benson 2.1.3-2 +- Work around an optimiser failure somewhere in ecj or gcj (#125613). + +* Fri May 28 2004 Gary Benson +- Build with katana. + +* Mon May 24 2004 Gary Benson 2.1.3-1 +- Initial Red Hat Linux build. + +* Mon May 24 2004 Gary Benson +- Upgraded to latest version. + +* Sun Jul 20 2003 Anthony Green +- Add %%doc + +* Fri Jul 18 2003 Anthony Green +- Initial RHUG build.