Merge pull request #24 from FluidityProject/fix-package-building

Rewrite Debian/Ubuntu packaging

Author: stephankramer

.github/workflows/ubuntu.yml

@@ -9,14 +9,30 @@ on:
       - main
 
 jobs:
-  Ubuntu-Focal:
+  ubuntu-local-builds:
     runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [ "Local Build Focal", "Local Build Jammy" ]
+        include:
+
+          - name: "Local Build Focal"
+            release: focal
+            python: python3.8
+
+          - name: "Local Build Jammy"
+            release: jammy
+            python: python3.10
+
+
     container:
-      image: ubuntu:focal
+      image: ubuntu:${{ matrix.release }}
 
     steps:
       - name: Check Out Repo 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install dependencies
         run: | 
@@ -37,7 +53,7 @@ jobs:
 
       - name: Testing
         env:
-          PYTHONPATH: /tmp/lib/python3.8/site-packages
+          PYTHONPATH: /tmp/lib/${{ matrix.python }}/site-packages
           LD_LIBRARY_PATH: /tmp/lib
         run: | 
           cd python
@@ -47,11 +63,68 @@ jobs:
         run: make doc
 
       - name: Publish JUnit
-        uses: mikepenz/action-junit-report@v2
+        uses: mikepenz/action-junit-report@v3
         with:
           report_paths: '**/test_result*.xml'
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          check_name: JUnit Report
+          check_name: JUnit Report ${{ matrix.release }} local build 
           fail_on_failure: true
 
 
+  ubuntu-package-builds:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [ "Local Build Focal", "Local Build Jammy" ]
+        include:
+
+          - name: "Local Build Focal"
+            release: focal
+            python: python3.8
+
+          - name: "Local Build Jammy"
+            release: jammy
+            python: python3.10
+
+
+    container:
+      image: ubuntu:${{ matrix.release }}
+
+    steps:
+      - name: Check Out Repo 
+        uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: | 
+          echo "Europe/London" > /etc/timezone
+          apt-get -y update
+          DEBIAN_FRONTEND=noninteractive apt-get -y install devscripts equivs python3-junit.xml
+          # make empty spud-build-dep package which depends on the build deps for the spud debian package
+          mk-build-deps
+          # install it so that build dependencies get installed
+          DEBIAN_FRONTEND=noninteractive apt-get -y install ./spud-build-dep*deb
+
+
+      - name: Build Ubuntu package
+        run: debuild -uc -us
+
+      - name: Install Ubuntu package
+        run: DEBIAN_FRONTEND=noninteractive apt-get -y install ../*.deb
+
+      - name: Testing fortran library
+        run: make junittest
+
+      - name: Testing
+        run: | 
+          cd python
+          python3 test_libspud_junit.py
+
+      - name: Publish JUnit
+        uses: mikepenz/action-junit-report@v3
+        with:
+          report_paths: '**/test_result*.xml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          check_name: JUnit Report ${{ matrix.release }} Package
+          fail_on_failure: true

Makefile.in

@@ -51,7 +51,7 @@ VPATH = src/
 .cpp.lo:
 	./libtool --mode=compile --tag=CXX $(CXX) $(CXXFLAGS) -c $<
 
-default: libspud.la build-diamond
+default: libspud.la build-diamond build-pyspud
 
 libspud.la: $(OBJS)
 	./libtool --mode=link --tag=FC $(FC) $(FCFLAGS) -o $(LIB) $(OBJS) $(LIBS) -rpath @prefix@/lib 
@@ -61,6 +61,9 @@ libspud.la: $(OBJS)
 build-diamond:
 	cd diamond; python3 setup.py build; cd ..
 
+build-pyspud: libspud.la
+	cd python; python3 setup.py build; cd ..
+
 test: unittest
 
 unittest: libspud.la
@@ -95,21 +98,13 @@ install-spudtools:
 	@INSTALL@ -m644 schema/spud_base.rng $(DESTDIR)@prefix@/share/spud
 
 install-diamond:
-	cd diamond;	python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
+	cd diamond; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
 
 install-pyspud:
-ifeq ($(origin BUILDING_DEBIAN),undefined)
 	cd python; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
-else
-	cd python; for python in $(shell py3versions -r); do $$python setup.py install --prefix=$(DESTDIR)@prefix@ --install-layout=deb; done; cd ..
-endif
 
 install-dxdiff:
