Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

get.py using .json tool name with git version#9155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
mcspr wants to merge3 commits intoesp8266:master
base:master
Choose a base branch
Loading
frommcspr:pkg-tool-vs-archive
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions.gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
.DS_Store
tools/dist/
tools/xtensa-lx106-elf/
tools/xtensa-lx106-elf-gcc/
tools/mkspiffs/
tools/mklittlefs/
tools/python3/
Expand Down
2 changes: 1 addition & 1 deletionbootloaders/eboot/Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
XTENSA_TOOLCHAIN ?= ../../tools/xtensa-lx106-elf/bin/
XTENSA_TOOLCHAIN ?= ../../tools/xtensa-lx106-elf-gcc/bin/
ESPTOOL ?= ../../tools/esptool/esptool

BIN_DIR := ./
Expand Down
2 changes: 1 addition & 1 deletioncores/esp8266/esp8266_undocumented.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ extern "C" {
extern void (*user_start_fptr)();

#ifndef XCHAL_EXCCAUSE_NUM
// fromtools/xtensa-lx106-elf/include/xtensa/config/core.h:629:#define XCHAL_EXCCAUSE_NUM 64
// from xtensa hal header:xtensa/config/core.h:629:#define XCHAL_EXCCAUSE_NUM 64
#define XCHAL_EXCCAUSE_NUM 64
#endif

Expand Down
8 changes: 4 additions & 4 deletionsdoc/gdb.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,23 +96,23 @@ Open a Command Prompt and Start GDB
Open a terminal or ``CMD`` prompt and navigate to the proper ESP8266 toolchain
directory.

Linux
Linux (Using Board Manager version)

.. code:: bash

~/.arduino15/packages/esp8266/tools/xtensa-lx106-elf-gcc/2.5.0-4-b40a506/bin/xtensa-lx106-elf-gdb
~/.arduino15/packages/esp8266/tools/xtensa-lx106-elf-gcc/3.2.0-gcc10.3-c791b74/bin/xtensa-lx106-elf-gdb

Windows (Using Board Manager version)

.. code:: bash

%userprofile%\AppData\Local\Arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\2.5.0-3-20ed2b9\bin\xtensa-lx106-elf-gdb.exe
%userprofile%\AppData\Local\Arduino15\packages\esp8266\tools\xtensa-lx106-elf-gcc\3.2.0-gcc10.3-c791b74\bin\xtensa-lx106-elf-gdb.exe

Windows (Using Git version)

.. code:: bash

%userprofile%\Documents\Arduino\hardware\esp8266com\esp8266\tools\xtensa-lx106-elf\bin\xtensa-lx106-elf-gdb.exe
%userprofile%\Documents\Arduino\hardware\esp8266com\esp8266\tools\xtensa-lx106-elf-gcc\bin\xtensa-lx106-elf-gdb.exe

Please note the proper GDB name is "xtensa-lx106-elf-gdb". If you accidentally
run "gdb" you may start your own operating system's GDB, which will not know how
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@

# check if ar and openssl are available
if which('ar') is None and not os.path.isfile('./ar') and not os.path.isfile('./ar.exe'):
raise Exception("You need the program 'ar' from xtensa-lx106-elf found here: (esp8266-arduino-core)/hardware/esp8266com/esp8266/tools/xtensa-lx106-elf/xtensa-lx106-elf/bin/ar")
raise Exception("You need the program 'ar' from xtensa-lx106-elf found here: (esp8266-arduino-core)/hardware/esp8266com/esp8266/tools/xtensa-lx106-elf-gcc/xtensa-lx106-elf/bin/ar")
if which('openssl') is None and not os.path.isfile('./openssl') and not os.path.isfile('./openssl.exe'):
raise Exception("You need to have openssl in PATH, installable from https://www.openssl.org/")

Expand Down
2 changes: 1 addition & 1 deletionplatform.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ name=ESP8266 Boards (3.2.0-dev)
version=3.2.0-dev

# These will be removed by the packager script when doing a JSON release
runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf
runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf-gcc
runtime.tools.python3.path={runtime.platform.path}/tools/python3

runtime.tools.esptool.path={runtime.platform.path}/tools/esptool
Expand Down
2 changes: 1 addition & 1 deletiontests/ci/eboot_test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
set -ev

root=$(git rev-parse --show-toplevel)
READELF="$root/tools/xtensa-lx106-elf/bin/xtensa-lx106-elf-readelf"
READELF="$root/tools/xtensa-lx106-elf-gcc/bin/xtensa-lx106-elf-readelf"

cd $root/tools
python3 get.py -q
Expand Down
4 changes: 2 additions & 2 deletionstests/common.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -224,7 +224,7 @@ function build_sketches()
&& step_summary "$sketch warnings" "$cache_dir/build.log"
fi

print_size_info "$core_path"/tools/xtensa-lx106-elf/bin/xtensa-lx106-elf-size \
print_size_info "$core_path"/tools/xtensa-lx106-elf-gcc/bin/xtensa-lx106-elf-size \
$build_dir/*.elf >>$cache_dir/size.log

echo ::endgroup::
Expand DownExpand Up@@ -442,7 +442,7 @@ function install_platformio()
pio pkg install --global --skip-dependencies --platform "https://github.com/platformio/platform-espressif8266.git"

local framework_symlink="framework-arduinoespressif8266 @ symlink://${ESP8266_ARDUINO_BUILD_DIR}"
local toolchain_symlink="toolchain-xtensa @ symlink://${ESP8266_ARDUINO_BUILD_DIR}/tools/xtensa-lx106-elf/"
local toolchain_symlink="toolchain-xtensa @ symlink://${ESP8266_ARDUINO_BUILD_DIR}/tools/xtensa-lx106-elf-gcc/"

# pre-generate config; pio-ci with multiple '-O' replace each other instead of appending to the same named list
# (and, it is much nicer to write this instead of a multi-line cmdline with several large strings)
Expand Down
2 changes: 1 addition & 1 deletiontests/sanity_check.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ python3 get.py -q
popd
pushd "$cache_dir"

gcc="$root/tools/xtensa-lx106-elf/bin/xtensa-lx106-elf-gcc"\
gcc="$root/tools/xtensa-lx106-elf-gcc/bin/xtensa-lx106-elf-gcc"\
" -I$root/cores/esp8266"\
" -I$root/tools/sdk/include"\
" -I$root/variants/generic"\
Expand Down
67 changes: 39 additions & 28 deletionstools/get.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,13 +8,13 @@
import shutil
import errno
import os.path
import pathlib
import hashlib
import json
import platform
import sys
import tarfile
import zipfile
import re

verbose = True

Expand DownExpand Up@@ -48,29 +48,39 @@ def report_progress(count, blockSize, totalSize):
sys.stdout.write("\r%d%%" % percent)
sys.stdout.flush()

def unpack(filename, destination):
def unpack_impl(filename, destination):
file = None
dirname = ''
print('Extracting {0}'.format(filename))

if filename.endswith('tar.gz'):
tfile = tarfile.open(filename, 'r:gz')
tfile.extractall(destination)
dirname= tfile.getnames()[0]
file = tarfile.open(filename, 'r:gz')
file.extractall(destination)
dirname = file.getnames()[0]
elif filename.endswith('zip'):
zfile = zipfile.ZipFile(filename)
zfile.extractall(destination)
dirname =zfile.namelist()[0]
file = zipfile.ZipFile(filename)
file.extractall(destination)
dirname =file.namelist()[0]
else:
raise NotImplementedError('Unsupported archive type')

# a little trick to rename tool directories so they don't contain version number
rename_to = re.match(r'^([a-zA-Z_][^\-]*\-*)+', dirname).group(0).strip('-')
if rename_to != dirname:
print('Renaming {0} to {1}'.format(dirname, rename_to))
if os.path.isdir(rename_to):
shutil.rmtree(rename_to)
shutil.move(dirname, rename_to)
if file:
file.close()

return pathlib.Path(destination) / dirname

def unpack(name, filename, destination):
expected = pathlib.Path(destination) / name

print(f'Extracting {filename}')
output = unpack_impl(filename, destination)

if expected != output:
print(f'Renaming {output} to {expected}')
if expected.is_dir():
shutil.rmtree(expected)
output.rename(expected)

def get_tool(tool):
def get_tool(name,tool):
archive_name = tool['archiveFileName']
local_path = dist_dir + archive_name
url = tool['url']
Expand All@@ -81,21 +91,20 @@ def get_tool(tool):
sys.stdout.write("\rDone\n")
sys.stdout.flush()
else:
print('Tool{0} already downloaded'.format(archive_name))
print(f'Tool"{name}" already downloaded as "{archive_name}"')
local_hash = sha256sum(local_path)
if local_hash != real_hash:
print('Hash mismatch for {0}, delete the file and try again'.format(local_path))
raise RuntimeError()
unpack(local_path, '.')
raise RuntimeError(f'Hash mismatch for tool {name} "{local_path}", delete the file and try again')
unpack(name, local_path, '.')

defload_tools_list(filename, platform):
defload_tools(filename, platform):
tools_info = json.load(open(filename))['packages'][0]['tools']
tools_to_download =[]
tools_to_download ={}
for t in tools_info:
tool_platform = [p for p in t['systems'] if p['host'] == platform]
iflen(tool_platform) == 0:
ifnot tool_platform:
continue
tools_to_download.append(tool_platform[0])
tools_to_download[t['name']] =tool_platform[0]
return tools_to_download

def identify_platform():
Expand DownExpand Up@@ -127,10 +136,12 @@ def main():
if (os.path.exists('python3/python3')):
os.unlink('python3/python3')
print('Platform: {0}'.format(identify_platform()))
tools_to_download = load_tools_list('../package/package_esp8266com_index.template.json', identify_platform())
tools_to_download = load_tools(
'../package/package_esp8266com_index.template.json',
identify_platform())
mkdir_p(dist_dir)
for tool in tools_to_download:
get_tool(tool)
forname,tool in tools_to_download.items():
get_tool(name,tool)

if __name__ == '__main__':
main()
6 changes: 3 additions & 3 deletionstools/sdk/lib/compare/sdk-compare-libs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,10 +32,10 @@ verbose=false
sdk="$1"
me="$0"
core=$(cd ${me%/*}/../../../..; pwd)

tool="$core/tools/xtensa-lx106-elf-gcc/bin"

[ -r "$sdk/lib/libnet80211.a" ] || help "$0"
[ -r "$core/tools/xtensa-lx106-elf/bin" ] || help "$0"
[ -r "$tool" ] || help "$0"

tmp=$(pwd)/NONOSDK.deleteme

Expand All@@ -53,7 +53,7 @@ md5()
{
mkdir temp
cd temp
PATH="$core/tools/xtensa-lx106-elf/bin:$PATH" xtensa-lx106-elf-ar x "$1"
PATH="$tool:$PATH" xtensa-lx106-elf-ar x "$1"
rm -f mem_manager.o time.o user_interface.o eagle_lwip_if.o
cat *.o | md5sum
cd ..
Expand Down
6 changes: 4 additions & 2 deletionstools/sdk/lib/eval_fix_sdks.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
#!/bin/bash
# set -e

root=$(git rev-parse --show-toplevel)

single_sdk="${2}"
if [[ -n "$single_sdk" ]]; then
if [[ "NONOSDK" != "${single_sdk:0:7}" ]]; then
Expand All@@ -16,8 +18,8 @@ add_path_ifexist() {
return 1
}

if ! which xtensa-lx106-elf-ar| grep "tools/xtensa-lx106-elf/bin">>/dev/null; then
add_path_ifexist "../../../xtensa-lx106-elf/bin" || add_path_ifexist "../../xtensa-lx106-elf/bin"
if ! which xtensa-lx106-elf-ar >>/dev/null; then
add_path_ifexist "$root/tools/xtensa-lx106-elf-gcc/bin"
fi

help_msg() {
Expand Down
6 changes: 4 additions & 2 deletionstools/sdk/lib/fix_sdk_libs.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
#!/bin/bash
set -e

root=$(git rev-parse --show-toplevel)

add_path_ifexist() {
if [[ -d $1 ]]; then
export PATH=$( realpath $1 ):$PATH
Expand All@@ -9,8 +11,8 @@ add_path_ifexist() {
return 1
}

if ! which xtensa-lx106-elf-ar| grep "tools/xtensa-lx106-elf/bin">>/dev/null; then
add_path_ifexist "../../../xtensa-lx106-elf/bin" ||add_path_ifexist "../../xtensa-lx106-elf/bin"
if ! which xtensa-lx106-elf-ar >>/dev/null; then
add_path_ifexist "$root/tools/xtensa-lx106-elf-gcc/bin"
fi
WORK_SPACE=${PWD}

Expand Down
2 changes: 1 addition & 1 deletiontools/warnings/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,5 +8,5 @@ to delete every warning but "-Wreturn-type"

Generate the "none-g++" file with the following command:
````
./tools/xtensa-lx106-elf/bin/xtensa-lx106-elf-gcc --help=warnings -Q | grep '\[enabled\]' | grep -v 'return-type' | awk '{print $1}' | sed 's/-W/-Wno-/' | grep -v = | grep -v -- -f | egrep -v '(c11-c2x-compat|c90-c99-compat|c99-c11-compat|declaration-after-statement|designated-init|discarded-array-qualifiers|discarded-qualifiers|implicit-int|incompatible-pointer-types|int-conversion|old-style-definition|override-init-side-effects|pointer-to-int-cast)' > tools/warnings/none-g++
./tools/xtensa-lx106-elf-gcc/bin/xtensa-lx106-elf-gcc --help=warnings -Q | grep '\[enabled\]' | grep -v 'return-type' | awk '{print $1}' | sed 's/-W/-Wno-/' | grep -v = | grep -v -- -f | egrep -v '(c11-c2x-compat|c90-c99-compat|c99-c11-compat|declaration-after-statement|designated-init|discarded-array-qualifiers|discarded-qualifiers|implicit-int|incompatible-pointer-types|int-conversion|old-style-definition|override-init-side-effects|pointer-to-int-cast)' > tools/warnings/none-g++
````
[8]ページ先頭
©2009-2025 Movatter.jp