Moved sort_pdkfiles.py to common/, and modified behavior to always use the
default sort (which is a natural sort), given that doing "glob.glob" on a
file directory results in a pretty arbitrary and meaningless ordering.
diff --git a/VERSION b/VERSION
index 4ad595c..f683e66 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.42
+1.0.43
diff --git a/common/foundry_install.py b/common/foundry_install.py
index 3fa7f1c..a3d048b 100755
--- a/common/foundry_install.py
+++ b/common/foundry_install.py
@@ -106,15 +106,16 @@
# Each file is passed through the filter script
# before writing into the staging area.
#
-# sort: Optionally followed by "=" and the name of a script.
+# sort: Followed by "=" and the name of a script.
# The list of files to process (after applying items
# from "exclude") will be written to a file
# "filelist.txt", which will be used by the
-# library compile routines, if present. If a script
-# name is specified, then the sort script will rewrite
-# the file with the order in which entries should
-# appear in the compiled library. Only useful when
-# used with "compile" or "compile-only".
+# library compile routines, if present. The sort
+# script will rewrite the file with the order in
+# which entries should appear in the compiled library.
+# Only useful when used with "compile" or "compile-only".
+# If not specified, files are sorted by "natural sort"
+# order.
#
# noconvert : Install only; do not attempt to convert to other
# formats (applies only to GDS, CDL, and LEF).
@@ -458,6 +459,9 @@
# Create the target directory
os.makedirs(targetdir, exist_ok=True)
+ # Here's where common scripts are found:
+ scriptdir = os.path.split(os.getcwd())[0] + '/common'
+
#----------------------------------------------------------------
# Installation part 1: Install files into the staging directory
#----------------------------------------------------------------
@@ -726,16 +730,14 @@
else:
print('Renaming file to: ' + newname)
- # Option 'sort' may have an argument. . .
+ # Option 'sort' has an argument. . .
try:
sortscript = list(item.split('=')[1] for item in option if item.startswith('sort'))[0]
except IndexError:
- sortscript = None
+ # If option 'sort' is not specified, then use the "natural sort" script
+ sortscript = scriptdir + '/sort_pdkfiles.py'
else:
print('Sorting files with script ' + sortscript)
- # . . . or not.
- if 'sort' in option:
- sortscript = True
# 'anno' may be specified for LEF, in which case the LEF is used only
# to annotate GDS and is not itself installed; this allows LEF to
@@ -890,12 +892,10 @@
vfilter(targname)
if do_remove_spec:
- scriptdir = os.path.split(os.getcwd())[0] + '/common'
local_filter_scripts.append(scriptdir + '/remove_specify.py')
elif option[0] == 'cdl' or option[0] == 'spi' or option[0] == 'spice':
if do_stub:
- scriptdir = os.path.split(os.getcwd())[0] + '/common'
local_filter_scripts.append(scriptdir + '/makestub.py')
for filter_script in local_filter_scripts:
@@ -905,7 +905,6 @@
destfilelist.append(os.path.split(targname)[1])
if sortscript:
- print('Diagnostic: Sorting files to compile.')
with open(destlibdir + '/filelist.txt', 'w') as ofile:
for destfile in destfilelist:
print(destfile, file=ofile)
@@ -1841,7 +1840,6 @@
# The directory with scripts should be in ../common with respect
# to the Makefile that determines the cwd.
- scriptdir = os.path.split(os.getcwd())[0] + '/common'
# Run cdl2spi.py script to read in the CDL file and write out SPICE
for cdlfile in cdlfiles:
diff --git a/sky130/custom/scripts/sort_pdkfiles.py b/common/sort_pdkfiles.py
similarity index 100%
rename from sky130/custom/scripts/sort_pdkfiles.py
rename to common/sort_pdkfiles.py
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 88ad096..9525d38 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -73,7 +73,7 @@
# This Makefile contains bash-isms
SHELL = bash
-REVISION = 20200508
+REVISION = 20200927
TECH = sky130
# If EF_STYLE is set to 1, then efabless naming conventions are
