From 067466e2f148efef8429258fa20389df48ef79e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edouard=20Choini=C3=A8re?= <27212526+echoix@users.noreply.github.com> Date: Sun, 1 Dec 2024 00:34:08 +0000 Subject: [PATCH] style: Trim trailing whitespaces in mswindows/osgeo4w/ config scripts --- mswindows/osgeo4w/gdal-config | 2 +- mswindows/osgeo4w/geos-config | 2 +- mswindows/osgeo4w/liblas-config | 34 ++++++++++++++++----------------- mswindows/osgeo4w/mysql_config | 22 ++++++++++----------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/mswindows/osgeo4w/gdal-config b/mswindows/osgeo4w/gdal-config index 1917531b73e..9ad585f47b5 100755 --- a/mswindows/osgeo4w/gdal-config +++ b/mswindows/osgeo4w/gdal-config @@ -25,7 +25,7 @@ if test $# -eq 0; then usage 1 1>&2 fi -case $1 in +case $1 in --libs) echo $CONFIG_LIBS ;; diff --git a/mswindows/osgeo4w/geos-config b/mswindows/osgeo4w/geos-config index 6b52971ee80..523059726ee 100755 --- a/mswindows/osgeo4w/geos-config +++ b/mswindows/osgeo4w/geos-config @@ -32,7 +32,7 @@ case $1 in echo $OSGEO4W_ROOT_MSYS/lib/geos_c.lib ;; --ldflags) - echo + echo ;; --includes) echo $OSGEO4W_ROOT_MSYS/include diff --git a/mswindows/osgeo4w/liblas-config b/mswindows/osgeo4w/liblas-config index 0fbef69b696..05212ae94fc 100755 --- a/mswindows/osgeo4w/liblas-config +++ b/mswindows/osgeo4w/liblas-config @@ -7,57 +7,57 @@ INCLUDES="-I${prefix}/include " LIBS="-L$libdir -llas -llas_c" GDAL_INCLUDE="" -if test -n "$GDAL_INCLUDE" ; then +if test -n "$GDAL_INCLUDE" ; then INCLUDES="$INCLUDES -I$GDAL_INCLUDE" fi GDAL_LIBRARY="" -if test -n "$GDAL_LIBRARY" ; then +if test -n "$GDAL_LIBRARY" ; then LIBS="$LIBS $GDAL_LIBRARY" fi GEOTIFF_INCLUDE="" -if test -n "$GEOTIFF_INCLUDE" ; then +if test -n "$GEOTIFF_INCLUDE" ; then INCLUDES="$INCLUDES -I$GEOTIFF_INCLUDE" fi GEOTIFF_LIBRARY="" -if test -n "$GEOTIFF_LIBRARY" ; then +if test -n "$GEOTIFF_LIBRARY" ; then LIBS="$LIBS $GEOTIFF_LIBRARY" fi ORACLE_INCLUDE="" -if test -n "$ORACLE_INCLUDE" ; then +if test -n "$ORACLE_INCLUDE" ; then INCLUDES="$INCLUDES -I$ORACLE_INCLUDE" fi ORACLE_OCI_LIBRARY="" -if test -n "$ORACLE_OCI_LIBRARY" ; then +if test -n "$ORACLE_OCI_LIBRARY" ; then LIBS="$LIBS $ORACLE_OCI_LIBRARY " fi TIFF_INCLUDE="" -if test -n "$TIFF_INCLUDE" ; then +if test -n "$TIFF_INCLUDE" ; then INCLUDES="$INCLUDES -I$TIFF_INCLUDE" fi TIFF_LIBRARY="" -if test -n "$TIFF_LIBRARY" ; then +if test -n "$TIFF_LIBRARY" ; then LIBS="$LIBS $TIFF_LIBRARY" fi LIBXML2_INCLUDE_DIR="" -if test -n "$LIBXML2_INCLUDE_DIR" ; then +if test -n "$LIBXML2_INCLUDE_DIR" ; then INCLUDES="$INCLUDES -I$LIBXML2_INCLUDE_DIR" fi LIBXML2_LIBRARIES="" -if test -n "$LIBXML2_LIBRARIES" ; then +if test -n "$LIBXML2_LIBRARIES" ; then LIBS="$LIBS $LIBXML2_LIBRARIES" fi LASZIP_INCLUDE_DIR="" -if test -n "$LASZIP_INCLUDE_DIR" ; then +if test -n "$LASZIP_INCLUDE_DIR" ; then INCLUDES="$INCLUDES -I$LASZIP_INCLUDE_DIR" fi LASZIP_LIBRARY="" -if test -n "$LASZIP_LIBRARY" ; then +if test -n "$LASZIP_LIBRARY" ; then LIBS="$LIBS $LASZIP_LIBRARY" fi @@ -80,8 +80,8 @@ if test $# -eq 0; then usage 1 1>&2 fi -case $1 in - --libs) +case $1 in + --libs) echo $OSGEO4W_ROOT_MSYS/lib/liblas_c.lib ;; @@ -94,7 +94,7 @@ case $1 in ;; --defines) - echo + echo ;; --includes) @@ -102,13 +102,13 @@ case $1 in ;; --cflags) - echo + echo ;; --cxxflags) echo -pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long -std=c++98 ;; - + *) usage 1 1>&2 ;; diff --git a/mswindows/osgeo4w/mysql_config b/mswindows/osgeo4w/mysql_config index 11204eb9c72..d6b96ed2f13 100755 --- a/mswindows/osgeo4w/mysql_config +++ b/mswindows/osgeo4w/mysql_config @@ -1,15 +1,15 @@ #!/bin/sh # Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved. -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -109,7 +109,7 @@ else port=3306 fi -# Create options +# Create options # We intentionally add a space to the beginning and end of lib strings, simplifies replace later libs=" $ldflags -L$pkglibdir -lmysqlclient -lpthread -lz -lm -ldl " libs="$libs " @@ -131,19 +131,19 @@ for remove in DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS \ do # The first option we might strip will always have a space before it because # we set -I$pkgincludedir as the first option - cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"` - cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove */ /g"` + cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"` + cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove */ /g"` done -cflags=`echo "$cflags"|sed -e 's/ *\$//'` -cxxflags=`echo "$cxxflags"|sed -e 's/ *\$//'` +cflags=`echo "$cflags"|sed -e 's/ *\$//'` +cxxflags=`echo "$cxxflags"|sed -e 's/ *\$//'` # Same for --libs(_r) for remove in lmtmalloc static-libcxa i-static static-intel do # We know the strings starts with a space - libs=`echo "$libs"|sed -e "s/ -$remove */ /g"` - libs_r=`echo "$libs_r"|sed -e "s/ -$remove */ /g"` - embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove */ /g"` + libs=`echo "$libs"|sed -e "s/ -$remove */ /g"` + libs_r=`echo "$libs_r"|sed -e "s/ -$remove */ /g"` + embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove */ /g"` done # Strip trailing and ending space if any, and '+' (FIXME why?)