1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

s/PROJECT/APPLICATION/g

fixes #548
This commit is contained in:
Thomas Eichinger 2014-05-23 10:33:02 +02:00
parent 4e4f908379
commit 1e983c9670
59 changed files with 85 additions and 85 deletions

View File

@ -84,7 +84,7 @@ objsize:
sort -rnk$${SORTROW}
buildsize:
@$(SIZE) -dB $(BINDIR)$(PROJECT).elf
@$(SIZE) -dB $(BINDIR)$(APPLICATION).elf
buildsizes: SHELL=bash
buildsizes:

View File

@ -62,24 +62,24 @@ include $(RIOTBASE)/Makefile.cflags
# the binaries to link
BASELIBS += $(BINDIR)$(BOARD)_base.a
BASELIBS += $(BINDIR)${PROJECT}.a
BASELIBS += $(BINDIR)${APPLICATION}.a
BASELIBS += $(USEPKG:%=${BINDIR}%.a)
.PHONY: all clean flash doc term objsize buildsize buildsizes buildsizes-diff
export ELFFILE ?= $(BINDIR)$(PROJECT).elf
export ELFFILE ?= $(BINDIR)$(APPLICATION).elf
export HEXFILE ?= $(ELFFILE:.elf=.hex)
## make script for the application
all: $(BINDIR)$(PROJECT).a
@echo "Building application $(PROJECT) for $(BOARD) w/ MCU $(MCU)."
## make script for your application. Build RIOT-base here!
all: $(BINDIR)$(APPLICATION).a
@echo "Building application $(APPLICATION) for $(BOARD) w/ MCU $(MCU)."
"$(MAKE)" -C $(RIOTBOARD)/$(BOARD)
"$(MAKE)" -C $(RIOTBASE)
ifeq (,$(RIOTNOLINK))
ifeq ($(BUILDOSXNATIVE),1)
$(AD)$(LINK) $(UNDEF) -o $(ELFFILE) $(BASELIBS) $(LINKFLAGS) -Wl,-no_pie
else
$(AD)$(LINK) $(UNDEF) -o $(ELFFILE) -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(BINDIR)$(PROJECT).map $(LINKFLAGS)
$(AD)$(LINK) $(UNDEF) -o $(ELFFILE) -Wl,--start-group $(BASELIBS) -lm -Wl,--end-group -Wl,-Map=$(BINDIR)$(APPLICATION).map $(LINKFLAGS)
endif
$(AD)$(SIZE) $(ELFFILE)
$(AD)$(OBJCOPY) $(OFLAGS) $(ELFFILE) $(HEXFILE)
@ -89,10 +89,10 @@ endif
SRC = $(wildcard *.c)
# string array of all names replaced .c with .o
OBJ = $(SRC:%.c=${BINDIR}${PROJECT}/%.o)
OBJ = $(SRC:%.c=${BINDIR}${APPLICATION}/%.o)
$(BINDIR)$(PROJECT).a: $(OBJ)
$(AD)$(AR) -rc $(BINDIR)$(PROJECT).a $(OBJ)
$(BINDIR)$(APPLICATION).a: $(OBJ)
$(AD)$(AR) -rc $(BINDIR)$(APPLICATION).a $(OBJ)
# add extra include paths for packages in $(USEMODULE)
export USEMODULE_INCLUDES =
@ -120,7 +120,7 @@ $(RIOTBASE)/pkg/%/Makefile.include::
# pull in dependency info for *existing* .o files
-include $(OBJ:.o=.d)
$(BINDIR)$(PROJECT)/%.o: %.c $(PROJDEPS) $(USEPKG:%=${BINDIR}%.a)
$(BINDIR)$(APPLICATION)/%.o: %.c $(PROJDEPS) $(USEPKG:%=${BINDIR}%.a)
@echo; echo "Compiling.... $*.c"; echo
$(AD)mkdir -p "$(dir $@)"
$(AD)$(CC) $(CFLAGS) $(INCLUDES) -c "$<" -o "$@"

View File

@ -36,7 +36,7 @@ export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endi
# linkerscript specified in cpu/Makefile.include
export LINKFLAGS += -T$(LINKERSCRIPT)
export OFLAGS += -O binary
export FFLAGS += -e -w -v -b bin/$(BOARD)/$(PROJECT).hex
export FFLAGS += -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
# additional compiler and linker flags to enable newlib-nano and optimize for it
# CAREFUL: newlib-nano is not supported by the ubuntu arm-none-eabi- toolchain, so its disabled by default

View File

