enhanced cores_Makefile-0018.patch for extern setting of PORT etc and to avoid the __cxa_pure_virtual error

cores_Makefile-0018.patch (text/plain), 9.60 KB, created by Juergen Rose on 2010-08-06 12:38:36 UTC

diff -u -r hardware_new/arduino/cores/arduino/Makefile hardware/arduino/cores/arduino/Makefile
--- hardware_new/arduino/cores/arduino/Makefile	2010-08-05 14:28:17.000000000 +0200
+++ hardware/arduino/cores/arduino/Makefile	2010-08-06 15:18:37.000000000 +0200
@@ -0,0 +1,289 @@
+# Arduino adaptation by mellis, eighthave, oli.keller,
+# alex norman [with help from http://code.google.com/p/arduino/issues/detail?id=65#c5]
+# Version 0018 Modifications by scoates & xSmurf
+# Version 0017/Mac modifications made by
+#	David Wolever 
+#	http://blog.codekills.net/
+#
+# modified for use with Gentoo as ordinary user by j.rose   06-Aug-10
+#          for configuration with environmental variables:
+#                     ARDUINO_PORT
+#                     ARDUINO_BAUD
+#                     ARDUINO_UPLOAD_PROTOCOL
+#                     ARDUINO_BUILD_MCU
+#                     ARDUINO_BUILD_F_MCU
+#          for avoiding "undefined reference to `__cxa_pure_virtual'" error
+#
+# This makefile allows you to build sketches from the command line
+# without the Arduino environment (or Java).
+#
+# Detailed instructions for using the makefile:
+#
+# 1. Copy this file into the folder with your sketch. There should be a
+# file with the same name as the folder and with the extension .pde
+# (e.g. foo.pde in the foo/ folder).
+#
+# 2. Modify the line containg "INSTALL_DIR" to point to the directory that
+# contains the Arduino installation (for example, under Mac OS X, this
+# might be /Applications/arduino-VER).
+#
+# 3. Modify the line containing "PORT" to refer to the filename
+# representing the USB or serial connection to your Arduino board
+# (e.g. PORT = /dev/tty.USB0). If the exact name of this file
+# changes, you can use * as a wildcard (e.g. PORT = /dev/tty.usb*).
+#
+# 4. Set the line containing "BUILD_MCU" to match your board's processor.
+# Older one's are atmega8 based, newer ones like Arduino Mini, Bluetooth
+# or Diecimila have the atmega168. If you're using a LilyPad Arduino,
+# change BUILD_F_CPU to 8000000.
+#
+# 5. At the command line, change to the directory containing your
+# program's file and the makefile.
+#
+# 6. Type "make" and press enter to compile/verify your program.
+#
+# 7. Type "make upload", reset your Arduino board, and press enter to
+# upload your program to the Arduino board.
+#
+# 8. (SC) You need avrdude version 5.8 or newer. As of Arduino0018, this
+# means that you need to build your own avrdude from
+# http://www.nongnu.org/avrdude/
+# $Id$
+
+TARGET = $(notdir $(CURDIR))
+INSTALL_DIR = /usr/share/arduino-0018
+
+ifdef ARDUINO_PORT
+	PORT=$(ARDUINO_PORT)
+else
+	PORT = /dev/ttyUSB0
+endif
+
+# Get these values from:
+#	 $(INSTALL_DIR)/hardware/boards.txt
+ifdef ARDUINO_BAUD
+	UPLOAD_SPEED = $(ARDUINO_BAUD)
+else
+	UPLOAD_SPEED = 57600
+endif
+
+# Get these values from:
+#	 $(INSTALL_DIR)/hardware/boards.txt
+ifdef ARDUINO_UPLOAD_PROTOCOL
+	UPLOAD_PROTOCOL = $(ARDUINO_UPLOAD_PROTOCOL)
+else
+	UPLOAD_PROTOCOL = stk500v1
+  #UPLOAD_PROTOCOL = arduino
+endif
+
+ifdef ARDUINO_BUILD_MCU
+	BUILD_MCU = $(ARDUINO_BUILD_MCU)
+else
+  #BUILD_MCU = atmega1280
+	BUILD_MCU = atmega328p
+  #BUILD_MCU = atmega168
+  #BUILD_MCU = atmega8
+endif
+
+ifdef ARDUINO_BUILD_F_MCU
+  BUILD_F_CPU = $(ARDUINO_BUILD_F_MCU)
+else
+  #BUILD_F_CPU = 20000000
+  BUILD_F_CPU = 16000000
+  #BUILD_F_CPU = 8000000
+endif
+
+############################################################################
+# Below here nothing should be changed...
+
+ARDUINO = $(INSTALL_DIR)/hardware/arduino/cores/arduino
+LIBRARIES = $(INSTALL_DIR)/hardware/libraries
+#AVR_TOOLS_PATH = $(INSTALL_DIR)/tools/avr/bin
+AVR_TOOLS_PATH = /usr/bin
+AVRDUDE_PATH = /usr/bin
+AVRDUDE_CONF_FILE = /etc/avrdude.conf
+
+SRC = pins_arduino.c wiring.c wiring_analog.c wiring_digital.c \
+	wiring_pulse.c wiring_shift.c WInterrupts.c
+
+CXXSRC = HardwareSerial.cpp WMath.cpp Print.cpp Tone.cpp
+
+FORMAT = ihex
+
+# Name of this Makefile (used for "make depend").
+MAKEFILE = Makefile
+
+# Debugging format.
+# Native formats for AVR-GCC's -g are stabs [default], or dwarf-2.
+# AVR (extended) COFF requires stabs, plus an avr-objcopy run.
+DEBUG = stabs
+
+OPT = s
+
+# Place -D or -U options here
+CDEFS = -DF_CPU=$(BUILD_F_CPU)
+CXXDEFS = -DF_CPU=$(BUILD_F_CPU)
+
+# Place -I options here
+CINCS = -I$(ARDUINO)
+CXXINCS = -I$(ARDUINO)
+
+
+# Compiler flag to set the C Standard level.
+# c89 - "ANSI" C
+# gnu89 - c89 plus GCC extensions
+# c99 - ISO C99 standard (not yet fully implemented)
+# gnu99 - c99 plus GCC extensions
+CSTANDARD = -std=gnu99
+CDEBUG = -g$(DEBUG)
+CWARN = -Wall -Wstrict-prototypes
+CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
+#CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
+
+CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
+CXXFLAGS = $(CDEFS) $(CINCS) -O$(OPT)
+#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs
+LDFLAGS = -lm
+
+# Programming support using avrdude. Settings and variables.
+AVRDUDE_PORT = $(PORT)
+AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex
+AVRDUDE_FLAGS = -V -F \
+	-p $(BUILD_MCU) -P $(AVRDUDE_PORT) -c $(UPLOAD_PROTOCOL) \
+	-b $(UPLOAD_SPEED) -C $(AVRDUDE_CONF_FILE)
+
+# Program settings
+CC = $(AVR_TOOLS_PATH)/avr-gcc
+CXX = $(AVR_TOOLS_PATH)/avr-g++
+OBJCOPY = $(AVR_TOOLS_PATH)/avr-objcopy
+OBJDUMP = $(AVR_TOOLS_PATH)/avr-objdump
+AR = $(AVR_TOOLS_PATH)/avr-ar
+SIZE = $(AVR_TOOLS_PATH)/avr-size
+NM = $(AVR_TOOLS_PATH)/avr-nm
+AVRDUDE = $(AVRDUDE_PATH)/avrdude
+REMOVE = rm -f
+MV = mv -f
+
+# Define all object files.
+OBJ = $(SRC:.c=.o) $(CXXSRC:.cpp=.o) $(ASRC:.S=.o)
+
+# Define all listing files.
+LST = $(ASRC:.S=.lst) $(CXXSRC:.cpp=.lst) $(SRC:.c=.lst)
+
+# Combine all necessary flags and optional flags.
+# Add target processor to flags.
+ALL_CFLAGS = -mmcu=$(BUILD_MCU) -I. $(CFLAGS)
+ALL_CXXFLAGS = -mmcu=$(BUILD_MCU) -I. $(CXXFLAGS)
+ALL_ASFLAGS = -mmcu=$(BUILD_MCU) -I. -x assembler-with-cpp $(ASFLAGS)
+
+# Default target.
+all: applet_files build sizeafter
+
+build: elf hex
+
+applet_files: $(TARGET).pde
+	# Here is the "preprocessing".
+	# It creates a .cpp file based with the same name as the .pde file.
+	# On top of the new .cpp file comes the WProgram.h header.
+	# At the end there is a generic main() function attached.
+	# Then the .cpp file will be compiled. Errors during compile will
+	# refer to this new, automatically generated, file.
+	# Not the original .pde file you actually edit...
+	test -d applet || mkdir applet
+	cat $(ARDUINO)/main.cpp > applet/$(TARGET).cpp
+	echo >> applet/$(TARGET).cpp
+	echo "extern \"C\" void __cxa_pure_virtual(void); " >> applet/$(TARGET).cpp
+	echo "void __cxa_pure_virtual(void) {}" >> applet/$(TARGET).cpp
+	echo >> applet/$(TARGET).cpp
+	cat $(TARGET).pde >> applet/$(TARGET).cpp
+
+
+elf: applet/$(TARGET).elf
+hex: applet/$(TARGET).hex
+eep: applet/$(TARGET).eep
+lss: applet/$(TARGET).lss
+sym: applet/$(TARGET).sym
+
+# Program the device.
+upload: applet/$(TARGET).hex
+	perl -MDevice::SerialPort -e 'Device::SerialPort->new("$(PORT)")->pulse_dtr_on(1000)'; $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
+
+# Display size of file.
+HEXSIZE = $(SIZE) --target=$(FORMAT) applet/$(TARGET).hex
+ELFSIZE = $(SIZE) applet/$(TARGET).elf
+sizebefore:
+	@if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_BEFORE); $(HEXSIZE); echo; fi
+
+sizeafter:
+	@if [ -f applet/$(TARGET).elf ]; then echo; echo $(MSG_SIZE_AFTER); $(HEXSIZE); echo; fi
+
+# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
+COFFCONVERT=$(OBJCOPY) --debugging \
+	--change-section-address .data-0x800000 \
+	--change-section-address .bss-0x800000 \
+	--change-section-address .noinit-0x800000 \
+	--change-section-address .eeprom-0x810000
+
+coff: applet/$(TARGET).elf
+	$(COFFCONVERT) -O coff-avr applet/$(TARGET).elf $(TARGET).cof
+
+extcoff: $(TARGET).elf
+	$(COFFCONVERT) -O coff-ext-avr applet/$(TARGET).elf $(TARGET).cof
+
+.SUFFIXES: .elf .hex .eep .lss .sym
+
+.elf.hex:
+	$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
+
+.elf.eep:
+	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+	--change-section-lma .eeprom=0 -O $(FORMAT) $< $@
+
+# Create extended listing file from ELF output file.
+.elf.lss:
+	$(OBJDUMP) -h -S $< > $@
+
+# Create a symbol table from ELF output file.
+.elf.sym:
+	$(NM) -n $< > $@
+
+# Link: create ELF output file from library.
+applet/$(TARGET).elf: $(TARGET).pde applet/core.a
+#applet/$(TARGET).elf: $(TARGET).cpp applet/core.a
+	$(CC) $(ALL_CFLAGS) -o $@ applet/$(TARGET).cpp -L. applet/core.a $(LDFLAGS)
+
+applet/core.a: $(OBJ)
+	@for i in $(OBJ); do echo $(AR) rcs applet/core.a $$i; $(AR) rcs applet/core.a $$i; done
+
+vpath %.cpp $(ARDUINO)
+# Compile: create object files from C++ source files.
+.cpp.o:
+	$(CXX) -c $(ALL_CXXFLAGS) $< -o $@
+
+vpath %.c $(ARDUINO)
+# Compile: create object files from C source files.
+.c.o:
+	$(CC) -c $(ALL_CFLAGS) $< -o $@
+
+# Compile: create assembler files from C source files.
+.c.s:
+	$(CC) -S $(ALL_CFLAGS) $< -o $@
+
+# Assemble: create object files from assembler source files.
+.S.o:
+	$(CC) -c $(ALL_ASFLAGS) $< -o $@
+
+# Automatic dependencies
+%.d: %.c
+	$(CC) -M $(ALL_CFLAGS) $< | sed "s;$(notdir $*).o:;$*.o $*.d:;" > $@
+
+%.d: %.cpp
+	$(CXX) -M $(ALL_CXXFLAGS) $< | sed "s;$(notdir $*).o:;$*.o $*.d:;" > $@
+
+# Target: clean project.
+clean:
+	$(REMOVE) applet/$(TARGET).hex applet/$(TARGET).eep applet/$(TARGET).cof applet/$(TARGET).elf \
+		applet/$(TARGET).map applet/$(TARGET).sym applet/$(TARGET).lss applet/core.a \
+		$(OBJ) $(LST) $(SRC:.c=.s) $(SRC:.c=.d) $(CXXSRC:.cpp=.s) $(CXXSRC:.cpp=.d) *~ .bash_history
+
+.PHONY: all build elf hex eep lss sym program coff extcoff clean applet_files sizebefore sizeafter
\ No newline at end of file
Only in hardware/arduino/cores/arduino: Makefile~