DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build.py: errorhandling improved

Browse Source
This commit is contained in:
Klaus K Wilting 2018-09-19 14:20:52 +02:00
parent e5a4ada7d5
commit 972cac75f1
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
build.py
View File

@ -1,37 +1,54 @@
# build.py # build.py
# pre-build script, setting up build environment # pre-build script, setting up build environment
import sys
import os
import os.path
import requests import requests
from os.path import basename from os.path import basename
from platformio import util from platformio import util
Import("env") Import("env")
# get keyfile from platformio.ini and parse it # get platformio environment variables
project_config = util.load_project_config() project_config = util.load_project_config()
# check if file loraconf.h is present in source directory
keyfile = str(env.get("PROJECTSRC_DIR")) + "/loraconf.h"
if os.path.isfile(keyfile) and os.access(keyfile, os.R_OK):
print "Parsing LORAWAN keys from " + keyfile
else:
sys.exit("Missing file loraconf.h, please create it using template loraconf.sample.h! Aborting.")
# check if file ota.conf is present in source directory
keyfile = str(env.get("PROJECTSRC_DIR")) + "/" + project_config.get("common", "keyfile") keyfile = str(env.get("PROJECTSRC_DIR")) + "/" + project_config.get("common", "keyfile")
print "Parsing OTA keys from " + keyfile if os.path.isfile(keyfile) and os.access(keyfile, os.R_OK):
print "Parsing OTA keys from " + keyfile
else:
sys.exit("Missing file ota.conf, please create it using template ota.sample.conf! Aborting.")
# parse file ota.conf
mykeys = {} mykeys = {}
with open(keyfile) as myfile: with open(keyfile) as myfile:
for line in myfile: for line in myfile:
key, value = line.partition("=")[::2] key, value = line.partition("=")[::2]
mykeys[key.strip()] = str(value).strip() mykeys[key.strip()] = str(value).strip()
# get bintray credentials from keyfile # get bintray user credentials
user = mykeys["BINTRAY_USER"] user = mykeys["BINTRAY_USER"]
repository = mykeys["BINTRAY_REPO"] repository = mykeys["BINTRAY_REPO"]
apitoken = mykeys["BINTRAY_API_TOKEN"] apitoken = mykeys["BINTRAY_API_TOKEN"]
# get bintray parameters from platformio.ini # get bintray upload parameters
version = project_config.get("common", "release_version") version = project_config.get("common", "release_version")
package = str(env.get("PIOENV")) package = str(env.get("PIOENV"))
# put bintray credentials to platformio environment # put bintray user credentials to platformio environment
env.Replace(BINTRAY_USER=user) env.Replace(BINTRAY_USER=user)
env.Replace(BINTRAY_REPO=repository) env.Replace(BINTRAY_REPO=repository)
env.Replace(BINTRAY_API_TOKEN=apitoken) env.Replace(BINTRAY_API_TOKEN=apitoken)
# get runtime credentials from keyfile and put them to compiler directive # get runtime credentials and put them to compiler directive
env.Replace(CPPDEFINES=[ env.Replace(CPPDEFINES=[
('WIFI_SSID', '\\"' + mykeys["OTA_WIFI_SSID"] + '\\"'), ('WIFI_SSID', '\\"' + mykeys["OTA_WIFI_SSID"] + '\\"'),
('WIFI_PASS', '\\"' + mykeys["OTA_WIFI_PASS"] + '\\"'), ('WIFI_PASS', '\\"' + mykeys["OTA_WIFI_PASS"] + '\\"'),