Compare commits

...
Sign in to create a new pull request.

4 commits

Author SHA1 Message Date
Jens Reimann
d4109e0f7c Change release to 1.1 2018-04-19 18:10:54 +02:00
Jens Reimann
6baed96184 prepare for adding luajit 2018-04-19 18:10:54 +02:00
Jens Reimann
f4d2a50a5d Fix the "with" flag handling, disable lua again 2018-04-19 18:10:54 +02:00
Jens Reimann
ca1caa19bc Update to final release 1.9.0, enable lua, opcua 2018-04-19 18:09:58 +02:00
3 changed files with 21 additions and 12 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
/org.eclipse.4diac.forte-1.9.0.M3.tar.gz
/org.eclipse.4diac.forte-1.9.0.tar.gz

View file

@ -1,28 +1,31 @@
%global _with_sysfs 1
%global extraver M3
%global with_sysfs 1
%global with_opcua 1
Name: 4diac-forte
Version: 1.9.0
Release: 0.1.%{extraver}%{?dist}
Release: 1.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++
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
%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
@ -31,7 +34,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
@ -40,12 +43,13 @@ 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 } \
%{?with_luajit: -DFORTE_USE_LUATYPES=LuaJIT } \
-DFORTE_TESTS=OFF \
../..
make %{?_smp_mflags}
@ -76,6 +80,10 @@ cd bin/posix
%config(noreplace) %{_sysconfdir}/sysconfig/4diac-forte
%changelog
* Thu Apr 19 2018 Jens Reimann <jreimann@redhat.com> - 1.9.0-1.1
- Update to the final release 1.9.0
- Enable Lua integration
- Enable OPC UA integration
* Mon Feb 05 2018 Jens Reimann <jreimann@redhat.com> - 1.9.0.M3-0.1
- Initial version of the package

View file

@ -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