Fixed a bug in catch and added debian building for launchpad

dcdillon · dcdillon · commit 689131016988 · 2015-09-13T17:00:58.000-05:00
diff --git a/Makefile.am b/Makefile.am
@@ -1,3 +1,2 @@
 SUBDIRS = include examples tests
 TESTS = tests/test
-EXTRA_DIST=debian
diff --git a/cleanup.sh b/cleanup.sh
@@ -25,3 +25,4 @@ rm -rf Makefile.in \
 ## remove (maybe) some other generated files
 rm -rf deb
 rm -rf cpuaff*.tar.gz
+rm -rf deb.*
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT(cpuaff,1.0.0,dcdillon@gmail.com,cpuaff)
+AC_INIT(cpuaff,1.0.2,dcdillon@gmail.com,cpuaff)
 AM_INIT_AUTOMAKE
 AC_OUTPUT(Makefile include/Makefile examples/Makefile tests/Makefile)
 AC_CONFIG_HEADERS([config.h])
diff --git a/dch b/dch
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+VERSION=""
+
+while getopts "v:" opt; do
+    case $opt in
+        v)
+            VERSION=$OPTARG
+            shift 2
+            ;;
+    esac
+done
+
+dch -v $VERSION~vivid -c debian.vivid/changelog -D vivid $*
+dch -v $VERSION~trusty -c debian.trusty/changelog -D trusty $*
+dch -v $VERSION~precise -c debian.precise/changelog -D precise $*
diff --git a/debian.precise/changelog b/debian.precise/changelog
@@ -0,0 +1,11 @@
+libcpuaff (1.0.2-1~precise) precise; urgency=medium
+
+  * Working on first launchpad build
+
+ -- Daniel C. Dillon <dcdillon@gmail.com>  Sun, 13 Sep 2015 15:46:31 -0500
+
+libcpuaff (1.0.2-0) unstable; urgency=low
+
+  * Initial release
+
+ -- Daniel C. Dillon <dcdillon@gmail.com>  Sun, 13 Sep 2015 15:21:04 -0500
diff --git a/debian.precise/compat b/debian.precise/compat
diff --git a/debian.precise/control b/debian.precise/control
@@ -1,12 +1,13 @@
-Source: libcpuaff-dev
-Maintainer: Daniel C. Dillon <dcdillon@gmail.com>
-Section: libdevel
+Source: libcpuaff
 Priority: optional
+Maintainer: Daniel C. Dillon <dcdillon@gmail.com>
+Build-Depends: debhelper (>= 9), autotools-dev
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9)
+Section: libs
 
 Package: libcpuaff-dev
-Architecture: all
+Section: libdevel
+Architecture: any
 Depends: ${misc:Depends}
 Description: C++ header only library for managing CPU affinity.
  cpuaff provides an interface to cpu affinity management that
