This commit is contained in:
parent
85e3bdd672
commit
59162fb888
@ -238,7 +238,6 @@ build-jar-repository -s -p lib/build \
|
||||
guava javax.inject glassfish-servlet-api aopalliance cglib objectweb-asm aqute-bnd jarjar
|
||||
%{ant} clean.all no_aop
|
||||
pushd build/no_aop
|
||||
%pom_xpath_inject "pom:project" "<classifier>no_aop</classifier>" core
|
||||
%{ant} -Dversion=%{version} jar
|
||||
popd
|
||||
%{ant} -Dversion=%{version} dist javadoc
|
||||
@ -246,10 +245,11 @@ popd
|
||||
%install
|
||||
# jars
|
||||
install -dm 0755 %{buildroot}%{_javadir}/%{short_name}
|
||||
install -pm 0644 build/no_aop/build/guice-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}-no_aop.jar
|
||||
ln -sf %{short_name}/%{name}-no_aop.jar %{buildroot}%{_javadir}/%{name}-no_aop.jar
|
||||
install -pm 0644 build/guice-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}.jar
|
||||
install -pm 0644 build/no_aop/build/guice-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}.jar
|
||||
# Provide symlinks for all jars that existed, no_aop and aop
|
||||
ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}/%{name}-no_aop.jar
|
||||
ln -sf %{short_name}/%{name}.jar %{buildroot}%{_javadir}/%{name}-no_aop.jar
|
||||
|
||||
install -pm 0644 build/dist/guice-jmx-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-jmx.jar
|
||||
install -pm 0644 build/dist/guice-assistedinject-%{version}.jar %{buildroot}%{_javadir}/%{short_name}/guice-assistedinject.jar
|
||||
@ -269,12 +269,8 @@ install -pm 0644 bom/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-bom
|
||||
install -pm 0644 extensions/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/extensions-parent.pom
|
||||
%add_maven_depmap %{short_name}/extensions-parent.pom -a org.sonatype.sisu.inject:extensions-parent -f extensions
|
||||
|
||||
install -pm 0644 build/no_aop/core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}-no_aop.pom
|
||||
%add_maven_depmap %{short_name}/%{name}-no_aop.pom %{short_name}/%{name}-no_aop.jar -a org.sonatype.sisu:sisu-guice::no_aop:
|
||||
# a huge hack to force the no_aop classifier to the version 2.3.0 reactor
|
||||
perl -pi -e 's#<ns0:artifactId>guice</ns0:artifactId>#<ns0:artifactId>guice</ns0:artifactId><ns0:classifier>no_aop</ns0:classifier>#g' %{buildroot}%{_datadir}/maven-metadata/%{name}.xml
|
||||
install -pm 0644 core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}.pom
|
||||
%add_maven_depmap %{short_name}/%{name}.pom %{short_name}/%{name}.jar -a org.sonatype.sisu:sisu-guice
|
||||
install -pm 0644 build/no_aop/core/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/%{name}.pom
|
||||
%add_maven_depmap %{short_name}/%{name}.pom %{short_name}/%{name}.jar -a "org.sonatype.sisu:sisu-guice,com.google.inject:guice::no_aop:,org.sonatype.sisu:sisu-guice::no_aop:"
|
||||
|
||||
install -pm 0644 extensions/jmx/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}/guice-jmx.pom
|
||||
%add_maven_depmap %{short_name}/guice-jmx.pom %{short_name}/guice-jmx.jar -a org.sonatype.sisu.inject:guice-jmx -f jmx
|
||||
@ -301,6 +297,7 @@ cp -pr build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
|
||||
%files -f .mfiles
|
||||
%dir %{_javadir}/%{short_name}
|
||||
%{_javadir}/%{name}*.jar
|
||||
%{_javadir}/%{short_name}/*-no_aop.jar
|
||||
|
||||
%files -n %{short_name}-parent -f .mfiles-parent
|
||||
%license COPYING
|
||||
|
Loading…
x
Reference in New Issue
Block a user