@ -16,7 +16,7 @@ export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o
export FLASHER = mspdebug
export HEXFILE = $(BINDIR)$(PROJECT).hex
export HEXFILE = $(BINDIR)$(APPLICATION).hex
export USEMODULE += msp430_common
export FFLAGS = rf2500 "prog $(HEXFILE)"
export OFLAGS = -O ihex

View File

@ -17,10 +17,10 @@ LINKFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,--cref -lc -lgcc -lnosys -
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = $(BINDIR)$(PROJECT).hex
export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = $(HEXFILE)
export ELFFILE = bin/$(PROJECT).elf
export ELFFILE = bin/$(APPLICATION).elf
export DEBUGGER_FLAGS = $(ELFFILE)
export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ -I$(RIOTCPU)/$(CPU)/include

View File

@ -14,7 +14,7 @@ export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc
TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
export HEXFILE = $(BINDIR)$(PROJECT).hex
export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FLASHER ?= mspdebug
export PORT ?= /dev/ttyUSB0

View File

@ -19,7 +19,7 @@ LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = $(BINDIR)$(PROJECT).hex
export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = $(PORT) $(HEXFILE)
include $(RIOTBOARD)/msba2-common/Makefile.dep

View File

@ -5,7 +5,7 @@ export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/
export CPU = native
export ELF = $(BINDIR)$(PROJECT).elf
export ELF = $(BINDIR)$(APPLICATION).elf
# toolchain:
export PREFIX =

View File

@ -3,5 +3,5 @@ include $(RIOTBOARD)/x86-multiboot-common/Makefile.include
CFLAGS += -march=i686 -mtune=i686
CFLAGS += -I$(RIOTBOARD)/qemu-i386/include
TERMPROG = qemu-system-i386 -m 512m -serial stdio -nographic -monitor /dev/null -kernel $(BINDIR)/$(PROJECT).hex
TERMPROG = qemu-system-i386 -m 512m -serial stdio -nographic -monitor /dev/null -kernel $(BINDIR)/$(APPLICATION).hex
FLASHER = true

View File

@ -24,7 +24,7 @@ LINKFLAGS = -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = $(BINDIR)/$(PROJECT).hex
export HEXFILE = $(BINDIR)/$(APPLICATION).hex
export FFLAGS = -t $(PORT) -f $(HEXFILE) -c 'bbmc -l redbee-econotag reset'
export OFLAGS = -O binary --gap-fill=0xff

View File

