Merge pull request #743 from zowe/feature/stub-version-in-asm

Update the dynlink stub generator to include the stub version

CHANGELOG.md

@@ -3,6 +3,7 @@
 All notable changes to the ZSS package will be documented in this file.
 
 ## `3.2.0`
+- Enhancement: include the stub version in the generated HLASM stub (#743)
 - Enhancement: expose new cmutils functions (#740)
 
 ## `3.1.0`

tools/dynzis/org/zowe/zis/ZISStubGenerator.java

@@ -90,8 +90,11 @@ private void generateCode(PrintStream out, boolean generateASM, DispatchMode dis
         Set<String> symbols = new HashSet<>();
         Set<String> functions = new HashSet<>();
         int maxStubNum = 0;
+        int stubVersion = 0;
+        boolean stubVersionFound = false;
         Pattern stubPattern = Pattern.compile("^#define\\s+ZIS_STUB_(\\S+)\\s+([0-9]{1,8})\\s*/\\*\\s*(\\S+)(\\s+mapped)?\\s*\\*/\\s*");
         Pattern maxStubCountPattern = Pattern.compile("^#define\\s+MAX_ZIS_STUBS\\s+([0-9]+)\\s*");
+        Pattern versionPattern = Pattern.compile("^#define\\s+ZIS_STUBS_VERSION\\s+([0-9]+)$");
 
         String line;
         while ((line = reader.readLine()) != null) {
@@ -155,9 +158,20 @@ private void generateCode(PrintStream out, boolean generateASM, DispatchMode dis
             if (maxStubCountMatcher.matches()) {
                 maxStubNum = Integer.parseInt(maxStubCountMatcher.group(1));
             }
+            if (!stubVersionFound) {
+                Matcher stubVersionMatcher = versionPattern.matcher(line);
+                if (stubVersionMatcher.matches()) {
+                    stubVersion = Integer.parseInt(stubVersionMatcher.group(1));
+                    stubVersionFound = true;
+                }
+            }
 
         }
+        if (!stubVersionFound) {
+            throw new RuntimeException("Error: stub version not found");
+        }
         if (generateASM) {
+            out.printf("ZISSTUBV EQU  %d\n", stubVersion);
             writeLines(out, hlasmEpilog);
         } else {
             writeLines(out, initCopyright);