diff --git a/debian.precise/copyright b/debian.precise/copyright
diff --git a/debian.precise/rules b/debian.precise/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+# main packaging script based on dh7 syntax
+%:
+	dh $@  --with autotools-dev
+
+# debmake generated override targets
+# This is example for Cmake (See http://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+
+
+
diff --git a/debian.precise/source/format b/debian.precise/source/format
diff --git a/debian.trusty/changelog b/debian.trusty/changelog
@@ -0,0 +1,11 @@
+libcpuaff (1.0.2-1~trusty) trusty; urgency=medium
+
+  * Working on first launchpad build
+
+ -- Daniel C. Dillon <dcdillon@gmail.com>  Sun, 13 Sep 2015 15:46:31 -0500
+
+libcpuaff (1.0.2-0) unstable; urgency=low
+
+  * Initial release
+
+ -- Daniel C. Dillon <dcdillon@gmail.com>  Sun, 13 Sep 2015 15:21:04 -0500
diff --git a/debian.trusty/compat b/debian.trusty/compat
@@ -0,0 +1 @@
+9
diff --git a/debian.trusty/control b/debian.trusty/control
@@ -0,0 +1,14 @@
+Source: libcpuaff
+Priority: optional
+Maintainer: Daniel C. Dillon <dcdillon@gmail.com>
+Build-Depends: debhelper (>= 9), autotools-dev
+Standards-Version: 3.9.6
+Section: libs
+
+Package: libcpuaff-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}
+Description: C++ header only library for managing CPU affinity.
+ cpuaff provides an interface to cpu affinity management that
+ addresses cores by numa, socket, core, and processing unit.
diff --git a/debian.trusty/copyright b/debian.trusty/copyright
@@ -0,0 +1,28 @@
+Copyright (c) 2015, Daniel C. Dillon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of cpuaff nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/debian.trusty/rules b/debian.trusty/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+# main packaging script based on dh7 syntax
+%:
+	dh $@  --with autotools-dev
+
+# debmake generated override targets
+# This is example for Cmake (See http://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+
+
+
diff --git a/debian.trusty/source/format b/debian.trusty/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian.vivid/changelog b/debian.vivid/changelog
@@ -0,0 +1,11 @@
+libcpuaff (1.0.2-1~vivid) vivid; urgency=medium
+
+  * Working on first launchpad build
+
+ -- Daniel C. Dillon <dcdillon@gmail.com>  Sun, 13 Sep 2015 15:46:31 -0500
+
+libcpuaff (1.0.2-0) unstable; urgency=low
+
+  * Initial release
+
+ -- Daniel C. Dillon <dcdillon@gmail.com>  Sun, 13 Sep 2015 15:21:04 -0500
diff --git a/debian.vivid/compat b/debian.vivid/compat
@@ -0,0 +1 @@
+9
diff --git a/debian.vivid/control b/debian.vivid/control
@@ -0,0 +1,14 @@
+Source: libcpuaff
+Priority: optional
+Maintainer: Daniel C. Dillon <dcdillon@gmail.com>
+Build-Depends: debhelper (>= 9), autotools-dev
+Standards-Version: 3.9.6
+Section: libs
+
+Package: libcpuaff-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}
+Description: C++ header only library for managing CPU affinity.
+ cpuaff provides an interface to cpu affinity management that
+ addresses cores by numa, socket, core, and processing unit.
diff --git a/debian.vivid/copyright b/debian.vivid/copyright
@@ -0,0 +1,28 @@
+Copyright (c) 2015, Daniel C. Dillon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of cpuaff nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/debian.vivid/rules b/debian.vivid/rules
@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+# main packaging script based on dh7 syntax
+%:
+	dh $@  --with autotools-dev
+
+# debmake generated override targets
+# This is example for Cmake (See http://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+
+
+
diff --git a/debian.vivid/source/format b/debian.vivid/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/changelog b/debian/changelog
diff --git a/debian/rules b/debian/rules
diff --git a/format_code b/format_code
diff --git a/generate_deb b/generate_deb
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# Copyright (c) 2015, Daniel C. Dillon
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+rm -rf deb.*
+rm -rf *.tar.gz
+
+./cleanup.sh
+./bootstrap.sh
+./configure
+make dist
+
+for DIST in $*; do
+    mkdir deb.$DIST
+    cp *.tar.gz deb.$DIST
+
+    pushd deb.$DIST
+
+    PACKAGE=`ls *.tar.gz | grep -Po '^[A-Za-z]+'`
+    DEBPACKAGE=`echo $PACKAGE | sed -r 's/([A-Z])/-\1/g' | tr '[:upper:]' '[:lower:]'`
+    VERSION=`ls *.tar.gz | grep -Po '[0-9]+\.[0-9]+\.[0-9]+'`
+    mv ${PACKAGE}-${VERSION}.tar.gz lib${DEBPACKAGE}_${VERSION}.orig.tar.gz
+    tar -xzf lib${DEBPACKAGE}_${VERSION}.orig.tar.gz
+    mv ${PACKAGE}-${VERSION} lib${DEBPACKAGE}-${VERSION}
+    pushd lib${DEBPACKAGE}-${VERSION}
+    cp -r ../../debian.$DIST ./debian
+
+    debuild -S -sa -uc -us -rfakeroot
+
+    popd
+
+    popd
+done
diff --git a/generate_doc b/generate_doc
diff --git a/publish b/publish
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Copyright (c) 2015, Daniel C. Dillon
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+./generate_deb $*
+
+for DIST in $*; do
+    pushd deb.$DIST
+
+    CHANGES=`ls *.changes | tail -1`
+    debsign $CHANGES
+    dput ppa:dcdillon/ppa $CHANGES
+
+    popd
+done
diff --git a/scripts/generate_deb b/scripts/generate_deb
diff --git a/tests/catch.hpp b/tests/catch.hpp

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`SUBDIRS = include examples tests`
`2`	`2`	`TESTS = tests/test`
`3`		`-EXTRA_DIST=debian`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,11 @@ @@
 +libcpuaff (1.0.2-1~precise) precise; urgency=medium
++
 +  * Working on first launchpad build
++
 + -- Daniel C. Dillon <[email protected]>  Sun, 13 Sep 2015 15:46:31 -0500
++
 +libcpuaff (1.0.2-0) unstable; urgency=low
++
 +  * Initial release
++
 + -- Daniel C. Dillon <[email protected]>  Sun, 13 Sep 2015 15:21:04 -0500