Rename UNet2 --> UNetUDP (production of new release 1.4)

conf/libuniset.spec

@@ -2,8 +2,8 @@
 %define oname uniset
 
 Name: libuniset
-Version: 1.3
-Release: alt19
+Version: 1.4
+Release: alt1
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -183,7 +183,7 @@ rm -f %buildroot%_libdir/*.la
 %_libdir/libUniSetRT*.so.*
 %_libdir/libUniSetShared*.so.*
 %_libdir/libUniSetNetwork*.so.*
-%_libdir/libUniSetUNet2*.so.*
+%_libdir/libUniSetUNetUDP*.so.*
 #%_libdir/libUniSetSMDBServer*.so.*
 
 %files extensions-devel
@@ -195,7 +195,7 @@ rm -f %buildroot%_libdir/*.la
 %_libdir/libUniSetRT*.so
 %_libdir/libUniSetShared*.so
 %_libdir/libUniSetNetwork.so
-%_libdir/libUniSetUNet2.so
+%_libdir/libUniSetUNetUDP.so
 #%_libdir/libUniSetSMDBServer.so
 %_pkgconfigdir/*Extensions.pc
 %_pkgconfigdir/libUniSetIO*.pc
@@ -213,6 +213,10 @@ rm -f %buildroot%_libdir/*.la
 
 
 %changelog
+* Thu May 31 2012 Pavel Vainerman <pv@altlinux.ru> 1.4-alt1
+- rename unet2 -->unetudp
+- release version 1.4
+
 * Thu May 31 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt19
 - DBServer: set log info level - LEVEL9
 - minor fixies for linker errors (new gcc)

configure.ac

@@ -3,7 +3,7 @@
 # See doc: http://www.gnu.org/software/hello/manual/autoconf/Generic-Programs.html
 
 # AC_PREREQ(2.59)
-AC_INIT([uniset], [1.3.0], pv@etersoft.ru)
+AC_INIT([uniset], [1.4.0], pv@etersoft.ru)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
 # AC_CONFIG_MACRO_DIR([m4])
@@ -30,7 +30,7 @@ AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
 AM_PROG_LIBTOOL
 
-LIBVER=1:3:0
+LIBVER=1:4:0
 AC_SUBST(LIBVER)
 
 # Checks for libraries.
@@ -189,8 +189,8 @@ AC_CONFIG_FILES([Makefile
 				 extensions/SMViewer/Makefile
 				 extensions/UniNetwork/Makefile
 				 extensions/UniNetwork/libUniSetNetwork.pc
-				 extensions/UNet2/Makefile
-				 extensions/UNet2/libUniSetUNet2.pc
+				 extensions/UNetUDP/Makefile
+				 extensions/UNetUDP/libUniSetUNetUDP.pc
 				 extensions/SharedMemory/Makefile
 				 extensions/SharedMemory/libUniSetSharedMemory.pc
 				 extensions/SharedMemoryPlus/Makefile

extensions/Makefile.am

@@ -4,7 +4,7 @@
 
 if HAVE_EXTENTIONS
 SUBDIRS = lib include SharedMemory IOControl LogicProcessor \
-	ModbusMaster ModbusSlave SMViewer UniNetwork UNet2 DBServer-MySQL tests
+	ModbusMaster ModbusSlave SMViewer UniNetwork UNetUDP DBServer-MySQL tests
 #SMDBServer
 #SharedMemoryPlus
 #UDPExchange

extensions/ModbusMaster/Makefile.am

@@ -11,7 +11,7 @@ lib_LTLIBRARIES 	= libUniSetMBTCPMaster.la libUniSetRTU.la
 
 # -------------------- Mobus TCP -------------------
 # не забывайте править версию в pc-файле
-UMBTCP_VER=1:3:1
+UMBTCP_VER=@LIBVER@
 
 
 libUniSetMBTCPMaster_la_LDFLAGS  = -version-info $(UMBTCP_VER)

extensions/ModbusSlave/Makefile.am

-bin_PROGRAMS 			= @PACKAGE@-mbslave
+bin_PROGRAMS = @PACKAGE@-mbslave
 
 # не забывайте править версию в pc-файле 
-UMBS_VER=1:1:1
+UMBS_VER=@LIBVER@
 
 lib_LTLIBRARIES 				= libUniSetMBSlave.la
 libUniSetMBSlave_la_LDFLAGS  = -version-info $(UMBS_VER) 

extensions/UNet2/Makefile.am

-bin_PROGRAMS 	= @PACKAGE@-unetexchange @PACKAGE@-unet2-tester
-
-# не забывайте править версию в pc-файле 
-UNET2_VER=@LIBVER@
-
-lib_LTLIBRARIES 			= libUniSetUNet2.la
-libUniSetUNet2_la_LDFLAGS  = -version-info $(UNET2_VER)
-libUniSetUNet2_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
-								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
-								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
-								$(SIGC_LIBS) $(COMCPP_LIBS)
-libUniSetUNet2_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
-libUniSetUNet2_la_SOURCES 	= UDPPacket.cc UNetReceiver.cc UNetSender.cc UNetExchange.cc
-
-@PACKAGE@_unetexchange_SOURCES 		= unetexchange.cc
-@PACKAGE@_unetexchange_LDADD 		= libUniSetUNet2.la $(top_builddir)/lib/libUniSet.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
-									$(SIGC_LIBS) $(COMCPP_LIBS)
-@PACKAGE@_unetexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
-
-
-@PACKAGE@_unet2_tester_SOURCES	= UDPPacket.cc unet2-tester.cc
-@PACKAGE@_unet2_tester_LDADD 	= $(COMCPP_LIBS)
-@PACKAGE@_unet2_tester_CXXFLAGS	= $(COMCPP_CFLAGS)
-
-# install
-devel_include_HEADERS = *.h
-devel_includedir = $(pkgincludedir)/extensions
-
-pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetUNet2.pc
-
-all-local:
-	ln -sf ../UNet2/$(devel_include_HEADERS) ../include

extensions/UNet2/create_links.sh

-#!/bin/sh
-
-ln -s -f ../../Utilities/scripts/uniset-start.sh 
-ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh
-ln -s -f ../../Utilities/scripts/uniset-functions.sh 
-ln -s -f ../../conf/test.xml test.xml
-

extensions/UNetUDP/Makefile.am

+bin_PROGRAMS = @PACKAGE@-unetexchange @PACKAGE@-unet-udp-tester
+
+# не забывайте править версию в pc-файле 
+UNETUDP_VER=@LIBVER@
+
+lib_LTLIBRARIES 			= libUniSetUNetUDP.la
+libUniSetUNetUDP_la_LDFLAGS  = -version-info $(UNETUDP_VER)
+libUniSetUNetUDP_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
+								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+								$(SIGC_LIBS) $(COMCPP_LIBS)
+libUniSetUNetUDP_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+libUniSetUNetUDP_la_SOURCES 	= UDPPacket.cc UNetReceiver.cc UNetSender.cc UNetExchange.cc
+
+@PACKAGE@_unetexchange_SOURCES 		= unetexchange.cc
+@PACKAGE@_unetexchange_LDADD 		= libUniSetUNetUDP.la $(top_builddir)/lib/libUniSet.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(SIGC_LIBS) $(COMCPP_LIBS)
+@PACKAGE@_unetexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+
+
+@PACKAGE@_unet_udp_tester_SOURCES	= UDPPacket.cc unet-udp-tester.cc
+@PACKAGE@_unet_udp_tester_LDADD 	= $(COMCPP_LIBS)
+@PACKAGE@_unet_udp_tester_CXXFLAGS	= $(COMCPP_CFLAGS)
+
+# install
+devel_include_HEADERS = *.h
+devel_includedir = $(pkgincludedir)/extensions
+
+pkgconfigdir 	= $(libdir)/pkgconfig
+pkgconfig_DATA 	= libUniSetUNetUDP.pc
+
+all-local:
+	ln -sf ../UNetUDP/$(devel_include_HEADERS) ../include

extensions/UNet2/libUniSetUNet2.pc.in → extensions/UNetUDP/libUniSetUNetUDP.pc.in

@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libUniSetUNet2
-Description: Support library for UniSetUNet2
+Name: libUniSetUNetUDP
+Description: Support library for UniSetUNetUDP
 Requires: libUniSetExtensions
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetUNet2
+Libs: -L${libdir} -lUniSetUNetUDP
 Cflags: -I${includedir}/uniset

extensions/UNetUDP/stop.sh

+../../Utilities/scripts/uniset-stop.sh
\ No newline at end of file

extensions/UNetUDP/test.xml

+../../conf/test.xml
\ No newline at end of file

extensions/UNetUDP/uniset-functions.sh

+../../Utilities/scripts/uniset-functions.sh
\ No newline at end of file

extensions/UNetUDP/uniset-start.sh

+../../Utilities/scripts/uniset-start.sh
\ No newline at end of file