Skip to content

Commit 66ff5ce

Browse files
committed
Bump version to v1.5 for release
1 parent de21423 commit 66ff5ce

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

Arduino.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020
# Original Arduino adaptation by mellis, eighthave, oli.keller
2121
#
22-
# Current version: 1.3.4
22+
# Current version: 1.5
2323
#
2424
# Refer to HISTORY.md file for complete history of changes
2525
#
@@ -1134,7 +1134,7 @@ endif
11341134

11351135
########################################################################
11361136
# Tools version info
1137-
ARDMK_VERSION = 1.3.4
1137+
ARDMK_VERSION = 1.5
11381138
$(call show_config_variable,ARDMK_VERSION,[COMPUTED])
11391139

11401140
CC_VERSION := $(shell $(CC) -dumpversion)

HISTORY.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ A Makefile for Arduino Sketches
44
The following is the rough list of changes that went into different versions.
55
I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
66

7-
### In development
7+
### 1.5 (2015-04-07)
88
- New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e)
99
- New: Add support for 1.5.x vendor/hardware architecture library location (Issue #276) (https://github.com/lukasz-e)
1010
- New: Added test suite and integration with travis CI. (https://github.com/peplin)
@@ -17,7 +17,6 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
1717
- New: Support for PuTTY under Windows (https://github.com/PeterMosmans)
1818
- New: Add support for installation using homebrew(https://github.com/ladislas)
1919
- New: Add support and example for flashing on a remote RPi. (https://github.com/Gaboose)
20-
2120
- Tweak: Update Makefile-example.mk with STD flags (https://github.com/ladislas)
2221
- Tweak: Allow remove of any OBJDIR with `$(REMOVE) $(OBJDIR)`. (https://github.com/ladislas)
2322
- Tweak: Add cpp to extensions supported by "make generate_assembly". (https://github.com/sej7278)
@@ -33,7 +32,6 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
3332
- Tweak: Add = to PARSE_BOARD regex to make it less greedy and not match vid.0, vid.1 and vid (https://github.com/sej7278)
3433
- Tweak: Added note about clock submenu's being used as F_CPU (https://github.com/sej7278)
3534
- Tweak: Better autodetection of ARDUINO_SKETCHBOOK and ARDUINO_DIR on OSX (https://github.com/sej7278)
36-
3735
- Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans)
3836
- Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas)
3937
- Fix: Make avr-g++ use CXXFLAGS instead of CFLAGS. (https://github.com/sej7278)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ See examples/BlinkTeensy for example usage.
236236

237237
## Versioning
238238

239-
The current version of the makefile is `1.3.4`. You can find the full history in the [HISTORY.md](HISTORY.md) file
239+
The current version of the makefile is `1.5`. You can find the full history in the [HISTORY.md](HISTORY.md) file
240240

241241
This project adheres to Semantic [Versioning 2.0](http://semver.org/).
242242

ard-reset-arduino.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH ARD-RESET-ARDUINO "1" "April 2014" "ard-reset-arduino 1.3.4" "Arduino CLI Reset"
1+
.TH ARD-RESET-ARDUINO "1" "April 2015" "ard-reset-arduino 1.5" "Arduino CLI Reset"
22

33
.SH NAME
44
ard-reset-arduino - Reset Arduino board
@@ -8,7 +8,7 @@ ard-reset-arduino - Reset Arduino board
88
[OPTION]... [PORT]
99

1010
.SH DESCRIPTION
11-
To reset Arduinos, we either pulse the DTR line or open the USB port
11+
To reset Arduinos, we either pulse the DTR line or open the USB port
1212
at 1200 baud and close it again.
1313

1414
.SH OPTIONS
@@ -29,7 +29,7 @@ ard-reset-arduino \-\-verbose \-\-period=0.1 /dev/cu.usb*
2929
ard-reset-arduino \-\-verbose \-\-caterina /dev/ttyUSB0
3030

3131
.SH BUGS
32-
There are no known bugs in this application. Please report problems
32+
There are no known bugs in this application. Please report problems
3333
to the author. Patches are welcome.
3434

3535
.SH AUTHOR

packaging/fedora/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ First install the dependencies as root:
66

77
From the top-level Arduino-Makefile directory you've checked out of github, run the following (as unprivileged user) to create a compressed tarball using the naming conventions required by rpmbuild:
88

9-
git archive HEAD --prefix=arduino-mk-1.3.4/ -o ../arduino-mk-1.3.4.tar.gz
9+
git archive HEAD --prefix=arduino-mk-1.5/ -o ../arduino-mk-1.5.tar.gz
1010

1111
If you don't already have a rpmbuild setup (e.g. you've not installed the SRPM) you will need to create the directories:
1212

1313
mkdir -p ~/rpmbuild/{SOURCES,SPECS}
1414

1515
Then copy the tarball and specfile into those directories:
1616

17-
cp ../arduino-mk-1.3.4.tar.gz ~/rpmbuild/SOURCES/
17+
cp ../arduino-mk-1.5.tar.gz ~/rpmbuild/SOURCES/
1818
cp packaging/fedora/arduino-mk.spec ~/rpmbuild/SPECS/
1919

2020
Then compile. This will create a binary and source RPM:

packaging/fedora/arduino-mk.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: arduino-mk
2-
Version: 1.3.4
2+
Version: 1.5
33
Release: 1%{dist}
44
Summary: Program your Arduino from the command line
55
Packager: Simon John <[email protected]>

0 commit comments

Comments
 (0)