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
626f192b
Commit
626f192b
authored
Aug 22, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Исправил warning: 'underlinked libraries'
parent
08ea8fa3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
49 additions
and
29 deletions
+49
-29
configure.ac
configure.ac
+0
-1
Makefile.am
extensions/IOControl/Makefile.am
+8
-4
Makefile.am
extensions/ModbusSlave/Makefile.am
+6
-6
start_fg.sh
extensions/SharedMemory/start_fg.sh
+4
-6
Makefile.am
extensions/SharedMemoryPlus/Makefile.am
+12
-3
smemory-plus.cc
extensions/SharedMemoryPlus/smemory-plus.cc
+10
-2
Makefile.am
extensions/UniNetwork/Makefile.am
+6
-4
Makefile.am
lib/Makefile.am
+1
-1
Makefile.am
python/lib/pyUniSet/Makefile.am
+2
-2
No files found.
configure.ac
View file @
626f192b
...
...
@@ -56,7 +56,6 @@ fi
AM_CONDITIONAL(DISABLE_SQLITE, test ${buildsqlite} = false)
# check IDL compiler
AC_PATH_PROG([IDL], [omniidl])
test "x$IDL" = "x" && AC_MSG_ERROR([*** omniidl not found.])
...
...
extensions/IOControl/Makefile.am
View file @
626f192b
if
ENABLE_IO
bin_PROGRAMS
=
@PACKAGE@-iocontrol @PACKAGE@-iotest @PACKAGE@-iocalibr
# не забывайте править версию в2.pc-файле
...
...
@@ -5,13 +6,13 @@ UIO_VER=@LIBVER@
lib_LTLIBRARIES
=
libUniSet2IOControl.la
libUniSet2IOControl_la_LDFLAGS
=
-version-info
$(UIO_VER)
libUniSet2IOControl_la_LIBADD
=
$(COMEDI_LIBS)
$(SIGC_LIBS)
\
libUniSet2IOControl_la_LIBADD
=
$(COMEDI_LIBS)
$(SIGC_LIBS)
$(COMCPP_LIBS)
\
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
\
$(top_builddir)
/lib/libUniSet2.la
\
$(top_builddir)
/extensions/SharedMemory/libUniSet2SharedMemory.la
\
-lm
libUniSet2IOControl_la_CXXFLAGS
=
$(COMEDI_CFLAGS)
$(SIGC_CFLAGS)
\
libUniSet2IOControl_la_CXXFLAGS
=
$(COMEDI_CFLAGS)
$(SIGC_CFLAGS)
$(COMCPP_CFLAGS)
\
-I
$(top_builddir)
/extensions/include
\
-I
$(top_builddir)
/extensions/SharedMemory
...
...
@@ -19,8 +20,8 @@ libUniSet2IOControl_la_SOURCES = ComediInterface.cc IOControl.cc
@PACKAGE@
_iocontrol_LDADD
=
libUniSet2IOControl.la
\
$(top_builddir)
/lib/libUniSet2.la
\
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
$(COMEDI_LIBS)
-lm
@PACKAGE@
_iocontrol_CXXFLAGS
=
$(COMEDI_CFLAGS)
$(SIGC_CFLAGS)
\
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
$(COMEDI_LIBS)
$(SIGC_LIBS)
$(COMCPP_LIBS)
-lm
@PACKAGE@
_iocontrol_CXXFLAGS
=
$(COMEDI_CFLAGS)
$(SIGC_CFLAGS)
$(COMCPP_CFLAGS)
\
-I
$(top_builddir)
/extensions/include
\
-I
$(top_builddir)
/extensions/SharedMemory
@PACKAGE@
_iocontrol_SOURCES
=
iocontrol.cc
...
...
@@ -45,3 +46,6 @@ pkgconfig_DATA = libUniSet2IOControl.pc
all-local
:
ln
-sf
../IOControl/
$(devel_include_HEADERS)
../include
endif
# end of ENABLE_IO
extensions/ModbusSlave/Makefile.am
View file @
626f192b
...
...
@@ -8,23 +8,23 @@ libUniSet2MBSlave_la_LDFLAGS = -version-info $(UMBS_VER)
libUniSet2MBSlave_la_LIBADD
=
$(top_builddir)
/lib/libUniSet2.la
\
$(top_builddir)
/extensions/SharedMemory/libUniSet2SharedMemory.la
\
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
\
$(SIGC_LIBS)
libUniSet2MBSlave_la_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
$(SIGC_LIBS)
$(COMCPP_LIBS)
libUniSet2MBSlave_la_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
$(COMCPP_CFLAGS)
libUniSet2MBSlave_la_SOURCES
=
MBSlave.cc MBTCPMultiSlave.cc
@PACKAGE@
_mbslave_SOURCES
=
mbslave.cc
@PACKAGE@
_mbslave_LDADD
=
libUniSet2MBSlave.la
$(top_builddir)
/lib/libUniSet2.la
\
$(top_builddir)
/extensions/SharedMemory/libUniSet2SharedMemory.la
\
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
\
$(SIGC_LIBS)
@PACKAGE@
_mbslave_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
$(SIGC_LIBS)
$(COMCPP_LIBS)
@PACKAGE@
_mbslave_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
$(COMCPP_CFLAGS)
@PACKAGE@
_mbtcp_multislave_SOURCES
=
mbtcp-multislave.cc
@PACKAGE@
_mbtcp_multislave_LDADD
=
libUniSet2MBSlave.la
$(top_builddir)
/lib/libUniSet2.la
\
$(top_builddir)
/extensions/SharedMemory/libUniSet2SharedMemory.la
\
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
\
$(SIGC_LIBS)
@PACKAGE@
_mbtcp_multislave_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
$(SIGC_LIBS)
$(COMCPP_LIBS)
@PACKAGE@
_mbtcp_multislave_CXXFLAGS
=
-I
$(top_builddir)
/extensions/include
-I
$(top_builddir)
/extensions/SharedMemory
$(SIGC_CFLAGS)
$(COMCPP_CFLAGS)
# install
devel_include_HEADERS
=
*
.h
...
...
extensions/SharedMemory/start_fg.sh
View file @
626f192b
...
...
@@ -4,8 +4,7 @@ export LD_LIBRARY_PATH="../../lib/.libs;../lib/.libs"
ulimit
-Sc
10000000000
./uniset2-start.sh
-f
./uniset2-smemory
--smemory-id
SharedMemory
--pulsar-id
DO_C
--pulsar-iotype
DO
\
--confile
test.xml
--datfile
test.xml
\
--ulog-add-levels
info,crit,warn,level9,system
\
--dlog-add-levels
info,crit,warn
\
--db-logging
1
\ No newline at end of file
./uniset2-start.sh
-f
./uniset2-smemory
--smemory-id
SharedMemory
--pulsar-id
DO_C
--pulsar-iotype
DO
--pulsar-msec
100
\
--confile
test.xml
--datfile
test.xml
--db-logging
1
\
#--ulog-add-levels info,crit,warn,level9,system \
#--dlog-add-levels info,crit,warn \
extensions/SharedMemoryPlus/Makefile.am
View file @
626f192b
if
ENABLE_IO
IO_LIBS
=
$(top_builddir)
/extensions/IOControl/libUniSet2IOControl.la
IO_CFLAGS
=
-I
$(top_builddir)
/extensions/IOControl
-DUNISET_ENABLE_IO
else
IO_LIBS
=
IO_CFLAGS
=
endif
bin_PROGRAMS
=
@PACKAGE@-smemory-plus
@PACKAGE@
_smemory_plus_LDADD
=
$(top_builddir)
/lib/libUniSet2.la
\
...
...
@@ -5,18 +13,19 @@ bin_PROGRAMS = @PACKAGE@-smemory-plus
$(top_builddir)
/extensions/ModbusMaster/libUniSet2MBTCPMaster.la
\
$(top_builddir)
/extensions/ModbusMaster/libUniSet2RTU.la
\
$(top_builddir)
/extensions/ModbusSlave/libUniSet2MBSlave.la
\
$(top_builddir)
/extensions/IOControl/libUniSet2IOControl.la
\
$(top_builddir)
/extensions/SharedMemory/libUniSet2SharedMemory.la
\
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
\
$(IO_LIBS)
\
$(SIGC_LIBS)
$(COMCPP_LIBS)
@PACKAGE@
_smemory_plus_CXXFLAGS
=
-I
$(top_builddir)
/extensions/CanNetwork
\
@PACKAGE@
_smemory_plus_CXXFLAGS
=
\
-I
$(top_builddir)
/extensions/UNetUDP
\
-I
$(top_builddir)
/extensions/ModbusMaster
\
-I
$(top_builddir)
/extensions/ModbusSlave
\
-I
$(top_builddir)
/extensions/IOControl
\
-I
$(top_builddir)
/extensions/SharedMemory
\
-I
$(top_builddir)
/extensions/include
\
$(IO_CFLAGS)
\
$(SIGC_CFLAGS)
$(COMCPP_CFLAGS)
@PACKAGE@
_smemory_plus_SOURCES
=
smemory-plus.cc
extensions/SharedMemoryPlus/smemory-plus.cc
View file @
626f192b
...
...
@@ -10,10 +10,12 @@
#include "MBSlave.h"
#include "MBTCPMaster.h"
#include "SharedMemory.h"
#include "IOControl.h"
//#include "UniExchange.h"
#include "UNetExchange.h"
#include "Configuration.h"
#ifdef UNISET_ENABLE_IO
#include "IOControl.h"
#endif
// --------------------------------------------------------------------------
using
namespace
std
;
using
namespace
UniSetTypes
;
...
...
@@ -49,7 +51,8 @@ int main( int argc, const char **argv )
return
1
;
act
->
addManager
(
static_cast
<
class
UniSetManager
*>
(
shm
));
#ifdef UNISET_ENABLE_IO
// ------------ IOControl ----------------
std
::
list
<
ThreadCreator
<
IOControl
>*
>
lst_iothr
;
for
(
unsigned
int
i
=
0
;
i
<
MaxAddNum
;
i
++
)
...
...
@@ -81,6 +84,7 @@ int main( int argc, const char **argv )
lst_iothr
.
push_back
(
io_thr
);
}
}
#endif
// ------------- RTU Exchange --------------
for
(
unsigned
int
i
=
0
;
i
<
MaxAddNum
;
i
++
)
{
...
...
@@ -175,8 +179,10 @@ int main( int argc, const char **argv )
SystemMessage
sm
(
SystemMessage
::
StartUp
);
act
->
broadcast
(
sm
.
transport_msg
()
);
#ifdef UNISET_IO_ENABLE
for
(
std
::
list
<
ThreadCreator
<
IOControl
>*
>::
iterator
it
=
lst_iothr
.
begin
();
it
!=
lst_iothr
.
end
();
++
it
)
(
*
it
)
->
start
();
#endif
act
->
run
(
false
);
on_sigchild
(
SIGTERM
);
...
...
@@ -213,8 +219,10 @@ void help_print( int argc, const char* argv[] )
cout
<<
endl
<<
"###### SM options ######"
<<
endl
;
SharedMemory
::
help_print
(
argc
,
argv
);
#ifdef UNISET_IO_ENABLE
cout
<<
endl
<<
"###### IO options ###### (prefix: --ioX)"
<<
endl
;
IOControl
::
help_print
(
argc
,
argv
);
#endif
cout
<<
endl
<<
"###### RTU options ###### (prefix: --rtuX)"
<<
endl
;
RTUExchange
::
help_print
(
argc
,
argv
);
...
...
extensions/UniNetwork/Makefile.am
View file @
626f192b
...
...
@@ -7,16 +7,18 @@ lib_LTLIBRARIES = libUniSet2Network.la
libUniSet2Network_la_LDFLAGS
=
-version-info
$(UNET_VER)
libUniSet2Network_la_LIBADD
=
$(SIGC_LIBS)
$(top_builddir)
/lib/libUniSet2.la
\
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
\
$(top_builddir)
/extensions/SharedMemory/libUniSet2SharedMemory.la
libUniSet2Network_la_CPPFLAGS
=
$(SIGC_CFLAGS)
\
$(top_builddir)
/extensions/SharedMemory/libUniSet2SharedMemory.la
\
$(COMCPP_LIBS)
libUniSet2Network_la_CPPFLAGS
=
$(SIGC_CFLAGS)
$(COMCPP_CFLAGS)
\
-I
$(top_builddir)
/extensions/include
\
-I
$(top_builddir)
/extensions/SharedMemory
libUniSet2Network_la_SOURCES
=
UniExchange.cc
@PACKAGE@
_network_LDADD
=
libUniSet2Network.la
\
$(top_builddir)
/lib/libUniSet2.la
\
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
@PACKAGE@
_network_CPPFLAGS
=
$(SIGC_CFLAGS)
-I
$(top_builddir)
/extensions/include
$(top_builddir)
/extensions/lib/libUniSet2Extensions.la
\
$(COMCPP_LIBS)
@PACKAGE@
_network_CPPFLAGS
=
$(SIGC_CFLAGS)
$(COMCPP_CFLAGS)
-I
$(top_builddir)
/extensions/include
@PACKAGE@
_network_SOURCES
=
uninet.cc
# install
...
...
lib/Makefile.am
View file @
626f192b
...
...
@@ -12,7 +12,7 @@
lib_LTLIBRARIES
=
libUniSet2.la
libUniSet2_la_SOURCES
=
libUniSet2_la_LDFLAGS
=
-version-info
@LIBVER@
libUniSet2_la_LIBADD
=
\
libUniSet2_la_LIBADD
=
-lm
\
$(top_builddir)
/src/Communications/libCommunications.la
\
$(top_builddir)
/src/Communications/Modbus/libModbus.la
\
$(top_builddir)
/src/Interfaces/libInterfaces.la
\
...
...
python/lib/pyUniSet/Makefile.am
View file @
626f192b
...
...
@@ -21,9 +21,9 @@ UConnector_wrap.cxx: UConnector.i UConnector.h
swig
-python
-c
++
-classic
UConnector.i
_pyUModbus_la_SOURCES
=
UModbus.cc UModbus_wrap.cxx
_pyUModbus_la_CXXFLAGS
=
$(UNISET_CFLAGS)
$(UNISET_EXT_CFLAGS)
$(PYTHON_CFLAGS)
_pyUModbus_la_CXXFLAGS
=
$(UNISET_CFLAGS)
$(UNISET_EXT_CFLAGS)
$(
COMCPP_CFLAGS)
$(
PYTHON_CFLAGS)
_pyUModbus_la_LDFLAGS
=
-module
-avoid-version
_pyUModbus_la_LIBADD
=
$(UNISET_LIBS)
$(UNISET_EXT_LIBS)
$(PYTHON_LIBS)
_pyUModbus_la_LIBADD
=
$(UNISET_LIBS)
$(UNISET_EXT_LIBS)
$(
COMCPP_LIBS)
$(
PYTHON_LIBS)
UModbus_wrap.cxx
:
UInterface.i UModbus.h
swig
-python
-c
++
-classic
UModbus.i
...
...
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