diff --git a/NormUserGuide.pdf b/NormUserGuide.pdf new file mode 100644 index 0000000..c3a1664 Binary files /dev/null and b/NormUserGuide.pdf differ diff --git a/README.md b/README.md index 3697528..94f8c49 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,9 @@ line options are not yet fully documented, but there is abbreviated "help" available in the "norm" application. And many options are similar to the preceding NRL MDP work (see http://mdp.pf.itd.nrl.navy.mil). +A _very_ preliminary user's guide for the "norm" demo app is now included. +See the file "NormUserGuide.pdf" + A "normTest.cpp" program is now included which is a simple demonstration (and active test code) of the evolving NORM API. When the API is further completed, I plan to provide a few different example applications diff --git a/VERSION.TXT b/VERSION.TXT index ed35c8e..04d0195 100644 --- a/VERSION.TXT +++ b/VERSION.TXT @@ -1,5 +1,11 @@ NORM Version History +Version 1.2b6 +============= + - Added normApi.cpp into libNorm.a (Norm.lib (WIN32)) builds + - Fixed Solaris build (new protolib code) + - Included very rough user's guide for "norm" demo app + Version 1.2b5 ============= - Initial release with theoretically-working API diff --git a/common/normBitmask.h b/common/normBitmask.h index 0f0650d..eccc8b7 100644 --- a/common/normBitmask.h +++ b/common/normBitmask.h @@ -196,13 +196,13 @@ class NormSlidingMask unsigned char* mask; - UINT32 mask_len; - UINT32 range_mask; - INT32 range_sign; - INT32 num_bits; - INT32 start; - INT32 end; - UINT32 offset; + UINT32 mask_len; + UINT32 range_mask; + INT32 range_sign; + INT32 num_bits; + INT32 start; + INT32 end; + UINT32 offset; }; // end class NormSlidingMask #endif // _NORM_BITMASK_ diff --git a/common/normTest.cpp b/common/normTest.cpp index c5ca626..cbf0962 100644 --- a/common/normTest.cpp +++ b/common/normTest.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) NormStartReceiver(session, 1024*1024); // Uncomment the following line to start sender - //NormStartSender(session, 1024*1024, 1024, 64, 0); + NormStartSender(session, 1024*1024, 1024, 64, 0); NormAddAckingNode(session, NormGetLocalNodeId(session)); diff --git a/common/normVersion.h b/common/normVersion.h index f35fbde..abe6348 100644 --- a/common/normVersion.h +++ b/common/normVersion.h @@ -32,6 +32,6 @@ #ifndef _NORM_VERSION #define _NORM_VERSION -#define VERSION "1.2b5" +#define VERSION "1.2b6" #endif // _NORM_VERSION diff --git a/unix/Makefile.common b/unix/Makefile.common index 0d4a474..747033f 100644 --- a/unix/Makefile.common +++ b/unix/Makefile.common @@ -11,7 +11,7 @@ COMMON = ../common UNIX = ../unix NS = ../ns -INCLUDES = $(TCL_INCL_PATH) $(SYSTEM_INCLUDES) -I$(UNIX) -I$(COMMON) -I$(PROTOLIB)/common +INCLUDES = $(SYSTEM_INCLUDES) -I$(UNIX) -I$(COMMON) -I$(PROTOLIB)/common CFLAGS = -g -DPROTO_DEBUG -DUNIX -D_FILE_OFFSET_BITS=64 -O -fPIC $(SYSTEM_HAVES) $(INCLUDES) @@ -21,24 +21,6 @@ LDFLAGS = $(SYSTEM_LDFLAGS) LIBS = $(SYSTEM_LIBS) -lm -lpthread XLIBS = -lXmu -lXt -lX11 -#NOTE: TK_LIB must come before TCL_LIB for some reason -TKLIBS = $(TK_LIB) $(TCL_LIB) - -TCL_SCRIPTS = ${TCL_SCRIPT_PATH}/init.tcl \ - ${TK_SCRIPT_PATH}/tk.tcl \ - ${TK_SCRIPT_PATH}/bgerror.tcl \ - ${TK_SCRIPT_PATH}/button.tcl \ - ${TK_SCRIPT_PATH}/dialog.tcl \ - ${TK_SCRIPT_PATH}/entry.tcl \ - ${TK_SCRIPT_PATH}/focus.tcl \ - ${TK_SCRIPT_PATH}/listbox.tcl \ - ${TK_SCRIPT_PATH}/menu.tcl \ - ${TK_SCRIPT_PATH}/palette.tcl \ - ${TK_SCRIPT_PATH}/scale.tcl \ - ${TK_SCRIPT_PATH}/scrlbar.tcl \ - ${TK_SCRIPT_PATH}/tearoff.tcl \ - ${TK_SCRIPT_PATH}/text.tcl \ - ${TK_SCRIPT_PATH}/optMenu.tcl TARGETS = norm raft @@ -55,7 +37,7 @@ NORM_SRC = $(COMMON)/normMessage.cpp $(COMMON)/normSession.cpp \ $(COMMON)/normNode.cpp $(COMMON)/normObject.cpp \ $(COMMON)/normSegment.cpp $(COMMON)/normBitmask.cpp \ $(COMMON)/normEncoder.cpp $(COMMON)/galois.cpp \ - $(COMMON)/normFile.cpp + $(COMMON)/normFile.cpp $(COMMON)/normApi.cpp NORM_OBJ = $(NORM_SRC:.cpp=.o) @@ -86,7 +68,7 @@ norm: $(APP_OBJ) libnorm.a $(LIBPROTO) # (normTest) test of NORM API -TEST_SRC = $(COMMON)/normApi.cpp $(COMMON)/normTest.cpp +TEST_SRC = $(COMMON)/normTest.cpp TEST_OBJ = $(TEST_SRC:.cpp=.o) normTest: $(TEST_OBJ) libnorm.a $(LIBPROTO) diff --git a/win32/Norm.opt b/win32/Norm.opt index a2a886f..fbbc4f0 100644 Binary files a/win32/Norm.opt and b/win32/Norm.opt differ diff --git a/win32/NormLib.dsp b/win32/NormLib.dsp index 1bc193d..09b7cec 100644 --- a/win32/NormLib.dsp +++ b/win32/NormLib.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\common" /I "..\protolib\common" /I "..\protolib\win32" /D "NDEBUG" /D "PROTO_DEBUG" /D "HAVE_IPV6" /D "HAVE_ASSERT" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\common" /I "..\protolib\common" /I "..\protolib\win32" /D "NDEBUG" /D "PROTO_DEBUG" /D "HAVE_IPV6" /D "HAVE_ASSERT" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /GX /Od /I "..\common" /I "..\protolib\common" /I "..\protolib\win32" /D "_DEBUG" /D "PROTO_DEBUG" /D "HAVE_IPV6" /D "HAVE_ASSERT" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\common" /I "..\protolib\common" /I "..\protolib\win32" /D "_DEBUG" /D "PROTO_DEBUG" /D "HAVE_IPV6" /D "HAVE_ASSERT" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -100,6 +100,10 @@ SOURCE=..\common\galois.cpp # End Source File # Begin Source File +SOURCE=..\common\normApi.cpp +# End Source File +# Begin Source File + SOURCE=..\common\normBitmask.cpp !IF "$(CFG)" == "NormLib - Win32 Release" diff --git a/win32/normTest.dsp b/win32/normTest.dsp index 5a747bb..d7d564f 100644 --- a/win32/normTest.dsp +++ b/win32/normTest.dsp @@ -87,10 +87,6 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\common\normApi.cpp -# End Source File -# Begin Source File - SOURCE=..\common\normTest.cpp # End Source File # End Group