[groovy18] Build against shaded asm3
Michal Srb
msrb at fedoraproject.org
Thu Dec 5 16:59:11 UTC 2013
commit 15167ec63ef20098445cfe8ef025a31338e68901
Author: Michal Srb <msrb at redhat.com>
Date: Thu Dec 5 17:58:44 2013 +0100
Build against shaded asm3
groovy18.spec | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/groovy18.spec b/groovy18.spec
index 058df13..8cdf545 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -4,7 +4,7 @@
%global majorversion 1.8
Name: groovy18
Version: 1.8.9
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Dynamic language for the Java Platform
Group: Development/Languages
# Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -105,13 +105,18 @@ for s in src/main/groovy/transform/NotYetImplemented.java\
native2ascii -encoding UTF8 ${s} ${s}
done
+# build against shaded asm3
+# TODO: fast&ugly, this could use some improvements
+find . -name "*.java" -exec sed -i 's|org.objectweb.asm|org.objectweb.distroshaded.asm|g' {} +
+find . -name "*.groovy" -exec sed -i 's|org.objectweb.asm|org.objectweb.distroshaded.asm|g' {} +
+
%build
mkdir -p target/lib/{compile,tools}
# Construct classpath
build-jar-repository target/lib/compile servlet jsp \
- objectweb-asm3/asm-tree objectweb-asm3/asm \
- objectweb-asm3/asm-util objectweb-asm3/asm-analysis \
+ objectweb-asm3/asm-tree-distroshaded objectweb-asm3/asm-distroshaded \
+ objectweb-asm3/asm-util-distroshaded objectweb-asm3/asm-analysis-distroshaded \
antlr ant/ant-antlr antlr \
bsf jline1/jline-1 xstream ant junit ivy commons-cli \
jansi
@@ -175,6 +180,9 @@ install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
%changelog
+* Thu Dec 05 2013 Michal Srb <msrb at redhat.com> - 1.8.9-7
+- Build against shaded asm3
+
* Fri Nov 15 2013 gil cattaneo <puntogil at libero.it> 1.8.9-6
- use objectweb-asm3
More information about the scm-commits
mailing list