Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: Sort package lists, configure options, and other various sortable files #4563

Merged
merged 17 commits into from
Nov 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/build_ubuntu-22.04.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,26 @@ set -u
export INSTALL_PREFIX=$1

./configure \
--prefix="$INSTALL_PREFIX/" \
--enable-largefile \
--with-cxx \
--with-zstd \
--with-bzlib \
--prefix="$INSTALL_PREFIX/" \
--with-blas \
--with-bzlib \
--with-cxx \
--with-fftw \
--with-freetype \
--with-freetype-includes="/usr/include/freetype2/" \
--with-geos \
--with-lapack \
--with-libsvm \
--with-readline \
--with-netcdf \
--with-openmp \
--with-pdal \
--with-pthread \
--with-tiff \
--with-freetype \
--with-freetype-includes="/usr/include/freetype2/" \
--with-proj-share=/usr/share/proj \
--with-geos \
--with-pthread \
--with-readline \
--with-sqlite \
--with-fftw \
--with-netcdf
--with-tiff \
--with-zstd

eval $makecmd
make install
26 changes: 13 additions & 13 deletions .github/workflows/build_ubuntu-22.04_without_x.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,25 @@ set -u
export INSTALL_PREFIX=$1

./configure \
--prefix="$INSTALL_PREFIX/" \
--enable-largefile \
--with-cxx \
--with-zstd \
--with-bzlib \
--prefix="$INSTALL_PREFIX/" \
--with-blas \
--with-lapack \
--with-readline \
--without-openmp \
--with-pdal \
--without-pthread \
--with-tiff \
--with-bzlib \
--with-cxx \
--with-fftw \
--with-freetype \
--with-freetype-includes="/usr/include/freetype2/" \
--with-proj-share=/usr/share/proj \
--with-geos \
--with-lapack \
--with-netcdf \
--with-pdal \
--with-proj-share=/usr/share/proj \
--with-readline \
--with-sqlite \
--with-fftw \
--with-netcdf
--with-tiff \
--with-zstd \
--without-openmp \
--without-pthread

eval $makecmd
make install
27 changes: 14 additions & 13 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,26 @@ jobs:
echo "CFLAGS=${{ env.CFLAGS }}" >> $GITHUB_ENV
echo "CXXFLAGS=${{ env.CXXFLAGS }}" >> $GITHUB_ENV
./configure \
--prefix="$HOME/install/" \
--enable-largefile \
--with-cxx \
--with-zstd \
--with-bzlib \
--prefix="$HOME/install/" \
--with-blas \
--with-lapack \
--with-readline \
--without-openmp \
--with-pdal \
--without-pthread \
--with-tiff \
--with-bzlib \
--with-cxx \
--with-fftw \
--with-freetype \
--with-freetype-includes="/usr/include/freetype2/" \
--with-proj-share=/usr/share/proj \
--with-geos \
--with-lapack \
--with-netcdf \
--with-pdal \
--with-proj-share=/usr/share/proj \
--with-readline \
--with-sqlite \
--with-fftw \
--with-netcdf
--with-tiff \
--with-zstd \
--without-openmp \
--without-pthread

env:
CFLAGS: -fPIC -g
CXXFLAGS: -fPIC -g
Expand Down
64 changes: 32 additions & 32 deletions .github/workflows/macos_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,51 +12,51 @@ INSTALL_PREFIX=$1

