commit: r494 - in trunk/libspread-util: . docs include src
[email protected] Tue, 06 Mar 2012 01:11:25 -0500
| Newsgroups | gmane.network.spread.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: jonathan Date: 2012-03-06 01:11:25 -0500 (Tue, 06 Mar 2012) New Revision: 494 Modified: trunk/libspread-util/Changelog trunk/libspread-util/docs/Readme.txt trunk/libspread-util/include/spu_alarm_types.h trunk/libspread-util/src/Makefile.in Log: Merge fixes from libspread-util trunk as of Mar 06 2012 01:11 Modified: trunk/libspread-util/Changelog =================================================================== --- trunk/libspread-util/Changelog 2012-03-06 05:27:57 UTC (rev 493) +++ trunk/libspread-util/Changelog 2012-03-06 06:11:25 UTC (rev 494) @@ -1,3 +1,8 @@ +Mon Mar 5 23:50:52 2012 Jonathan Stanton <[email protected]> + + * include/spu_alarm_types.h (CONF_SYS): Change CONF alarm type which conflicted with OpenSSL + to CONF_SYS to avoid the conflict. + Mon Mar 5 18:14:22 2012 Jonathan Stanton <[email protected]> * src/memory.c (Mem_init_status): Remove Mem_init_status function as it is hacked in Modified: trunk/libspread-util/docs/Readme.txt =================================================================== --- trunk/libspread-util/docs/Readme.txt 2012-03-06 05:27:57 UTC (rev 493) +++ trunk/libspread-util/docs/Readme.txt 2012-03-06 06:11:25 UTC (rev 494) @@ -72,6 +72,33 @@ The detailed changes in this first release (from the internal code in Spread) can be found in the Changelog file. +STEPS TO CONVERT APPLICATION USING PREVIOUS CODE TO NEW LIBRARY: +---------------------------------------------------------------- + +For an application that previously used alarm.c, data_link.c, events.c or memory.c, +these are the suggested changes to make the application compatible with using the +same APIs via this new library. + +1) Fix build: + - Change configure.in in application to call subconfigure for libspread-util package + - Change top level Makefile.in to add libspread-util as a subdirectory to build (and install if using shared libraries) + +2) Integrate with svn to allow customization + - Import libspread-util release into vendor branch. Then merge into subdirectory in main package. + This allows local changes to be made to application's version of the library. + +3) Add application specific memory types to libspread-util/include/spu_objects_local.h + +4) Fix any usage of the previous APIs that have changed in the new release. These include: + - Fix any callers of Alarm_enable_precise_timestamps() to use new function for high_res alarm formats. + - Fix all callers of Mem_init_object() to add the 'obj_name' parameter to the calls. + - Change all #include of the headers to use the new header names of spu_* + - Compare local copies of memory.h objects.h alarm.h and make sure the defined types match those in the standard library, or modify the objects_local.h and alarm_types.h files to match the app. + - Change all use of SPLOG_PRINT_NODATE to new feature flag SPLOG_NODATE along with correct main type like SPLOG_PRINT. + - Consider changing all application use of "spu_objects.h" to "spu_objects_local.h" as most applications do not need anything from objects.h. + + + SOURCE INSTALL: --------------- Modified: trunk/libspread-util/include/spu_alarm_types.h =================================================================== --- trunk/libspread-util/include/spu_alarm_types.h 2012-03-06 05:27:57 UTC (rev 493) +++ trunk/libspread-util/include/spu_alarm_types.h 2012-03-06 06:11:25 UTC (rev 494) @@ -59,7 +59,7 @@ #define NETWORK 0x00000020 #define PROTOCOL 0x00000040 #define SESSION 0x00000080 -//#define CONF 0x00000100 Clash with an OpenSSL definition +#define CONF_SYS 0x00000100 #define MEMB 0x00000200 #define FLOW_CONTROL 0x00000400 #define STATUS 0x00000800 Modified: trunk/libspread-util/src/Makefile.in =================================================================== --- trunk/libspread-util/src/Makefile.in 2012-03-06 05:27:57 UTC (rev 493) +++ trunk/libspread-util/src/Makefile.in 2012-03-06 06:11:25 UTC (rev 494) @@ -60,11 +60,11 @@ ENT=@ENT@ EXEEXT=@EXEEXT@ -TARGETS=libspread-util.a @LIBSPSO@ +TARGETS=libspread-util.a libspread-util.sa @LIBSPSO@ LIB_OBJS=alarm.o events.o memory.o data_link.o -LIB_SHOBJS=alarm.lo events.lo memory.lo data_link.lo +LIB_SHOBJS=$(LIB_OBJS:.o=.lo) all: $(TARGETS) @@ -78,6 +78,10 @@ $(AR) rv $@ $(LIB_OBJS) $(RANLIB) $@ +libspread-util.sa: $(LIB_SHOBJS) + $(AR) rv $@ $(LIB_SHOBJS) + $(RANLIB) $@ + libspread-util.dylib: $(LIB_SHOBJS) $(SHLD) -o libspread-util.$(LIBFULLVERSION).dylib $(LIB_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(SHLDNAME)libspread-util.$(LIBVERSION).dylib -current_version $(LIBFULLVERSION) -compatibility_version $(LIBCOMPATVERSION) $(SOFTLINK) -f libspread-util.$(LIBFULLVERSION).dylib $@ @@ -101,7 +105,7 @@ ) clean: - rm -f *.lo *.o *.a *.dylib *.so $(TARGETS) + rm -f *.lo *.o *.a *.sa *.dylib *.so $(TARGETS) rm -f core core.* rm -rf autom4te.cache rm -rf ../lib/$(host) @@ -113,6 +117,8 @@ $(buildtoolsdir)/mkinstalldirs ../lib/$(host) $(INSTALL) -m 644 libspread-util.a ../lib/$(host)/libspread-util.a $(INSTALL) -m 644 libspread-util.a ../lib/libspread-util.a + $(INSTALL) -m 644 libspread-util.sa ../lib/$(host)/libspread-util.sa + $(INSTALL) -m 644 libspread-util.sa ../lib/libspread-util.sa ifeq (@LIBSPSO@, libspread-util.so) $(INSTALL) -m 755 libspread-util.so.$(LIBFULLVERSION) ../lib/$(host)/libspread-util.so.$(LIBFULLVERSION) $(INSTALL) -m 755 libspread-util.so.$(LIBFULLVERSION) ../lib/libspread-util.so.$(LIBFULLVERSION)