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
a27da390
Commit
a27da390
authored
May 13, 2011
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DBServer-MySQL переехал в extensions. Для него создан отдельный pc-файл.
parent
97348da6
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
42 additions
and
13 deletions
+42
-13
Makefile.am
Utilities/Makefile.am
+1
-7
libuniset.spec
conf/libuniset.spec
+20
-4
configure.ac
configure.ac
+2
-1
DBInterface.cc
extensions/DBServer-MySQL/DBInterface.cc
+0
-0
DBInterface.h
extensions/DBServer-MySQL/DBInterface.h
+0
-0
DBServer_MySQL.cc
extensions/DBServer-MySQL/DBServer_MySQL.cc
+0
-0
DBServer_MySQL.h
extensions/DBServer-MySQL/DBServer_MySQL.h
+0
-0
Makefile.am
extensions/DBServer-MySQL/Makefile.am
+7
-0
create_links.sh
extensions/DBServer-MySQL/create_links.sh
+0
-0
db_create.sql
extensions/DBServer-MySQL/db_create.sql
+0
-0
db_rotate.sql
extensions/DBServer-MySQL/db_rotate.sql
+0
-0
libUniSetMySQL.pc.in
extensions/DBServer-MySQL/libUniSetMySQL.pc.in
+11
-0
main.cc
extensions/DBServer-MySQL/main.cc
+0
-0
start_fg.sh
extensions/DBServer-MySQL/start_fg.sh
+0
-0
Makefile.am
extensions/Makefile.am
+1
-1
No files found.
Utilities/Makefile.am
View file @
a27da390
...
...
@@ -2,16 +2,10 @@
# This file is part of the UniSet library #
############################################################################
UTIL
S
=
scripts Admin NullController SViewer-text
\
SUBDIR
S
=
scripts Admin NullController SViewer-text
\
InfoServer SMonit MBTester codegen SImitator
#MapSourceParser ClassGen
if
DISABLE_MYSQL
SUBDIRS
=
${
UTILS
}
else
SUBDIRS
=
${
UTILS
}
DBServer-MySQL
endif
include
$(top_builddir)/conf/common.mk
...
...
conf/libuniset.spec
View file @
a27da390
...
...
@@ -3,7 +3,7 @@
Name: libuniset
Version: 1.0
Release: alt3
0
Release: alt3
1
Summary: UniSet - library for building distributed industrial control systems
License: GPL
Group: Development/C++
...
...
@@ -43,6 +43,16 @@ Obsoletes: %oname-mysql-dbserver
%description mysql-dbserver
MySQL dbserver for %name
%package mysql-devel
Group: Development/Databases
Summary: Libraries needed to develop for uniset MySQL
Requires: %name = %version-%release
Provides: %oname-mysql-devel
Obsoletes: %oname-mysql-devel
%description mysql-devel
Libraries needed to develop for uniset MySQL
%package utils
Summary: UniSet utilities
Group: Development/Tools
...
...
@@ -54,7 +64,7 @@ Obsoletes: %oname-utils
UniSet utilities
%package doc
Group: Development/C
Group: Development/C
++
Summary: Documentations for developing with UniSet
Requires: lib%name = %version-%release
...
...
@@ -62,7 +72,7 @@ Requires: lib%name = %version-%release
Documentations for developing with UniSet
%package extensions
Group: Development/
Databases
Group: Development/
C++
Summary: libUniSet extensions
Requires: %name = %version-%release
Provides: %oname-extentions
...
...
@@ -74,7 +84,7 @@ Obsoletes: %name-extentions
Extensions for libuniset
%package extensions-devel
Group: Development/
Databases
Group: Development/
C++
Summary: Libraries needed to develop for uniset extensions
Requires: %name-extensions = %version-%release
Provides: %name-extentions-devel
...
...
@@ -135,6 +145,9 @@ rm -f %buildroot%_libdir/*.la
%_bindir/%oname-mysql-*dbserver
%_libdir/*-mysql.so*
%files mysql-devel
%_pkgconfigdir/libUniSetMySQL.pc
%if_enabled doc
%files doc
%_docdir/%name
...
...
@@ -186,10 +199,13 @@ rm -f %buildroot%_libdir/*.la
%_pkgconfigdir/libUniSetShared*.pc
%_pkgconfigdir/libUniSetNetwork*.pc
%_pkgconfigdir/libUniSetUNet*.pc
#%_pkgconfigdir/libUniSetSMDBServer.pc
#%_pkgconfigdir/libUniSet*.pc
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
* Wed May 11 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt30
- add new function to UniversalInterface
...
...
configure.ac
View file @
a27da390
...
...
@@ -167,7 +167,6 @@ AC_CONFIG_FILES([Makefile
Utilities/SMonit/Makefile
Utilities/InfoServer/Makefile
Utilities/MBTester/Makefile
Utilities/DBServer-MySQL/Makefile
Utilities/SImitator/Makefile
Utilities/codegen/Makefile
Utilities/codegen/uniset-codegen
...
...
@@ -176,6 +175,8 @@ AC_CONFIG_FILES([Makefile
extensions/libUniSetExtensions.pc
extensions/lib/Makefile
extensions/include/Makefile
extensions/DBServer-MySQL/Makefile
extensions/DBServer-MySQL/libUniSetMySQL.pc
extensions/IOControl/Makefile
extensions/IOControl/libUniSetIOControl.pc
extensions/RTUExchange/Makefile
...
...
Utilitie
s/DBServer-MySQL/DBInterface.cc
→
extension
s/DBServer-MySQL/DBInterface.cc
View file @
a27da390
Utilitie
s/DBServer-MySQL/DBInterface.h
→
extension
s/DBServer-MySQL/DBInterface.h
View file @
a27da390
Utilitie
s/DBServer-MySQL/DBServer_MySQL.cc
→
extension
s/DBServer-MySQL/DBServer_MySQL.cc
View file @
a27da390
Utilitie
s/DBServer-MySQL/DBServer_MySQL.h
→
extension
s/DBServer-MySQL/DBServer_MySQL.h
View file @
a27da390
Utilitie
s/DBServer-MySQL/Makefile.am
→
extension
s/DBServer-MySQL/Makefile.am
View file @
a27da390
if
DISABLE_MYSQL
else
UMYSQL_VER
=
@LIBVER@
lib_LTLIBRARIES
=
libUniSet-mysql.la
...
...
@@ -14,3 +18,5 @@ include $(top_builddir)/conf/setting.mk
# install
devel_include_HEADERS
=
*
.h
devel_includedir
=
$(includedir)
/@PACKAGE@/mysql
endif
\ No newline at end of file
Utilitie
s/DBServer-MySQL/create_links.sh
→
extension
s/DBServer-MySQL/create_links.sh
View file @
a27da390
File moved
Utilitie
s/DBServer-MySQL/db_create.sql
→
extension
s/DBServer-MySQL/db_create.sql
View file @
a27da390
Utilitie
s/DBServer-MySQL/db_rotate.sql
→
extension
s/DBServer-MySQL/db_rotate.sql
View file @
a27da390
File moved
extensions/DBServer-MySQL/libUniSetMySQL.pc.in
0 → 100644
View file @
a27da390
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libUniSetMySQL
Description: Support library for libUniSetMySQL
Requires: libUniSet
Version: 1.0.0
Libs: -L${libdir} -lUniSet-mysql -lmysqlclient
Cflags: -I${includedir}/uniset -I${includedir}/mysql
Utilitie
s/DBServer-MySQL/main.cc
→
extension
s/DBServer-MySQL/main.cc
View file @
a27da390
Utilitie
s/DBServer-MySQL/start_fg.sh
→
extension
s/DBServer-MySQL/start_fg.sh
View file @
a27da390
File moved
extensions/Makefile.am
View file @
a27da390
...
...
@@ -4,7 +4,7 @@
if
HAVE_EXTENTIONS
SUBDIRS
=
lib include SharedMemory IOControl RTUExchange LogicProcessor
\
ModbusSlave MBTCPMaster SMViewer UniNetwork UNet2
ModbusSlave MBTCPMaster SMViewer UniNetwork UNet2
DBServer-MySQL
#SMDBServer
#SharedMemoryPlus
#UDPExchange
...
...
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