Update to upstream version 2.1
- Build with xmvn
This commit is contained in:
Mikolaj Izdebski
parent
4b32362dd2
commit
964139d799
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ plexus-compiler-1.5.2.tar.gz
|
||||
/sonatype-plexus-components-plexus-compiler-1.8-0-g7ca7d76.tar.gz
|
||||
sonatype-plexus-compiler-plexus-compiler-1.8.3-0-gef6142f.tar.gz
|
||||
/sonatype-plexus-compiler-plexus-compiler-1.9.1-0-g233d1ab.tar.gz
|
||||
/plexus-compiler-2.1.tar.gz
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
diff --git a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
|
||||
index 49d890d..b6952b9 100644
|
||||
--- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
|
||||
+++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
|
||||
@@ -404,6 +404,13 @@ public class EclipseJavaCompiler
|
||||
|
||||
return result;
|
||||
}
|
||||
+
|
||||
+ // added in recent JDT versions
|
||||
+ public boolean ignoreOptionalProblems()
|
||||
+ {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
}
|
||||
|
||||
private class EclipseCompilerINameEnvironment
|
||||
@ -29,11 +29,11 @@
|
||||
#
|
||||
|
||||
%global parent plexus
|
||||
%global dirhash 56a0f9b
|
||||
%global dirhash 16e340d
|
||||
|
||||
Name: plexus-compiler
|
||||
Version: 1.9.2
|
||||
Release: 3%{?dist}
|
||||
Version: 2.1
|
||||
Release: 1%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Compiler call initiators for Plexus
|
||||
# extras subpackage has a bit different licensing
|
||||
@ -44,8 +44,6 @@ URL: http://plexus.codehaus.org/
|
||||
|
||||
Source0: https://github.com/sonatype/%{name}/tarball/%{name}-%{version}#/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch0: plexus-compiler-ignoreOptionalProblems.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: maven
|
||||
BuildRequires: jpackage-utils
|
||||
@ -58,11 +56,6 @@ BuildRequires: plexus-containers-component-metadata
|
||||
BuildRequires: junit4
|
||||
BuildRequires: plexus-pom
|
||||
|
||||
Requires: classworlds
|
||||
Requires: plexus-containers-container-default
|
||||
Requires: plexus-utils
|
||||
Requires: junit4
|
||||
|
||||
%description
|
||||
Plexus Compiler adds support for using various compilers from a
|
||||
unified api. Support for javac is available in main package. For
|
||||
@ -70,29 +63,29 @@ additional compilers see %{name}-extras package.
|
||||
|
||||
%package extras
|
||||
Summary: Extra compiler support for %{name}
|
||||
Group: Development/Libraries
|
||||
# ASL 2.0: src/main/java/org/codehaus/plexus/compiler/util/scan/
|
||||
# ...codehaus/plexus/compiler/csharp/CSharpCompiler.java
|
||||
# ASL 1.1/MIT: ...codehaus/plexus/compiler/jikes/JikesCompiler.java
|
||||
License: MIT and ASL 2.0 and ASL 1.1
|
||||
Requires: jpackage-utils
|
||||
Requires: eclipse-ecj
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description extras
|
||||
Additional support for csharp, eclipse and jikes compilers
|
||||
|
||||
%package pom
|
||||
Summary: Maven POM files for %{name}
|
||||
|
||||
%description pom
|
||||
This package provides %{summary}.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Documentation
|
||||
Requires: jpackage-utils
|
||||
|
||||
%description javadoc
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n sonatype-plexus-compiler-%{dirhash}
|
||||
%patch0 -p1
|
||||
|
||||
%pom_disable_module plexus-compiler-aspectj plexus-compilers/pom.xml
|
||||
|
||||
@ -100,83 +93,26 @@ API documentation for %{name}.
|
||||
%pom_disable_module plexus-compiler-test
|
||||
|
||||
%build
|
||||
mvn-rpmbuild -e \
|
||||
-Dmaven.test.skip=true \
|
||||
install javadoc:aggregate
|
||||
|
||||
%mvn_package ":plexus-compiler{,s}" pom
|
||||
%mvn_package ":*{csharp,eclipse,jikes}*" extras
|
||||
# Tests are skipped because of unavailable plexus-compiler-test artifact
|
||||
%mvn_build -f
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -d -m 755 %{buildroot}%{_javadir}/%{parent}
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
%mvn_install
|
||||
|
||||
for mod in plexus-compiler-{api,manager}; do
|
||||
jarname=${mod/plexus-}
|
||||
install -pm 644 $mod/target/${mod}-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{parent}/$jarname.jar
|
||||
|
||||
install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-$jarname.pom
|
||||
%add_maven_depmap JPP.%{parent}-$jarname.pom %{parent}/$jarname.jar
|
||||
done
|
||||
|
||||
pushd plexus-compilers
|
||||
for mod in plexus-compiler-{csharp,eclipse,jikes,javac}; do
|
||||
jarname=${mod/plexus-}
|
||||
install -pm 644 $mod/target/${mod}-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{parent}/$jarname.jar
|
||||
|
||||
install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-$jarname.pom
|
||||
%add_maven_depmap JPP.%{parent}-$jarname.pom %{parent}/$jarname.jar -f extras
|
||||
done
|
||||
|
||||
install -pm 644 plexus-compiler-javac/target/plexus-compiler-javac-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{parent}/compiler-javac.jar
|
||||
|
||||
install -pm 644 plexus-compiler-javac/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compiler-javac.pom
|
||||
%add_maven_depmap JPP.%{parent}-compiler-javac.pom %{parent}/compiler-javac.jar
|
||||
|
||||
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compilers.pom
|
||||
%add_maven_depmap JPP.%{parent}-compilers.pom
|
||||
popd
|
||||
|
||||
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-compiler.pom
|
||||
%add_maven_depmap JPP.%{parent}-compiler.pom
|
||||
|
||||
|
||||
# javadocs
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
%pre javadoc
|
||||
# workaround for rpm bug, can be removed in F-17
|
||||
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
|
||||
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
||||
|
||||
|
||||
%files
|
||||
%{_javadir}/%{parent}/compiler-api.jar
|
||||
%{_javadir}/%{parent}/compiler-manager.jar
|
||||
%{_javadir}/%{parent}/compiler-javac.jar
|
||||
%{_mavenpomdir}/JPP.%{parent}-compilers.pom
|
||||
%{_mavenpomdir}/JPP.%{parent}-compiler.pom
|
||||
%{_mavenpomdir}/JPP.%{parent}-compiler-api.pom
|
||||
%{_mavenpomdir}/JPP.%{parent}-compiler-manager.pom
|
||||
%{_mavenpomdir}/JPP.%{parent}-compiler-javac.pom
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
|
||||
%files extras
|
||||
%{_mavendepmapfragdir}/%{name}-extras
|
||||
%{_javadir}/%{parent}/compiler-csharp.jar
|
||||
%{_javadir}/%{parent}/compiler-eclipse.jar
|
||||
%{_javadir}/%{parent}/compiler-jikes.jar
|
||||
%{_mavenpomdir}/JPP.%{parent}-compiler-jikes.pom
|
||||
%{_mavenpomdir}/JPP.%{parent}-compiler-eclipse.pom
|
||||
%{_mavenpomdir}/JPP.%{parent}-compiler-csharp.pom
|
||||
%files -f .mfiles
|
||||
%files extras -f .mfiles-extras
|
||||
%files pom -f .mfiles-pom
|
||||
|
||||
%files javadoc
|
||||
%doc %{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Wed Jan 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1-1
|
||||
- Update to upstream version 2.1
|
||||
- Build with xmvn
|
||||
|
||||
* Wed Dec 5 2012 Michal Srb <msrb@redhat.com> - 0:1.9.2-3
|
||||
- Replaced dependency to plexus-container-default with plexus-containers-container-default
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user