Commit 5782b523 authored by Pavel Vainerman's avatar Pavel Vainerman

DBServer-MySQL переехал в extensions. Для него создан отдельный pc-файл.

parent 7631f09a
...@@ -2,16 +2,10 @@ ...@@ -2,16 +2,10 @@
# This file is part of the UniSet library # # This file is part of the UniSet library #
############################################################################ ############################################################################
UTILS = scripts Admin NullController SViewer-text \ SUBDIRS = scripts Admin NullController SViewer-text \
InfoServer SMonit MBTester codegen SImitator InfoServer SMonit MBTester codegen SImitator
#MapSourceParser ClassGen #MapSourceParser ClassGen
if DISABLE_MYSQL
SUBDIRS = ${UTILS}
else
SUBDIRS = ${UTILS} DBServer-MySQL
endif
include $(top_builddir)/conf/common.mk include $(top_builddir)/conf/common.mk
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Name: libuniset Name: libuniset
Version: 1.0 Version: 1.0
Release: alt30 Release: alt31
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
License: GPL License: GPL
Group: Development/C++ Group: Development/C++
...@@ -43,6 +43,16 @@ Obsoletes: %oname-mysql-dbserver ...@@ -43,6 +43,16 @@ Obsoletes: %oname-mysql-dbserver
%description mysql-dbserver %description mysql-dbserver
MySQL dbserver for %name 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 %package utils
Summary: UniSet utilities Summary: UniSet utilities
Group: Development/Tools Group: Development/Tools
...@@ -54,7 +64,7 @@ Obsoletes: %oname-utils ...@@ -54,7 +64,7 @@ Obsoletes: %oname-utils
UniSet utilities UniSet utilities
%package doc %package doc
Group: Development/C Group: Development/C++
Summary: Documentations for developing with UniSet Summary: Documentations for developing with UniSet
Requires: lib%name = %version-%release Requires: lib%name = %version-%release
...@@ -62,7 +72,7 @@ Requires: lib%name = %version-%release ...@@ -62,7 +72,7 @@ Requires: lib%name = %version-%release
Documentations for developing with UniSet Documentations for developing with UniSet
%package extensions %package extensions
Group: Development/Databases Group: Development/C++
Summary: libUniSet extensions Summary: libUniSet extensions
Requires: %name = %version-%release Requires: %name = %version-%release
Provides: %oname-extentions Provides: %oname-extentions
...@@ -74,7 +84,7 @@ Obsoletes: %name-extentions ...@@ -74,7 +84,7 @@ Obsoletes: %name-extentions
Extensions for libuniset Extensions for libuniset
%package extensions-devel %package extensions-devel
Group: Development/Databases Group: Development/C++
Summary: Libraries needed to develop for uniset extensions Summary: Libraries needed to develop for uniset extensions
Requires: %name-extensions = %version-%release Requires: %name-extensions = %version-%release
Provides: %name-extentions-devel Provides: %name-extentions-devel
...@@ -135,6 +145,9 @@ rm -f %buildroot%_libdir/*.la ...@@ -135,6 +145,9 @@ rm -f %buildroot%_libdir/*.la
%_bindir/%oname-mysql-*dbserver %_bindir/%oname-mysql-*dbserver
%_libdir/*-mysql.so* %_libdir/*-mysql.so*
%files mysql-devel
%_pkgconfigdir/libUniSetMySQL.pc
%if_enabled doc %if_enabled doc
%files doc %files doc
%_docdir/%name %_docdir/%name
...@@ -186,10 +199,13 @@ rm -f %buildroot%_libdir/*.la ...@@ -186,10 +199,13 @@ rm -f %buildroot%_libdir/*.la
%_pkgconfigdir/libUniSetShared*.pc %_pkgconfigdir/libUniSetShared*.pc
%_pkgconfigdir/libUniSetNetwork*.pc %_pkgconfigdir/libUniSetNetwork*.pc
%_pkgconfigdir/libUniSetUNet*.pc %_pkgconfigdir/libUniSetUNet*.pc
#%_pkgconfigdir/libUniSetSMDBServer.pc #%_pkgconfigdir/libUniSetSMDBServer.pc
#%_pkgconfigdir/libUniSet*.pc #%_pkgconfigdir/libUniSet*.pc
%exclude %_pkgconfigdir/libUniSet.pc %exclude %_pkgconfigdir/libUniSet.pc
%changelog %changelog
* Wed May 11 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt30 * Wed May 11 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt30
- add new function to UniversalInterface - add new function to UniversalInterface
......
...@@ -167,7 +167,6 @@ AC_CONFIG_FILES([Makefile ...@@ -167,7 +167,6 @@ AC_CONFIG_FILES([Makefile
Utilities/SMonit/Makefile Utilities/SMonit/Makefile
Utilities/InfoServer/Makefile Utilities/InfoServer/Makefile
Utilities/MBTester/Makefile Utilities/MBTester/Makefile
Utilities/DBServer-MySQL/Makefile
Utilities/SImitator/Makefile Utilities/SImitator/Makefile
Utilities/codegen/Makefile Utilities/codegen/Makefile
Utilities/codegen/uniset-codegen Utilities/codegen/uniset-codegen
...@@ -176,6 +175,8 @@ AC_CONFIG_FILES([Makefile ...@@ -176,6 +175,8 @@ AC_CONFIG_FILES([Makefile
extensions/libUniSetExtensions.pc extensions/libUniSetExtensions.pc
extensions/lib/Makefile extensions/lib/Makefile
extensions/include/Makefile extensions/include/Makefile
extensions/DBServer-MySQL/Makefile
extensions/DBServer-MySQL/libUniSetMySQL.pc
extensions/IOControl/Makefile extensions/IOControl/Makefile
extensions/IOControl/libUniSetIOControl.pc extensions/IOControl/libUniSetIOControl.pc
extensions/RTUExchange/Makefile extensions/RTUExchange/Makefile
......
if DISABLE_MYSQL
else
UMYSQL_VER=@LIBVER@ UMYSQL_VER=@LIBVER@
lib_LTLIBRARIES = libUniSet-mysql.la lib_LTLIBRARIES = libUniSet-mysql.la
...@@ -14,3 +18,5 @@ include $(top_builddir)/conf/setting.mk ...@@ -14,3 +18,5 @@ include $(top_builddir)/conf/setting.mk
# install # install
devel_include_HEADERS = *.h devel_include_HEADERS = *.h
devel_includedir = $(includedir)/@PACKAGE@/mysql devel_includedir = $(includedir)/@PACKAGE@/mysql
endif
\ No newline at end of file
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
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
if HAVE_EXTENTIONS if HAVE_EXTENTIONS
SUBDIRS = lib include SharedMemory IOControl RTUExchange LogicProcessor \ SUBDIRS = lib include SharedMemory IOControl RTUExchange LogicProcessor \
ModbusSlave MBTCPMaster SMViewer UniNetwork UNet2 ModbusSlave MBTCPMaster SMViewer UniNetwork UNet2 DBServer-MySQL
#SMDBServer #SMDBServer
#SharedMemoryPlus #SharedMemoryPlus
#UDPExchange #UDPExchange
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment