Skip to content

Commit

Permalink
Bump version to v1.5 for release
Browse files Browse the repository at this point in the history
  • Loading branch information
sudar committed Apr 7, 2015
1 parent de21423 commit 66ff5ce
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Arduino.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#
# Original Arduino adaptation by mellis, eighthave, oli.keller
#
# Current version: 1.3.4
# Current version: 1.5
#
# Refer to HISTORY.md file for complete history of changes
#
Expand Down Expand Up @@ -1134,7 +1134,7 @@ endif

########################################################################
# Tools version info
ARDMK_VERSION = 1.3.4
ARDMK_VERSION = 1.5
$(call show_config_variable,ARDMK_VERSION,[COMPUTED])

CC_VERSION := $(shell $(CC) -dumpversion)
Expand Down
4 changes: 1 addition & 3 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ A Makefile for Arduino Sketches
The following is the rough list of changes that went into different versions.
I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.

### In development
### 1.5 (2015-04-07)
- New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e)
- New: Add support for 1.5.x vendor/hardware architecture library location (Issue #276) (https://github.com/lukasz-e)
- New: Added test suite and integration with travis CI. (https://github.com/peplin)
Expand All @@ -17,7 +17,6 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- New: Support for PuTTY under Windows (https://github.com/PeterMosmans)
- New: Add support for installation using homebrew(https://github.com/ladislas)
- New: Add support and example for flashing on a remote RPi. (https://github.com/Gaboose)

- Tweak: Update Makefile-example.mk with STD flags (https://github.com/ladislas)
- Tweak: Allow remove of any OBJDIR with `$(REMOVE) $(OBJDIR)`. (https://github.com/ladislas)
- Tweak: Add cpp to extensions supported by "make generate_assembly". (https://github.com/sej7278)
Expand All @@ -33,7 +32,6 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- Tweak: Add = to PARSE_BOARD regex to make it less greedy and not match vid.0, vid.1 and vid (https://github.com/sej7278)
- Tweak: Added note about clock submenu's being used as F_CPU (https://github.com/sej7278)
- Tweak: Better autodetection of ARDUINO_SKETCHBOOK and ARDUINO_DIR on OSX (https://github.com/sej7278)

- Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans)
- Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas)
- Fix: Make avr-g++ use CXXFLAGS instead of CFLAGS. (https://github.com/sej7278)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ See examples/BlinkTeensy for example usage.

## Versioning

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

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

Expand Down
6 changes: 3 additions & 3 deletions ard-reset-arduino.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH ARD-RESET-ARDUINO "1" "April 2014" "ard-reset-arduino 1.3.4" "Arduino CLI Reset"
.TH ARD-RESET-ARDUINO "1" "April 2015" "ard-reset-arduino 1.5" "Arduino CLI Reset"

.SH NAME
ard-reset-arduino - Reset Arduino board
Expand All @@ -8,7 +8,7 @@ ard-reset-arduino - Reset Arduino board
[OPTION]... [PORT]

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

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

.SH BUGS
There are no known bugs in this application. Please report problems
There are no known bugs in this application. Please report problems
to the author. Patches are welcome.

.SH AUTHOR
Expand Down
4 changes: 2 additions & 2 deletions packaging/fedora/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ First install the dependencies as root:

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:

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

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

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

Then copy the tarball and specfile into those directories:

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

Then compile. This will create a binary and source RPM:
Expand Down
2 changes: 1 addition & 1 deletion packaging/fedora/arduino-mk.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: arduino-mk
Version: 1.3.4
Version: 1.5
Release: 1%{dist}
Summary: Program your Arduino from the command line
Packager: Simon John <[email protected]>
Expand Down

7 comments on commit 66ff5ce

@sej7278
Copy link
Collaborator

@sej7278 sej7278 commented on 66ff5ce Apr 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sudar - Fedora/Debian packages here

Tested on Fedora 20/1.0.5, Raspbian Wheezy/1.0.1 and Debian Jessie/1.6.3

After the Jessie release we'll have to send to ScottH @maqifrnswa

@sudar
Copy link
Owner Author

@sudar sudar commented on 66ff5ce Apr 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sej7278 Thanks for all the hard work in getting this release out :)

@sej7278
Copy link
Collaborator

@sej7278 sej7278 commented on 66ff5ce Apr 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its been a big release hasn't it - 133 commits (1616 insertions, 205 deletions) from 16 contributors in 270 days!

@maqifrnswa
Copy link
Contributor

@maqifrnswa maqifrnswa commented on 66ff5ce Apr 7, 2015 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sej7278
Copy link
Collaborator

@sej7278 sej7278 commented on 66ff5ce Apr 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maqifrnswa yes i don't envy you trying to package ide 1.6, especially with all the new jssc and java8 cruft. luckily it doesn't depend on avr-gcc 4.9 or we'd really be in trouble.

p.s. note that we don't support the arm sam stuff yet, mainly because the toolchain hasn't stabilised and we don't have any sam boards to test with.

@maqifrnswa
Copy link
Contributor

@maqifrnswa maqifrnswa commented on 66ff5ce Apr 7, 2015 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sej7278
Copy link
Collaborator

@sej7278 sej7278 commented on 66ff5ce Apr 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well the way 1.6 is going its possibly easiest just to let the users download the sam toolkit to their home directories with the ide, no way you can package that anyway.

if the licensing issue includes sam libraries it'll be more difficult.

Please sign in to comment.