diff --git a/.gitignore b/.gitignore index b4be7af..4feff61 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.out .deps/ .libs/ +.idea/ aclocal.m4 autom4te.cache/ build-aux/ @@ -35,6 +36,7 @@ src/sql/lexer.c src/sql/parser.c src/sql/parser.h src/util/mdb-array +src/util/mdb-count src/util/mdb-export src/util/mdb-header src/util/mdb-import diff --git a/CHANGELOG.md b/CHANGELOG.md index c92e432..cb4a72e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# Changelog for 0.8.2 +* Improved support for Access 2010, 2013, and 2016: @evanmiller #9 +* Build script and readme improvements @cyberemissary + # Changelog for 0.8.1 * Format README as Github Markdown: @joshuapinter #3 * Updated changelog markdown format and will keep it in slightly different style: @cyberemissary #7 diff --git a/README.md b/README.md index 1a51719..24ca918 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,10 @@ $ sudo apt-get install cyber-mdbtools No repository for RPM distribution, but you can install from rpm file: ```bash -$ wget https://rpm.cybercoder.site/rpm/cyber-mdbtools-0.8.1-2.x86_64.rpm -$ rpm -i cyber-mdbtools-0.8.1-2.x86_64.rpm +# Replace the with the version number you wish to install. For list of versions see the releases on GitHub + +$ wget https://rpm.cybercoder.site/rpm/cyber-mdbtools--1.x86_64.rpm +$ rpm -i cyber-mdbtools--1.x86_64.rpm ``` > The RPM package was created using `alient` from the DEB package, so it may or may not work on your linux distribution. @@ -33,7 +35,7 @@ $ rpm -i cyber-mdbtools-0.8.1-2.x86_64.rpm Feel free to submit PR requests here. I will try to review and merge them regularly. # mdbtools -_version 0.8.1_ +_version 0.8.2_ Welcome to the exciting world of MDB Tools! In short, MDB Tools is a set of programs to help you use Microsoft Access file in various settings. The major diff --git a/bin/package.sh b/bin/package.sh index e0ec972..832eb0c 100644 --- a/bin/package.sh +++ b/bin/package.sh @@ -1,12 +1,48 @@ -#!/bin/bash -e +#!/bin/bash -ex + +# You must run this as sudo + +function usage(){ + echo "" + echo "This script packages mdbtools into a .deb and .rpm packages" + echo "" + echo "Usage package.sh []" + echo "" + echo "Arguments:" + echo " is the version to build" + echo " is the release number to build; optional (default 1)" + echo "" +} if [ -z "$1" ]; then - echo "Missing version" - echo "" - echo "Usage package.sh " - echo "" + echo "ERROR: Missing version" + usage exit 1 fi -sudo checkinstall -y --pkgname=cyber-mdbtools --pkgversion=$1 --pkggroup=Tools --pkgsource=https://github.com/cyberemissary/mdbtools/archive/master.zip \ ---maintainer=admin@cyberemissary.com --provides=mdbtools \ No newline at end of file +if [ "--help" = "$1" ]; then + usage + exit 0 +fi + +PKG_VERSION=$1 +PKG_RELEASE=1 + +if [ ! -z "$2" ]; then + PKG_RELEASE=$2 +fi + +autoreconf -i -f +./configure + +checkinstall -y --pkgname=cyber-mdbtools --pkgversion=${PKG_VERSION} --pkgrelease=${PKG_RELEASE} --pkggroup=Tools \ +--pkgsource=https://github.com/cyberemissary/mdbtools/archive/master.zip \ +--maintainer=admin@cyberemissary.com --provides=mdbtools + +# remove directory in case we are rebuilding the same version and we quite prematurely before +rm -Rf cyber-mdbtools-${PKG_VERSION} +alien -r -g -v -k cyber-mdbtools_${PKG_VERSION}-${PKG_RELEASE}_amd64.deb + +cd cyber-mdbtools-${PKG_VERSION} +rpmbuild --buildroot $(pwd)/ --bb cyber-mdbtools-${PKG_VERSION}-${PKG_RELEASE}.spec +cd \ No newline at end of file diff --git a/configure.ac b/configure.ac index 7f57c6e..80a0302 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([mdbtools],[0.8.1],[mdbtools-dev@lists.sourceforge.net]) +AC_INIT([mdbtools],[0.8.2],[mdbtools-dev@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR(src/extras/mdb-dump.c)