Refactor: use completely customized debian rules file -- without calling dh in it (WIP)

Author: qount25

lib/pgpm/deb/scripts/install_default_control.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ext_dir="${PGPM_INSTALL_ROOT:-$PGPM_BUILDROOT}/$(pg_config --sharedir)/extension"
+ext_dir="$PGPM_INSTALL_ROOT/$(pg_config --sharedir)/extension"
 control_fn="$ext_dir/$PGPM_EXTENSION_NAME.control"
 
 echo "Creating extension dir: $ext_dir"

lib/pgpm/deb/scripts/pg_config.sh

@@ -0,0 +1,21 @@
+#! /usr/bin/env bash
+
+# Ensure PG_CONFIG is set
+if [[ -z "$PG_CONFIG" ]]; then
+  echo "Error: PG_CONFIG is not set."
+  exit 1
+fi
+
+# Wrapper function for pg_config
+pg_config_wrapper() {
+  "$PG_CONFIG" "$@" | while read -r line; do
+    if [[ -n "$PGPM_REDIRECT_TO_BUILDROOT" && -f "$line" || -d "$line" ]]; then
+      echo "$PGPM_INSTALL_ROOT$line"
+    else
+      echo "$line"
+    fi
+  done
+}
+
+# Call the wrapper function with the arguments passed to the script
+pg_config_wrapper "$@"

lib/pgpm/deb/scripts/prepare_artifacts.sh

@@ -6,12 +6,7 @@ new_extension_so=
 
 PG_CONFIG="${PG_CONFIG:-"pg_config"}"
 
-# When building with pbuilder on Debian, files are installed under
-# `$PGPM_BUILDROOT/debian/ext-name-0.0.0/`  -- this path should then be
-# assigned to the PGPM_INSTALL_ROOT env variable. However it isn't assigned
-# to it (as is the case with rpm and mock), then we use PGPM_BUILDROOT instead.
-# In this script we're 
-install_root="${PGPM_INSTALL_ROOT:-$PGPM_BUILDROOT}"
+install_root=$PGPM_INSTALL_ROOT
 
 for file in $(find $PGPM_BUILDROOT -name '*.so'); do
   filename=$(basename "$file")

lib/pgpm/deb/templates/rules.erb

@@ -1,49 +1,52 @@
 #!/usr/bin/make -f
 
-DEB_BUILDDIR ?= $(CURDIR)
-EXTENSION_NAME ?= "<%= self.package.extension_name %>"
+export DEB_BUILDDIR = $(CURDIR)
+export PGPM_BUILDROOT = $(CURDIR)
+export PG_CONFIG = $(shell /usr/bin/which pg_config)
+export PGPM_EXTENSION_NAME = "<%= self.package.extension_name %>"
+export PGPM_EXTENSION_VERSION = "<%= self.package.version %>"
+export PGPM_INSTALL_ROOT = "$(CURDIR)/debian/<%= deb_pkg_name(pkg_type) %>"
 
 <% if pkg_type == :versioned %>
 %:
-	dh $@
-
-override_dh_install:
-	dh_install
-	chmod +x "$(DEB_BUILDDIR)/prepare_artifacts.sh"
-	find $(DEB_BUILDDIR) -type f | sort - | sed 's|^$(DEB_BUILDDIR)||' > .pgpm_before | sort
-	export PG_CONFIG="which pg_config"; \
-	export PGPM_BUILDROOT="$(DEB_BUILDDIR)"; \
-	export PGPM_EXTENSION_NAME=$(EXTENSION_NAME); \
-	export PGPM_EXTENSION_VERSION="<%= self.package.version %>"; \
-	export PGPM_INSTALL_ROOT="$(DEB_BUILDDIR)/debian/<%= deb_pkg_name(pkg_type) %>"; \
+	echo " --> % rules target"
+
+build:
+	echo " --> build target"
+	<%= self.package.build_steps.join("\n\t").gsub('$', '$$') %>
+
+install: build
+	mkdir -p $$PGPM_INSTALL_ROOT
+	echo " --> install target"
+	<%= self.package.install_steps.join("\n\t").gsub('$', '$$') %>
+	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
 
-<% if self.package.configure_steps.size > 0 %>
-override_dh_auto_configure:
-	<%= self.package.configure_steps.join("\n\t") %>
-<% end %>
+build-arch:
+	echo " --> build-arch"
 
-<% if self.package.build_steps.size > 0 %>
-override_dh_build:
-	<%= self.package.build_steps.join("\n\t") %>
-<% end %>
+build-indep:
+	echo " --> build-indep"
 
-<% if self.package.install_steps.size > 0 %>
-override_dh_install:
-	<%= self.package.install_steps.join("\n\t") %>
-<% end %>
+binary: install
+	echo " --> binary"
+
+binary-arch:
+	echo " --> binary-arch"
+
+binary-indep:
+	echo " --> binary-indep"
+
+clean:
+	echo " --> clean"
 
 <% else %>
 %:
 	dh $@
 
 install:
 	echo " --> INSTALL"
