From 877f8ffbd63d6c6576ad78dafff2c3f54b1d68b8 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Thu, 21 May 2015 10:42:19 +0300 Subject: [PATCH] Bundle some libraries with the board manager package #282 SD #283 Adafruit_ILI9341 #290 OneWire --- build/.gitignore | 7 +++++++ build/build_board_manager_package.sh | 30 +++++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 build/.gitignore diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 000000000..0e4a6549a --- /dev/null +++ b/build/.gitignore @@ -0,0 +1,7 @@ +*.zip +linux/*tar.gz +linux/dist/*tgz +macosx/*tar.gz +macosx/dist/*tgz +windows/*zip +windows/dist/*tgz diff --git a/build/build_board_manager_package.sh b/build/build_board_manager_package.sh index 3d6ba517f..9a1582f6e 100755 --- a/build/build_board_manager_package.sh +++ b/build/build_board_manager_package.sh @@ -5,6 +5,11 @@ outdir=esp8266-$ver srcdir=../hardware/esp8266com/esp8266/ mkdir -p $outdir cp -R $srcdir/* $outdir/ + +cp -R ../libraries/SD $outdir/libraries/ +cp -R ../libraries/Adafruit_ILI9341 $outdir/libraries/ +cp -R ../libraries/OneWire $outdir/libraries/ + cat $srcdir/platform.txt | \ gsed 's/runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-lx106-elf//g' | \ gsed 's/runtime.tools.esptool.path={runtime.platform.path}\/tools//g' | \ @@ -12,13 +17,17 @@ gsed 's/tools.esptool.path={runtime.platform.path}\/tools/tools.esptool.path=\{r > $outdir/platform.txt zip -r $outdir.zip $outdir +rm -rf $outdir sha=`shasum -a 256 $outdir.zip | cut -f 1 -d ' '` size=`/bin/ls -l $outdir.zip | awk '{print $5}'` echo Size: $size echo SHA-256: $sha -scp $outdir.zip dl:apps/download_files/download/ - +if [ ! -z "$do_upload" ]; then + remote="http://arduino.esp8266.com" +else + remote="http://localhost:8000" +fi cat << EOF > package_esp8266com_index.json { @@ -36,7 +45,7 @@ cat << EOF > package_esp8266com_index.json "architecture":"esp8266", "version":"$ver", "category":"ESP8266", - "url":"http://arduino.esp8266.com/$outdir.zip", + "url":"$remote/$outdir.zip", "archiveFileName":"$outdir.zip", "checksum":"SHA-256:$sha", "size":"$size", @@ -85,11 +94,11 @@ cat << EOF > package_esp8266com_index.json "size":"12513" }, { - "host":"i686-pc-linux-gnu", - "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-linux32.tar.gz", + "host":"i686-pc-linux-gnu", + "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.4/esptool-0.4.4-linux32.tar.gz", "archiveFileName":"esptool-0.4.4-linux32.tar.gz", "checksum":"SHA-256:4aa81b97a470641771cf371e5d470ac92d3b177adbe8263c4aae66e607b67755", - "size":"12044" + "size":"12044" } ] }, @@ -131,5 +140,12 @@ cat << EOF > package_esp8266com_index.json } EOF -scp package_esp8266com_index.json dl:apps/download_files/download +if [ ! -z "$do_upload" ]; then + scp $outdir.zip dl:apps/download_files/download/ + scp package_esp8266com_index.json dl:apps/download_files/download +else + python -m SimpleHTTPServer +fi + +