rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework the Makefiles to be compatible with binary packages.

Browse Source
This commit is contained in:
Petteri Aimonen
2013-11-17 20:04:29 +02:00
parent bee09c3a38
commit b4457a86d6
8 changed files with 86 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/network_server/Makefile
View File

@@ -1,9 +1,8 @@
CFLAGS = -ansi -Wall -Werror -g -O0 # Include the nanopb provided Makefile rules
include ../../extra/nanopb.mk
# Path to the nanopb root folder # Compiler flags to enable all warnings & debug info
NANOPB_DIR = ../.. CFLAGS = -ansi -Wall -Werror -g -O0
DEPS = $(NANOPB_DIR)/pb_decode.c $(NANOPB_DIR)/pb_decode.h \
$(NANOPB_DIR)/pb_encode.c $(NANOPB_DIR)/pb_encode.h $(NANOPB_DIR)/pb.h
CFLAGS += -I$(NANOPB_DIR) CFLAGS += -I$(NANOPB_DIR)
all: server client all: server client
@@ -11,9 +10,6 @@ all: server client
clean: clean:
rm -f server client fileproto.pb.c fileproto.pb.h rm -f server client fileproto.pb.c fileproto.pb.h
%: %.c $(DEPS) fileproto.pb.h fileproto.pb.c %: %.c common.c fileproto.pb.c
$(CC) $(CFLAGS) -o $@ $< $(NANOPB_DIR)/pb_decode.c $(NANOPB_DIR)/pb_encode.c fileproto.pb.c common.c $(CC) $(CFLAGS) -o $@ $^ $(NANOPB_CORE)
fileproto.pb.c fileproto.pb.h: fileproto.proto $(NANOPB_DIR)/generator/nanopb_generator.py
protoc -ofileproto.pb $<
python $(NANOPB_DIR)/generator/nanopb_generator.py fileproto.pb

9
examples/simple/Makefile
View File

@@ -1,8 +1,8 @@
# Include the nanopb provided Makefile rules
include ../../extra/nanopb.mk
# Compiler flags to enable all warnings & debug info # Compiler flags to enable all warnings & debug info
CFLAGS = -Wall -Werror -g -O0 CFLAGS = -Wall -Werror -g -O0
# Path to the nanopb root folder
NANOPB_DIR = ../..
CFLAGS += -I$(NANOPB_DIR) CFLAGS += -I$(NANOPB_DIR)
# C source code files that are required # C source code files that are required
@@ -17,6 +17,5 @@ simple: $(CSRC)
# Build rule for the protocol # Build rule for the protocol
simple.pb.c: simple.proto simple.pb.c: simple.proto
protoc -osimple.pb simple.proto $(PROTOC) $(PROTOC_OPTS) --nanopb_out=. simple.proto
python $(NANOPB_DIR)/generator/nanopb_generator.py simple.pb

19
examples/using_double_on_avr/Makefile
View File

@@ -1,10 +1,8 @@
CFLAGS = -Wall -Werror -g -O0 # Include the nanopb provided Makefile rules
include ../../extra/nanopb.mk
# Path to the nanopb root directory # Compiler flags to enable all warnings & debug info
NANOPB_DIR = ../.. CFLAGS = -Wall -Werror -g -O0
DEPS = double_conversion.c $(NANOPB_DIR)/pb.h \
$(NANOPB_DIR)/pb_decode.c $(NANOPB_DIR)/pb_decode.h \
$(NANOPB_DIR)/pb_encode.c $(NANOPB_DIR)/pb_encode.h
CFLAGS += -I$(NANOPB_DIR) CFLAGS += -I$(NANOPB_DIR)
all: run_tests all: run_tests
@@ -15,13 +13,8 @@ clean:
test_conversions: test_conversions.c double_conversion.c test_conversions: test_conversions.c double_conversion.c
$(CC) $(CFLAGS) -o $@ $^ $(CC) $(CFLAGS) -o $@ $^
%: %.c $(DEPS) doubleproto.pb.h doubleproto.pb.c %: %.c double_conversion.c doubleproto.pb.c
$(CC) $(CFLAGS) -o $@ $< double_conversion.c \ $(CC) $(CFLAGS) -o $@ $^ $(NANOPB_CORE)
$(NANOPB_DIR)/pb_decode.c $(NANOPB_DIR)/pb_encode.c doubleproto.pb.c
doubleproto.pb.c doubleproto.pb.h: doubleproto.proto $(NANOPB_DIR)/generator/nanopb_generator.py
protoc -odoubleproto.pb $<
python $(NANOPB_DIR)/generator/nanopb_generator.py doubleproto.pb
run_tests: test_conversions encode_double decode_double run_tests: test_conversions encode_double decode_double
./test_conversions ./test_conversions

16
examples/using_union_messages/Makefile
View File

