From ca1caa19bc70f9074834b35d614e8a653b3fd354 Mon Sep 17 00:00:00 2001 From: Jens Reimann Date: Thu, 19 Apr 2018 15:58:53 +0200 Subject: [PATCH 1/4] Update to final release 1.9.0, enable lua, opcua --- .gitignore | 1 + 4diac-forte.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 93f7ab0..6c36e6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /org.eclipse.4diac.forte-1.9.0.M3.tar.gz +/org.eclipse.4diac.forte-1.9.0.tar.gz diff --git a/4diac-forte.spec b/4diac-forte.spec index 7c945d6..7f0faa4 100644 --- a/4diac-forte.spec +++ b/4diac-forte.spec @@ -1,15 +1,15 @@ %global _with_sysfs 1 - -%global extraver M3 +%global _with_opcua 1 +%global _with_lua 1 Name: 4diac-forte Version: 1.9.0 -Release: 0.1.%{extraver}%{?dist} +Release: 1%{?dist} Summary: IEC 61499 runtime environment License: EPL URL: http://eclipse.org/4diac -Source0: https://git.eclipse.org/c/4diac/org.eclipse.4diac.forte.git/snapshot/org.eclipse.4diac.forte-%{version}.%{extraver}.tar.gz +Source0: https://git.eclipse.org/c/4diac/org.eclipse.4diac.forte.git/snapshot/org.eclipse.4diac.forte-%{version}.tar.gz %{?systemd_requires} BuildRequires: cmake, gcc-c++ @@ -31,7 +31,7 @@ online-reconfiguration of its applications and the real-time capable execution of all function block types provided by the IEC 61499 standard. %prep -%setup -q -n org.eclipse.4diac.forte-%{version}.%{extraver} +%setup -q -n org.eclipse.4diac.forte-%{version} %build mkdir -p bin/posix @@ -76,6 +76,10 @@ cd bin/posix %config(noreplace) %{_sysconfdir}/sysconfig/4diac-forte %changelog +* Thu Apr 19 2018 Jens Reimann - 1.9.0-1 +- Update to the final release 1.9.0 +- Enable Lua integration +- Enable OPC UA integration * Mon Feb 05 2018 Jens Reimann - 1.9.0.M3-0.1 - Initial version of the package diff --git a/sources b/sources index b84470c..e83a000 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.eclipse.4diac.forte-1.9.0.M3.tar.gz) = 67b36b0c0c72b3fc9126052ff9815ac5c3f12925d1e14cfce7fa91b3231530173aeccefe5201660394cb3cf99b07c1fc4107776df44c9661151625de8e5cb17d +SHA512 (org.eclipse.4diac.forte-1.9.0.tar.gz) = 1163c4751a99ce635eef1261a1ea22f84a5ad5cf47c60343b1163b51f03384efdb5e6f32536c0d7b83a7bf12d885f0aee6e9e108e34fdb0b4ea9f03f751b1f97 From f4d2a50a5d09e42f8b01f81e825870a43b09f6a4 Mon Sep 17 00:00:00 2001 From: Jens Reimann Date: Thu, 19 Apr 2018 16:25:31 +0200 Subject: [PATCH 2/4] Fix the "with" flag handling, disable lua again --- 4diac-forte.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/4diac-forte.spec b/4diac-forte.spec index 7f0faa4..8363eef 100644 --- a/4diac-forte.spec +++ b/4diac-forte.spec @@ -1,7 +1,6 @@ -%global _with_sysfs 1 -%global _with_opcua 1 -%global _with_lua 1 +%global with_sysfs 1 +%global with_opcua 1 Name: 4diac-forte Version: 1.9.0 @@ -15,11 +14,11 @@ Source0: https://git.eclipse.org/c/4diac/org.eclipse.4diac.forte.git/snapshot/o BuildRequires: cmake, gcc-c++ BuildRequires: systemd -%if %{with opcua} +%if 0%{?with_opcua} BuildRequires: open62541-devel >= 0.2 %endif -%if %{with lua} +%if 0%{?with_lua} BuildRequires: lua-devel >= 5.1 %endif @@ -40,12 +39,12 @@ cd bin/posix -DFORTE_COM_ETH=ON \ -DFORTE_COM_FBDK=ON \ -DFORTE_COM_LOCAL=ON \ - %{?_with_opcua: -DFORTE_COM_OPC_UA=ON -DFORTE_COM_OPC_UA_INCLUDE_DIR=%{_includedir}/open62541 -DFORTE_COM_OPC_UA_LIB_DIR=%{_libdir}} \ + %{?with_opcua: -DFORTE_COM_OPC_UA=ON -DFORTE_COM_OPC_UA_INCLUDE_DIR=%{_includedir}/open62541 -DFORTE_COM_OPC_UA_LIB_DIR=%{_libdir}} \ -DFORTE_MODULE_CONVERT=ON \ -DFORTE_MODULE_IEC61131=ON \ - %{?_with_sysfs: -DFORTE_MODULE_SysFs=ON } \ + %{?with_sysfs: -DFORTE_MODULE_SysFs=ON } \ -DFORTE_MODULE_UTILS=ON \ - %{?_with_lua: -DFORTE_USE_LUATYPES=Lua } \ + %{?with_lua: -DFORTE_USE_LUATYPES=Lua } \ -DFORTE_TESTS=OFF \ ../.. make %{?_smp_mflags} From 6baed961845f2d1e5cc045a4152acd9d6e192220 Mon Sep 17 00:00:00 2001 From: Jens Reimann Date: Thu, 19 Apr 2018 17:27:22 +0200 Subject: [PATCH 3/4] prepare for adding luajit --- 4diac-forte.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/4diac-forte.spec b/4diac-forte.spec index 8363eef..453dab8 100644 --- a/4diac-forte.spec +++ b/4diac-forte.spec @@ -22,6 +22,10 @@ BuildRequires: open62541-devel >= 0.2 BuildRequires: lua-devel >= 5.1 %endif +%if 0%{?with_luajit} +BuildRequires: luajit-devel >= 2.1.0 +%endif + %description The 4DIAC runtime environment (4DIAC-RTE, FORTE) is a small portable implementation of an IEC 61499 runtime environment targeting small @@ -45,6 +49,7 @@ cd bin/posix %{?with_sysfs: -DFORTE_MODULE_SysFs=ON } \ -DFORTE_MODULE_UTILS=ON \ %{?with_lua: -DFORTE_USE_LUATYPES=Lua } \ + %{?with_luajit: -DFORTE_USE_LUATYPES=LuaJIT } \ -DFORTE_TESTS=OFF \ ../.. make %{?_smp_mflags} From d4109e0f7c4b81eac5f81267f1b4ac6703c6d118 Mon Sep 17 00:00:00 2001 From: Jens Reimann Date: Thu, 19 Apr 2018 17:43:37 +0200 Subject: [PATCH 4/4] Change release to 1.1 --- 4diac-forte.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/4diac-forte.spec b/4diac-forte.spec index 453dab8..f2f0c58 100644 --- a/4diac-forte.spec +++ b/4diac-forte.spec @@ -4,7 +4,7 @@ Name: 4diac-forte Version: 1.9.0 -Release: 1%{?dist} +Release: 1.1%{?dist} Summary: IEC 61499 runtime environment License: EPL URL: http://eclipse.org/4diac @@ -80,7 +80,7 @@ cd bin/posix %config(noreplace) %{_sysconfdir}/sysconfig/4diac-forte %changelog -* Thu Apr 19 2018 Jens Reimann - 1.9.0-1 +* Thu Apr 19 2018 Jens Reimann - 1.9.0-1.1 - Update to the final release 1.9.0 - Enable Lua integration - Enable OPC UA integration