Skip to content

Commit

Permalink
Verison 1.2 bump.
Browse files Browse the repository at this point in the history
Signed-off-by: Phil Dibowitz <[email protected]>
  • Loading branch information
jaymzh committed Apr 7, 2015
1 parent a9925bc commit f324e52
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 17 deletions.
9 changes: 9 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
1.2
Released: 04/06/15
[email protected]:
- Build fixes for non-Linux Debian platforms
[email protected]
- Add Ultimate One, 350, Touch, and Home Hub support
- Fix buffer overrun crash in website communications
- Windows install/documentation fixes

1.1
Released: 03/28/14
[email protected]:
Expand Down
17 changes: 7 additions & 10 deletions ReleaseChecklist
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
- Check ABI/API version
(http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html)
* If bumping, bump in:
* Makefile.am
- use libtool versioning
* libconcord.py
- only need the _current_ part of the version
* The libtooling versioning has a variety of issues. We simply use a single
integer for our so-version and we bump it anytime we change the API for
safety (i.e. libconcord.h)
* vi libconcord/Makefile.am libconcord/bindings/python/libconcord.py \
concordance/configure.ac

- Bump concordance version number
* concordance/concordance.c
* concordance/configure.ac
* libconcord/configure.ac
* libconcord/bindings/python/setup.py
* vi concordance/concordance.c concordance/configure.ac \
libconcord/configure.ac libconcord/bindings/python/setup.py

- Check for old version:
* fgrep -R '0.20' *
Expand Down
2 changes: 1 addition & 1 deletion concordance/concordance.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ int set_canon(int flag)
#define DEFAULT_FW_FILENAME_BIN "firmware.bin"
#define DEFAULT_SAFE_FILENAME "safe.bin"

const char * const VERSION = "1.1+git";
const char * const VERSION = "1.2";

struct options_t {
int binary;
Expand Down
4 changes: 2 additions & 2 deletions concordance/configure.ac
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
AC_INIT([concordance], [1.1+git], [[email protected]])
AC_INIT([concordance], [1.2], [[email protected]])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_PROG_CC_C_O
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_LIBTOOL
AC_PROG_CXX
AC_CANONICAL_HOST
LIBCONCORD_VERSION="3"
LIBCONCORD_VERSION="4"
case $host_os in
darwin*)
LIBCONCORD_LDFLAGS="-lconcord.$LIBCONCORD_VERSION"
Expand Down
2 changes: 1 addition & 1 deletion libconcord/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ libconcord_la_SOURCES = remote.cpp remote_z.cpp libconcord.cpp binaryfile.cpp \
operationfile.cpp remote_mh.cpp libusbhid.cpp libhidapi.cpp
include_HEADERS = libconcord.h
libconcord_la_CPPFLAGS = -Wall
libconcord_la_LDFLAGS = -version-info 3:0:0 $(LIBCONCORD_LDFLAGS) -lzip
libconcord_la_LDFLAGS = -version-info 4:0:0 $(LIBCONCORD_LDFLAGS) -lzip
libconcord_la_CXXFLAGS = $(ZIP_CFLAGS)
UDEVROOT ?= /
UDEVLIBDIR ?= $(UDEVROOT)/lib
Expand Down
2 changes: 1 addition & 1 deletion libconcord/bindings/python/libconcord.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# Define the libconcord ABI this libconcord.py corresponds to
# Bump this when the .so file version gets bumped

ABI_VERSION = 3
ABI_VERSION = 4

# Load the DLL

Expand Down
2 changes: 1 addition & 1 deletion libconcord/bindings/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

setup(
name='libconcord',
version='1.1',
version='1.2',
py_modules=['libconcord'],
)

2 changes: 1 addition & 1 deletion libconcord/configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([libconcord], [1.1+git], [[email protected]])
AC_INIT([libconcord], [1.2], [[email protected]])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
Expand Down

0 comments on commit f324e52

Please sign in to comment.