Use right version of files.

pull/7/head
Peter Hinch 2016-12-01 17:21:11 +00:00
rodzic 6bc5b7147f
commit 4d5ce589a5
2 zmienionych plików z 19 dodań i 11 usunięć

Wyświetl plik

@ -1,7 +1,7 @@
#! /bin/bash #! /bin/bash
# Update MicroPython source and prepare for build # Update MicroPython source and prepare for build
cd /mnt/qnap2/data/Projects/MicroPython/micropython/ cd $MPDIR
echo Working... echo Working...
git checkout master git checkout master
git pull origin master git pull origin master
@ -16,8 +16,7 @@ make BOARD=PYBLITEV10 clean
cd ../esp8266 cd ../esp8266
make clean make clean
cd ../unix cd ../unix
make axtls make -j 8 axtls
# If you're going to enable deplibs: see micropython/README # If you're going to enable deplibs: see micropython/README
#make deplibs #make deplibs
make make -j 8

Wyświetl plik

@ -4,23 +4,32 @@
# requires pyb_check # requires pyb_check
# Also requires the pyboard.py utility to be on the path (micropython/tools/pyboard.py) # Also requires the pyboard.py utility to be on the path (micropython/tools/pyboard.py)
export MPDIR='/mnt/qnap2/data/Projects/MicroPython/micropython' MPDEVICE='/dev/pyboard'
export MPDEVICE='/dev/pyboard'
# Determine board type
BOARD="" BOARD=""
if pyb_check PYBV11 if pyb_check $MPDEVICE PYBV11
then then
BOARD="PYBV11" BOARD="PYBV11"
fi fi
if pyb_check PYBV10 if pyb_check $MPDEVICE PYBV10
then then
BOARD="PYBV10" BOARD="PYBV10"
fi fi
if pyb_check PYBLITEV10 if pyb_check $MPDEVICE PYBLITEV10
then then
BOARD="PYBLITEV10" BOARD="PYBLITEV10"
fi fi
echo Building for $BOARD echo Building for $BOARD
# Check for user override of frozen directory
if [ $FROZEN_DIR ]
then
echo Frozen modules located in $FROZEN_DIR
else
FROZEN_DIR='modules'
fi
if [ $BOARD ] if [ $BOARD ]
then then
cd $MPDIR/stmhal cd $MPDIR/stmhal
@ -28,10 +37,10 @@ then
then then
make BOARD=$BOARD clean make BOARD=$BOARD clean
fi fi
if make -j 8 BOARD=$BOARD FROZEN_MPY_DIR=modules && pyb_boot if make -j 8 BOARD=$BOARD FROZEN_MPY_DIR=$FROZEN_DIR && pyb_boot $MPDEVICE
then then
sleep 1 sleep 1
sudo make BOARD=$BOARD deploy make BOARD=$BOARD deploy
cd - cd -
sleep 1 sleep 1
rshell rshell