-ifeq ($(origin BUILDING_DEBIAN),undefined)
 	cd dxdiff; python3 setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
-else
-	cd dxdiff; for python in $(shell py3versions -r); do $$python setup.py install --prefix=$(DESTDIR)@prefix@ --install-layout=deb; done; cd ..
-endif
 
 clean:
 	@cd doc; $(MAKE) clean

debian/changelog

@@ -1,3 +1,9 @@
+spud (1.2) UNRELEASED; urgency=medium
+
+  * Rewrite Debian/Ubuntu packaging
+
+ -- Stephan Kramer <s.kramer@imperial.ac.uk>  Tue, 25 Oct 2022 12:12:05 +0100
+
 spud (1.1.8) buster; urgency=medium
 
   * Change to python3 and remove python(2) dependecies

debian/compat

@@ -1 +1 @@
-9
+11

debian/control

@@ -2,10 +2,10 @@ Source: spud
 Maintainer: The ICOM team <patrick.farrell@imperial.ac.uk>
 Uploaders: David Ham <david.ham@imperial.ac.uk>
 Section: science
-Priority: extra
-Build-Depends: gfortran (>=4.2), g++ (>=4.2), python3-setuptools (>= 0.6b3-1), python3-all-dev (>= 2.3.5-11), debhelper (>= 5.0.38), dh-python, texlive
+Priority: optional
+Build-Depends: gfortran (>=4.2), g++ (>=4.2), python3-setuptools (>= 39), python3-all-dev, debhelper (>= 5.0.38), dh-python, texlive
 Standards-Version: 3.8.0
-XS-Python-Version: >= 2.5
+X-Python3-Version: >= 3.6
 
 Package: spud-diamond
 Architecture: all
@@ -16,7 +16,7 @@ Conflicts: python-diamond, diamond
 Replaces: python-diamond
 Provides: ${python:Provides}
 X-Python-Version: ${python:Versions}
-Description: A schema-driven interface for writing XML documents
+Description: Schema-driven interface for writing XML documents
  Diamond is a dynamic schema-driven graphical user interface for writing
  XML documents. The interface is automatically generated from a schema
  written in RELAX NG describing an XML language. The interface is optimised
@@ -29,7 +29,7 @@ Depends: ${shlibs:Depends}, spudtools, libtinyxml-dev, ${misc:Depends}
 Recommends: spud-diamond
 Section: libdevel
 Suggests:
-Description: An automatic options system for scientific models.
+Description: Automatic options system for scientific models.
  Spud is an automatic options system which reads an xml options file 
  into a dictionary for immediate access from within the model. The xml 
  file is generated using a spud-compatible RELAX NG schema and a
@@ -43,7 +43,7 @@ Conflicts: libspud-dev (<<1.0.6)
 Replaces: libspud-dev (<<1.0.6)
 Section: science
 Suggests:
-Description: An automatic options system for scientific models.
+Description: Automatic options system for scientific models.
  Spud is an automatic options system which reads an xml options file 
  into a dictionary for immediate access from within the model. The xml 
  file is generated using a spud-compatible RELAX NG schema and a
@@ -58,7 +58,7 @@ Replaces: python-spud
 Architecture: any
 X-Python-Version: ${python:Versions}
 Depends: libspud-dev (= ${binary:Version}), ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Description: An automatic options system for scientific models (python interface).
+Description: Automatic options system for scientific models (python interface).
  Spud is an automatic options system which reads an xml options file 
  into a dictionary for immediate access from within the model. The xml 
  file is generated using a spud-compatible RELAX NG schema and a
@@ -72,6 +72,6 @@ Replaces: python-dxdiff
 Architecture: all
 X-Python-Version: ${python:Versions}
 Depends: ${python3:Depends}, ${misc:Depends}
-Description: An XML aware diff tool.
+Description: XML aware diff tool.
  DXdiff (Diamond Xml diff) is an XML aware diff tool for finding edit scripts
  between two XML files.

debian/install.spud-diamond

@@ -0,0 +1,2 @@
+usr/lib/libspud*
+usr/include/spud*

debian/libspud-dev.dirs

@@ -0,0 +1,2 @@
+usr/lib/python3*/dist-packages/dxdiff*
+usr/bin/dxdiff