External Release v2024.05.05

- Improve `run_command()` APIs with Python3 and above support
- Add basic ICX build configurations
- Fix legal headers

Author: marjevan

README.md

@@ -1,9 +1,5 @@
 MBUILD USER INFO
 -----------------
-
-![.github/workflows/ci.yml](https://github.com/intelxed/mbuild/workflows/.github/workflows/ci.yml/badge.svg)
-
-
 See:
 
 https://intelxed.github.io/

build-doc

@@ -1,4 +1,21 @@
 #!/bin/csh
+#BEGIN_LEGAL
+#
+#Copyright (c) 2016 Intel Corporation
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  
+#END_LEGAL
 
 seet webdir=/var/www/html/mjcharne/mbuild
 epydoc -v --simple-term --no-private --html -o epydoc-out --name mbuild --url 'http://mjc.intel.com/mjcharne/mbuild' mbuild/__init__.py 

do-dist

@@ -1,6 +1,23 @@
 #!/bin/csh -f
 #
 # edit setup.py, set the version number
+#BEGIN_LEGAL
+#
+#Copyright (c) 2016 Intel Corporation
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  
+#END_LEGAL
 python setup.py sdist --formats=gztar,zip
 cp dist/* /home/mjcharne/www/mbuild/download
 make-web-accessible /home/mjcharne/www/mbuild/download

mbuild/__init__.py

@@ -1,6 +1,6 @@
 #BEGIN_LEGAL
 #
-#Copyright (c) 2022 Intel Corporation
+#Copyright (c) 2024 Intel Corporation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -112,7 +112,6 @@
 from .plan import *
 from .arar import *
 from .doxygen import doxygen_run, doxygen_args, doxygen_env
-from .header_tag import *
 
 __all__ = [ 'base',
             'dag',
@@ -123,8 +122,7 @@
             'msvs',
             'arar',
             'doxygen',
-            'dfs',
-            'header_tag' ]
+            'dfs']
 
 
 import time

mbuild/arar.py

@@ -3,7 +3,7 @@
 # Repackage a bunch of static libs as one big static library.
 #BEGIN_LEGAL
 #
-#Copyright (c) 2016 Intel Corporation
+#Copyright (c) 2024 Intel Corporation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -62,23 +62,23 @@ def repack(files, ar='ar', target='liball.a', verbose=False):
         else:
             cmd = "%s x ../%s" % (ar,arg)
         if verbose:
-            uprint(u"EXTRACTING %s" % (cmd))
+            print(u"EXTRACTING %s" % (cmd))
         error= os.system(cmd)
         if error:
             raise arar_error('Extract failed for command %s' % (cmd))
     files = glob.glob('*.o') + doto
     local_target = os.path.basename(target)
     cmd = "%s rcv %s %s" % (ar, local_target, " ".join(files))
     if verbose:
-        uprint(u"RECOMBINING %s" % (cmd))
+        print(u"RECOMBINING %s" % (cmd))
     error=os.system(cmd)
     if error:
         raise arar_error('Recombine failed')
 
     os.chdir('..')
     os.rename(os.path.join(tdir,local_target), target)
     if verbose:
-        uprint(u"CREATED %s" % (target))
+        print(u"CREATED %s" % (target))
     shutil.rmtree(tdir)
 
 

mbuild/base.py

@@ -2,7 +2,7 @@
 # -*- python -*-
 #BEGIN_LEGAL
 #
-#Copyright (c) 2022 Intel Corporation
+#Copyright (c) 2024 Intel Corporation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -25,16 +25,15 @@
 import locale
 
 _MBUILD_ENCODING = locale.getpreferredencoding()
-def unicode_encoding():
+def unicode_encoding() -> str:
     return _MBUILD_ENCODING
 
 PY3 = sys.version_info > (3,)
 def is_python3():
-    global PY3
     return PY3
 
 _mbuild_verbose_level = 1
-def verbose(level=0):
+def verbose(level=0) -> bool:
   """Return True if the configured message level supplied is >= the
   level arguement
   @param level: int
@@ -57,30 +56,26 @@ def get_verbosity():
   global _mbuild_verbose_level
   return _mbuild_verbose_level
 
-def bracket(s,m=''):
+def bracket(s,m='') -> str:
   """add a bracket around s and append m.
   @rtype: string
   @return: a bracketed string s and a suffixed message m
   """
-  n = convert2unicode(m)
-  return u'[{}] {}'.format(s,n)
+  return u'[{}] {}'.format(s,m)
 
 def error_msg(s,t):
   """Emit '[s] t' to stderr with a newline"""
-  sys.stderr.write(u2output(bracket(s,t) + "\n"))
+  print(bracket(s,t))
 
 def msg(s, pad=''):
   """Emit s to stdout with a newline"""
-  # someone could pass unicode as pad...
-  sys.stdout.write(u2output(pad))
-  sys.stdout.write(u2output(s))
-  sys.stdout.write("\n")
+  print(pad, end='')
+  print(s)
 
 def msgn(s, pad=''):
   """Emit s to stdout without a newline"""
-  # someone could pass unicode as pad...
-  sys.stdout.write(u2output(pad))
-  sys.stdout.write(u2output(s))
+  print(pad, end='')
+  print(s, end='')
 
 def msgb(s,t='',pad=''):
   """a bracketed  string s  sent to stdout, followed by a string t"""
@@ -170,12 +165,12 @@ def check_python_version(maj,minor,fix=0):
 
 
 try:
-  if check_python_version(2,7) == False:
-    die("MBUILD error: Need Python version 2.7 or later.")
+  if check_python_version(3,8) == False:
+    die("MBUILD error: Need Python version 3.8 or later.")
 except:
-  die("MBUILD error: Need Python version 2.7 or later.")
+  die("MBUILD error: Need Python version 3.8 or later.")
 
-import platform # requires python 2.3
+import platform
 _on_mac = False
 _on_native_windows = False
 _on_windows = False # cygwin or native windows
@@ -227,28 +222,9 @@ def on_mac():
 
 ######  
 
-# UNICODE SUPPORT FEATURES for PY2/PY3 co-existence
-
-   
-# unicode string constructors
-if PY3:
-    ustr = str
-else:
-    ustr = unicode  # converts its argument to a unicode object
-
-# binary data strings constructors
-if PY3:
-    bstr = bytes
-else:
-    bstr = str
-
-def unicode2bytes(us):
-    """convert a unicode object (unicode type in python2 or string type in
-       python3) to bytes suitable for writing to a file."""
-    return us.encode(unicode_encoding())
 
 def bytes2unicode(bs):
-    """Convert a bytes object or a python2 string to unicode"""
+    """Convert a bytes object to unicode"""
     return bs.decode(unicode_encoding())
 
 def ensure_string(x):
@@ -269,42 +245,8 @@ def ensure_string(x):
 def uappend(lst,s):
     """Make sure s is unicode before adding it to the list lst"""
     lst.append(ensure_string(s))
-    
-def u2output(s):
-    """encode unicode string for output to stderr/stdout, but leave bytes
-       strings as is. Python3 can print unicode to stdout/stderr if
-       the locale (LANG env var, etc.) supports it.    """
-    # we don't want to call encode for non-unicode (bytes) strings
-    # because that can generate *decode* errors. In python3 we are set
-    # since all strings are unicode and thus it is always safe to call
-    # encode on them. In python2 we must see if the string is unicode
-    # or bytes.
-
-    # python3 does not allow bytes objects as arguments to
-    # sys.stdout.write() so we just leave stuff as unicode strings in
-    # python3. If LANG is not C, that works. If LANG is C, wait for
-    # python 3.7 in mid June 2018. Or just do not use LANG = C!
-    global PY3
-    if not PY3:
-        if isinstance(s,unicode):
-            return unicode2bytes(s)
-    return s
-
-def uprint(s):
-    """encode unicode for output and print"""
-    t = u2output(s)
-    print(t)
 
 def is_stringish(x):
-   global PY3
    if isinstance(x,bytes) or isinstance(x,str):
       return True
-   # python2 has a type unicode, which does not exist by default in
-   # python3.
-   if not PY3:
-      return isinstance(x,unicode)
    return False
-
-def convert2unicode(x):
-   """convert an arbitrary x to a unicode string"""
-   return ustr(x)