pkg-config and add gitignore.

This commit is contained in:
Kyle 2016-01-28 00:17:22 -08:00
parent 1d100ffb76
commit c7fd93112e
13 changed files with 132 additions and 9 deletions

59
.gitignore vendored Normal file
View File

@ -0,0 +1,59 @@
*.o
*.lo
*.a
*.la
*.dirstamp
*.pc
*.log
*.trs
TAGS
tags
core*
# autoconf output
autom4te.cache
*.in
!/src/libemsha-1.pc.in
config.*
compile
*.m4
configure
depcomp
*.info
mdate-sh
stamp-*
texinfo.tex
version.texi
install-sh
missing
Makefile
.deps
.libs
libtool
ltmain.sh
RELEASE_NOTES
debian/files
debian/libemsha-1.postinst.debhelper
debian/libemsha-1.postrm.debhelper
debian/libemsha-1.substvars
debian/libemsha-1/
debian/libemsha-dev.substvars
debian/libemsha-dev/
debian/shlibs.local
debian/source/
debian/tmp/
doc/source/header.dated.rst
doc/source/header.rst
src/cov-int/
src/emsha_core_test
src/emsha_hmac_test
src/emsha_mem_test
src/emsha_sha256_test
src/emsha_static_hmac_test
src/emsha_static_mem_test
src/emsha_static_sha_test
src/libemsha.tgz
doc/source/conf.py
/test-driver
do-release

View File

@ -12,6 +12,7 @@ addons:
- clang - clang
- python-sphinx - python-sphinx
- python-sphinx-rtd-theme - python-sphinx-rtd-theme
- pkg-config
install: install:
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
script: "./autobuild && ./do-release" script: "./autobuild && ./do-release"

View File

@ -1,6 +1,13 @@
LIBEMSHA CHANGELOG LIBEMSHA CHANGELOG
================== ==================
1.0.2 (2015-01-28):
Added:
+ Build now includes pkg-config.
+ Debian packaging source files added.
------------------
1.0.1 (2015-12-22): 1.0.1 (2015-12-22):
Fixed: Fixed:

View File

@ -2,17 +2,18 @@
# versions that can be used with Travis right now. # versions that can be used with Travis right now.
AC_PREREQ([2.68]) AC_PREREQ([2.68])
AC_INIT([libemsha], AC_INIT([libemsha],
[1.0.1], [1.0.2],
[coder@kyleisom.net], [coder@kyleisom.net],
[libemsha], [libemsha],
[https://kyleisom.net/projects/libemsha/]) [https://kyleisom.net/projects/libemsha/])
AM_INIT_AUTOMAKE([1.11 foreign]) AM_INIT_AUTOMAKE([1.11 foreign])
AC_CONFIG_SRCDIR([src/emsha/sha256.hh]) AC_CONFIG_SRCDIR([src/emsha/sha256.hh])
AC_CONFIG_FILES([Makefile src/Makefile doc/source/conf.py doc/source/header.rst]) AC_CONFIG_FILES([Makefile src/Makefile doc/source/conf.py doc/source/header.rst src/libemsha-1.pc])
AC_CONFIG_FILES([do-release], [chmod +x do-release]) AC_CONFIG_FILES([do-release], [chmod +x do-release])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
PKG_PROG_PKG_CONFIG
AC_CHECK_HEADERS AC_CHECK_HEADERS
LT_INIT LT_INIT

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
libemsha (1.0.2-2) stable; urgency=medium
* Package bump to fix dependency issues.
-- Kyle Isom <kyle@imap.cc> Thu, 28 Jan 2016 00:49:45 -0800
libemsha (1.0.2-1) stable; urgency=medium
* Add pkg-config to build.
-- Kyle Isom <kyle@imap.cc> Thu, 28 Jan 2016 00:27:31 -0800
libemsha (1.0.1-1) unstable; urgency=low libemsha (1.0.1-1) unstable; urgency=low
* Initial release for packaging. * Initial release for packaging.

5
debian/copyright vendored
View File

@ -1,11 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libemsha Upstream-Name: libemsha
Source: <url://example.com> Source: https://git.kyleisom.net/lib/libemsha
Files: * Files: *
Copyright: <years> <put author's name and email here> Copyright: <years> <put author's name and email here>
<years> <likewise for another author> <years> <likewise for another author>
License: 2015 K. Isom <coder@kyleisom.net> License: MIT
2015 K. Isom <coder@kyleisom.net>
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation to deal in the Software without restriction, including without limitation

View File

@ -1,2 +1 @@
usr/lib
usr/include usr/include

View File

@ -1,3 +1,2 @@
usr/include/* usr/include/*
usr/lib/*/lib*.a usr/lib/*/pkgconfig/*
usr/lib/*/lib*.so

32
debian/rules vendored Executable file
View File

@ -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)

View File

@ -2,9 +2,9 @@
libemsha libemsha
======== ========
Version: 1.0.1 Version: 1.0.2
Date: 2015-12-22 Date: 2016-01-28
----------------- -----------------

View File

@ -7,6 +7,8 @@ CLOC_PSOURCES = emsha.cc sha256.cc hmac.cc internal.hh \
emsha/emsha.hh emsha/hmac.hh emsha/sha256.hh emsha/emsha.hh emsha/hmac.hh emsha/sha256.hh
CLOC_TSOURCES = test_emsha.cc test_hmac.cc test_mem.cc test_sha256.cc \ CLOC_TSOURCES = test_emsha.cc test_hmac.cc test_mem.cc test_sha256.cc \
test_utils.cc test_utils.hh test_utils.cc test_utils.hh
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libemsha-1.pc
lib_LTLIBRARIES = libemsha.la lib_LTLIBRARIES = libemsha.la
nobase_include_HEADERS = emsha/sha256.hh emsha/hmac.hh emsha/emsha.hh nobase_include_HEADERS = emsha/sha256.hh emsha/hmac.hh emsha/emsha.hh

10
src/libemsha-1.pc.in Normal file
View File

@ -0,0 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: @PACKAGE_NAME@
Description: C++11 HMAC-SHA256 library
URL: @PACKAGE_URL@
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -Wl,-rpath,${libdir} -lemsha