Fix: better way to handle custom configure, build and install steps in deb rules + timescaledb package custom configure/install steps

Author: qount25

lib/pgpm/deb/spec.rb

@@ -53,6 +53,16 @@ def arch
         end
       end
 
+      def cmds_if_not_empty(cmds, else_echo)
+        if cmds.nil? || cmds.empty?
+          return "\techo \"#{else_echo}\""
+        else
+          cmds.map! { |c| c.to_s }
+          cmds.map! { |c| c.gsub("$", "$$") }
+          return cmds.join("\t")
+        end
+      end
+
     end
   end
 end

lib/pgpm/deb/templates/rules.erb

@@ -9,44 +9,32 @@ export PGPM_INSTALL_ROOT = "$(CURDIR)/debian/<%= deb_pkg_name(pkg_type) %>"
 
 <% if pkg_type == :versioned %>
 %:
-	echo " --> % rules target"
+	dh $@
+
+override_dh_auto_configure:
+	echo " --> configuring"
+	<%= cmds_if_not_empty self.package.configure_steps, '...nothing to configure'  %>
 
-build:
-	echo " --> build target"
-	<%= self.package.build_steps.join("\n\t").gsub('$', '$$') %>
+override_dh_auto_build:
+	echo " --> building"
+	<%= cmds_if_not_empty self.package.build_steps, '...nothing to build'  %>
 
-install: build
-	mkdir -p $$PGPM_INSTALL_ROOT
-	echo " --> install target"
-	<%= self.package.install_steps.join("\n\t").gsub('$', '$$') %>
+override_dh_auto_install:
+	echo " --> installing"
+	dh_auto_install
+	<%= cmds_if_not_empty self.package.install_steps, '...no custom install steps'  %>
 	chmod +x "$$DEB_BUILDDIR/prepare_artifacts.sh"
 	find $$PGPM_INSTALL_ROOT -type f | sort - | sed 's|^$$PGPM_INSTALL_ROOT||' > .pgpm_before | sort
 	./prepare_artifacts.sh
 
-build-arch:
-	echo " --> build-arch"
-
-build-indep:
-	echo " --> build-indep"
-
-binary: install
-	echo " --> binary"
-
-binary-arch:
-	echo " --> binary-arch"
-
-binary-indep:
-	echo " --> binary-indep"
-
-clean:
-	echo " --> clean"
-
 <% else %>
 %:
 	dh $@
 
-install:
+override_dh_auto_install:
+	dh_auto_install
 	echo " --> INSTALL"
 	chmod +x "$$DEB_BUILDDIR/install_default_control.sh"
 	./install_default_control.sh
+
 <% end %>

packages/timescale/timescaledb.rb

@@ -42,17 +42,17 @@ def configure_steps
       case Pgpm::OS.in_scope.class.name
       when "debian", "ubuntu"
         ["dh_auto_configure -- -DCMAKE_BUILD_TYPE=\"Release\""]
-      when "rocky+epel-9", "redhat", "fedora"
-        []
+      else
+        super
       end
     end
 
     def install_steps
       case Pgpm::OS.in_scope.class.name
-      when "debian", "ubuntu"
-        []
       when "rocky+epel-9", "redhat", "fedora"
         ["DESTDIR=$PGPM_INSTALL_ROOT cmake --build build --target install"]
+      else
+        super
       end
     end