Build: Linux packaging (via docker)

cisco · Nov 13, 2016 · 60b6b6a · 60b6b6a
1 parent a175ca5
commit 60b6b6a
Show file tree

Hide file tree

Showing 42 changed files with 2,123 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,8 @@ libtool
 */.libs
 include/cjose/version.h
 doc/Doxyfile
+**/*.pkg-tag
+**/*.img-tag
 
 # Object files
 *.o
@@ -49,3 +51,7 @@ test/*.trs
 *-e
 /.project
 /.cproject
+
+# Deliverables
+cjose-*.tar.gz
+dist/
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . include src doc test
+SUBDIRS = . include src test doc platform
 EXTRA_DIST = CHANGELOG.md README.md LICENSE
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -9,3 +9,17 @@ doxygen:
 
 test : check
 	cat test/check_cjose.log
+
+clean-local :
+	rm -rf dist/*
+
+distclean-local :
+	rm -rf dist/*
+
+package-prepare : dist
+	mkdir -p dist && \
+	rm -rf dist/cjose-$(PACKAGE_VERSION).tar.gz && \
+	cp cjose-$(PACKAGE_VERSION).tar.gz dist
+
+package-local : package-prepare
+	@echo packages built
diff --git a/Makefile.in b/Makefile.in
@@ -167,6 +167,7 @@ am__recursive_targets = \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	cscope distdir dist dist-all distcheck
+am__extra_recursive_targets = package-recursive
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -377,7 +378,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = . include src doc test
+SUBDIRS = . include src test doc platform
 EXTRA_DIST = CHANGELOG.md README.md LICENSE
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = cjose.pc
@@ -485,6 +486,7 @@ $(am__recursive_targets):
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
+package-local: 
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -786,13 +788,13 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
+	distclean-local distclean-tags
 
 dvi: dvi-recursive
 
@@ -844,6 +846,10 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
+package: package-recursive
+
+package-am: package-local
+
 pdf: pdf-recursive
 
 pdf-am:
@@ -858,19 +864,20 @@ uninstall-am: uninstall-pkgconfigDATA
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	clean-libtool clean-local cscope cscopelist-am ctags ctags-am \
+	dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-libtool distclean-local \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool package-am \
+	package-local pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-pkgconfigDATA
 
 .PRECIOUS: Makefile
@@ -882,6 +889,20 @@ doxygen:
 test : check
 	cat test/check_cjose.log
 
+clean-local :
+	rm -rf dist/*
+
+distclean-local :
+	rm -rf dist/*
+
+package-prepare : dist
+	mkdir -p dist && \
+	rm -rf dist/cjose-$(PACKAGE_VERSION).tar.gz && \
+	cp cjose-$(PACKAGE_VERSION).tar.gz dist
+
+package-local : package-prepare
+	@echo packages built
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
@@ -682,6 +682,23 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
+# AM_EXTRA_RECURSIVE_TARGETS                                -*- Autoconf -*-
+
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_EXTRA_RECURSIVE_TARGETS
+# --------------------------
+# Define the list of user recursive targets.  This macro exists only to
+# be traced by Automake, which will ensure that a proper definition of
+# user-defined recursive targets (and associated rules) is propagated
+# into all the generated Makefiles.
+# TODO: We should really reject non-literal arguments here...
+AC_DEFUN([AM_EXTRA_RECURSIVE_TARGETS], [])
+
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996-2014 Free Software Foundation, Inc.

diff --git a/configure b/configure
@@ -14932,7 +14932,8 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile include/Makefile include/cjose/version.h src/Makefile test/Makefile doc/Makefile doc/Doxyfile cjose.pc"
+
+ac_config_files="$ac_config_files Makefile include/Makefile include/cjose/version.h src/Makefile test/Makefile doc/Makefile doc/Doxyfile platform/Makefile platform/centos/Makefile platform/debian/Makefile cjose.pc"
 
 
 cat >confcache <<\_ACEOF
@@ -16020,6 +16021,9 @@ do
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;;
+    "platform/Makefile") CONFIG_FILES="$CONFIG_FILES platform/Makefile" ;;
+    "platform/centos/Makefile") CONFIG_FILES="$CONFIG_FILES platform/centos/Makefile" ;;
+    "platform/debian/Makefile") CONFIG_FILES="$CONFIG_FILES platform/debian/Makefile" ;;
     "cjose.pc") CONFIG_FILES="$CONFIG_FILES cjose.pc" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

diff --git a/configure.ac b/configure.ac
@@ -67,11 +67,13 @@ AC_CHECK_LIB([jansson],
     [AC_MSG_ERROR([Jansson is missing; it is required for this software])]
 )
 
+AM_EXTRA_RECURSIVE_TARGETS([package])
 AC_CONFIG_FILES([Makefile
                  include/Makefile include/cjose/version.h
                  src/Makefile
                  test/Makefile
                  doc/Makefile doc/Doxyfile
+                 platform/Makefile platform/centos/Makefile platform/debian/Makefile
                  cjose.pc])
 
 AC_OUTPUT

diff --git a/doc/Makefile.in b/doc/Makefile.in
@@ -148,6 +148,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(doxygendir)"
 DATA = $(nobase_doxygen_DATA)
+am__extra_recursive_targets = package-recursive
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -368,6 +369,7 @@ uninstall-nobase_doxygenDATA:
 	@list='$(nobase_doxygen_DATA)'; test -n "$(doxygendir)" || list=; \
 	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
 	dir='$(DESTDIR)$(doxygendir)'; $(am__uninstall_files_from_dir)
+package-local: 
 tags TAGS:
 
 ctags CTAGS:
@@ -500,6 +502,10 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
+package: package-am
+
+package-am: package-local
+
 pdf: pdf-am
 
 pdf-am:
@@ -522,8 +528,9 @@ uninstall-am: uninstall-nobase_doxygenDATA
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am uninstall-nobase_doxygenDATA
+	mostlyclean-generic mostlyclean-libtool package-am \
+	package-local pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-nobase_doxygenDATA
 
 .PRECIOUS: Makefile
 

diff --git a/include/Makefile.in b/include/Makefile.in
@@ -149,6 +149,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(includedir)"
 HEADERS = $(nobase_include_HEADERS)
+am__extra_recursive_targets = package-recursive
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -386,6 +387,7 @@ uninstall-nobase_includeHEADERS:
 	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
 	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+package-local: 
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -562,6 +564,10 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
+package: package-am
+
+package-am: package-local
+
 pdf: pdf-am
 
 pdf-am:
@@ -585,8 +591,9 @@ uninstall-am: uninstall-nobase_includeHEADERS
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-nobase_includeHEADERS
+	mostlyclean-libtool package-am package-local pdf pdf-am ps \
+	ps-am tags tags-am uninstall uninstall-am \
+	uninstall-nobase_includeHEADERS
 
 .PRECIOUS: Makefile
 

diff --git a/platform/Makefile.am b/platform/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = centos debian
+
+package-local :
+	mkdir -p $(top_builddir)/dist && \
+	rm -rf $(top_builddir)/dist/cjose-$(PACKAGE_VERSION).tar.gz && \
+	cp $(top_builddir)/cjose-$(PACKAGE_VERSION).tar.gz $(top_builddir)/dist