[gradle] added missing jnr-ffi
gil
gil at fedoraproject.org
Wed Apr 24 09:49:30 UTC 2013
commit 55203fca6c10630775f87a2681e1f813e99e4a57
Author: gil <puntogil at libero.it>
Date: Wed Apr 24 11:49:18 2013 +0200
added missing jnr-ffi
gradle-1.0-build.xml | 22 +++++++++++++++++-----
gradle-1.0-jnr-ffi.patch | 10 ++++++++++
gradle.spec | 12 +++++++++++-
3 files changed, 38 insertions(+), 6 deletions(-)
---
diff --git a/gradle-1.0-build.xml b/gradle-1.0-build.xml
index 9525516..f479560 100644
--- a/gradle-1.0-build.xml
+++ b/gradle-1.0-build.xml
@@ -321,20 +321,30 @@
<fileset dir="/usr/share/java" includes="maven-ant-tasks.jar"/>
<!--maven-ant-tasks. deps-->
<fileset dir="/usr/share/java" includes="ant.jar"/>
- <fileset dir="/usr/share/java" includes="maven/maven-compat.jar"/>
+ <!--fileset dir="/usr/share/java" includes="maven/maven-compat.jar"/>
<fileset dir="/usr/share/java" includes="maven/maven-artifact.jar"/>
- <!--fileset dir="/usr/share/java" includes="maven2/maven-artifact-manager.jar"/-->
+ <fileset dir="/usr/share/java" includes="maven2/maven-artifact-manager.jar"/>
<fileset dir="/usr/share/java" includes="maven2/maven-error-diagnostics.jar"/>
<fileset dir="/usr/share/java" includes="maven/maven-model.jar"/>
- <!--fileset dir="/usr/share/java" includes="maven2/maven-project.jar"/-->
+ <fileset dir="/usr/share/java" includes="maven2/maven-project.jar"/>
<fileset dir="/usr/share/java" includes="maven/maven-core.jar"/>
- <fileset dir="/usr/share/java" includes="maven/maven-settings.jar"/>
+ <fileset dir="/usr/share/java" includes="maven/maven-settings.jar"/-->
+ <fileset dir="/usr/share/java" includes="maven/maven-artifact-2.2.1.jar"/>
+ <fileset dir="/usr/share/java" includes="maven/maven-artifact-manager.jar"/>
+ <fileset dir="/usr/share/java" includes="maven/maven-error-diagnostics.jar"/>
+ <fileset dir="/usr/share/java" includes="maven/maven-model-2.2.1.jar"/>
+ <fileset dir="/usr/share/java" includes="maven/maven-project.jar"/>
+ <fileset dir="/usr/share/java" includes="maven/maven-core.jar"/>
+ <fileset dir="/usr/share/java" includes="maven/maven-settings-2.2.1.jar"/>
<fileset dir="/usr/share/java" includes="maven-wagon/provider-api.jar"/>
<fileset dir="/usr/share/java" includes="plexus/containers-component-annotations.jar"/>
<fileset dir="/usr/share/java" includes="plexus/plexus-component-api.jar"/>
<fileset dir="/usr/share/java" includes="plexus/container-default.jar"/>
<fileset dir="/usr/share/java" includes="plexus/classworlds.jar"/>
<fileset dir="/usr/share/java" includes="plexus/interpolation.jar"/>
+ <!--polyglot-maven support>
+ <fileset dir="/usr/share/java" includes="polyglot-maven/pmaven-common.jar"/>
+ <fileset dir="/usr/share/java" includes="polyglot-maven/pmaven-groovy.jar"/-->
</path>
<path id="native.classpath">
@@ -348,6 +358,7 @@
<fileset dir="/usr/share/java" includes="jna.jar"/>
<fileset dir="/usr/share/java" includes="jnr-posix.jar"/>
<fileset dir="/usr/share/java" includes="jnr-constants.jar"/>
+ <fileset dir="/usr/share/java" includes="jnr-ffi.jar"/>
<fileset dir="/usr/share/java" includes="slf4j/api.jar"/>
</path>
@@ -799,7 +810,7 @@
<set-propertyfile
destfile="${native.build.dir}/gradle-native-classpath.properties"
projects="gradle-base-services"
- runtime="commons-io-1.4.jar,slf4j-api-1.6.4.jar,jaffl.jar,jna-3.2.7.jar,jnr-posix-1.0.3.jar,jnr-constants.jar,jansi-1.2.1.jar,guava-11.0.1.jar,jcip-annotations-1.0.jar" />
+ runtime="commons-io-1.4.jar,slf4j-api-1.6.4.jar,jaffl.jar,jna-3.2.7.jar,jnr-posix-1.0.3.jar,jnr-constants.jar,jnr-ffi.jar,jansi-1.2.1.jar,guava-11.0.1.jar,jcip-annotations-1.0.jar" />
<jar-and-manifest
basedir="${native.build.dir}"
@@ -1229,6 +1240,7 @@
<fileset dir="/usr/share/java" includes="jna.jar"/>
<fileset dir="/usr/share/java" includes="jnr-posix.jar"/>
<fileset dir="/usr/share/java" includes="jnr-constants.jar"/>
+ <fileset dir="/usr/share/java" includes="jnr-ffi.jar"/>
<fileset dir="/usr/share/java" includes="jsch.jar"/>
<fileset dir="/usr/share/java" includes="junit.jar"/>
<fileset dir="/usr/share/java" includes="logback/logback-classic.jar"/>
diff --git a/gradle-1.0-jnr-ffi.patch b/gradle-1.0-jnr-ffi.patch
new file mode 100644
index 0000000..fb70dbc
--- /dev/null
+++ b/gradle-1.0-jnr-ffi.patch
@@ -0,0 +1,10 @@
+--- subprojects/native/native.gradle 2013-04-23 10:29:40.438809353 +0200
++++ subprojects/native/native.gradle-gil 2013-04-23 11:07:16.497217943 +0200
+@@ -14,6 +14,7 @@
+ dependency libraries.jna
+ dependency 'org.jruby.extras:jnr-constants:0.7'
+ dependency 'org.jruby.extras:jaffl:0.7'
++ dependency 'com.github.jnr:jnr-ffi:0.7.10'
+ }
+ compile module('org.fusesource.jansi:jansi:1.2.1') {
+ dependency libraries.jna
diff --git a/gradle.spec b/gradle.spec
index 1962f6a..0246440 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -30,7 +30,7 @@
Name: gradle
Version: 1.0
-Release: 14%{?nameddottag}%{?dist}
+Release: 15%{?nameddottag}%{?dist}
Summary: Groovy based build system
Group: Development/Tools
License: ASL 2.0
@@ -118,6 +118,9 @@ Patch29: gradle-1.0-jnr-posix2.patch
Patch30: gradle-1.0-ivy23.patch
Patch31: gradle-1.0-printStackTrace.patch
+# jnr-posix 2.x depend on jnr-ffi 0.7.x caused
+# java.lang.NoClassDefFoundError: jnr/ffi/Struct
+Patch32: gradle-1.0-jnr-ffi.patch
# Build requirements (alphabetical):
BuildRequires: aether
@@ -364,6 +367,7 @@ done
# subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/ComposableFilePermissionHandlerTest.groovy \
# subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/ComposableFilePermissionHandlerTest.groovy
%patch30 -p1
+%patch32 -p0
%endif
%patch31 -p0
@@ -488,6 +492,9 @@ ln -sf $(build-classpath jcip-annotations) %{buildroot}%{_datadir}/%{name}/lib/j
ln -sf $(build-classpath jna) %{buildroot}%{_datadir}/%{name}/lib/jna-3.2.7.jar
ln -sf $(build-classpath jnr-constants) %{buildroot}%{_datadir}/%{name}/lib/jnr-constants.jar
ln -sf $(build-classpath jnr-posix) %{buildroot}%{_datadir}/%{name}/lib/jnr-posix-1.0.3.jar
+%if %{?fedora} > 18
+ln -sf $(build-classpath jnr-ffi) %{buildroot}%{_datadir}/%{name}/lib/jnr-ffi.jar
+%endif
# gradle -gui Starting external process java.lang.NoClassDefFoundError: com/kenai/jaffl/struct/Struct
ln -sf $(build-classpath jaffl) %{buildroot}%{_datadir}/%{name}/lib/jaffl.jar
ln -sf $(build-classpath jsch) %{buildroot}%{_datadir}/%{name}/lib/jsch-0.1.46.jar
@@ -579,6 +586,9 @@ fi
%doc LICENSE NOTICE
%changelog
+* Mon Apr 22 2013 gil cattaneo <puntogil at libero.it> 1.0-15
+- added missing jnr-ffi
+
* Mon Apr 22 2013 gil cattaneo <puntogil at libero.it> 1.0-14
- print the stack trace even when failure is not instance of GradleException
More information about the scm-commits
mailing list