@@ -1,9 +1,8 @@
CFLAGS = -ansi -Wall -Werror -g -O0 # Include the nanopb provided Makefile rules
include ../../extra/nanopb.mk
# Path to the nanopb root folder # Compiler flags to enable all warnings & debug info
NANOPB_DIR = ../.. CFLAGS = -ansi -Wall -Werror -g -O0
DEPS = $(NANOPB_DIR)/pb_decode.c $(NANOPB_DIR)/pb_decode.h \
$(NANOPB_DIR)/pb_encode.c $(NANOPB_DIR)/pb_encode.h $(NANOPB_DIR)/pb.h
CFLAGS += -I$(NANOPB_DIR) CFLAGS += -I$(NANOPB_DIR)
all: encode decode all: encode decode
@@ -14,9 +13,6 @@ all: encode decode
clean: clean:
rm -f encode unionproto.pb.h unionproto.pb.c rm -f encode unionproto.pb.h unionproto.pb.c
%: %.c $(DEPS) unionproto.pb.h unionproto.pb.c %: %.c unionproto.pb.c
$(CC) $(CFLAGS) -o $@ $< $(NANOPB_DIR)/pb_decode.c $(NANOPB_DIR)/pb_encode.c unionproto.pb.c $(CC) $(CFLAGS) -o $@ $^ $(NANOPB_CORE)
unionproto.pb.h unionproto.pb.c: unionproto.proto $(NANOPB_DIR)/generator/nanopb_generator.py
protoc -ounionproto.pb $<
python $(NANOPB_DIR)/generator/nanopb_generator.py unionproto.pb

29
extra/nanopb.mk Normal file
View File

@@ -0,0 +1,29 @@
# This is an include file for Makefiles. It provides rules for building
# .pb.c and .pb.h files out of .proto, as well the path to nanopb core.
# Path to the nanopb root directory
NANOPB_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../)
# Files for the nanopb core
NANOPB_CORE = $(NANOPB_DIR)/pb_encode.c $(NANOPB_DIR)/pb_decode.c
# Check whether to use binary version of nanopb_generator or the
# system-supplied python interpreter.
ifneq "$(wildcard $(NANOPB_DIR)/generator-bin)" ""
# Binary package
PROTOC = $(NANOPB_DIR)/generator-bin/protoc
PROTOC_OPTS =
else
# Source only or git checkout
PROTOC = protoc
ifdef windir
PROTOC_OPTS = --plugin=nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb.bat
else
PROTOC_OPTS = --plugin=nanopb=$(NANOPB_DIR)/generator/protoc-gen-nanopb
endif
endif
# Rule for building .pb.c and .pb.h
%.pb.c %.pb.h: %.proto $(wildcard %.options)
$(PROTOC) $(PROTOC_OPTS) --nanopb_out=. $<

17
generator/nanopb_generator.py
View File

@@ -15,10 +15,17 @@ except:
print print
raise raise
import proto.nanopb_pb2 as nanopb_pb2 try:
import proto.descriptor_pb2 as descriptor import proto.nanopb_pb2 as nanopb_pb2
import proto.descriptor_pb2 as descriptor
except:
print
print "********************************************************************"
print "*** Failed to import the protocol definitions for generator. ***"
print "*** You have to run 'make' in the nanopb/generator/proto folder. ***"
print "********************************************************************"
print
raise
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@@ -1031,7 +1038,7 @@ def main_plugin():
if __name__ == '__main__': if __name__ == '__main__':
# Check if we are running as a plugin under protoc # Check if we are running as a plugin under protoc
if 'protoc-gen-' in sys.argv[0]: if 'protoc-gen-' in sys.argv[0] or '--protoc-plugin' in sys.argv:
main_plugin() main_plugin()
else: else:
main_cli() main_cli()

12
generator/protoc-gen-nanopb Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/sh
# This file is used to invoke nanopb_generator.py as a plugin
# to protoc on Linux and other *nix-style systems.
# Use it like this:
# protoc --plugin=nanopb=..../protoc-gen-nanopb --nanopb_out=dir foo.proto
#
# Note that if you use the binary package of nanopb, the protoc
# path is already set up properly and there is no need to give
# --plugin= on the command line.
exec python $(dirname $0)/nanopb_generator.py --protoc-plugin

11
generator/protoc-gen-nanopb.bat Normal file
View File

@@ -0,0 +1,11 @@
:: This file is used to invoke nanopb_generator.py as a plugin
:: to protoc on Windows.
:: Use it like this:
:: protoc --plugin=nanopb=..../protoc-gen-nanopb.bat --nanopb_out=dir foo.proto
::
:: Note that if you use the binary package of nanopb, the protoc
:: path is already set up properly and there is no need to give
:: --plugin= on the command line.
set mydir=%~dp0
python %mydir%\nanopb_generator.py --protoc-plugin