make file updates for buildVersion_src

TACC · Feb 28, 2024 · dc1afc4 · dc1afc4
1 parent ab0ca8b
commit dc1afc4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 15 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -74,7 +74,7 @@ LEGACY_ORDERING           := @LEGACY_ORDERING@
 EXPORT_MODULE             := @EXPORT_MODULE@
 BASENAME                  := @BASENAME@
 UPDATE_VERSION            := LUA_PATH="$(srcdir)/tools/?.lua;$$LUA_PATH;;" $(srcdir)/proj_mgmt/updateVersion
-BUILD_V_Src               := LUA_PATH="$(srcdir)/tools/?.lua;$$LUA_PATH;;" $(srcdir)/proj_mgmt/buildVersion_src
+BUILD_V_src               := LUA_PATH="$(srcdir)/tools/?.lua;$$LUA_PATH;;" $(srcdir)/proj_mgmt/buildVersion_src
 PS                        := @PS@
 READLINK                  := @READLINK@
 EXPR                      := @EXPR@
@@ -545,12 +545,14 @@ libexec:  $(lua_code)
 	$(MAKE) FILELIST="$^" DIRLOC=$(DESTDIR)$(LIBEXEC) GIT_VERSION=$(GIT_VERSION) __installMe
 
 VersionSrc:
-	$(BUILDV_src) -b $(GIT_BRANCH) -t $(TAG) -g $(GIT_VERSION)                          \
-                      -d $(VDATE)                                    >  $(DESTDIR)$(LIBEXEC)/Version.lua
+	echo LUA_PATH:  $$LUA_PATH
+	echo LUA_CPATH: $$LUA_CPATH
+	$(BUILD_V_src) -b $(GIT_BRANCH) -t $(version) -g $(GIT_VERSION)                          \
+                       -d $(VDATE)                                    >  $(DESTDIR)$(LIBEXEC)/Version.lua
 
 STVersionSrc:
-	$(BUILDV_src) -b $(GIT_BRANCH) -t $(TAG) -g $(GIT_VERSION)                          \
-                      -d $(VDATE)                                    >  $(DESTDIR)$(SETTARG)/Version.luaSTVersionSrc
+	$(BUILD_V_src) -b $(GIT_BRANCH) -t $(version) -g $(GIT_VERSION)                          \
+                       -d $(VDATE)                                    >  $(DESTDIR)$(SETTARG)/Version.luaSTVersionSrc
 
 
 

diff --git a/build.rtm b/build.rtm
@@ -12,8 +12,8 @@ parallel_make_install()
   fi
 
   if [ "$BUILD_TYPE" != "EXPERIMENTAL" ]; then
-    echo "$SUDO $MAKE GIT_VERSION=$GIT_VERSION -j install     $MAKE_EXTRA"
-          $SUDO $MAKE GIT_VERSION=$GIT_VERSION -j install     $MAKE_EXTRA
+    echo "$SUDO $MAKE GIT_VERSION=$GIT_VERSION install     $MAKE_EXTRA"
+          $SUDO $MAKE GIT_VERSION=$GIT_VERSION install     $MAKE_EXTRA
   else
     echo "$SUDO $MAKE pre-install $MAKE_EXTRA"
     $SUDO $MAKE GIT_VERSION=$GIT_VERSION -j pre-install $MAKE_EXTRA

diff --git a/proj_mgmt/buildVersion_src b/proj_mgmt/buildVersion_src
@@ -2,10 +2,9 @@
 -- -*- lua -*-
 
 Version = "0.0"
+_G._DEBUG    = false
+local posix  = require("posix")
 
-require("strict")
-require("string_utils")
-require("VarDump")
 local Optiks = require("Optiks")
 local dbg    = require("Dbg"):dbg()
 local s_mTbl = {}
@@ -45,41 +44,58 @@ function buildVersionCode(branch, tag, gittag, dateStr)
 end
 
 
+-- This function forces the option parser to write to stderr instead of
+-- stdout.
+local function l_prt(...)
+   stderr:write(...)
+end
+
+
+--------------------------------------------------------------------------
+-- This function prevents the option parser from exiting when it finds an
+-- error.
+local function l_nothing()
+end
 
 function main()
    options()
    local mTbl   = mTbl()
+   print("branch: ",mTbl.branch)
    local s = buildVersionCode(mTbl.branch, mTbl.tag, mTbl.gittag, mTbl.vdate)
    print (s)
 end
 
 function options()
    local mTbl          = mTbl()
    local usage         = "Usage: buildVersion.lua --branch branch --tag tag --gittag gittag --vdate dateStr outfile"
-   local cmdlineParser = Optiks:new{usage=usage, version=Version}
+   local cmdlineParser = Optiks:new{usage=usage,
+                                    error=l_nothing,
+                                    exit=l_nothing,
+                                    prt=l_prt,
+                                    version=Version}
 
    cmdlineParser:add_option{ 
       name   = {'-v','--verbose'},
       dest   = 'verbosityLevel',
       action = 'count',
    }
    cmdlineParser:add_option{ 
-      name   = {'--branch'},
+      name   = {'-b','--branch'},
       dest   = 'branch',
       action = 'store',
    }
    cmdlineParser:add_option{ 
-      name   = {'--tag'},
+      name   = {'-t','--tag'},
       dest   = 'tag',
       action = 'store',
    }
    cmdlineParser:add_option{ 
-      name   = {'--gittag'},
+      name   = {'-g','--gittag'},
       dest   = 'gittag',
       action = 'store',
    }
    cmdlineParser:add_option{ 
-      name   = {'--vdate'},
+      name   = {'-d','--vdate'},
       dest   = 'vdate',
       action = 'store',
    }