CONFIGURE_FLAGS="\
--prefix=${INSTALL_PREFIX} \
--with-opengl=aqua \
--with-openmp \
--without-x \
--with-blas=openblas \
--with-bzlib \
--with-bzlib-includes=${CONDA_PREFIX}/include \
--with-bzlib-libs=${CONDA_PREFIX}/lib \
--with-cairo \
--with-cairo-includes=${CONDA_PREFIX}/include/cairo \
--with-cairo-ldflags="-lcairo" \
--with-cairo-libs=${CONDA_PREFIX}/lib \
--with-cxx \
--with-fftw-includes=${CONDA_PREFIX}/include \
--with-fftw-libs=${CONDA_PREFIX}/lib \
--with-freetype \
--with-freetype-includes=${CONDA_PREFIX}/include/freetype2 \
--with-freetype-libs=${CONDA_PREFIX}/lib \
--with-gdal=${CONDA_PREFIX}/bin/gdal-config \
--with-proj-includes=${CONDA_PREFIX}/include \
--with-proj-libs=${CONDA_PREFIX}/lib \
--with-proj-share=${CONDA_PREFIX}/share/proj \
--with-geos=${CONDA_PREFIX}/bin/geos-config \
--with-includes=${CONDA_PREFIX}/include \
--with-lapack=openblas \
--with-libpng=${CONDA_PREFIX}/bin/libpng-config \
--with-tiff-includes=${CONDA_PREFIX}/include \
--with-tiff-libs=${CONDA_PREFIX}/lib \
--with-postgres=yes \
--with-postgres-includes=${CONDA_PREFIX}/include \
--with-postgres-libs=${CONDA_PREFIX}/lib \
--without-mysql \
--with-sqlite \
--with-sqlite-libs=${CONDA_PREFIX}/lib \
--with-sqlite-includes=${CONDA_PREFIX}/include \
--with-fftw-includes=${CONDA_PREFIX}/include \
--with-fftw-libs=${CONDA_PREFIX}/lib \
--with-cxx \
--with-cairo \
--with-cairo-includes=${CONDA_PREFIX}/include/cairo \
--with-cairo-libs=${CONDA_PREFIX}/lib \
--with-cairo-ldflags="-lcairo" \
--with-zstd \
--with-zstd-libs=${CONDA_PREFIX}/lib \
--with-zstd-includes=${CONDA_PREFIX}/include \
--with-bzlib \
--with-bzlib-libs=${CONDA_PREFIX}/lib \
--with-bzlib-includes=${CONDA_PREFIX}/include \
--with-libs=${CONDA_PREFIX}/lib \
--with-netcdf=${CONDA_PREFIX}/bin/nc-config \
--with-blas=openblas \
--with-lapack=openblas \
--with-netcdf=${CONDA_PREFIX}/bin/nc-config \
--with-nls \
--with-libs=${CONDA_PREFIX}/lib \
--with-includes=${CONDA_PREFIX}/include \
--with-opengl=aqua \
--with-openmp \
--with-pdal \
--with-postgres-includes=${CONDA_PREFIX}/include \
--with-postgres-libs=${CONDA_PREFIX}/lib \
--with-postgres=yes \
--with-proj-includes=${CONDA_PREFIX}/include \
--with-proj-libs=${CONDA_PREFIX}/lib \
--with-proj-share=${CONDA_PREFIX}/share/proj \
--with-readline \
--with-readline-includes=${CONDA_PREFIX}/include/readline \
--with-readline-libs=${CONDA_PREFIX}/lib
--with-sqlite \
--with-sqlite-includes=${CONDA_PREFIX}/include \
--with-sqlite-libs=${CONDA_PREFIX}/lib \
--with-tiff-includes=${CONDA_PREFIX}/include \
--with-tiff-libs=${CONDA_PREFIX}/lib \
--with-zstd \
--with-zstd-includes=${CONDA_PREFIX}/include \
--with-zstd-libs=${CONDA_PREFIX}/lib \
--without-mysql \
--without-x \
"

export CFLAGS="-O2 -pipe -arch ${CONDA_ARCH} -DGL_SILENCE_DEPRECATION -Wall -Wextra -Wpedantic -Wvla"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/optional_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
folium
ipyleaflet
jupyter
PyVirtualDisplay
ipyleaflet
2 changes: 1 addition & 1 deletion .gunittest.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ exclude =
python/grass/temporal/testsuite/unittests_temporal_raster_algebra_equal_ts.py
python/grass/temporal/testsuite/unittests_temporal_raster_conditionals_complement_else.py
raster/r.in.lidar/testsuite/test_base_resolution.sh
temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
temporal/t.info/testsuite/test.t.info.sh
temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py
Expand Down
28 changes: 14 additions & 14 deletions .travis/linux.script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@ echo "MAKEFLAGS is '$MAKEFLAGS'"

