Move gdal/* to toplevel

.github/workflows/android.yml

@@ -3,10 +3,10 @@ name: Android build
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 jobs:
 

.github/workflows/android/start.sh

@@ -55,7 +55,6 @@ tar xzf sqlite-autoconf-3250100.tar.gz
 # Build proj
 (cd proj;  ./autogen.sh && PKG_CONFIG_PATH=/tmp/install/lib/pkgconfig ./configure --host=arm-linux-androideabi --prefix=/tmp/install --disable-static && make -j3 && make install)
 
-cd gdal
 ./autogen.sh
 ./configure --host=arm-linux-androideabi --with-proj=/tmp/install --with-sqlite3=/tmp/install
 make USER_DEFS="-Wextra -Werror" -j3

.github/workflows/asan/start.sh

@@ -80,12 +80,9 @@ sudo sh -c "apt-get remove -y libproj-dev"
 
 export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
-CURRENT_DIR=$PWD
-cd gdal
-
 ./autogen.sh
 SANITIZE_FLAGS="-DMAKE_SANITIZE_HAPPY -fsanitize=undefined -fsanitize=address -fsanitize=unsigned-integer-overflow"
-CFLAGS=$SANITIZE_FLAGS CXXFLAGS=$SANITIZE_FLAGS LDFLAGS="-fsanitize=undefined -fsanitize=address -lstdc++" ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --without-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-libtiff=internal --with-rename-internal-libtiff-symbols --with-hide-internal-symbols --with-gnm --with-proj=/usr/local --with-fgdb=$PWD/../FileGDB_API-64gcc51
+CFLAGS=$SANITIZE_FLAGS CXXFLAGS=$SANITIZE_FLAGS LDFLAGS="-fsanitize=undefined -fsanitize=address -lstdc++" ./configure --prefix=/usr --without-libtool --enable-debug --with-jpeg12 --with-poppler --without-podofo --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-libtiff=internal --with-rename-internal-libtiff-symbols --with-hide-internal-symbols --with-gnm --with-proj=/usr/local --with-fgdb=$PWD/FileGDB_API-64gcc51
 sed -i "s/-fsanitize=address/-fsanitize=address -shared-libasan/g" GDALmake.opt
 sed -i "s/-fsanitize=unsigned-integer-overflow/-fsanitize=unsigned-integer-overflow -fno-sanitize-recover=unsigned-integer-overflow/g" GDALmake.opt
 make USER_DEFS="-Werror" -j3
@@ -108,8 +105,6 @@ sudo ldconfig
 
 ccache -s
 
-cd "$CURRENT_DIR"
-
 echo "Saving ccache..."
 rm -f "$WORK_DIR/ccache.tar.gz"
 (cd $HOME && tar czf "$WORK_DIR/ccache.tar.gz" .ccache)

.github/workflows/asan_build.yml

@@ -3,10 +3,10 @@ name: ASAN build
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 jobs:
 

.github/workflows/clang_static_analyzer.yml

@@ -3,10 +3,10 @@ name: CLang Static Analyzer
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 
 jobs:
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Run
-        run: docker run --rm -v $PWD:$PWD ubuntu:16.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./gdal/ci/travis/csa_part_1/before_install.sh && sh ./gdal/ci/travis/csa_part_1/install.sh && sh ./gdal/ci/travis/csa_part_1/script.sh"
+        run: docker run --rm -v $PWD:$PWD ubuntu:16.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./ci/travis/csa_part_1/before_install.sh && sh ./ci/travis/csa_part_1/install.sh && sh ./ci/travis/csa_part_1/script.sh"
 
   clang_static_analyzer_part_2:
     runs-on: ubuntu-20.04
@@ -29,4 +29,4 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Run
-        run: docker run --rm -v $PWD:$PWD ubuntu:16.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./gdal/ci/travis/csa_part_2/before_install.sh && sh ./gdal/ci/travis/csa_part_2/install.sh && sh ./gdal/ci/travis/csa_part_2/script.sh"
+        run: docker run --rm -v $PWD:$PWD ubuntu:16.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./ci/travis/csa_part_2/before_install.sh && sh ./ci/travis/csa_part_2/install.sh && sh ./ci/travis/csa_part_2/script.sh"

.github/workflows/code_checks.yml

@@ -3,10 +3,10 @@ name: Code Checks
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 jobs:
 
@@ -23,10 +23,10 @@ jobs:
           sudo apt install -y cppcheck libsqlite3-dev ccache sqlite3 libproj-dev
 
       - name: Run configure
-        run: (cd gdal && ./autogen.sh && ./configure)
+        run: (./autogen.sh && ./configure)
 
       - name: Run cppcheck test
-        run: ./gdal/scripts/cppcheck.sh
+        run: ./scripts/cppcheck.sh
 
   code_quality_checks:
     runs-on: ubuntu-latest
@@ -35,19 +35,19 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Detect tabulations
-        run: ./gdal/scripts/detect_tabulations.sh
+        run: ./scripts/detect_tabulations.sh
 
       - name: Detect printf
-        run: ./gdal/scripts/detect_printf.sh
+        run: ./scripts/detect_printf.sh
 
       - name: Detect self assignments
-        run: ./gdal/scripts/detect_self_assignment.sh
+        run: ./scripts/detect_self_assignment.sh
 
       - name: Detect suspicious char digit zero
-        run: ./gdal/scripts/detect_suspicious_char_digit_zero.sh
+        run: ./scripts/detect_suspicious_char_digit_zero.sh
 
       - name: Shellcheck
-        run: shellcheck -e SC2086,SC2046,SC2164,SC2054 $(find gdal -name '*.sh' -a -not -name ltmain.sh)
+        run: shellcheck -e SC2086,SC2046,SC2164,SC2054 $(find . -name '*.sh' -a -not -name ltmain.sh -a -not -wholename "./autotest/*" -a -not -wholename "./.github/*")
 
   flake8:
     runs-on: ubuntu-latest
@@ -64,7 +64,7 @@ jobs:
         run: |
             export FLAKE8="flake8 --config autotest/setup.cfg"
             $FLAKE8 autotest
-            $FLAKE8 gdal/swig/python/gdal-utils/
+            $FLAKE8 swig/python/gdal-utils/
 
   doxygen:
     runs-on: ubuntu-18.04
@@ -79,6 +79,6 @@ jobs:
 
       - name: Run doxygen
         run: |
-            cd gdal/doc
+            cd doc
             make .doxygen_up_to_date >log.txt 2>&1
             if grep -i warning log.txt | grep -v -e russian -e brazilian; then echo "Doxygen warnings found" && cat log.txt && /bin/false; else echo "No Doxygen warnings found"; fi

.github/workflows/conda.yml

@@ -3,11 +3,11 @@ name: Conda
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
-    # Disabled because of https://github.com/OSGeo/gdal/issues/4599
+            - 'doc/**'
+    # Disabled because of https://github.com/OSGeo/issues/4599
     #pull_request:
     #    paths-ignore:
-    #        - 'gdal/doc/**'
+    #        - 'doc/**'
 
 
 jobs:
@@ -35,7 +35,7 @@ jobs:
     - name: Setup
       shell: bash -l {0}
       run: |
-          source ./gdal/ci/travis/conda/setup.sh
+          source ./ci/travis/conda/setup.sh
 
     - name: Support longpaths
       run: git config --system core.longpaths true
@@ -44,7 +44,7 @@ jobs:
     - name: Build
       shell: bash -l {0}
       run: |
-          source ../gdal/ci/travis/conda/compile.sh
+          source ../ci/travis/conda/compile.sh
       working-directory: ./gdal-feedstock
 
     - uses: ilammy/msvc-dev-cmd@v1
@@ -61,5 +61,5 @@ jobs:
       env:
         ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
       run: |
-          source ../gdal/ci/travis/conda/upload.sh || true
+          source ../ci/travis/conda/upload.sh || true
       working-directory: ./gdal-feedstock

.github/workflows/fedora_rawhide.yml

@@ -3,10 +3,10 @@ name: Fedora Rawhide
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 
 jobs:

.github/workflows/fedora_rawhide/start.sh

@@ -49,16 +49,14 @@ ccache -M 1G
 ccache -s
 
 # Configure GDAL
-CURRENT_DIR=$PWD
-cd gdal
 ./autogen.sh
 CC='ccache clang' CXX='ccache clang++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-python=/usr/bin/python3 --with-poppler --with-spatialite --with-liblzma --with-webp --with-hdf4 --with-hdf5 --with-armadillo
 
 make USER_DEFS=-Werror -j$(nproc)
 (cd apps && make USER_DEFS=-Werror -j$(nproc) test_ogrsf)
 make install
 ldconfig
-cd "$CURRENT_DIR"
+
 (cd autotest/cpp && make -j3)
 
 ccache -s

.github/workflows/macos.yml

@@ -3,10 +3,10 @@ name: MacOS build
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 
 jobs:
@@ -26,17 +26,17 @@ jobs:
       - name: Install Requirements
         shell: bash -l {0}
         run: |
-          source ./gdal/ci/travis/osx/before_install.sh
+          source ./ci/travis/osx/before_install.sh
 
       - name: Build
         shell: bash -l {0}
         run: |
-          source ./gdal/ci/travis/osx/install.sh
+          source ./ci/travis/osx/install.sh
 
       - name: Run tests
         shell: bash -l {0}
         run: |
-          source ./gdal/ci/travis/osx/script.sh
+          source ./ci/travis/osx/script.sh
         env:
             # Emulate a few Travis-CI env variable so that some tests get properly skipped
             TRAVIS: true

.github/workflows/mingw_w64.yml

@@ -3,10 +3,10 @@ name: mingw_w64 build
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 
 jobs:

.github/workflows/mingw_w64/start.sh

@@ -75,7 +75,6 @@ tar xzf sqlite-autoconf-3250100.tar.gz
 (cd proj; sudo make -j3 install)
 
 # build GDAL
-cd gdal
 ./autogen.sh
 ./configure --host=x86_64-w64-mingw32 --with-proj=/tmp/install
 make USER_DEFS="-Wextra -Werror" -j3
@@ -90,7 +89,7 @@ cd swig/python
 ln -s "$WINEPREFIX/drive_c/users/root/Local Settings/Application Data/Programs/Python/Python37" $WINEPREFIX/drive_c/Python37
 gendef $WINEPREFIX/drive_c/Python37/python37.dll
 x86_64-w64-mingw32-dlltool --dllname $WINEPREFIX/drive_c/Python37/python37.dll --input-def python37.def --output-lib $WINEPREFIX/drive_c/Python37/libs/libpython37.a
-bash fallback_build_mingw32_under_unix_py37.sh 
+bash fallback_build_mingw32_under_unix_py37.sh
 cd ../..
 
 ccache -s
@@ -101,7 +100,7 @@ rm -f "$WORK_DIR/ccache.tar.gz"
 
 
 wine64 apps/gdalinfo.exe --version
-cd ../autotest
+cd autotest
 # Does not work under wine
 rm -f gcore/rfc30.py
 rm -f pyscripts/data/test_utf8*
@@ -116,7 +115,7 @@ export PYTEST="wine64 $PYTHON_DIR/python.exe -m pytest -vv -p no:sugar --color=n
 
 
 # Run all the Python autotests
-GDAL_DATA=$PWD/../gdal/data \
-    PYTHONPATH=$PWD/../gdal/swig/python/build/lib.win-amd64-3.7 \
-    PATH=$PWD/../gdal:$PWD/../gdal/apps/.libs:$PWD:$PATH \
+GDAL_DATA=$PWD/../data \
+    PYTHONPATH=$PWD/../swig/python/build/lib.win-amd64-3.7 \
+    PATH=$PWD/../gdal:$PWD/../apps/.libs:$PWD:$PATH \
     $PYTEST

.github/workflows/ubuntu_18.04.yml

@@ -3,10 +3,10 @@ name: Ubuntu 18.04 build
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 
 jobs:

.github/workflows/ubuntu_18.04/install.sh

@@ -42,8 +42,6 @@ sudo sh -c "apt-get remove -y libproj-dev"
 export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
 # Configure GDAL
-CURRENT_DIR=$PWD
-cd gdal
 ./autogen.sh
 CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-rasterlite2 --with-fgdb=/usr
 # --enable-debug --with-podofo
@@ -56,7 +54,7 @@ sudo rm -f /usr/lib/libgdal.so*
 sudo make install
 sudo ldconfig
 sudo ln -s libgdal.so /usr/lib/libgdal.so.20
-cd "$CURRENT_DIR"
+
 (cd autotest/cpp && make -j3)
 
 ccache -s

.github/workflows/ubuntu_18.04_32bit.yml

@@ -3,10 +3,10 @@ name: Ubuntu 18.04 32bit build
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 
 jobs:

.github/workflows/ubuntu_18.04_32bit/start.sh

@@ -68,8 +68,6 @@ sudo sh -c "apt-get remove -y libproj-dev"
 export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
 # Configure GDAL
-CURRENT_DIR=$PWD
-cd gdal
 ./autogen.sh
 CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python=/usr/bin/python3 --with-poppler --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-rasterlite2 --enable-debug --with-libtiff=internal --with-hide-internal-symbols
 
@@ -79,7 +77,7 @@ sudo rm -f /usr/lib/libgdal.so*
 sudo make install
 sudo ldconfig
 sudo ln -s libgdal.so /usr/lib/libgdal.so.20
-cd "$CURRENT_DIR"
+
 (cd autotest/cpp && make -j3)
 
 ccache -s