Added natural sorting to the remainder of the library generation scripts, as it's obvious that any kind of sorting is preferable to the randomized ordering caused by using glob.glob().
diff --git a/common/create_gds_library.py b/common/create_gds_library.py index b02535f..757ed33 100755 --- a/common/create_gds_library.py +++ b/common/create_gds_library.py
@@ -14,6 +14,7 @@ import glob import fnmatch import subprocess +from sort_pdkfiles import natural_sort #---------------------------------------------------------------------------- @@ -56,6 +57,7 @@ glist = glob.glob(destlibdir + '/*.gds') glist.extend(glob.glob(destlibdir + '/*.gdsii')) glist.extend(glob.glob(destlibdir + '/*.gds2')) + glist = natural_sort(glist) if alllibname in glist: glist.remove(alllibname)
diff --git a/common/create_spice_library.py b/common/create_spice_library.py index 90d4e65..df2f197 100755 --- a/common/create_spice_library.py +++ b/common/create_spice_library.py
@@ -14,6 +14,7 @@ import re import glob import fnmatch +from sort_pdkfiles import natural_sort #---------------------------------------------------------------------------- @@ -73,6 +74,7 @@ slist.extend(glob.glob(destlibdir + '/*.ckt')) slist.extend(glob.glob(destlibdir + '/*.cir')) slist.extend(glob.glob(destlibdir + '/*' + spiext)) + slist = natural_sort(slist) if alllibname in slist: slist.remove(alllibname)
diff --git a/common/create_verilog_library.py b/common/create_verilog_library.py index d5b09ea..e1bc4af 100755 --- a/common/create_verilog_library.py +++ b/common/create_verilog_library.py
@@ -14,6 +14,7 @@ import re import glob import fnmatch +from sort_pdkfiles import natural_sort #---------------------------------------------------------------------------- @@ -56,6 +57,7 @@ vlist.append(destlibdir + '/' + rfile) else: vlist = glob.glob(destlibdir + '/*.v') + vlist = natural_sort(vlist) if alllibname in vlist: vlist.remove(alllibname)