-	chmod +x "$(DEB_BUILDDIR)/install_default_control.sh"
-	export PG_CONFIG="which pg_config"; \
-	export PGPM_BUILDROOT="$(DEB_BUILDDIR)"; \
-	export PGPM_EXTENSION_NAME=$(EXTENSION_NAME); \
-	export PGPM_EXTENSION_VERSION="<%= self.package.version %>"; \
-	export PGPM_INSTALL_ROOT="$(DEB_BUILDDIR)/debian/<%= deb_pkg_name(pkg_type) %>"; \
+	chmod +x "$$DEB_BUILDDIR/install_default_control.sh"
 	./install_default_control.sh
 <% end %>

lib/pgpm/package/dependencies.rb

@@ -18,7 +18,6 @@ def build_dependencies
             "postgresql-common"
           ]
           if self.native?
-            binding.break
             deps << "build-essential"
           end
         when "rocky+epel-9", "redhat", "fedora"

lib/pgpm/package/make.rb

@@ -5,23 +5,13 @@ class Package
     module Make
 
       def build_steps
-        case Pgpm::OS.in_scope.class.name
-        when "debian", "ubuntu"
-          return []
-        when "rocky+epel-9", "redhat", "fedora"
-          return [Pgpm::Commands::Make.new("PG_CONFIG=$PG_CONFIG")] if makefile_present?
-        end
-        super
+        [Pgpm::Commands::Make.new("PG_CONFIG=$PG_CONFIG")] if makefile_present?
       end
 
       def install_steps
-        case Pgpm::OS.in_scope.class.name
-        when "debian", "ubuntu"
-          return []
-        when "rocky+epel-9", "redhat", "fedora"
-          return [Pgpm::Commands::Make.new("install", "DESTDIR=$PGPM_BUILDROOT", "PG_CONFIG=$PG_CONFIG")] if makefile_present?
+        if makefile_present?
+          [Pgpm::Commands::Make.new("install", "DESTDIR=$PGPM_INSTALL_ROOT", "PG_CONFIG=$PG_CONFIG")]
         end
-        super
       end
 
       def makefile_present?

lib/pgpm/rpm/scripts/pg_config.sh

@@ -1,7 +1,5 @@
 #! /usr/bin/env bash
 
-#!/bin/bash
-
 # Ensure PG_CONFIG is set
 if [[ -z "$PG_CONFIG" ]]; then
   echo "Error: PG_CONFIG is not set."
@@ -12,12 +10,12 @@ fi
 pg_config_wrapper() {
   "$PG_CONFIG" "$@" | while read -r line; do
     if [[ -n "$PGPM_REDIRECT_TO_BUILDROOT" && -f "$line" || -d "$line" ]]; then
-      echo "$PGPM_BUILDROOT$line"
+      echo "$PGPM_INSTALL_ROOT$line"
     else
       echo "$line"
     fi
   done
 }
 
 # Call the wrapper function with the arguments passed to the script
-pg_config_wrapper "$@"
+pg_config_wrapper "$@"

lib/pgpm/rpm/scripts/prepare_artifacts.sh

@@ -4,17 +4,17 @@ set -xe
 
 new_extension_so=
 
-for file in $(find $PGPM_BUILDROOT -name '*.so'); do
+for file in $(find $PGPM_INSTALL_ROOT -name '*.so'); do
   filename=$(basename "$file")
   if [[ "$filename" == "${PGPM_EXTENSION_NAME}.so" ]]; then
     extension_so=$filename
     dir=$(dirname "$file")
