Update test suite to latest MPIDE.
Almost fixed https://github.com/sudar/Arduino-Makefile/issues/253 but for https://github.com/sudar/Arduino-Makefile/issues/255
This commit is contained in:
parent
4d514b5234
commit
c91646d6ce
3 changed files with 16 additions and 15 deletions
|
@ -81,6 +81,13 @@ ARDUINO_CORE_PATH = $(ALTERNATE_CORE_PATH)/cores/$(ALTERNATE_CORE)
|
|||
ARDUINO_PREFERENCES_PATH = $(MPIDE_PREFERENCES_PATH)
|
||||
ARDUINO_DIR = $(MPIDE_DIR)
|
||||
|
||||
# TODO Because of a bug in MPIDE 20140821, if crti.S is not
|
||||
# compiled into libcore.a as crti.S.o (i.e. NOT crti.o) the
|
||||
# program will compile but will crash on the device. Need to wait
|
||||
# for a decision on
|
||||
# https://github.com/sudar/Arduino-Makefile/issues/255 and/or
|
||||
# implement a workaround before merging this code into the master
|
||||
# branch.
|
||||
CORE_AS_SRCS = $(ARDUINO_CORE_PATH)/vector_table.S \
|
||||
$(ARDUINO_CORE_PATH)/cpp-startup.S \
|
||||
$(ARDUINO_CORE_PATH)/crti.S \
|
||||
|
|
|
@ -9,18 +9,16 @@ if [ -z "$MPIDE_DIR" ] || ! test -e $MPIDE_DIR || [ $OS == "cygwin" ]; then
|
|||
|
||||
echo "Installing MPIDE..."
|
||||
|
||||
MPIDE_BUILD=20140821
|
||||
if [ $OS == "cygwin" ]; then
|
||||
MPIDE_BASENAME="mpide-0023-windows-20130715"
|
||||
MPIDE_BASENAME="mpide-0023-windows-$MPIDE_BUILD"
|
||||
MPIDE_FILE="$MPIDE_BASENAME".zip
|
||||
EXTRACT_COMMAND="unzip -q"
|
||||
if ! command -v unzip >/dev/null 2>&1; then
|
||||
_cygwin_error "unzip"
|
||||
fi
|
||||
elif [ $OS == "mac" ]; then
|
||||
MPIDE_BASENAME=mpide-0023-macosx-20130715
|
||||
MPIDE_FILE="$MPIDE_BASENAME".dmg
|
||||
MPIDE_BASENAME=mpide-0023-macosx-$MPIDE_BUILD
|
||||
EXTRACT_COMMAND="unzip -q"
|
||||
else
|
||||
MPIDE_BASENAME=mpide-0023-linux64-20130817-test
|
||||
MPIDE_BASENAME=mpide-0023-linux64-$MPIDE_BUILD
|
||||
MPIDE_FILE="$MPIDE_BASENAME".tgz
|
||||
EXTRACT_COMMAND="tar -xzf"
|
||||
fi
|
||||
|
@ -37,13 +35,9 @@ if [ -z "$MPIDE_DIR" ] || ! test -e $MPIDE_DIR || [ $OS == "cygwin" ]; then
|
|||
if ! test -d $MPIDE_BASENAME
|
||||
then
|
||||
echo "Installing MPIDE to local folder..."
|
||||
if [ $OS == "mac" ]; then
|
||||
hdiutil attach $MPIDE_FILE
|
||||
cp -R /Volumes/Mpide/Mpide.app/Contents/Resources/Java $MPIDE_BASENAME
|
||||
hdiutil detach /Volumes/Mpide
|
||||
else
|
||||
$EXTRACT_COMMAND $MPIDE_FILE
|
||||
fi
|
||||
rm -rf mpide-0023-$MPIDE_BUILD
|
||||
cp -R $MPIDE_BASENAME mpide-0023-$MPIDE_BUILD
|
||||
echo "MPIDE installed"
|
||||
fi
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
ARDMK_DIR=../../
|
||||
DEPENDENCIES_FOLDER = ../../dependencies
|
||||
DEPENDENCIES_MPIDE_DIR = $(DEPENDENCIES_FOLDER)/mpide-0023-linux64-20130817-test
|
||||
DEPENDENCIES_MPIDE_DIR = $(DEPENDENCIES_FOLDER)/mpide-0023-20140821
|
||||
|
||||
ifeq ($(MPIDE_DIR),)
|
||||
MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR)
|
||||
|
|
Loading…
Reference in a new issue