diff --git a/.github/workflows/esp-idf-v4.3-build.yml b/.github/workflows/esp-idf-v4.3-build.yml index a1ca113a..10bf35b5 100644 --- a/.github/workflows/esp-idf-v4.3-build.yml +++ b/.github/workflows/esp-idf-v4.3-build.yml @@ -52,6 +52,8 @@ jobs: git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/*.py git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/*.py2 + git update-index --chmod=+x ./components/spotify/cspot/bell/nanopb/generator/proto/*.py + cd server_certs;./getcert.sh;cat github.pem;cd .. shopt -s nocasematch diff --git a/components/spotify/cspot/bell/nanopb/generator/proto/__init__.py b/components/spotify/cspot/bell/nanopb/generator/proto/__init__.py index 29153d40..d2f44ebb 100644 --- a/components/spotify/cspot/bell/nanopb/generator/proto/__init__.py +++ b/components/spotify/cspot/bell/nanopb/generator/proto/__init__.py @@ -30,7 +30,9 @@ if os.path.isfile(protosrc): cmd.append("-I={}".format(_builtin_proto_include)) try: + sys.stdout.write("Invoking:" + ' '.join(cmd) + "\n") invoke_protoc(argv=cmd) except: + sys.stdout.write("Failed to build nanopb_pb2.py: " + ' '.join(cmd) + "\n") sys.stderr.write("Failed to build nanopb_pb2.py: " + ' '.join(cmd) + "\n") raise diff --git a/components/spotify/cspot/bell/nanopb/generator/protoc b/components/spotify/cspot/bell/nanopb/generator/protoc index 4b1512d0..0c733f4a 100644 --- a/components/spotify/cspot/bell/nanopb/generator/protoc +++ b/components/spotify/cspot/bell/nanopb/generator/protoc @@ -7,22 +7,25 @@ from nanopb_generator import invoke_protoc if __name__ == '__main__': # Add argument so that protoc-gen-nanopb gets found + print("Getting path to protoc-gen-nanopb") if getattr(sys, 'frozen', False): mypath = os.path.dirname(sys.executable) # For pyInstaller else: mypath = os.path.dirname(__file__) - + print("Looking for executable file name") if os.path.isfile(os.path.join(mypath, "protoc-gen-nanopb.exe")): protoc_gen_nanopb = os.path.join(mypath, "protoc-gen-nanopb.exe") elif os.name == 'nt': protoc_gen_nanopb = os.path.join(mypath, "protoc-gen-nanopb.bat") else: protoc_gen_nanopb = os.path.join(mypath, "protoc-gen-nanopb") - + print("Found executable file name: " + protoc_gen_nanopb) args = sys.argv[1:] if os.path.isfile(protoc_gen_nanopb): args = ['--plugin=protoc-gen-nanopb=%s' % protoc_gen_nanopb] + args + # print the command line that we are about to execute + print("invoking protoc with parameters: ".join(args)) status = invoke_protoc(['protoc'] + args) sys.exit(status) diff --git a/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb b/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb index 471a620b..71ef4c78 100644 --- a/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb +++ b/components/spotify/cspot/bell/nanopb/generator/protoc-gen-nanopb @@ -10,4 +10,5 @@ # --plugin= on the command line. MYPATH=$(dirname "$0") +echo "Executing $MYPATH/nanopb_generator.py " exec "$MYPATH/nanopb_generator.py" --protoc-plugin