@ -19,7 +19,7 @@ export FLASHER = goodfet.bsl
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = $(BINDIR)$(PROJECT).hex
export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
export INCLUDES += -I$(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include

View File

@ -36,7 +36,7 @@ export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endi
# linkerscript specified in cpu/Makefile.include
export LINKFLAGS += -T$(LINKERSCRIPT)
export OFLAGS += -O binary
export FFLAGS += -e -w -v -b bin/$(BOARD)/$(PROJECT).hex
export FFLAGS += -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
# additional linker and compiler flags to enable and optimize for newlib-nano
# ATTENTION: since the newlib nano specs are not installed by default for all arm-none-eabi- tool-chains,

View File

@ -17,7 +17,7 @@ export FLASHER = mspdebug
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = $(BINDIR)$(PROJECT).hex
export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include

View File

@ -19,7 +19,7 @@ export FLASHER = goodfet.bsl
ifeq ($(strip $(PORT)),)
export PORT = /dev/ttyUSB0
endif
export HEXFILE = $(BINDIR)$(PROJECT).hex
export HEXFILE = $(BINDIR)$(APPLICATION).hex
export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
export OFLAGS = -O ihex

View File

@ -4,7 +4,7 @@ OBJECTS = system_LPC17xx.o startup_LPC17xx.o main.o
CC_SYMBOLS = -DTARGET_LPC1769 -DTOOLCHAIN_GCC_ARM -DNDEBUG -D__CORTEX_M3
LD_FLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map=$(PROJECT).map,--cref --specs=nano.specs
LD_FLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map=$(APPLICATION).map,--cref --specs=nano.specs
LD_SYS_LIBS = -lc -lgcc -lnosys
all: $(BINDIR)$(MODULE).a
@ -15,10 +15,10 @@ include $(RIOTBASE)/Makefile.base
nxpsum:
$(CCLOCAL) nxpsum.c -std=c99 -o nxpsum
#$(PROJECT).elf: $(OBJECTS) $(SYS_OBJECTS)
#$(APPLICATION).elf: $(OBJECTS) $(SYS_OBJECTS)
# $(LD) $(LD_FLAGS) -T$(LINKER_SCRIPT) $(LIBRARY_PATHS) -o $@ $(addprefix $(BUILD_DIR), $^) $(LIBRARIES) $(LD_SYS_LIBS) $(LIBRARIES) $(LD_SYS_LIBS)
$(PROJECT).bin: $(PROJECT).elf nxpsum
$(APPLICATION).bin: $(APPLICATION).elf nxpsum
$(OBJCOPY) -O binary $< $@
# Compute nxp checksum on .bin file here
./nxpsum $@

2
dist/Makefile vendored
View File

@ -7,7 +7,7 @@
####
# Set the name of your application:
export PROJECT = foobar
export APPLICATION = foobar
# If no BOARD is found in the environment, use this default:
export BOARD ?= native

View File

@ -22,32 +22,32 @@
DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
PROJECT_NAME = "6LoWPAN Border Router linux driver"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER =
PROJECT_NUMBER =
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
# a quick idea about the purpose of the project. Keep the description short.
PROJECT_BRIEF =
PROJECT_BRIEF =
# With the PROJECT_LOGO tag one can specify an logo or icon that is
# included in the documentation. The maximum height of the logo should not
# exceed 55 pixels and the maximum width should not exceed 200 pixels.
# With the PROJECT_LOGO tag one can specify an logo or icon that is
# included in the documentation. The maximum height of the logo should not
# exceed 55 pixels and the maximum width should not exceed 200 pixels.
# Doxygen will copy the logo to the output directory.
PROJECT_LOGO =
PROJECT_LOGO =
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.

View File

@ -9,7 +9,7 @@ flash() {
run_tests() {
TESTDIR=projects/${1}/tests
flash ${PROJECT} || return
flash ${APPLICATION} || return
for tst in `ls ${TESTDIR}/`; do
echo "Project \"${1}\": Running test ${tst}..."
$TESTDIR/$tst || (
@ -24,17 +24,17 @@ echo "Running tests..."
echo
for i in projects/*; do
export PROJECT=`basename $i`
if [ -d projects/${PROJECT}/tests ]; then
export APPLICATION=`basename $i`
if [ -d projects/${APPLICATION}/tests ]; then
{
echo "Testing project ${PROJECT}..."
echo "Testing project ${APPLICATION}..."
PORT="`sh ${TOOLROOT}/tools/lock_board.sh`"
FLASHUTIL_SHELL="sh -c"
echo "Using Target connecting to ${PORT}."
export PORT FLASHUTIL_SHELL
run_tests ${PROJECT}
run_tests ${APPLICATION}
sh ${TOOLROOT}/tools/unlock_board.sh ${PORT}
} 2>&1

View File

@ -70,12 +70,12 @@
* RIOT uses GNU make as build system. The simplest way to compile and link a
* application (application or library) with RIOT, is to set up a Makefile providing
* at least the following variables:
* * PROJECT
* * APPLICATION
* * BOARD
* * RIOTBASE
*
* and an instruction to include the `Makefile.include`, located in RIOT's root
* directory. `PROJECT` should contain the (unique) name of your application, `BOARD`
* directory. `APPLICATION` should contain the (unique) name of your application, `BOARD`
* specifies the platform the application should be built for by default, and
* `RIOTBASE` specifies the path to your copy of the RIOT repository (note, that
* you may want to use `$(CURDIR)` here, to give a relative path). You can use Make's

View File

@ -1,5 +1,5 @@
# name of your application
export PROJECT = ccn-lite-client
export APPLICATION = ccn-lite-client
# If no BOARD is found in the environment, use this default:
export BOARD ?= native

View File

@ -1,5 +1,5 @@
# name of your application
export PROJECT = ccn-lite-relay
export APPLICATION = ccn-lite-relay
# If no BOARD is found in the environment, use this default:
export BOARD ?= native

View File

@ -1,5 +1,5 @@
# name of your application
export PROJECT = default
export APPLICATION = default
# If no BOARD is found in the environment, use this default:
export BOARD ?= native

View File

@ -1,5 +1,5 @@
# name of your application
export PROJECT = hello-world
export APPLICATION = hello-world
# If no BOARD is found in the environment, use this default:
export BOARD ?= native

View File

@ -1,5 +1,5 @@
# name of your application
export PROJECT = ipc_pingpong
export APPLICATION = ipc_pingpong
# If no BOARD is found in the environment, use this default:
export BOARD ?= native

View File

@ -1,5 +1,5 @@
# name of your application
export PROJECT = rpl_udp
export APPLICATION = rpl_udp
# If no BOARD is found in the environment, use this default:
export BOARD ?= native

View File

@ -1,4 +1,4 @@
export PROJECT = test_bloom
export APPLICATION = test_bloom
include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := chronos mbed_lpc1768 msb-430 msb-430h redbee-econotag \

View File

@ -1,4 +1,4 @@
export PROJECT = test_bloom_bytes
export APPLICATION = test_bloom_bytes
include ../Makefile.tests_common
USEMODULE += hashes

View File

@ -1,4 +1,4 @@
export PROJECT = test_disable_module
export APPLICATION = test_disable_module
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_float
export APPLICATION = test_float
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_hwtimer
export APPLICATION = test_hwtimer
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_hwtimer_spin
export APPLICATION = test_hwtimer_spin
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_hwtimer_wait
export APPLICATION = test_hwtimer_wait
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
PROJECT = test_irq
APPLICATION = test_irq
include ../Makefile.tests_common
USEMODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_mutex_unlock_and_sleep
export APPLICATION = test_mutex_unlock_and_sleep
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
PROJECT = test_nativenet
APPLICATION = test_nativenet
include ../Makefile.tests_common
BOARD_WHITELIST := native
@ -12,5 +12,5 @@ FORCE:
touch main.c
sender: CFLAGS += -DSENDER
sender: PROJECT = test_nativenet_sender
sender: APPLICATION = test_nativenet_sender
sender: FORCE all

View File

@ -1,4 +1,4 @@
export PROJECT = test_net_if
export APPLICATION = test_net_if
BOARD_BLACKLIST = mbed_lpc1768 arduino-due udoo qemu-i386
# qemu-i386: no tranceiver, yet

View File

@ -1,4 +1,4 @@
export PROJECT = test_pnet
export APPLICATION = test_pnet
include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := chronos msb-430h redbee-econotag telosb wsn430-v1_3b wsn430-v1_4 z1

View File

@ -1,4 +1,4 @@
export PROJECT = test_posix_semaphore
export APPLICATION = test_posix_semaphore
include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := mbed_lpc1768 redbee-econotag chronos

View File

@ -1,4 +1,4 @@
export PROJECT = test_posix_sleep
export APPLICATION = test_posix_sleep
include ../Makefile.tests_common
USEMODULE += posix

View File

@ -1,4 +1,4 @@
export PROJECT = test_pthread
export APPLICATION = test_pthread
include ../Makefile.tests_common
USEMODULE += posix

View File

@ -1,5 +1,5 @@
# name of your application
PROJECT = test_pthread_barrier
APPLICATION = test_pthread_barrier
include ../Makefile.tests_common
## Modules to include.

View File

@ -1,4 +1,4 @@
PROJECT = test_pthread_cleanup
APPLICATION = test_pthread_cleanup
include ../Makefile.tests_common
USEMODULE += pthread

View File

@ -1,4 +1,4 @@
export PROJECT = test_condition_variable
export APPLICATION = test_condition_variable
include ../Makefile.tests_common
USEMODULE += posix

View File

@ -1,4 +1,4 @@
export PROJECT = test_pthread_cooperation
export APPLICATION = test_pthread_cooperation
include ../Makefile.tests_common
USEMODULE += posix

View File

@ -1,4 +1,4 @@
PROJECT = test_pthread_rwlock
APPLICATION = test_pthread_rwlock
include ../Makefile.tests_common
USEMODULE += pthread

View File

@ -1,4 +1,4 @@
PROJECT = test_queue_fairness
APPLICATION = test_queue_fairness
include ../Makefile.tests_common
USEMODULE += vtimer

View File

@ -1,4 +1,4 @@
export PROJECT = test_sha256
export APPLICATION = test_sha256
include ../Makefile.tests_common
USEMODULE += crypto

View File

@ -1,4 +1,4 @@
export PROJECT = test_shell
export APPLICATION = test_shell
include ../Makefile.tests_common
USEMODULE += shell

View File

@ -1,4 +1,4 @@
export PROJECT = test_thread_basic
export APPLICATION = test_thread_basic
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_thread_cooperation
export APPLICATION = test_thread_cooperation
include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := chronos msb-430 msb-430h mbed_lpc1768 redbee-econotag

View File

@ -1,4 +1,4 @@
export PROJECT = test_thread_exit
export APPLICATION = test_thread_exit
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_thread_msg
export APPLICATION = test_thread_msg
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_thread_msg_block_w_queue
export APPLICATION = test_thread_msg_block_w_queue
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_thread_msg_block_wo_queue
export APPLICATION = test_thread_msg_block_wo_queue
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_thread_msg_seq
export APPLICATION = test_thread_msg_seq
include ../Makefile.tests_common
DISABLE_MODULE += auto_init

View File

@ -1,4 +1,4 @@
export PROJECT = test_vtimer_msg
export APPLICATION = test_vtimer_msg
include ../Makefile.tests_common
USEMODULE += vtimer

View File

@ -1,4 +1,4 @@
export PROJECT = unittests
export APPLICATION = unittests
include ../Makefile.tests_common
USEMODULE += embunit