RELEASE: 0.2.2

Merge branch 'release/0.2.2'

Author: krayon

AUTHORS.creole

@@ -0,0 +1,9 @@
+= RatSlap Authors =
+
+[[ http://www.qdnx.org/krayon/ | Krayon (Todd Harbour) ]]
+
+== RatSlap Contributors ==
+
+-
+
+<<< vim:set ts=4 sw=4 tw=80 et cindent ai si syn=creole: >>>

CONTRIBUTING.creole

@@ -0,0 +1,14 @@
+= Contributing =
+
+== Pull Requests ==
+
+If you have a pull request (PR) for a change or a fix, please try to base your
+changes off develop unless it's a serious security issue with a specific release
+in which case base it off that.
+
+Don't be too concerned if you can't deside, an incorrectly targeted PR is better
+than no PR :D
+
+... and Thank you.
+
+<<< vim:set ts=4 sw=4 tw=80 et cindent ai si syn=creole: >>>

CONTRIBUTORS.creole

@@ -0,0 +1 @@
+AUTHORS.creole

COPYING

@@ -0,0 +1 @@
+LICENSE

Makefile

@@ -84,32 +84,35 @@ CFLAGS        += $(CARCH_FLAG) $(CPU_FLAG) $(OPT_FLAGS) $(BUILDOPTS) $(shell pkg
 APPNAME        = $(shell sed -n 's/^[ \t]*\#define[ \t]*APP_NAME[ \t]*"\([^"]*\)".*$$/\1/p'    app.h)
 BINNAME        = $(shell sed -n 's/^[ \t]*\#define[ \t]*BIN_NAME[ \t]*"\([^"]*\)".*$$/\1/p'    app.h)
 
-# Retrieve version
+# Retrieve version from git
 #     This is something like:
-#         1.10.5-3-g6ab5527-dirty
+#         1.10.5-3-g6ab5527-dirty-ft-cool
 #     Where:
-#         1.10.5                  == tag
-#               -3                == 3 commits ahead of tag
-#                 -g6ab5527       == commit starting with g6ab5527
-#                          -dirty == some files are not in the repository
-#APPVER="$(shell grep _APP_VERSION app.h|head -1|cut -d'"' -f2)"
+#         1.10.5                          == tag / major version
+#               -3                        == 3 commits ahead of tag
+#                 -g6ab5527               == 'g'it commit starting with 6ab5527
+#                          -dirty         == some files here changed or not in repository
+#                                -ft-cool == ft-cool branch
+MAJVER = $(shell bash -c \
+	'\
+	  echo -n "$$(git describe --always --tags --match="*" --dirty)" \
+	')
+
 APPBRANCH = $(shell bash -c \
 	'\
-        ( \
-		  n="$$(git name-rev --always --name-only --no-undefined HEAD)"; \
-		  [ "$${n}" != "master" ] && echo -n "$${n}" || true \
-		) \
+	  git name-rev --always --name-only --no-undefined HEAD|sed "s@feature/@ft-@;s@hotfix/\(.*\)@\1.HF@;s@release/\(.*\)@\1.PRE@"\
 	')
+#APPVER="$(shell grep _APP_VERSION app.h|head -1|cut -d'"' -f2)"
 APPVER = $(shell bash -c \
-    '\
-        git describe          --tags --match="*" --dirty &>/dev/null \
-    &&  git describe --always --tags --match="*" --dirty             \
-    ||  (echo -n "$(APPBRANCH)-"; git describe --always --tags --dirty)     \
-    ')
+	'\
+	  echo -n "$(MAJVER)"; \
+	  [ ! -z "$(APPBRANCH)" ] && [ "$(APPBRANCH)" != "master" ] && [ "$(APPBRANCH)" != "$(MAJVER)" ] && echo -n "-$(APPBRANCH)" \
+	')
 
 BUILD_DATE     = $(shell date +'%Y-%m-%d %H:%M:%S%z')
 BUILD_MONTH    = $(shell date +'%B')
 BUILD_YEAR     = $(shell date +'%Y')
+BUILD_COMMIT   = $(shell git rev-parse --verify 'HEAD^{commit}')
 
 ARCHIVE_NAME   = $(BINNAME)-$(APPVER)
 ARCHIVE_FILE   = $(ARCHIVE_NAME).$(ARCHIVE_EXT)
@@ -151,6 +154,7 @@ git.h: gitup git.h.TEMPLATE
 	@sed -i 's#//SOURCE//#// WARNING // Auto-generated file, DO NOT MODIFY //#' git.h
 	@sed -i 's#\%\%APP_VERSION\%\%#$(APPVER)#'                                  git.h
 	@sed -i 's#\%\%BUILD_DATE\%\%#$(BUILD_DATE)#'                               git.h
+	@sed -i 's#\%\%BUILD_COMMIT\%\%#$(BUILD_COMMIT)#'                           git.h
 
 log.h: log.h.TEMPLATE
 	@# Generating log header

README.creole

@@ -26,7 +26,14 @@
 == Introduction ==
 
 //RatSlap// aims to provide a way to configure configurable Logitech mice from
-within Linux.
+within Linux. It is licensed under the GNU GPL version 2. For more information,
+see [[LICENSE]] / [[COPYING]] .
+
+For a list of authors and contributors, see [[AUTHORS.creole]] /
+[[CONTRIBUTORS.creole]] .
+
+For more information on contributing (new feature, bug fix, pull request etc),
+please see [[CONTRIBUTING.creole]] .
 
 == Availability ==
 
@@ -246,6 +253,9 @@ tool cannot do).
 ** [[https://bugs.qdnx.org/bug/117|QB#117 - Compile fails when ctags missing]]
 ** Prettier Changelog
 ** Added man page
+* v0.2.2
+** [[https://bugs.qdnx.org/121|QB#121 - set_debug is deprecated, use libusb_set_option instead]]
+** Added some documentation: AUTHORS, CONTRIBUTING
 
 == TODO ==
 

git.h.TEMPLATE

@@ -30,7 +30,8 @@
 #define   GIT_H
 
 // SemVer ( Semantic Versioning - http://semver.org/ )
-#define APP_VERSION "%%APP_VERSION%%"
-#define BUILD_DATE  "%%BUILD_DATE%%"
+#define APP_VERSION  "%%APP_VERSION%%"
+#define BUILD_DATE   "%%BUILD_DATE%%"
+#define BUILD_COMMIT "%%BUILD_COMMIT%%"
 
 #endif /* GIT_H */

main.c

@@ -551,7 +551,12 @@ static libusb_context *usb_init(void) {
     }
 
     // FIXME: Set debug?
+    
+#if LIBUSBX_API_VERSION < 0x01000106
     libusb_set_debug(usb_ctx, 3);
+#else
+    libusb_set_option(usb_ctx, LIBUSB_OPTION_LOG_LEVEL, 3);
+#endif
 
     return usb_ctx;
 }