Refactor: packaging: kill automake and move build steps from crmsh.spec into Makefile

Author: nicholasyang2022

Makefile

@@ -0,0 +1,75 @@
+DESTDIR ?= /
+datadir ?= /usr/share
+confdir ?= /etc
+localstatedir ?= /var
+tmpfilesdir ?= /lib/tmpfiles.d
+mandir ?= /$(datadir)/man
+fwdefdir ?= /usr/lib/firewalld/services
+
+PYTHON ?= python3
+
+.PHONY: all install uninstall
+
+all: non-python
+
+install: install-non-python
+
+uninstall: uninstall-non-python uninstall-python
+
+.PHONY: non-python manpages html-docs python
+
+non-python: manpages html-docs
+
+manpages: doc/crm.8 doc/crmsh_crm_report.8
+
+html-docs: doc/crm.8.html doc/crmsh_crm_report.8.html doc/profiles.html
+
+%.8: %.8.adoc
+	a2x -f manpage $<
+
+%.html: %.adoc
+	asciidoc --unsafe --backend=xhtml11 $<
+
+python:
+	$(PYTHON) -m pip wheel .
+
+.PHONY: install-non-python uninstall-non-python install-python uninstall-python
+
+install-non-python: non-python
+	# additional directories
+	install -d -m0770 $(DESTDIR)$(localstatedir)/cache/crm
+	install -d -m0770 $(DESTDIR)$(localstatedir)/log/crmsh
+	install -d -m0755 $(DESTDIR)${tmpfilesdir}
+	# install configuration
+	install -Dm0644 -t $(DESTDIR)$(confdir)/crm etc/{crm.conf,profiles.yml}
+	install -m0644 crmsh.tmpfiles.d.conf $(DESTDIR)$(tmpfilesdir)/crmsh.conf
+	# install manpages
+	install -Dpm0644 -t $(DESTDIR)$(mandir)/man8 doc/*.8
+	install -Dpm0644 -t $(DESTDIR)$(datadir)/crmsh/ doc/crm.8.adoc
+	# install data
+	for d in $$(cat data-manifest); do \
+		if [ -x "$$d" ] ; then mode="0755" ; else mode="0644" ; fi; \
+		install -D -m "$${mode}" "$$d" $(DESTDIR)$(datadir)/crmsh/"$$d"; \
+	done
+	$(RM) -r $(DESTDIR)$(datadir)/crmsh/tests
+	mv $(DESTDIR)$(datadir)/crmsh/test $(DESTDIR)$(datadir)/crmsh/tests
+	install -p test/testcases/xmlonly.sh $(DESTDIR)$(datadir)/crmsh/tests/testcases/configbasic-xml.filter
+	install -Dm0644 contrib/bash_completion.sh $(DESTDIR)$(datadir)/bash-completion/completions/crm
+	if [ -n "$(fwdefdir)" ]; then \
+		install -Dm0644 high-availability.xml $(DESTDIR)$(fwdefdir)/high-availability.xml; \
+	fi
+
+install-python: python
+	$(PYTHON) -m pip install --break-system-packages --prefix /usr --no-index --find-links ./ crmsh
+
+uninstall-non-python:
+	$(RM) -r $(DESTDIR)$(confdir)/crm
+	$(RM) -r $(DESTDIR)$(localstatedir)/cache/crm
+	$(RM) -r $(DESTDIR)$(localstatedir)/log/crm
+	$(RM) -r $(DESTDIR)$(datadir)/crmsh
+	$(RM) -r $(DESTDIR)$(datadir)/bash-completion/completions/crm
+	$(RM) $(DESTDIR)$(fwdefdir)/high-availability.xml
+	$(RM) $(DESTDIR)$(tmpfilesdir)/crmsh.conf
+
+uninstall-python:
+	$(PYTHON) -m pip uninstall --yes crmsh

Makefile.am

@@ -80,43 +80,21 @@ do
   fi
 done
 
-for command in automake14 automake-1.4 automake15 automake-1.5 automake17 automake-1.7 automake19 automake-1.9 automake-1.11 automake
-do
-  if
-      testProgram $command
-  then
-    : OK $pkg is installed
-    automake=$command
-    aclocal=`echo  "$automake" | sed -e 's/automake/aclocal/'`
-  fi
-done
-
 if [ -z $autoconf ]; then
     echo You must have autoconf installed to compile the crmsh package.
     echo Download the appropriate package for your system,
     echo or get the source tarball at: $gnu/autoconf/
     exit 1
-
-elif [ -z $automake ]; then
-    echo You must have automake installed to compile the crmsh package.
-    echo Download the appropriate package for your system,
-    echo or get the source tarball at: $gnu/automake/
-    exit 1
-
 fi
 
 # Create local copies so that the incremental updates will work.
-rm -f ./autoconf ./automake ./autoheader
+rm -f ./autoconf ./autoheader
 ln -s `which $autoconf` ./autoconf
-ln -s `which $automake` ./automake
 ln -s `which $autoheader` ./autoheader
 
 printf "$autoconf:\t"
 $autoconf --version | head -n 1
 
-printf "$automake:\t"
-$automake --version | head -n 1
-
 arch=`uname -s`
 # Disable the errors on FreeBSD until a fix can be found.
 if [ ! "$arch" = "FreeBSD" ]; then
@@ -134,9 +112,6 @@ fi
 echo $aclocal $ACLOCAL_FLAGS
 $aclocal $ACLOCAL_FLAGS
 
-echo $automake --add-missing --include-deps --copy
-$automake --add-missing --include-deps --copy
-
 echo $autoconf
 $autoconf
 

autogen.sh

@@ -30,31 +30,19 @@ AC_ARG_WITH(daemon-user,
     [ CRM_DAEMON_USER="$withval" ],
     [ CRM_DAEMON_USER="hacluster" ])
 
-AM_INIT_AUTOMAKE([no-define foreign])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME")
 AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION")
 
-dnl automake >= 1.11 offers --enable-silent-rules for suppressing the output from
-dnl normal compilation.  When a failure occurs, it will then display the full 
-dnl command line
-dnl Wrap in m4_ifdef to avoid breaking on older platforms
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
-
 AC_SUBST(OCF_ROOT_DIR)
 AC_SUBST(CRM_DAEMON_USER)
 
 CRM_CACHE_DIR=${localstatedir}/cache/crm
 AC_DEFINE_UNQUOTED(CRM_CACHE_DIR,"$CRM_CACHE_DIR", Where crm shell keeps the cache)
 AC_SUBST(CRM_CACHE_DIR)
 
-AM_PATH_PYTHON([3])
 AC_PATH_PROGS(ASCIIDOC, asciidoc)
 
-AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${ASCIIDOC}" != x"")
-
-AC_CONFIG_FILES(Makefile \
-etc/crm.conf             \
+AC_CONFIG_FILES(etc/crm.conf             \
 version                  \
 crmsh.spec               \
 )

configure.ac

@@ -172,14 +172,7 @@ sed -i -e '1{\@^#!%{_bindir}/python3@d}' crmsh/report/core.py
 %pyproject_wheel
 %endif
 
-# Generate manpages
-for manpg in doc/crm{,sh_crm_report}.8.adoc ; do
-    a2x -f manpage $manpg
-done
-
-for docad in doc/crm{,sh_crm_report}.8.adoc ; do
-    asciidoc --unsafe --backend=xhtml11 $docad
-done
+make all
 
 %if %{with regression_tests}
 tox
@@ -190,48 +183,19 @@ fi
 %endif
 
 %install
-# make DESTDIR=%%{buildroot} docdir=%%{crmsh_docdir} install
 %if 0%{?suse_version}
 %python3_pyproject_install
 %else
 %pyproject_install
 %endif
 
-# additional directories
-install -d -m0770 %{buildroot}%{_localstatedir}/cache/crm
-install -d -m0770 %{buildroot}%{_localstatedir}/log/crmsh
-install -d -m0755 %{buildroot}%{_tmpfilesdir}
-
-# install configuration
-install -Dm0644 -t %{buildroot}%{_sysconfdir}/crm etc/{crm.conf,profiles.yml}
-install -m0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
-
-# install manpages
-install -Dpm0644 -t %{buildroot}%{_mandir}/man8 doc/*.8
-install -Dpm0644 -t %{buildroot}%{_datadir}/crmsh/ doc/crm.8.adoc
-
-# install data
-for d in $(cat data-manifest); do
-	if [ -x $d ] ; then mode="0755" ; else mode="0644" ; fi
-	install -D -m $mode $d %{buildroot}%{_datadir}/crmsh/$d
-done
-mv %{buildroot}%{_datadir}/crmsh/test{,s}
-install -p test/testcases/xmlonly.sh \
-	%{buildroot}%{_datadir}/crmsh/tests/testcases/configbasic-xml.filter
-
-install -Dm0644 contrib/bash_completion.sh \
-	%{buildroot}%{_datadir}/bash-completion/completions/crm
+make DESTDIR=%{buildroot} tmpfilesdir=%{_tmpfilesdir} fwdefdir=%{_fwdefdir} install
 
 if [ -f %{buildroot}%{_bindir}/crm ]; then
-	install -Dm0755 %{buildroot}%{_bindir}/crm %{buildroot}%{_sbindir}/crm
-	rm %{buildroot}%{_bindir}/crm
+	install -d %{buildroot}%{_sbindir}/
+	mv %{buildroot}%{_bindir}/crm %{buildroot}%{_sbindir}/crm
 fi
 
-%if %{use_firewalld}
-install -Dm0644 high-availability.xml \
-	%{buildroot}%{_fwdefdir}/high-availability.xml
-%endif
-
 %if 0%{?suse_version}
 %fdupes %{buildroot}
 %endif

crmsh.spec.in

@@ -190,7 +190,7 @@ deploy_ha_node() {
         else
             podman_security=""
         fi
-	make_cmd="cd $PROJECT_INSIDE;./autogen.sh && ./configure --prefix /usr && make install && make install-crmconfDATA prefix= && cp /usr/bin/crm /usr/sbin"
+	make_cmd="cd $PROJECT_INSIDE;./autogen.sh && ./configure --prefix /usr && make install install-python && cp /usr/bin/crm /usr/sbin"
 
 	info "Deploying \"$node_name\"..."
 	podman run --rm -d $podman_options $podman_capabilties $podman_security $CONTAINER_IMAGE