pool/opa-fmgui
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 528668 from home:NMoreyChaisemartin:branches:science:HPC

Browse Source 
- Update embedded gradle binaries to 3.2 to support JDK9
- Add opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch to fix 
  compilation with JDK9

OBS-URL: https://build.opensuse.org/request/show/528668
OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-fmgui?expand=0&rev=35
This commit is contained in:
Nicolas Morey-Chaisemartin 2017-09-25 15:06:08 +00:00 committed by Git OBS Bridge
parent 78bfec13af
commit 3066af742b
5 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gradle-2.9-bin.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c9159ec4362284c0a38d73237e224deae6139cbde0db4f0f44e1c7691dd3de2f
size 44786923

3
gradle-3.2-bin.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5321b36837226dc0377047a328f12010f42c7bf88ee4a3b1cee0c11040082935
size 69147475

28
opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git build.xml build.xml
index a7f6209..84f4c59 100644
--- build.xml
+++ build.xml
@@ -1,4 +1,4 @@
-<project name ="FMGUI" default="build" basedir=".">
+<project name ="FMGUI" default="buildOPA" basedir=".">
<property name="src" value="src"/>
<property name="target" value="target"/>
<property name="resources" value="resources"/>
@@ -18,7 +18,7 @@
</condition>
</target>
<target name="compile" description="Compiles the Fabric Manager GUI application">
- <javac srcdir="${src}" destdir="${target}/classes"
+ <javac target="1.7" srcdir="${src}" destdir="${target}/classes"
encoding="windows-1252"
debug="true"
fork="yes"
@@ -53,7 +53,7 @@
<target name="clear" description="Clears build files">
<delete dir="${target}"/>
</target>
- <target name="build" description="Builds the Fabric Manager GUI application" depends="init,compile,createJar">
+ <target name="buildOPA" description="Builds the Fabric Manager GUI application" depends="init,compile,createJar">
<echo message="Fabric Manager GUI application has been built: ${target}/${opa-fmgui.app.jar}"/>
</target>
</project>

7
opa-fmgui.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Sep 25 14:41:13 UTC 2017 - nmoreychaisemartin@suse.com
- Update embedded gradle binaries to 3.2 to support JDK9
- Add opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch to fix
compilation with JDK9
-------------------------------------------------------------------
Sun Sep 10 23:38:22 UTC 2017 - jengelh@inai.de

6
opa-fmgui.spec
View File

@ -24,7 +24,7 @@
%define appfolder opa-fmgui
%define appjar opa-fmgui.jar
%define _binary_payload w9.gzdio
%define gradle_version 2.9
%define gradle_version 3.2
Name: opa-fmgui
Version: 10.1.0.0.115
@ -77,6 +77,7 @@ Patch3: opa-fmgui-intel-manifest-license.patch
# Patch auto extracted by service
Patch5: stl-14927-jgraphx-update.patch
Patch6: manifest-version.patch
Patch7: opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
BuildRequires: ant
BuildRequires: jre >= 1.7
@ -102,12 +103,13 @@ script fmgui.
%patch3 -p1
%patch5 -p1
%patch6 -p1
%patch7
%build
(cd %{_tmppath}; rm -Rf gradle-%{gradle_version}; unzip %{_sourcedir}/gradle-%{gradle_version}-bin.zip)
GRADLE_LIB_DIR=%{_sourcedir}
export GRADLE_LIB_DIR
%{_tmppath}/gradle-%{gradle_version}/bin/gradle copyDeps build --info
%{_tmppath}/gradle-%{gradle_version}/bin/gradle copyDeps buildOPA --info
%install
mkdir -p %{buildroot}%{_javadir}/%{appfolder}