-    extension_dirname=${dir#"$PGPM_BUILDROOT"}
+    extension_dirname=${dir#"$PGPM_INSTALL_ROOT"}
     new_extension_so=$PGPM_EXTENSION_NAME--$PGPM_EXTENSION_VERSION.so
   fi
 done
 
-extdir=$PGPM_BUILDROOT$($PG_CONFIG --sharedir)/extension
+extdir=$PGPM_INSTALL_ROOT$($PG_CONFIG --sharedir)/extension
 
 # control files
 default_control=$extdir/$PGPM_EXTENSION_NAME.control
@@ -24,7 +24,7 @@ controls=("$default_control" "$versioned_control")
 
 if [[ -n "$new_extension_so" ]]; then
 
-  mv "$PGPM_BUILDROOT$extension_dirname/$extension_so" "$PGPM_BUILDROOT$extension_dirname/$new_extension_so"
+  mv "$PGPM_INSTALL_ROOT$extension_dirname/$extension_so" "$PGPM_INSTALL_ROOT$extension_dirname/$new_extension_so"
 
   # Change the extension name in controls
   for control in "${controls[@]}"; do
@@ -37,7 +37,7 @@ if [[ -n "$new_extension_so" ]]; then
   done
 
   # sql files
-  for sql_file in $(find $PGPM_BUILDROOT -name '*.sql' -type f); do
+  for sql_file in $(find $PGPM_INSTALL_ROOT -name '*.sql' -type f); do
     # extension.so
     sed -i "s|/${extension_so}'|/${new_extension_so}'|g" "$sql_file"
     # extension
@@ -46,7 +46,7 @@ if [[ -n "$new_extension_so" ]]; then
 
   # bitcode
 
-  pkglibdir=$PGPM_BUILDROOT$($PG_CONFIG --pkglibdir)
+  pkglibdir=$PGPM_INSTALL_ROOT$($PG_CONFIG --pkglibdir)
 
   bitcode_extension=$pkglibdir/bitcode/${extension_so%".so"}
   bitcode_index=$pkglibdir/bitcode/${extension_so%".so"}.index.bc
@@ -60,7 +60,7 @@ if [[ -n "$new_extension_so" ]]; then
   fi
 
   # includes
-  includedir=$PGPM_BUILDROOT$($PG_CONFIG --includedir-server)
+  includedir=$PGPM_INSTALL_ROOT$($PG_CONFIG --includedir-server)
 
   if [[ -d "${includedir}/extension/$PGPM_EXTENSION_NAME" ]]; then
     versioned_dir=${includedir}/extension/$PGPM_EXTENSION_NAME--$PGPM_EXTENSION_VERSION
@@ -85,4 +85,4 @@ if [[ -f "$default_control" ]]; then
     # Don't need default_version
     sed -i '/default_version/d' "$versioned_control"
   fi
-fi
+fi

lib/pgpm/rpm/spec.rb

@@ -97,12 +97,12 @@ def to_s
 
           %build
           export PG_CONFIG=$(rpm -ql #{@postgres_distribution.pg_config_package} | grep 'pg_config$')
-          export PGPM_BUILDROOT=%{buildroot}
+          export PGPM_INSTALL_ROOT=%{buildroot}
           #{@package.build_steps.map(&:to_s).join("\n")}
 
           %install
           export PG_CONFIG=$(rpm -ql #{@postgres_distribution.pg_config_package} | grep 'pg_config$')
-          export PGPM_BUILDROOT=%{buildroot}
+          export PGPM_INSTALL_ROOT=%{buildroot}
           cp %{SOURCE#{sources.find_index { |src| src.name == "pg_config.sh" }}} ./pg_config.sh
           chmod +x ./pg_config.sh
           find %{buildroot} -type f | sort - | sed 's|^%{buildroot}||' > .pgpm_before | sort

packages/omnigres/package.rb

@@ -88,17 +88,17 @@ def build_steps
 
     def install_steps
       steps = [
-        "mkdir -p $PGPM_BUILDROOT/$($PG_CONFIG --sharedir)/extension",
-        "mkdir -p $PGPM_BUILDROOT/$($PG_CONFIG --pkglibdir)",
+        "mkdir -p $PGPM_INSTALL_ROOT/$($PG_CONFIG --sharedir)/extension",
+        "mkdir -p $PGPM_INSTALL_ROOT/$($PG_CONFIG --pkglibdir)",
         # Package .so artifacts
-        "find build/packaged -name '#{name}*.so' -type f -exec cp {} $PGPM_BUILDROOT/$($PG_CONFIG --pkglibdir) \\;",
+        "find build/packaged -name '#{name}*.so' -type f -exec cp {} $PGPM_INSTALL_ROOT/$($PG_CONFIG --pkglibdir) \\;",
         # Package version-specific control file
-        "cp build/packaged/extension/#{name}--#{version}.control $PGPM_BUILDROOT/$($PG_CONFIG --sharedir)/extension",
+        "cp build/packaged/extension/#{name}--#{version}.control $PGPM_INSTALL_ROOT/$($PG_CONFIG --sharedir)/extension",
         # Package version-specific init file
-        "cp build/packaged/extension/#{name}--#{version}.sql $PGPM_BUILDROOT/$($PG_CONFIG --sharedir)/extension"
+        "cp build/packaged/extension/#{name}--#{version}.sql $PGPM_INSTALL_ROOT/$($PG_CONFIG --sharedir)/extension"
       ]
       if previous_version && !previous_version.broken? && !@no_migration
-        steps.push("cp build/packaged/extension/#{name}--#{previous_version.version}--#{version}.sql $PGPM_BUILDROOT/$($PG_CONFIG --sharedir)/extension")
+        steps.push("cp build/packaged/extension/#{name}--#{previous_version.version}--#{version}.sql $PGPM_INSTALL_ROOT/$($PG_CONFIG --sharedir)/extension")
       end
       steps
     end

packages/timescale/timescaledb.rb

@@ -52,7 +52,7 @@ def install_steps
       when "debian", "ubuntu"
         []
       when "rocky+epel-9", "redhat", "fedora"
-        ["DESTDIR=$PGPM_BUILDROOT cmake --build build --target install"]
+        ["DESTDIR=$PGPM_INSTALL_ROOT cmake --build build --target install"]
       end
     end