Compare commits

...

14 Commits

Author SHA1 Message Date
openeuler-ci-bot
4bd6900be9
!27 Merge master
From: @jvmboy 
Reviewed-by: @kuenking111 
Signed-off-by: @kuenking111
2023-07-19 08:41:07 +00:00
dongbohe
fe2e45ee46 Merge branch 'I66VDG' into openEuler-20.03-LTS-SP3 2022-12-21 15:42:44 +08:00
dongbohe
5fe66ace7b I66VDG: update to openjfx-11.0.18+0 2022-12-21 13:57:48 +08:00
openeuler-ci-bot
38112fa52f
!22 fix-specfile-error
From: @haomi0602 
Reviewed-by: @jvmboy 
Signed-off-by: @jvmboy
2022-08-10 08:21:46 +00:00
haomimi
b9f55f4f81 Modify specfile-error in changelog 2022-07-28 15:28:40 +08:00
openeuler-ci-bot
f9deed6d90 !17 change maven repository to huaweicloud
From: @si-gui
Reviewed-by: @jvmboy
Signed-off-by: @jvmboy
2021-09-23 09:42:35 +00:00
sunguoshuai
a3ec1a3bc9 change maven repository to huaweicloud 2021-09-23 09:53:47 +08:00
openeuler-ci-bot
762bad5855 !15 I41S80: change maven repository to huawei cloud
From: @jvmboy
Reviewed-by: @jiangfeilong1003
Signed-off-by: @jiangfeilong1003
2021-07-22 03:01:19 +00:00
noah
0c5a1d66f9 I41S80: change maven repository to huawei cloud 2021-07-21 16:21:16 +08:00
openeuler-ci-bot
c9a0c23dfe !14 I1PHZD: add openjfx11.yaml
From: @zhangyunbo7
Reviewed-by: @jvmboy
Signed-off-by: @jvmboy
2021-07-07 07:02:07 +00:00
zhangyunbo
7f3c52f486 add openjfx11.yaml 2021-06-22 00:28:56 +08:00
openeuler-ci-bot
3e2bf809ba !10 [sync] PR-9: I3CM07: change maven repository to ali cloud && add setttings.xml to source
From: @openeuler-sync-bot
Reviewed-by: @jiangfeilong1003
Signed-off-by: @jiangfeilong1003
2021-03-23 16:36:59 +08:00
Noah
935e2e511c I3CM07: change maven repository to ali cloud && add settings.xml to source
(cherry picked from commit ffbe4da8878bf2985f2307eafc88d75ce1ccfc7e)
2021-03-23 15:51:09 +08:00
openeuler-ci-bot
f28ccff6bb !6 I2A6MK: Add a license to this repo
From: @jvmboy
Reviewed-by: @jdkboy
Signed-off-by: @jdkboy
2020-12-22 09:37:22 +08:00
5 changed files with 35 additions and 22 deletions

View File

@ -3,14 +3,14 @@
%global xmvn_bootstrap 0
Name: openjfx
Version: 11.0.3
Release: 4
Version: 11.0.18.0
Release: 1
Summary: Rich client application platform for Java
License: GPL v2 with exceptions and BSD
License: LGPL-2.0-only and ICU and Public Domain and LGPL-2.1-only and GPL-2.0-only and GPL-2.0-or-later
URL: http://openjdk.java.net/projects/openjfx/
Source0: hg.openjdk.java.net/openjfx/11/rt/archive/rt-11.0.3+1.tar.bz2
Source0: https://github.com/openjdk/jfx11u/archive/refs/tags/11.0.18+0.tar.gz
Source1: pom-base.xml
Source2: pom-controls.xml
Source3: pom-fxml.xml
@ -53,7 +53,7 @@ BuildRequires: ant
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libstdc++-static
BuildRequires: mvn(antlr:antlr)
BuildRequires: mvn(org.antlr:antlr4-maven-plugin)
BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: pkgconfig(gtk+-2.0)
@ -82,7 +82,7 @@ Summary: OpenJFX development tools and libraries
%global debug_package %{nil}
%prep
%setup -q -n rt-11.0.3+1
%setup -q -n rt-11.0.18+0
#Drop *src/test folders
rm -rf modules/javafx.{base,controls,fxml,graphics,media,swing,swt,web}/src/test/
@ -130,7 +130,6 @@ export JAVA_HOME=%{_jvmdir}/java-11-openjdk
export CFLAGS="${RPM_OPT_FLAGS}"
export CXXFLAGS="${RPM_OPT_FLAGS}"
# %%mvn_build --skip-javadoc
mvn install --settings ./settings.xml
%install
@ -146,16 +145,25 @@ cp -a modules/javafx.graphics/mvn-lib{decora,javafx_font,javafx_font_freetype,ja
%license LICENSE
%license ADDITIONAL_LICENSE_INFO
%license ASSEMBLY_EXCEPTION
%doc README
%doc README.md
%files devel
%{openjfxdir}/
%license LICENSE
%license ADDITIONAL_LICENSE_INFO
%license ASSEMBLY_EXCEPTION
%doc README
%doc README.md
%changelog
* Wed Dec 20 2022 Noah <hedongbo@huawei.com> - 11.0.18.0-1
- update to openjfx-11.0.18+0
* Wed Jul 21 2021 Noah <hedongbo@huawei.com> - 11.0.3-6
- change maven repository to huawei cloud
* Mon Jun 21 2021 Benshuai5D <zhangyunbo7@huawei.com> - 11.0.3-5
- add openjfx11.yaml
* Tue Mar 23 2021 Noah <hedongbo@huawei.com> - 11.0.3-4
- change maven repository to ali cloud
- add settings.xml to source

5
openjfx11.yaml Normal file
View File

@ -0,0 +1,5 @@
---
version_control: git
src_repo: https://github.com/openjdk/jfx11u
tag_prefix:
seperator: "."

View File

@ -9,13 +9,13 @@
<dependencies>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>3.5.2</version>
<artifactId>antlr4</artifactId>
<version>4.7.2</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
<version>3.5.2</version>
<artifactId>antlr4-runtime</artifactId>
<version>4.7.2</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
@ -48,8 +48,8 @@
<plugins>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
<version>3.5.2</version>
<artifactId>antlr4-maven-plugin</artifactId>
<version>4.7.2</version>
<configuration>
<sourceDirectory>../src/main/antlr3</sourceDirectory>
<outputDirectory>../build/gensrc/antlr</outputDirectory>
@ -58,7 +58,7 @@
<execution>
<id>antlr</id>
<goals>
<goal>antlr</goal>
<goal>antlr4</goal>
</goals>
</execution>
</executions>

View File

@ -3,11 +3,11 @@
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
<mirrors>
<mirror>
<id>aliyun-central</id>
<mirrorOf>*</mirrorOf>
<name>aliyun central</name>
<url>https://maven.aliyun.com/repository/central</url>
</mirror>
<mirror>
<id>huaweicloud</id>
<mirrorOf>central</mirrorOf>
<name>central repo</name>
<url>https://mirrors.huaweicloud.com/repository/maven/</url>
</mirror>
</mirrors>
</settings>