Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
0052e09f
Commit
0052e09f
authored
Oct 02, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Выделил LogicProcessor и SharedMemoryPlus в отдельные пакеты.
parent
d7686473
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
11 deletions
+72
-11
libuniset2.spec
conf/libuniset2.spec
+53
-11
configure.ac
configure.ac
+13
-0
Makefile.am
extensions/LogicProcessor/Makefile.am
+6
-0
No files found.
conf/libuniset2.spec
View file @
0052e09f
...
...
@@ -4,13 +4,14 @@
%def_enable python
%def_enable rrd
%def_enable io
%def_enable logicproc
#%def_enable modbus
%define oname uniset2
Name: libuniset2
Version: 2.0
Release: alt
6
Release: alt
7
Summary: UniSet - library for building distributed industrial control systems
...
...
@@ -136,6 +137,7 @@ Obsoletes: %name-extentions-devel
%description extension-common-devel
Libraries needed to develop for uniset extensions
%if_enabled mysql
%package extension-mysql
Group: Development/Databases
...
...
@@ -189,6 +191,24 @@ Requires: %name-extension-common-devel = %version-%release
Libraries needed to develop for uniset RRD extension
%endif
%if_enabled logicproc
%package extension-logicproc
Group: Development/c++
Summary: LogicProcessor extension for libUniSet
Requires: %name-extension-common = %version-%release
%description extension-logicproc
LogicProcessor for %name
%package extension-logicproc-devel
Group: Development/C++
Summary: Libraries needed to develop for uniset LogicProcesor extension
Requires: %name-extension-common-devel = %version-%release
%description extension-logicproc-devel
Libraries needed to develop for uniset LogicProcessor extension
%endif
%if_enabled io
%package extension-io
Group: Development/C++
...
...
@@ -207,12 +227,20 @@ Requires: %name-extension-common-devel = %version-%release
Libraries needed to develop for uniset IOControl (io)
%endif
%package extension-smplus
Group: Development/C++
Summary: libUniSet2 SharedMemoryPlus extension ('all in one')
Requires: %name-extension-common = %version-%release
%description extension-smplus
SharedMemoryPlus extension ('all in one') for libuniset
%prep
%setup
%build
%autoreconf
%configure %{subst_enable doc} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable python} %{subst_enable rrd} %{subst_enable io}
%configure %{subst_enable doc} %{subst_enable mysql} %{subst_enable sqlite} %{subst_enable python} %{subst_enable rrd} %{subst_enable io}
%{subst_enable logicproc}
%make
%install
...
...
@@ -236,6 +264,8 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%_bindir/%oname-sviewer-text
%_bindir/%oname-smonit
%_bindir/%oname-simitator
%_bindir/%oname-log
%_bindir/%oname-logserver-wrap
%_bindir/%oname-start*
%_bindir/%oname-stop*
%_bindir/%oname-func*
...
...
@@ -297,8 +327,6 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%endif
%files extension-common
%_bindir/%oname-logicproc
%_bindir/%oname-plogicproc
%_bindir/%oname-mtr-conv
%_bindir/%oname-mtr-setup
%_bindir/%oname-mtr-read
...
...
@@ -306,14 +334,12 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%_bindir/%oname-rtu188-state
%_bindir/%oname-rtuexchange
%_bindir/%oname-smemory
%_bindir/%oname-smemory-plus
%_bindir/%oname-smviewer
%_bindir/%oname-network
%_bindir/%oname-unet*
#%_bindir/%oname-smdbserver
%_libdir/*Extensions.so.*
%_libdir/libUniSet2LP*.so.*
%_libdir/libUniSet2Extensions.so.*
%_libdir/libUniSet2MB*.so.*
%_libdir/libUniSet2RT*.so.*
%_libdir/libUniSet2Shared*.so.*
...
...
@@ -321,6 +347,20 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%_libdir/libUniSet2UNetUDP*.so.*
#%_libdir/libUniSet2SMDBServer*.so.*
%files extension-smplus
%_bindir/%oname-smemory-plus
%if_enabled logicproc
%files extension-logicproc
%_libdir/libUniSet2LP*.so.*
%_bindir/%oname-logicproc
%_bindir/%oname-plogicproc
%files extension-logicproc-devel
%_pkgconfigdir/libUniSet2Log*.pc
%_libdir/libUniSet2LP*.so
%endif
%if_enabled rrd
%files extension-rrd
%_bindir/%oname-rrd*
...
...
@@ -345,16 +385,14 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%files extension-common-devel
%_includedir/%oname/extensions/
%_libdir/*Extensions.so
%_libdir/libUniSet2LP*.so
%_libdir/libUniSet2Extensions.so
%_libdir/libUniSet2MB*.so
%_libdir/libUniSet2RT*.so
%_libdir/libUniSet2Shared*.so
%_libdir/libUniSet2Network.so
%_libdir/libUniSet2UNetUDP.so
#%_libdir/libUniSet2SMDBServer.so
%_pkgconfigdir/*Extensions.pc
%_pkgconfigdir/libUniSet2Log*.pc
%_pkgconfigdir/libUniSet2Extensions.pc
%_pkgconfigdir/libUniSet2MB*.pc
%_pkgconfigdir/libUniSet2RT*.pc
%_pkgconfigdir/libUniSet2Shared*.pc
...
...
@@ -366,6 +404,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%exclude %_pkgconfigdir/libUniSet2.pc
%changelog
* Wed Oct 01 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt7
- make "extension-smplus" package
- make "extension-logicproc" package
* Thu Aug 21 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt6
- make "extension-common" package
- make "extension-rrd" package
...
...
configure.ac
View file @
0052e09f
...
...
@@ -115,6 +115,19 @@ fi
AM_CONDITIONAL(DISABLE_IO, test ${buildio} = false)
AM_CONDITIONAL(ENABLE_IO, test ${buildio} = true)
#check logicproc build
AC_MSG_CHECKING([build logic processor extension])
buildlproc=true
AC_ARG_ENABLE(rrd, AC_HELP_STRING([--disable-logicproc], [disable build LogicProcessor extension]),
[ if test $enableval = yes; then buildlproc=true; else buildlproc=false; fi],[ buildlproc=true; ])
if test ${buildlproc} = true; then
AC_MSG_RESULT([enabled])
else
AC_MSG_RESULT([disabled])
fi
AM_CONDITIONAL(DISABLE_LOGICPROC, test ${buildlproc} = false)
#check build extensions
ext=true
AC_MSG_CHECKING([Extensions])
...
...
extensions/LogicProcessor/Makefile.am
View file @
0052e09f
if
DISABLE_LOGICPROC
else
# не забывайте править версию в2.pc-файле
ULPROC_VER
=
@LIBVER@
...
...
@@ -38,3 +42,5 @@ pkgconfig_DATA = libUniSet2LogicProcessor.pc
all-local
:
ln
-sf
../LogicProcessor/
$(devel_include_HEADERS)
../include
endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment