Getting this to final, minor tweaks

about getting from github.
	modified:   doc/libdwarf.pdf

Now that the leading element of semantic version
is 2 (instead of 0) some script elements needed
update to pass cmake and meson tests
on windows msys2 with shared libraries (dll).
	modified:   test/CMakeLists.txt
	modified:   test/meson.build
	modified:   test/test_dwarfdump.py
	modified:   test/test_dwarfdumpsetup.sh

Author: davea42

doc/libdwarf.pdf

@@ -333,21 +333,21 @@ if (DO_TESTING AND NOT WIN32)
     set(pebasedir "${PROJECT_SOURCE_DIR}")
     set(peshdir   "${PROJECT_SOURCE_DIR}/test")
     set(pebindir  "${PROJECT_BINARY_DIR}")
-    add_test(NAME selfdwarfdumppe COMMAND python3 ${peshdir}/test_dwarfdump.py PE cmake ${pebasedir} ${pebindir})
+    add_test(NAME selfdwarfdumppe COMMAND python3 ${peshdir}/test_dwarfdump.py PE cmake ${pebasedir} ${pebindir} ${PROJECT_VERSION})
 endif()
 
 if (DO_TESTING AND NOT WIN32)
     set(elfbasedir "${PROJECT_SOURCE_DIR}")
     set(elfshdir   "${PROJECT_SOURCE_DIR}/test")
     set(elfbindir  "${PROJECT_BINARY_DIR}")
-    add_test(NAME selfdwarfdumpelf COMMAND python3 ${elfshdir}/test_dwarfdump.py Elf cmake ${elfbasedir} ${elfbindir})
+    add_test(NAME selfdwarfdumpelf COMMAND python3 ${elfshdir}/test_dwarfdump.py Elf cmake ${elfbasedir} ${elfbindir} ${PROJECT_VERSION})
 endif()
 
 if (DO_TESTING AND NOT WIN32)
     set(macbasedir "${PROJECT_SOURCE_DIR}")
     set(macshdir   "${PROJECT_SOURCE_DIR}/test")
     set(macbindir  "${PROJECT_BINARY_DIR}")
-    add_test(NAME selfdwarfdumpmacho COMMAND python3 ${macshdir}/test_dwarfdump.py Macos cmake ${macbasedir} ${macbindir})
+    add_test(NAME selfdwarfdumpmacho COMMAND python3 ${macshdir}/test_dwarfdump.py Macos cmake ${macbasedir} ${macbindir} ${PROJECT_VERSION})
 endif()
 
 if (DO_TESTING AND BUILD_DWARFEXAMPLE AND NOT WIN32)

test/CMakeLists.txt

@@ -129,6 +129,7 @@ foreach atest_src : argstests
   test(atest_name,atexec, args: ['-f',projectbase])
 endforeach
 
+semantic_ver = meson.project_version()
 pyscripttests = [
   ['Elf'],
   ['PE',],
@@ -153,9 +154,10 @@ if py3_exe.found()
   foreach testscr : pyscripttests
     pytest_name = testscr[0]
     message(pytest_name)
+    semanticver = meson.project_version()
     buildbase = builddir
     pyexec_name = join_paths(projectbase,'test','test_dwarfdump.py')
-    test(pytest_name,py3_exe, args: [pyexec_name, pytest_name,'meson', projectbase, buildbase])
+    test(pytest_name,py3_exe, args: [pyexec_name, pytest_name,'meson', projectbase, buildbase, semanticver])
   endforeach
 endif
 

test/meson.build

@@ -3,7 +3,8 @@
 # for anyone to used for any purpose.
 #
 # Run in test dir as:
-# test_dwarfdump.py filetype buildsys sourcedirbase builddirbase
+# test_dwarfdump.py filetype buildsys sourcedirbase builddirbase \
+#  semanticver
 # where filetype is Elf, PE, or Macos
 # where buildsys is conf, cmake, or meson
 
@@ -54,14 +55,16 @@ def __init__(self):
         self.buildsystem = False
         self.srcbase = False
         self.bldbase = False
+        self.semanticver = False
         self.cwd = False
 
     def tprint(self):
         print("Testdata objtype        :", self.objtype)
         print("Testdata build system   :", self.buildsystem)
         print("Testdata source base dir:", self.srcbase)
         print("Testdata build base dir :", self.bldbase)
-        print("Testdata  working dir   :", self.cwd)
+        print("Testdata working dir    :", self.cwd)
+        print("Testdata Semantic Ver   :", self.semanticver)
 
 
 def setupfilesinvolved(td, dd):
@@ -169,23 +172,31 @@ def rundwarfdump(td, dd, dwarfdumppath, objpath, lmaxlines):
 # we are in windows copy dll from lib build to
 # the dwarfdump build directory.
 def copydll(td):
+    semantic = td.semanticver
+    svlist = semantic.split(".")
+    dllv = svlist[0]
+    print("Copy dll semantic:",semantic," Prefixnum",dllv)
+    dllname=''.join(["libdwarf-",dllv,".dll"])
     dllpath = os.path.join(td.bldbase,
-        "src/lib/libdwarf/libdwarf-0.dll")
+        "src/lib/libdwarf",dllname)
     targetdllpath= os.path.join(td.bldbase,
-        "src/bin/dwarfdump/libdwarf-0.dll")
+        "src/bin/dwarfdump",dllname)
+    print("dllpath",dllpath)
+    print("targetdllpath",targetdllpath)
     if os.path.exists(dllpath):
         if not os.path.exists(targetdllpath):
             shutil.copy(dllpath,targetdllpath)
 
 if __name__ == "__main__":
-    if len(sys.argv) != 5:
+    if len(sys.argv) != 6:
         print("FAIL test_dwarfdump.py arg count wrong")
         sys.exit(1)
     td = tdata()
     td.objtype = sys.argv[1]
     td.buildsystem = sys.argv[2]
     td.srcbase = sys.argv[3]
     td.bldbase = sys.argv[4]
+    td.semanticver = sys.argv[5]
     td.cwd = os.getcwd()
     print("Running dwarfdump test")
     td.tprint()

test/test_dwarfdump.py

@@ -27,7 +27,7 @@ then
       top_blddir=`pwd`
       echo "For ninja set top blddir $top_blddir"
     else
-      ignore, we leav top_blddir as above.
+      echo "ignore, we leave top_blddir as above."
     fi
   fi
 else