[WIP] Fixed installation process with the GNU Build System

.gitignore

@@ -1,6 +1,13 @@
-build
-dist
 *.pyc
 .*
 *~
-/src/cygapt/version.py
+
+# Autotools
+#
+Makefile.in
+Makefile
+/autom4te.cache/
+/aclocal.m4
+/build-aux/
+/configure
+/config.*

.travis.yml

@@ -4,11 +4,10 @@ python:
     - "2.6"
     - "2.7"
 
-install:
-    - make PYTHON=python
-
 script:
-    - make test PYTHON=python
+    - autoreconf -i
+    - ./configure
+    - make distcheck
 
 notifications:
     email: false

Makefile.am

@@ -0,0 +1,21 @@
+SUBDIRS = src doc tools
+
+DIST_SUBDIRS = $(SUBDIRS) \
+    build-aux
+
+dist_doc_DATA = \
+    AUTHORS \
+    CONTRIBUTING.md \
+    CONVENTIONS.md \
+    COPYING \
+    ChangeLog \
+    INSTALL.md \
+    LICENSE \
+    NEWS.md \
+    TODO \
+    README.md
+
+ACLOCAL_AMFLAGS = -I m4
+
+dist-hook:
+	echo '$(VERSION)' > $(distdir)/version

NEWS.md

@@ -20,3 +20,12 @@ News
 
       - `<cachedir>/<mirror>/<arch>/setup.ini`
 
+* 1.1.0 ()
+
+  * the python library of this package is private so it does not install under
+    the standard python `site-package` directory but on `$(pkgdatadir)/python`
+    (default: `/usr/local/share/cyg-apt/python`)
+
+  * to build from source it requires the `automake` package
+
+  * the build command line: `autoreconf -i && ./configure && make`

README.md

@@ -20,18 +20,32 @@ Requirements
 Build requirements
 ------------------
 
-* `make` 3.80+
-* `git` 1.7+
+* `make` 3.59+
+
+From source:
+
+    * `automake` 1.9+
 
 
 Install instructions
 --------------------
 
-Briefly the following commands should build, test and install this package.
+From source please run `autoreconf` first to generate all required build scripts:
+
+    $ autoreconf -i
+
+Briefly the following commands should configure, make and install this package:
+
+    $ ./configure && make && make install
+
+Some features can be enable by giving to `configure` the option `--enable-FEATURE[=ARG]`:
+
+  * If you want to install the **bash-completion** script then set the `--enable-bash-completion=DIR` option.
+    Where `DIR` may be one of the following directories:
 
-    $ make
-    $ make test
-    $ make install
+    - `pkg-config --variable=completionsdir bash-completion`
+    - `${BASH_COMPLETION_DIR}`
+    - `/etc/bash_completion.d`
 
 See the [`INSTALL.md`](INSTALL.md) file for more detailed instructions.
 

TODO

@@ -5,5 +5,3 @@ Add missing tests
     For it help you to the source code of cygcheck under the cygwin package
 [ArgParser] Update usage with pretty argparse format ( subparser ? )
 Add language translation
-[Makefile] Add `make uninstall`
-[Makefile] Add configure script for check dependency it must be set macro values

appveyor.yml

@@ -3,6 +3,9 @@ environment:
         CYG_ROOT: C:/cygwin
         CYG_MIRROR: http://cygwin.uib.no
         CYG_CACHE: C:/cygwin/var/cache/setup
+        # need to set DJDIR because bash fail to read the file descriptor 0
+        DJDIR: /
+        CYG_ENV: 'C:/cygwin/bin/bash -lc "cd \"$OLDPWD\" && '
 
     matrix:
         -
@@ -73,23 +76,30 @@ install:
     - 'if not "%PYTHON_PLATFORM%" == "cygwin" powershell ./.appveyor/install.ps1'
     - 'if not "%PYTHON_PLATFORM%" == "cygwin" dir "C:/python*"'
     - 'appveyor DownloadFile http://cygwin.com/setup-%CYG_ARCH%.exe -FileName setup.exe'
-    - 'setup.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P make -P python -P gnupg > NUL'
+    - 'setup.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P make -P python -P gnupg -P automake > NUL'
     - '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
     - '%PYTHON% --version'
     - '%PYTHON% -c "import sys; print(''Python architecture: {0}''.format(''x64'' if sys.maxsize > 2**32 else ''x86''))"'
     - '%PYTHON% -c "import sys; print(''Python platform: {0}''.format(sys.platform));"'
     - 'if "2.6" == "%PYTHON_VERSION%" appveyor DownloadFile https://raw.githubusercontent.com/bewest/argparse/master/argparse.py -FileName %PYTHON_DIR%/Lib/site-packages/argparse.py'
 
 build_script:
-    - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\"; make PYTHON=\"$PYTHON\""'
+    - '%CYG_ENV% autoreconf -i"'
+    - '%CYG_ENV% ./configure PYTHON=$PYTHON --prefix=\"`pwd`/_inst\""'
 
 test_script:
-    - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\"; make test PYTHON=\"$PYTHON\""'
-    - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\"; make install"'
-    - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\"; make installtest PYTHON=\"$PYTHON\""'
-    - ps: 'cp $env:CYG_ROOT/home/$env:USERNAME/.cyg-apt -destination $env:HOMEPATH'
-    - '%PYTHON% %CYG_ROOT%/bin/cyg-apt update -qX'
-    - '%PYTHON% %CYG_ROOT%/bin/cyg-apt ball cygwin> ball~'
+    - '%CYG_ENV% make distcheck DISTCHECK_CONFIGURE_FLAGS=PYTHON=$PYTHON"'
+    # test architecture detection
+    - '%CYG_ENV% make install"'
+    - 'echo ROOT="%CYG_ROOT%/">.cyg-apt'
+    - 'echo cache="%CYG_CACHE%">>.cyg-apt'
+    - 'echo mirror="%CYG_MIRROR%">>.cyg-apt'
+    - 'echo distname="curr">>.cyg-apt'
+    - 'set PATH=%APPVEYOR_BUILD_FOLDER%\_inst\bin;%PATH%'
+    - 'if "%PYTHON_PLATFORM%" == "cygwin" %CYG_ENV% cyg-apt update -q"'
+    - 'if "%PYTHON_PLATFORM%" == "cygwin" %CYG_ENV% cyg-apt ball cygwin"> ball~'
+    - 'if not "%PYTHON_PLATFORM%" == "cygwin" cyg-apt update -q'
+    - 'if not "%PYTHON_PLATFORM%" == "cygwin" cyg-apt ball cygwin> ball~'
     - ps: 'Get-Content ball~ | set path; cmd /c $env:CYG_ROOT/bin/cygpath -w $path> ball~'
     - ps: 'Get-Content ball~'
     - ps: 'if (-not(Get-Content ball~ | Test-Path)) { Exit 1 }'

build-aux/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = git-version-gen