./configure --host=x86_64-linux-gnu \
--build=x86_64-linux-gnu \
--enable-largefile \
--enable-shared \
--prefix=/usr/lib \
--sysconfdir=/etc \
--sharedstatedir=/var \
--enable-shared \
--with-postgres \
--sysconfdir=/etc \
--with-blas \
--with-cairo \
--with-cxx \
--with-gdal \
--with-freetype \
--with-readline \
--with-nls \
--with-odbc \
--with-freetype-includes=/usr/include/freetype2/ \
--with-gdal \
--with-geos \
--with-lapack \
--with-netcdf \
--with-blas \
--with-sqlite \
--with-zstd \
--enable-largefile \
--with-freetype-includes=/usr/include/freetype2/ \
--with-nls \
--with-odbc \
--with-pdal \
--with-postgres \
--with-postgres-includes=/usr/include/postgresql/ \
--with-proj-share=/usr/share/proj \
--with-cairo \
--with-pdal
--with-readline \
--with-sqlite \
--with-zstd

make CFLAGS="$CFLAGS $GRASS_EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $GRASS_EXTRA_CXXFLAGS"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ ARG GRASS_CONFIG="\
"

ARG GRASS_PYTHON_PACKAGES="\
Pillow \
matplotlib \
numpy \
Pillow \
pip \
ply \
psycopg2 \
Expand Down
24 changes: 12 additions & 12 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,39 +43,39 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
packageList = [
"autoconf2.69",
"autotools-dev",
"make",
"bison",
"flex",
"g++",
"gettext",
"flex",
"bison",
"libblas-dev",
"libcairo2-dev",
"libfftw3-dev",
"libfreetype6-dev",
"libgdal-dev",
"libgeos-dev",
"libglu1-mesa-dev",
"libjpeg-dev",
"libpng-dev",
"libtiff-dev",
"liblapack-dev",
"libmysqlclient-dev",
"libncurses5-dev",
"libnetcdf-dev",
"libpng-dev",
"libpq-dev",
"libproj-dev",
"proj-bin",
"libreadline-dev",
"libsqlite3-dev",
"libtiff-dev",
"libxmu-dev",
"make",
"netcdf-bin",
"proj-bin",
"python3",
"python3-wxgtk4.0",
"python3-dateutil",
"python3-dev",
"python3-numpy",
"python3-ply",
"python3-pil",
"libnetcdf-dev",
"netcdf-bin",
"libblas-dev",
"liblapack-dev",
"python3-ply",
"python3-wxgtk4.0",
"unixodbc-dev",
"zlib1g-dev",
# "libpdal-dev"
Expand Down
1 change: 0 additions & 1 deletion binder/apt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ liblapack-dev
libncurses5-dev
libnetcdf-dev
libpdal-dev
libgeos-dev
libpng-dev
libpq-dev
libproj-dev
Expand Down
12 changes: 6 additions & 6 deletions binder/postBuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ set -e

# compile
./configure \
--with-nls \
--with-cxx \
--with-readline \
--with-bzlib \
--with-proj-share=/usr/share/proj \
--with-geos=/usr/bin/geos-config \
--with-cairo \
--with-opengl-libs=/usr/include/GL \
--with-cxx \
--with-freetype=yes --with-freetype-includes="/usr/include/freetype2/" \
--with-geos=/usr/bin/geos-config \
--with-nls \
--with-opengl-libs=/usr/include/GL \
--with-proj-share=/usr/share/proj \
--with-readline \
--with-sqlite=yes \
--without-pdal
make
Expand Down
Loading
Loading