From cc92c90d913a7bb9c93362df60bc376ffe32af7a Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 9 Sep 2023 10:54:58 -0700 Subject: [PATCH 1/4] Added notes about waf execution in BUILD.TXT --- BUILD.TXT | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/BUILD.TXT b/BUILD.TXT index 3b3ebc2..4c6e360 100755 --- a/BUILD.TXT +++ b/BUILD.TXT @@ -6,11 +6,26 @@ To see a full list of options, run: ./waf -h +Note: if attempting to run waf as an executable as shown above results in a +message like this: + +/usr/bin/env: ‘python’: No such file or directory + +then try calling python directly: + +python waf + +or + +python3 waf + +For more background information about waf, visit the gitlab page at +https://gitlab.com/ita1024/./waf/ Configuring ----------- -To perform the configure checks, run: +To perform the configuration checks, run: ./waf configure @@ -51,6 +66,9 @@ To install, run: This will install the compiled library and headers to wherever your prefix was specified. (See configure flags) +This command may have to be run with root priviledges for certain prefix +directories depending on your system setup. + Uninstalling ------------ From f96423b68055ac7a63350f746d100f5f46854f7d Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 9 Sep 2023 11:10:47 -0700 Subject: [PATCH 2/4] Updated instructions for cloning and running make --- doc/NormUserGuide.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/NormUserGuide.xml b/doc/NormUserGuide.xml index cfb07fd..43af05c 100755 --- a/doc/NormUserGuide.xml +++ b/doc/NormUserGuide.xml @@ -96,11 +96,12 @@ - Download and unpack the NORM source code tarball. + Download and unpack the NORM source code tarball or clone the + repository using git clone --recurse-submodules https://github.com/USNavalResearchLaboratory/norm.git - cd norm/unix + cd norm/makefiles @@ -1160,4 +1161,4 @@ use with norm - \ No newline at end of file + From ea6709976c13264f8955f391bbc5fd2cf87800dd Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 9 Sep 2023 20:29:34 -0700 Subject: [PATCH 3/4] Added more detailed instructions for win32 builds --- doc/NormUserGuide.xml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/NormUserGuide.xml b/doc/NormUserGuide.xml index 43af05c..32f1782 100755 --- a/doc/NormUserGuide.xml +++ b/doc/NormUserGuide.xml @@ -96,8 +96,9 @@ - Download and unpack the NORM source code tarball or clone the - repository using git clone --recurse-submodules https://github.com/USNavalResearchLaboratory/norm.git + Download and unpack the NORM source code tarball or clone the github + repository using + git clone --recurse-submodules https://github.com/USNavalResearchLaboratory/norm.git @@ -119,7 +120,8 @@ - Download and unpack the NORM source code tarball + Download and unpack the NORM source code tarball or clone the + repository as described in the section above. @@ -129,7 +131,7 @@ - Open the "norm.sln" (VC++ .Net), + Inside the "norm/makefiles/win32" directory, open the "norm.sln" (VC++ .Net), "norm.dsw" (VC++ 6.0), or "norm.vcw" (Embedded VC++) workspace file. @@ -141,6 +143,11 @@ the "norm/win32/norm/Release" directory. + The easiest way to run these builds is with Visual Studio. If you do not already have Visual Studio installed, then it can + be downloaded for free here. + When you launch Visual Studio, make sure to select "Visual C++" and open the "norm.sln" file. + This should load all of the project files and allow you to right click on any of them in the Solution Explorer on the + left side and select "build". From 3b927838d6977e85e82cb17408d8943a17979451 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 9 Sep 2023 22:37:05 -0700 Subject: [PATCH 4/4] Fixed typo on line 20 (capitalized 'f') that caused the command to fail --- doc/NormUserGuide.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/NormUserGuide.xml b/doc/NormUserGuide.xml index 32f1782..8305cde 100755 --- a/doc/NormUserGuide.xml +++ b/doc/NormUserGuide.xml @@ -146,7 +146,7 @@ The easiest way to run these builds is with Visual Studio. If you do not already have Visual Studio installed, then it can be downloaded for free here. When you launch Visual Studio, make sure to select "Visual C++" and open the "norm.sln" file. - This should load all of the project files and allow you to right click on any of them in the Solution Explorer on the + This should load all of the project files and allow you to right-click on any of them in the Solution Explorer on the left side and select "build". @@ -388,7 +388,7 @@ A minimal example norm sender command-line syntax is: - norm addr <addr/port> sendFile + norm addr <addr/port> sendfile <fileName> The corresponding minimal norm receiver