Merge branch 'master' of github.com:pimoroni/cap1xxx

Author: Gadgetoid

.gitignore

@@ -18,3 +18,5 @@ library/debian/
 packaging/*tar.xz
 pip-log.txt
 pip-delete-this-directory.txt
+.DS_Store
+

README.md

@@ -0,0 +1,3 @@
+# Cap1xxx
+
+Python library for Microchip Capacitive Touch devices in the Cap1xxx family.

library/CHANGELOG.txt

@@ -1,15 +1,15 @@
 0.1.2
-    -----
+-----
 
 * Initial commit to Raspbian apt repository
 
 0.1.1
-    -----
+-----
 
 * Increased delay in polling loop to avoid CPU hogging
 
 0.0.2
-    -----
+-----
 
 * Many little bugfixes, for an actually working library
 

library/cap1xxx.py

@@ -8,23 +8,24 @@
 
 import atexit
 import signal
-import sys
 import threading
 import time
+from sys import exit, version_info
 
 try:
     from smbus import SMBus
 except ImportError:
-    if sys.version_info[0] < 3:
+    if version_info[0] < 3:
         exit("This library requires python-smbus\nInstall with: sudo apt-get install python-smbus")
-    elif sys.version_info[0] == 3:
+    elif version_info[0] == 3:
         exit("This library requires python3-smbus\nInstall with: sudo apt-get install python3-smbus")
 
 try:
     import RPi.GPIO as GPIO
 except ImportError:
     exit("This library requires the RPi.GPIO module\nInstall with: sudo pip install RPi.GPIO")
 
+__version__ = '0.1.2'
 
 # DEVICE MAP
 DEFAULT_ADDR = 0x28

packaging/makeall.sh

@@ -2,8 +2,9 @@
 
 # script control variables
 
-reponame="cap1xxx" # leave this blank for auto-detection
-libname="cap1xxx" # leave this blank for auto-detection
+reponame="" # leave this blank for auto-detection
+libname="" # leave this blank for auto-detection
+packagename="" # leave this blank for auto-selection
 
 debianlog="debian/changelog"
 debcontrol="debian/control"
@@ -51,15 +52,21 @@ if [ -z "$reponame" ]; then
         repodir="$rootdir"
         reponame="$(basename $repodir)"
     fi
+    reponame=$(echo "$reponame" | tr "[A-Z]" "[a-z]")
 fi
 
 if [ -z "$libname" ]; then
     cd "$libdir"
     libname=$(grep "name" setup.py | tr -d "[:space:]" | cut -c 7- | rev | cut -c 3- | rev)
-    cd "$debdir"
+    libname=$(echo "$libname" | tr "[A-Z]" "[a-z]") && cd "$debdir"
+fi
+
+if [ -z "$packagename" ]; then
+    packagename="$libname"
 fi
 
 echo "reponame is $reponame and libname is $libname"
+echo "output packages will be python-$packagename and python3-$packagename"
 
 # checking generating changelog file
 
@@ -82,31 +89,31 @@ fi
 
 inform "checking debian/copyright file..."
 
-if ! grep "^Source" $debcopyright | grep "$libname" $debcopyright &> /dev/null; then
+if ! grep "^Source" $debcopyright | grep "$reponame" &> /dev/null; then
     warning "$(grep "^Source" $debcopyright)" && FLAG=true
 fi
 
-if ! grep "^Upstream-Name" $debcopyright | grep "$libname" $debcopyright &> /dev/null; then
+if ! grep "^Upstream-Name" $debcopyright | grep "$libname" &> /dev/null; then
     warning "$(grep "^Upstream-Name" $debcopyright)" && FLAG=true
 fi
 
 # checking debian/control file
 
 inform "checking debian/control file..."
 
-if ! grep "^Source" $debcontrol | grep "$libname" $debcontrol &> /dev/null; then
+if ! grep "^Source" $debcontrol | grep "$libname" &> /dev/null; then
     warning "$(grep "^Source" $debcontrol)" && FLAG=true
 fi
 
-if ! grep "^Homepage" $debcontrol | grep "$reponame" $debcontrol &> /dev/null; then
+if ! grep "^Homepage" $debcontrol | grep "$reponame" &> /dev/null; then
     warning "$(grep "^Homepage" $debcontrol)" && FLAG=true
 fi
 
-if ! grep "^Package: python-$libname" $debcontrol &> /dev/null; then
+if ! grep "^Package: python-$packagename" $debcontrol &> /dev/null; then
     warning "$(grep "^Package: python-" $debcontrol)" && FLAG=true
 fi
 
-if ! grep "^Package: python3-$libname" $debcontrol &> /dev/null; then
+if ! grep "^Package: python3-$packagename" $debcontrol &> /dev/null; then
     warning "$(grep "^Package: python3-" $debcontrol)" && FLAG=true
 fi
 
@@ -119,11 +126,11 @@ fi
 
 inform "checking debian/rules file..."
 
-if ! grep "debian/python-$libname" $debrules &> /dev/null; then
+if ! grep "debian/python-$packagename" $debrules &> /dev/null; then
     warning "$(grep "debian/python-" $debrules)" && FLAG=true
 fi
 
-if ! grep "debian/python3-$libname" $debrules &> /dev/null; then
+if ! grep "debian/python3-$packagename" $debrules &> /dev/null; then
     warning "$(grep "debian/python3-" $debrules)" && FLAG=true
 fi
 

packaging/makedeb.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-gettools="yes"
+gettools="no"
 setup="yes"
 cleanup="yes"
 pkgfiles=( "build" "changes" "deb" "dsc" "tar.xz" )

packaging/makelog.sh

@@ -1,18 +1,82 @@
 #!/bin/bash
 
+# script control variables
+
+libname="" # leave this blank for auto-detection
+sibname=() # name of sibling in packages list
+versionwarn="yes" # set to anything but 'yes' to turn off warning
+
+debdir="$(pwd)"
+rootdir="$(dirname $debdir)"
+libdir="$rootdir/library"
+
 mainlog="CHANGELOG"
 debianlog="debian/changelog"
-pypilog="../library/CHANGELOG.txt"
+pypilog="$libdir/CHANGELOG.txt"
+
+# function define
+
+success() {
+    echo "$(tput setaf 2)$1$(tput sgr0)"
+}
+
+inform() {
+    echo "$(tput setaf 6)$1$(tput sgr0)"
+}
+
+warning() {
+    echo "$(tput setaf 1)$1$(tput sgr0)"
+}
+
+newline() {
+    echo ""
+}
 
 # generate debian changelog
 
 cat $mainlog > $debianlog
+inform "seeded debian changelog"
 
 # generate pypi changelog
 
 sed -e "/--/d" -e "s/  \*/\*/" \
     -e "s/.*\([0-9].[0-9].[0-9]\).*/\1/" \
     -e '/[0-9].[0-9].[0-9]/ a\
-    -----' $mainlog | cat -s > $pypilog
+-----' $mainlog | cat -s > $pypilog
+
+version=$(head -n 1 $pypilog)
+inform "pypi changelog generated"
+
+# touch up version in setup.py file
+
+if [ -n $(grep version "$libdir/setup.py" &> /dev/null) ]; then
+    inform "touched up version in setup.py"
+    sed -i "s/'[0-9].[0-9].[0-9]'/'$version'/" "$libdir/setup.py"
+else
+    warning "couldn't touch up version in setup, no match found"
+fi
+
+# touch up version in lib or package siblings
+
+if [ -z "$libname" ]; then
+    cd "$libdir"
+    libname=$(grep "name" setup.py | tr -d "[:space:]" | cut -c 7- | rev | cut -c 3- | rev)
+    libname=$(echo "$libname" | tr "[A-Z]" "[a-z]") && cd "$debdir"
+    sibname+=( "$libname" )
+elif [ "$libname" != "package" ]; then
+    sibname+=( "$libname" )
+fi
+
+for sibling in ${sibname[@]}; do
+    if grep -e "__version__" "$libdir/$sibling.py" &> /dev/null; then
+        sed -i "s/__version__ = '[0-9].[0-9].[0-9]'/__version__ = '$version'/" "$libdir/$sibling.py"
+        inform "touched up version in $sibling.py"
+    elif grep -e "__version__" "$libdir/$sibling/__init__.py" &> /dev/null; then
+        sed -i "s/__version__ = '[0-9].[0-9].[0-9]'/__version__ = '$version'/" "$libdir/$sibling/__init__.py"
+        inform "touched up version in $sibling/__init__.py"
+    elif [ "$versionwarn" == "yes" ]; then
+        warning "couldn't touch up __version__ in $sibling, no match found"
+    fi
+done
 
 exit 0