From b3cde77629629a043dde4ceeb1d2f62c87975777 Mon Sep 17 00:00:00 2001 From: Kate Temkin Date: Tue, 3 Sep 2019 14:04:21 -0600 Subject: [PATCH] release-prep: update Makefile to produce universal host packages --- .gitattributes | 2 ++ Makefile | 11 ++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitattributes b/.gitattributes index e3d726f5..ba255477 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,5 @@ appveyor.yml export-ignore .travis.yml export-ignore .gitattributes export-ignore id_deploy.enc export-ignore +.editorconfig export-ignore +.clang-format export-ignore diff --git a/Makefile b/Makefile index 3ff72320..1ab920e7 100644 --- a/Makefile +++ b/Makefile @@ -140,13 +140,9 @@ endif @mkdir -p host-packages @mkdir -p build - @#Python 2 - @pushd libgreat/host; $(PYTHON2) setup.py bdist_wheel --universal -d $(CURDIR)/host-packages; popd - @pushd host; $(PYTHON2) setup.py bdist_wheel --universal -d $(CURDIR)/host-packages; popd - - @#Python 3 - @pushd libgreat/host; $(PYTHON3) setup.py bdist_wheel -d $(CURDIR)/host-packages; popd - @pushd host; $(PYTHON3) setup.py bdist_wheel -d $(CURDIR)/host-packages; popd + @#Create our python pacakges. These universal packages work for py2/py3. + @pushd libgreat/host; $(PYTHON3) setup.py bdist_wheel --universal -d $(CURDIR)/host-packages; popd + @pushd host; $(PYTHON3) setup.py bdist_wheel --universal -d $(CURDIR)/host-packages; popd @# Create files for e.g. the nightly. @pushd libgreat/host; $(PYTHON3) setup.py bdist_wheel -d $(CURDIR)/release-files; popd @@ -236,3 +232,4 @@ clean: # Clean out our created files and directories. rm -rf VERSION firmware-bin host-packages release-files distro-packages *.egg-info CMakeFiles + rm -rf host/greatfet/assets/*.bin