From 9d6d9e424339cf26d55a07b5313612e22905b342 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Mon, 19 Aug 2024 17:54:18 +0300 Subject: [PATCH] rename --- .github/workflows/haskell-ci.yml | 14 +++++++------- cabal.project | 2 +- cabal.project.macos | 2 +- cabal.project.win | 2 +- .../.gitignore | 2 +- .../CHANGELOG.md | 0 .../LICENSE | 0 .../Setup.hs | 0 .../configure | 0 .../configure.ac | 0 .../m4/ax_compare_version.m4 | 0 .../m4/ax_lib_postgresql.m4 | 0 .../postgresql-libpq-configure.buildinfo.in | 0 .../postgresql-libpq-configure.cabal | 6 +++--- postgresql-libpq.cabal | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) rename {postgresql-libpq-pgconfig => postgresql-libpq-configure}/.gitignore (58%) rename {postgresql-libpq-pgconfig => postgresql-libpq-configure}/CHANGELOG.md (100%) rename {postgresql-libpq-pgconfig => postgresql-libpq-configure}/LICENSE (100%) rename {postgresql-libpq-pgconfig => postgresql-libpq-configure}/Setup.hs (100%) rename {postgresql-libpq-pgconfig => postgresql-libpq-configure}/configure (100%) rename {postgresql-libpq-pgconfig => postgresql-libpq-configure}/configure.ac (100%) rename {postgresql-libpq-pgconfig => postgresql-libpq-configure}/m4/ax_compare_version.m4 (100%) rename {postgresql-libpq-pgconfig => postgresql-libpq-configure}/m4/ax_lib_postgresql.m4 (100%) rename postgresql-libpq-pgconfig/postgresql-libpq-pgconfig.buildinfo.in => postgresql-libpq-configure/postgresql-libpq-configure.buildinfo.in (100%) rename postgresql-libpq-pgconfig/postgresql-libpq-pgconfig.cabal => postgresql-libpq-configure/postgresql-libpq-configure.cabal (88%) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 545cf49..b897592 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -176,7 +176,7 @@ jobs: touch cabal.project echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project echo "packages: $GITHUB_WORKSPACE/source/postgresql-libpq-pkgconfig" >> cabal.project - echo "packages: $GITHUB_WORKSPACE/source/postgresql-libpq-pgconfig" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/postgresql-libpq-configure" >> cabal.project cat cabal.project - name: sdist run: | @@ -192,23 +192,23 @@ jobs: echo "PKGDIR_postgresql_libpq=${PKGDIR_postgresql_libpq}" >> "$GITHUB_ENV" PKGDIR_postgresql_libpq_pkgconfig="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/postgresql-libpq-pkgconfig-[0-9.]*')" echo "PKGDIR_postgresql_libpq_pkgconfig=${PKGDIR_postgresql_libpq_pkgconfig}" >> "$GITHUB_ENV" - PKGDIR_postgresql_libpq_pgconfig="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/postgresql-libpq-pgconfig-[0-9.]*')" - echo "PKGDIR_postgresql_libpq_pgconfig=${PKGDIR_postgresql_libpq_pgconfig}" >> "$GITHUB_ENV" + PKGDIR_postgresql_libpq_configure="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/postgresql-libpq-configure-[0-9.]*')" + echo "PKGDIR_postgresql_libpq_configure=${PKGDIR_postgresql_libpq_configure}" >> "$GITHUB_ENV" rm -f cabal.project cabal.project.local touch cabal.project touch cabal.project.local echo "packages: ${PKGDIR_postgresql_libpq}" >> cabal.project echo "packages: ${PKGDIR_postgresql_libpq_pkgconfig}" >> cabal.project - echo "packages: ${PKGDIR_postgresql_libpq_pgconfig}" >> cabal.project + echo "packages: ${PKGDIR_postgresql_libpq_configure}" >> cabal.project echo "package postgresql-libpq" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project echo "package postgresql-libpq-pkgconfig" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project - echo "package postgresql-libpq-pgconfig" >> cabal.project + echo "package postgresql-libpq-configure" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(postgresql-libpq|postgresql-libpq-configure|postgresql-libpq-pkgconfig)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan @@ -240,7 +240,7 @@ jobs: ${CABAL} -vnormal check cd ${PKGDIR_postgresql_libpq_pkgconfig} || false ${CABAL} -vnormal check - cd ${PKGDIR_postgresql_libpq_pgconfig} || false + cd ${PKGDIR_postgresql_libpq_configure} || false ${CABAL} -vnormal check - name: haddock run: | diff --git a/cabal.project b/cabal.project index 5ea86a5..1831c58 100644 --- a/cabal.project +++ b/cabal.project @@ -1,3 +1,3 @@ packages: . packages: postgresql-libpq-pkgconfig -packages: postgresql-libpq-pgconfig +packages: postgresql-libpq-configure diff --git a/cabal.project.macos b/cabal.project.macos index fa22ac8..d541351 100644 --- a/cabal.project.macos +++ b/cabal.project.macos @@ -1,5 +1,5 @@ packages: . -packages: postgresql-libpq-pgconfig +packages: postgresql-libpq-configure constraints: unix installed diff --git a/cabal.project.win b/cabal.project.win index 34c88a0..de781d3 100644 --- a/cabal.project.win +++ b/cabal.project.win @@ -1,5 +1,5 @@ packages: . -packages: postgresql-libpq-pgconfig +packages: postgresql-libpq-configure constraints: Win32 installed diff --git a/postgresql-libpq-pgconfig/.gitignore b/postgresql-libpq-configure/.gitignore similarity index 58% rename from postgresql-libpq-pgconfig/.gitignore rename to postgresql-libpq-configure/.gitignore index 43a0fad..39729ac 100644 --- a/postgresql-libpq-pgconfig/.gitignore +++ b/postgresql-libpq-configure/.gitignore @@ -1,4 +1,4 @@ -postgresql-libpq-pgconfig.buildinfo +postgresql-libpq-configure.buildinfo config.log config.status aclocal.m4 diff --git a/postgresql-libpq-pgconfig/CHANGELOG.md b/postgresql-libpq-configure/CHANGELOG.md similarity index 100% rename from postgresql-libpq-pgconfig/CHANGELOG.md rename to postgresql-libpq-configure/CHANGELOG.md diff --git a/postgresql-libpq-pgconfig/LICENSE b/postgresql-libpq-configure/LICENSE similarity index 100% rename from postgresql-libpq-pgconfig/LICENSE rename to postgresql-libpq-configure/LICENSE diff --git a/postgresql-libpq-pgconfig/Setup.hs b/postgresql-libpq-configure/Setup.hs similarity index 100% rename from postgresql-libpq-pgconfig/Setup.hs rename to postgresql-libpq-configure/Setup.hs diff --git a/postgresql-libpq-pgconfig/configure b/postgresql-libpq-configure/configure similarity index 100% rename from postgresql-libpq-pgconfig/configure rename to postgresql-libpq-configure/configure diff --git a/postgresql-libpq-pgconfig/configure.ac b/postgresql-libpq-configure/configure.ac similarity index 100% rename from postgresql-libpq-pgconfig/configure.ac rename to postgresql-libpq-configure/configure.ac diff --git a/postgresql-libpq-pgconfig/m4/ax_compare_version.m4 b/postgresql-libpq-configure/m4/ax_compare_version.m4 similarity index 100% rename from postgresql-libpq-pgconfig/m4/ax_compare_version.m4 rename to postgresql-libpq-configure/m4/ax_compare_version.m4 diff --git a/postgresql-libpq-pgconfig/m4/ax_lib_postgresql.m4 b/postgresql-libpq-configure/m4/ax_lib_postgresql.m4 similarity index 100% rename from postgresql-libpq-pgconfig/m4/ax_lib_postgresql.m4 rename to postgresql-libpq-configure/m4/ax_lib_postgresql.m4 diff --git a/postgresql-libpq-pgconfig/postgresql-libpq-pgconfig.buildinfo.in b/postgresql-libpq-configure/postgresql-libpq-configure.buildinfo.in similarity index 100% rename from postgresql-libpq-pgconfig/postgresql-libpq-pgconfig.buildinfo.in rename to postgresql-libpq-configure/postgresql-libpq-configure.buildinfo.in diff --git a/postgresql-libpq-pgconfig/postgresql-libpq-pgconfig.cabal b/postgresql-libpq-configure/postgresql-libpq-configure.cabal similarity index 88% rename from postgresql-libpq-pgconfig/postgresql-libpq-pgconfig.cabal rename to postgresql-libpq-configure/postgresql-libpq-configure.cabal index 6fe2460..3048ca0 100644 --- a/postgresql-libpq-pgconfig/postgresql-libpq-pgconfig.cabal +++ b/postgresql-libpq-configure/postgresql-libpq-configure.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 -name: postgresql-libpq-pgconfig +name: postgresql-libpq-configure version: 0.10 -synopsis: low-level binding to libpq: pg_config based provider +synopsis: low-level binding to libpq: configure based provider description: This is a binding to libpq: the C application programmer's interface to PostgreSQL. libpq is a @@ -42,4 +42,4 @@ library source-repository head type: git location: https://github.com/haskellari/postgresql-libpq - subdir: postgresql-libpq-pgconfig + subdir: postgresql-libpq-configure diff --git a/postgresql-libpq.cabal b/postgresql-libpq.cabal index 031733e..399d90d 100644 --- a/postgresql-libpq.cabal +++ b/postgresql-libpq.cabal @@ -84,7 +84,7 @@ library build-depends: postgresql-libpq-pkgconfig ^>=0.10 else - build-depends: postgresql-libpq-pgconfig ^>=0.10 + build-depends: postgresql-libpq-configure ^>=0.10 build-tool-depends: hsc2hs:hsc2hs >=0.68.5