diff options
| -rw-r--r-- | .gitlab-ci.yml | 73 | ||||
| -rw-r--r-- | Makefile.am | 164 | ||||
| -rwxr-xr-x | autogen.sh | 18 | ||||
| -rw-r--r-- | configure.ac | 43 |
4 files changed, 5 insertions, 293 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b998c64..3f3850c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ # Please see the ci-templates documentation for details: # https://freedesktop.pages.freedesktop.org/ci-templates/ -.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha e195d80f35b45cc73668be3767b923fd76c70ed5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: @@ -30,15 +30,14 @@ variables: # The tag should be updated each time the list of packages is updated. # Changing a tag forces the associated image to be rebuilt. # Note: the tag has no meaning, we use a date format purely for readability - FDO_DISTRIBUTION_TAG: '2023-02-15.0' + FDO_DISTRIBUTION_TAG: '2025-01-05.1' # minimal set of packages required to build and install either way - BASE_PACKAGES: 'git gcc pkgconf xorg-font-util' - # packages needed to build and install with each set of tools - AUTOTOOLS_PACKAGES: 'autoconf automake make xorg-util-macros' + BASE_PACKAGES: 'git pkgconf xorg-font-util' + # packages needed to build and install with meson MESON_PACKAGES: 'meson ninja' # extra packages we need for various tests EXTRA_PACKAGES: 'diffutils jq' - FDO_DISTRIBUTION_PACKAGES: $BASE_PACKAGES $AUTOTOOLS_PACKAGES $MESON_PACKAGES $EXTRA_PACKAGES + FDO_DISTRIBUTION_PACKAGES: $BASE_PACKAGES $MESON_PACKAGES $EXTRA_PACKAGES # # Verify that commit messages are as expected @@ -89,23 +88,6 @@ container-prep: # # The default build, runs on the image built above. # -autotools: - stage: build - extends: - - .fdo.distribution-image@arch - script: - - mkdir _builddir - - pushd _builddir > /dev/null - - ../autogen.sh --disable-silent-rules - - make - - make check - - make distcheck - - mv xorg-cf-files-*.tar.gz .. - - popd > /dev/null - artifacts: - paths: - - xorg-cf-files-*.tar.gz - meson: extends: - .fdo.distribution-image@arch @@ -115,48 +97,3 @@ meson: - meson setup builddir --prefix="$PWD/../_inst" $MESON_OPTIONS - meson compile -C builddir - meson install -C builddir - -meson from tarball: - extends: - - .fdo.distribution-image@arch - stage: test - script: - - mkdir -p _tarball_build - - tar xf xorg-cf-files-*.tar.gz -C _tarball_build - - pushd _tarball_build/xorg-cf-files-* - - meson setup builddir - - meson test -C builddir - needs: - - autotools - variables: - GIT_STRATEGY: none - -compare meson and autotools: - extends: - - .fdo.distribution-image@arch - stage: test - script: - - mkdir -p $PWD/_meson_inst - - mkdir -p $PWD/_autotools_inst - # the prefix ends up in the site.def file, so we use a symlink - # to use the same --prefix for meson and autotools - - ln -sf $PWD/_meson_inst $PWD/_inst - - meson setup builddir --prefix=$PWD/_inst - - meson compile -C builddir - - meson install -C builddir - - rm $PWD/_inst - - ln -sf $PWD/_autotools_inst $PWD/_inst - - ./autogen.sh --prefix=$PWD/_inst - - make && make install - - diff --brief --recursive $PWD/_meson_inst $PWD/_autotools_inst - -check versions are in sync: - extends: - - .fdo.distribution-image@arch - stage: test - script: - - autoreconf -ivf - - ./configure --version | head -n 1 | sed -e 's/xorg-cf-files configure //' > autotools.version - - meson setup builddir - - meson introspect --projectinfo builddir | jq -r '.version' > meson.version - - diff -u autotools.version meson.version || (echo "ERROR - autotools and meson versions not in sync" && false) diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index fec6211..0000000 --- a/Makefile.am +++ /dev/null @@ -1,164 +0,0 @@ -BUILT_DEFFILES = \ - host.def \ - date.def \ - version.def - -DEFFILES = \ - cross.def \ - site.def \ - xf86site.def \ - xorgsite.def \ - xorgversion.def - -RULEFILES = \ - Imake.rules \ - Motif.rules \ - OpenBSDLib.rules \ - Win32.rules \ - X11.rules \ - bsdiLib.rules \ - bsdLib.rules \ - cde.rules \ - cross.rules \ - cygwin.rules \ - mingw.rules \ - darwinLib.rules \ - gnuLib.rules \ - hpLib.rules \ - ibmLib.rules \ - lnxLib.rules \ - lnxdoc.rules \ - necLib.rules \ - noop.rules \ - nto.rules \ - oldlib.rules \ - os2.rules \ - os2Lib.rules \ - osfLib.rules \ - scoLib.rules \ - sequentLib.rules \ - sgiLib.rules \ - sunLib.rules \ - sv3Lib.rules \ - sv4Lib.rules \ - QNX4.rules \ - xf86.rules - -TMPLFILES = \ - Imake.tmpl \ - Library.tmpl \ - Motif.tmpl \ - OpenBSDLib.tmpl \ - Server.tmpl \ - ServerLib.tmpl \ - Threads.tmpl \ - WinLib.tmpl \ - X11.tmpl \ - bsdiLib.tmpl \ - bsdLib.tmpl \ - cde.tmpl \ - cygwin.tmpl \ - mingw.tmpl \ - darwinLib.tmpl \ - hpLib.tmpl \ - gnuLib.tmpl \ - ibmLib.tmpl \ - lnxLib.tmpl \ - lnxdoc.tmpl \ - necLib.tmpl \ - os2Lib.tmpl \ - osfLib.tmpl \ - sgiLib.tmpl \ - sunLib.tmpl \ - sv3Lib.tmpl \ - sv4Lib.tmpl \ - xf86.tmpl \ - xorg.tmpl - -CFFILES = \ - Imake.cf \ - Amoeba.cf \ - DGUX.cf \ - dmx.cf \ - DragonFly.cf \ - FreeBSD.cf \ - Mips.cf \ - NetBSD.cf \ - OpenBSD.cf \ - Oki.cf \ - cygwin.cf \ - mingw.cf \ - Win32.cf \ - apollo.cf \ - bsd.cf \ - bsdi.cf \ - convex.cf \ - cray.cf \ - fujitsu.cf \ - generic.cf \ - gnu.cf \ - hp.cf \ - ibm.cf \ - isc.cf \ - linux.cf \ - luna.cf \ - macII.cf \ - mach.cf \ - minix.cf \ - moto.cf \ - ncr.cf \ - nec.cf \ - nto.cf \ - os2.cf \ - osf1.cf \ - pegasus.cf \ - sco.cf \ - sco5.cf \ - sequent.cf \ - sgi.cf \ - sony.cf \ - sun.cf \ - svr3.cf \ - svr4.cf \ - ultrix.cf \ - usl.cf \ - lynx.cf \ - x386.cf \ - QNX4.cf \ - darwin.cf \ - xfree86.cf \ - xorg.cf - -configdir = @XCONFDIR@ -dist_config_DATA = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) -config_DATA = $(BUILT_DEFFILES) - -EXTRA_DIST = \ - site.sample - -all-local: $(BUILT_DEFFILES) - -host.def: - @touch host.def -date.def: - @touch date.def -version.def: - @touch version.def - -CLEANFILES = $(BUILT_DEFFILES) - -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - -.PHONY: ChangeLog INSTALL - -INSTALL: - $(INSTALL_CMD) - -ChangeLog: - $(CHANGELOG_CMD) - -dist-hook: ChangeLog INSTALL - -# Optional meson build files -EXTRA_DIST += meson.build meson_options.txt empty.def diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 6304235..0000000 --- a/autogen.sh +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh - -srcdir=`dirname "$0"` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd "$srcdir" - -autoreconf -v --install || exit 1 -cd "$ORIGDIR" || exit $? - -git config --local --get format.subjectPrefix >/dev/null 2>&1 || - git config --local format.subjectPrefix "PATCH util/cf" - -if test -z "$NOCONFIGURE"; then - exec "$srcdir"/configure "$@" -fi - diff --git a/configure.ac b/configure.ac deleted file mode 100644 index dfc3e5a..0000000 --- a/configure.ac +++ /dev/null @@ -1,43 +0,0 @@ -dnl -dnl Process this file with autoconf to create configure. - -# Initialize Autoconf -AC_PREREQ([2.60]) -AC_INIT([xorg-cf-files], [1.0.8], - [https://gitlab.freedesktop.org/xorg/util/cf/-/issues], - [xorg-cf-files]) -AC_CONFIG_SRCDIR([Makefile.am]) - -# Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-xz]) - -# Require xorg-macros 1.20 or later: XORG_DEFAULT_NOCODE_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.20 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.20) -XORG_DEFAULT_NOCODE_OPTIONS - -# Require X.Org's font util macros 1.1 or later for XORG_FONTROOTDIR -m4_ifndef([XORG_FONT_MACROS_VERSION], - [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) -XORG_FONT_MACROS_VERSION(1.1) -XORG_FONTROOTDIR -XORG_FONTSUBDIR([ENCODINGSDIR],[encodingsdir],[encodings]) -# Convert ${FONTROOTDIR} to something Imake can handle -AC_PROG_SED -ENCODINGSDIR="`echo ${ENCODINGSDIR} | ${SED} 's/${FONTROOTDIR}/FontDir/'`" - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_XCONFDIR="${libdir}/X11/config" -AC_ARG_WITH(config-dir, - AS_HELP_STRING([--with-config-dir=<path>], [Path to config dir (default: ${libdir}/X11/config)]), - [XCONFDIR="$withval"], - [XCONFDIR="$DEFAULT_XCONFDIR"]) -AC_SUBST(XCONFDIR) - -AC_CONFIG_FILES([ - Makefile - site.def -]) -AC_OUTPUT |