Removed "requirements.txt" from the runtime directory, as that is
related to the virtual environment used at efabless and not relevant
here. Corrected the handling of $prefix in the top level Makefile,
so that installation of the run-time scripts is now correct.
diff --git a/Makefile.in b/Makefile.in
index 4f22d45..6f1dce5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,55 +82,58 @@
CPP = common/preproc.py
+prefix = @prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+
common_install:
- @if test -w @datadir@ ; then \
- mkdir -p @datadir@/pdk/scripts/ ;\
- cp runtime/cace.py @datadir@/pdk/scripts/ ;\
- cp runtime/cace_datasheet_upload.py @datadir@/pdk/scripts/ ;\
- cp runtime/cace_design_upload.py @datadir@/pdk/scripts/ ;\
- cp runtime/cace_gensim.py @datadir@/pdk/scripts/ ;\
- cp runtime/cace_launch.py @datadir@/pdk/scripts/ ;\
- cp runtime/cace_makeplot.py @datadir@/pdk/scripts/ ;\
- cp runtime/cdl2spi.py @datadir@/pdk/scripts/ ;\
- cp runtime/change_gds_cell.py @datadir@/pdk/scripts/ ;\
- cp runtime/change_gds_date.py @datadir@/pdk/scripts/ ;\
- cp runtime/change_gds_string.py @datadir@/pdk/scripts/ ;\
- cp runtime/changepath.py @datadir@/pdk/scripts/ ;\
- cp runtime/characterize_help.txt @datadir@/pdk/scripts/ ;\
- cp runtime/cleanup_unref.py @datadir@/pdk/scripts/ ;\
- cp runtime/config.py @datadir@/pdk/scripts/ ;\
- cp runtime/consoletext.py @datadir@/pdk/scripts/ ;\
- ${CPP} -DPREFIX=@datadir@ runtime/create_project.py \
- @datadir@/pdk/scripts/create_project.py ;\
- cp runtime/editparam.py @datadir@/pdk/scripts/ ;\
- cp runtime/failreport.py @datadir@/pdk/scripts/ ;\
- cp runtime/find_gds_prefix.py @datadir@/pdk/scripts/ ;\
- cp runtime/foundry_nodes.py @datadir@/pdk/scripts/ ;\
- cp runtime/helpwindow.py @datadir@/pdk/scripts/ ;\
- cp runtime/listboxchoice.py @datadir@/pdk/scripts/ ;\
- cp runtime/lvs_help.txt @datadir@/pdk/scripts/ ;\
- cp runtime/make_icon_from_soft.py @datadir@/pdk/scripts/ ;\
- cp runtime/makestub.py @datadir@/pdk/scripts/ ;\
- cp runtime/manager_help.txt @datadir@/pdk/scripts/ ;\
- cp runtime/netlist_to_layout.py @datadir@/pdk/scripts/ ;\
- cp runtime/padframe_generator.py @datadir@/pdk/scripts/ ;\
- cp runtime/profile.py @datadir@/pdk/scripts/ ;\
- ${CPP} -DPREFIX=@datadir@ runtime/project_manager.py \
- @datadir@/pdk/scripts/project_manager.py ;\
- cp runtime/qflow_help.txt @datadir@/pdk/scripts/ ;\
- cp runtime/rename_project.py @datadir@/pdk/scripts/ ;\
- cp runtime/requirements.txt @datadir@/pdk/scripts/ ;\
- cp runtime/settings.py @datadir@/pdk/scripts/ ;\
- cp runtime/simhints.py @datadir@/pdk/scripts/ ;\
- cp runtime/soc_floorplanner.py @datadir@/pdk/scripts/ ;\
- cp runtime/symbolbuilder.py @datadir@/pdk/scripts/ ;\
- cp runtime/tksimpledialog.py @datadir@/pdk/scripts/ ;\
- cp runtime/tooltip.py @datadir@/pdk/scripts/ ;\
- cp runtime/treeviewchoice.py @datadir@/pdk/scripts/ ;\
- cp runtime/treeviewsplit.py @datadir@/pdk/scripts/ ;\
+ @if test -w $(datadir) ; then \
+ mkdir -p $(datadir)/pdk/scripts/ ;\
+ cp runtime/cace.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/cace_datasheet_upload.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/cace_design_upload.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/cace_gensim.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/cace_launch.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/cace_makeplot.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/cdl2spi.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/change_gds_cell.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/change_gds_date.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/change_gds_string.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/changepath.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/characterize_help.txt $(datadir)/pdk/scripts/ ;\
+ cp runtime/cleanup_unref.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/config.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/consoletext.py $(datadir)/pdk/scripts/ ;\
+ ${CPP} -DPREFIX=$(datadir) runtime/create_project.py \
+ $(datadir)/pdk/scripts/create_project.py ;\
+ cp runtime/editparam.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/failreport.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/find_gds_prefix.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/foundry_nodes.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/helpwindow.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/listboxchoice.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/lvs_help.txt $(datadir)/pdk/scripts/ ;\
+ cp runtime/make_icon_from_soft.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/makestub.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/manager_help.txt $(datadir)/pdk/scripts/ ;\
+ cp runtime/netlist_to_layout.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/padframe_generator.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/profile.py $(datadir)/pdk/scripts/ ;\
+ ${CPP} -DPREFIX=$(datadir) runtime/project_manager.py \
+ $(datadir)/pdk/scripts/project_manager.py ;\
+ cp runtime/qflow_help.txt $(datadir)/pdk/scripts/ ;\
+ cp runtime/rename_project.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/settings.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/simhints.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/soc_floorplanner.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/symbolbuilder.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/tksimpledialog.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/tooltip.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/treeviewchoice.py $(datadir)/pdk/scripts/ ;\
+ cp runtime/treeviewsplit.py $(datadir)/pdk/scripts/ ;\
echo "Common install: Done." ;\
else \
- echo "Common install: @datadir@ is not writeable (ignoring)." ;\
+ echo "Common install: $(datadir) is not writeable (ignoring)." ;\
fi
#---------------------------------------------------
diff --git a/VERSION b/VERSION
index d83f599..e5365c8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.214
+1.0.215
diff --git a/runtime/requirements.txt b/runtime/requirements.txt
deleted file mode 100644
index d4fbc66..0000000
--- a/runtime/requirements.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Werkzeug==0.11.10
-aniso8601==1.1.0
-click==6.6
-matplotlib==0.99.1.1
-numpy==1.4.1
-pyparsing==1.5.6
-python-dateutil==2.5.3
-requests==2.10.0
-six==1.10.0
-virtualenv==15.0.2
-watchdog==0.8.3
diff --git a/scripts/configure b/scripts/configure
index 792ece4..8042b8a 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -1917,10 +1917,6 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
- if (( $(echo "$PYTHON_VERSION > 3" |bc -l) )); then
- pip3 install natsort
- fi
-
PYTHON_PREFIX='${prefix}'
