From e825742bbbbe99b99d525a3b34832b25a7396c84 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 6 Aug 2016 21:40:01 +0200 Subject: CMake: debian: Switch packaging over to CMake and dh 9 This new packaging is much easier to read, although the duplication in the install files is a bit annoying. We should probably also get rid of the movefiles for solvers, planners, and https method; but then we have to keep track of which methods exist in the apt package. Another disadvantage is that building only the documentation packages also requires building the code, as there's no way to turn off code building in the project. --- .gitignore | 7 ------- 1 file changed, 7 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index c96c33b29..14e8c596c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,6 @@ /buildlib/config.sub /configure -# copy of COPYING -/debian/copyright - # generated files in the process to build all # apt man pages and other documentation /doc/*/ @@ -36,10 +33,6 @@ /cmdline/apt-key /doc/apt-vendor.ent /doc/examples/sources.list -/debian/apt.install -/debian/libapt-pkg*.install -/debian/libapt-inst*.install -/debian/libapt-pkg-dev.install /vendor/current /vendor/*/sources.list /vendor/*/makefile.auto -- cgit v1.2.3 From 4d22a5704a0ebe19a5fa2524ac90a26c824325de Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 9 Aug 2016 20:17:21 +0200 Subject: Update gitignore for cmake We cannot be sure if you are not running the build tree, so this is a bit ugly. Gbp-Dch: ignore --- .gitignore | 111 ++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 23 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 14e8c596c..7baa7fbeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,92 @@ -*~ -# build artifacts -/aclocal.m4 -/autom4te.cache/ -/build/ -/buildlib/config.guess -/buildlib/config.sub -/configure - -# generated files in the process to build all -# apt man pages and other documentation -/doc/*/ +# Include directory +include/ + +# Cmake files +CMakeCache.txt +CMakeFiles +CMakeScripts +Makefile +cmake_install.cmake +install_manifest.txt +CTestTestfile.cmake +Testing/ + +gtest-* + +# Compiled output +*.o +*.so* +*.versionscript + +# Templates +*.pot +*.pot-* +!/po/apt-all.pot + +# Vendor files + +**/vendor/sources.list +**/LC_MESSAGES/ + +**/ftparchive/apt-ftparchive +**/cmdline/apt +**/cmdline/apt-cache +**/cmdline/apt-cdrom +**/cmdline/apt-config +**/cmdline/apt-extracttemplates +**/cmdline/apt-get +**/cmdline/apt-helper +**/cmdline/apt-key +**/cmdline/apt-mark +**/cmdline/apt-sortpkgs +**/cmdline/planners +**/cmdline/solvers +**/cmdline/apt + +**/methods/file +**/methods/copy +**/methods/store +**/methods/gpgv +**/methods/cdrom +**/methods/http +**/methods/https +**/methods/mirror +**/methods/ftp +**/methods/rred +**/methods/rsh +**/methods/ssh +**/methods/gzip +**/methods/bzip2 +**/methods/xz +**/methods/lzma + +**/test/interactive-helper/aptwebserver +**/test/interactive-helper/extract-control +**/test/interactive-helper/rpmver +**/test/interactive-helper/testdeb +**/test/interactive-helper/mthdcat +**/test/interactive-helper/test_fileutl +**/test/interactive-helper/test_udevcdrom +**/test/libapt/libapt_test + +# Documentation +Doxyfile +doxygen/ +*.html/ +*.text.html +*.text +*.*stamp* +*.[1-9] +**/doc/*/*.xml +**/doc/*/*.dbk !/doc/examples/ -!/doc/po/ -/doc/en/* -!/doc/en/makefile + +# Backend files +Makefile +*.ninja +.ninja* + +!CMakeLists.txt # package building artifacts /debian/*.log @@ -29,14 +102,6 @@ /debian/libapt-pkg-doc/ /debian/apt-transport-https/ -# generated from *.in files -/cmdline/apt-key -/doc/apt-vendor.ent -/doc/examples/sources.list -/vendor/current -/vendor/*/sources.list -/vendor/*/makefile.auto - # generated for and by abicheck /abicheck/apt_build.xml /abicheck/apt_installed.xml -- cgit v1.2.3