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,8 +49,6 @@ 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
 
@@ -58,7 +56,7 @@ 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

.github/workflows/ubuntu_20.04.yml

@@ -3,10 +3,10 @@ name: Ubuntu 20.04 build
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 
 jobs:
@@ -65,23 +65,23 @@ jobs:
         run: docker run -e GITHUB_WORKFLOW --rm gdal sh -c "cd /build/autotest/cpp && make quick_test && make testsse2 && (if (g++ -march=native -dM -E -x c++ - < /dev/null | grep AVX2 >/dev/null); then make testavx2; else /bin/true; fi)"
 
       - name: Run SWIG Perl tests
-        run: docker run --rm gdal sh -c "cd /build/gdal/swig/perl && make test"
+        run: docker run --rm gdal sh -c "cd /build/swig/perl && make test"
 
       - name: Run SWIG Java tests
-        run: docker run --rm gdal sh -c "cd /build/gdal/swig/java && make test"
+        run: docker run --rm gdal sh -c "cd /build/swig/java && make test"
 
       - name: Run SWIG CSharp tests
-        run: docker run --rm gdal sh -c "cd /build/gdal/swig/csharp && make && make test"
+        run: docker run --rm gdal sh -c "cd /build/swig/csharp && make && make test"
 
       - name: Build GDAL Python sdist distribution
-        run: docker run --rm gdal sh -c "cd /build/gdal/swig/python && python3 setup.py sdist"
+        run: docker run --rm gdal sh -c "cd /build/swig/python && python3 setup.py sdist"
 
       - name: Build gdal-utils Python bdist_wheel distribution
-        run: docker run --rm gdal sh -c "cd /build/gdal/swig/python/gdal-utils && python3 -m pip install wheel && python3 setup.py bdist_wheel"
+        run: docker run --rm gdal sh -c "cd /build/swig/python/gdal-utils && python3 -m pip install wheel && python3 setup.py bdist_wheel"
 
       - name: Run pytest
         # --security-opt seccomp=unconfined, so that the userfaulfd syscall is available
         run: docker run -e CI -e TRAVIS=yes -e TRAVIS_BRANCH=ubuntu_2004 -e GITHUB_WORKFLOW --security-opt seccomp=unconfined --rm gdal sh -c "cd /build/autotest && pip3 install -U -r requirements.txt && pytest"
 
       - name: Build fake ossfuzz fuzzers
-        run: docker run --rm gdal sh -c "cd /build/gdal/fuzzers && make dummyfuzzers_dynamic"
+        run: docker run --rm gdal sh -c "cd /build/fuzzers && make dummyfuzzers_dynamic"

.github/workflows/ubuntu_20.04/build.sh

@@ -23,7 +23,7 @@ else
   export OTHER_SWITCHES="--enable-debug "
 fi
 
-cd /build/gdal
+cd /build
 
 ./autogen.sh
 
@@ -75,9 +75,9 @@ make "-j$(nproc)" USER_DEFS=-Werror
 make install "-j$(nproc)"
 ldconfig
 
-(cd ../autotest/cpp && make "-j$(nproc)")
+(cd autotest/cpp && make "-j$(nproc)")
 
-#(cd ../autotest/cpp && \
+#(cd autotest/cpp && \
 #    make vsipreload.so && \
 #    LD_PRELOAD=./vsipreload.so gdalinfo /vsicurl/http://download.osgeo.org/gdal/data/ecw/spif83.ecw && \
 #    LD_PRELOAD=./vsipreload.so sqlite3  /vsicurl/http://download.osgeo.org/gdal/data/sqlite3/polygon.db "select * from polygon limit 10"

.github/workflows/validate_xml.yml

@@ -3,10 +3,10 @@ name: Validate XML
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 
 jobs:
@@ -24,6 +24,6 @@ jobs:
 
       - name: Run xmllint checks
         run: |
-          xmllint --schema ./gdal/data/nitf_spec.xsd ./gdal/data/nitf_spec.xml --noout
-          xmllint --schema ./gdal/data/vdv452.xsd ./gdal/data/vdv452.xml --noout
-          xmllint --schema ./gdal/data/gmlasconf.xsd ./gdal/data/gmlasconf.xml --noout
+          xmllint --schema ./data/nitf_spec.xsd ./data/nitf_spec.xml --noout
+          xmllint --schema ./data/vdv452.xsd ./data/vdv452.xml --noout
+          xmllint --schema ./data/gmlasconf.xsd ./data/gmlasconf.xml --noout

.github/workflows/windows_build.yml

@@ -3,10 +3,10 @@ name: Windows builds
 on:
     push:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
     pull_request:
         paths-ignore:
-            - 'gdal/doc/**'
+            - 'doc/**'
 
 
 jobs:
@@ -198,7 +198,7 @@ jobs:
             $env:NMAKE_LOCAL+="WEBP_LIBS = /NODEFAULTLIB:libcmt.lib `$(SDK_PREFIX)\libwebp-1.0.3-windows-x86\lib\libwebp.lib`n"
             $env:NMAKE_LOCAL+="LIBDEFLATE_CFLAGS = -I`$(SDK_PREFIX)`n"
             $env:NMAKE_LOCAL+="LIBDEFLATE_LIB = `$(SDK_PREFIX)\libdeflate.lib`n"
-            $env:NMAKE_LOCAL | Set-Content "$env:GITHUB_WORKSPACE\gdal\nmake.local"
+            $env:NMAKE_LOCAL | Set-Content "$env:GITHUB_WORKSPACE\nmake.local"
             #
             cd $env:GITHUB_WORKSPACE
             cd proj
@@ -218,17 +218,17 @@ jobs:
             Invoke-WebRequest "http://download.osgeo.org/proj/proj-datumgrid-1.8.zip" -OutFile "proj-datumgrid-1.8.zip"
             7z x proj-datumgrid-1.8.zip -aoa
             #
-            cd $env:GITHUB_WORKSPACE\gdal
+            cd $env:GITHUB_WORKSPACE
             copy $env:GITHUB_WORKSPACE\install-proj\bin\*.dll .
             exec { nmake /f makefile.vc MSVC_VER=$env:MSVC_VER $env:WIN64_ARG USER_DEFS="/WX $env:ARCH_FLAGS" }
             cd apps
             exec { nmake /f makefile.vc test_ogrsf.exe MSVC_VER=$env:MSVC_VER $env:WIN64_ARG USER_DEFS=/WX }
             $env:DISTUTILS_USE_SDK=1
             $env:MSSdk=1
-            cd $env:GITHUB_WORKSPACE\gdal\swig\python
+            cd $env:GITHUB_WORKSPACE\swig\python
             exec { python setup.py build }
             exec { python setup.py install }
-            cd $env:GITHUB_WORKSPACE\gdal\swig\csharp
+            cd $env:GITHUB_WORKSPACE\swig\csharp
             dotnet nuget locals all --clear
             dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org
             dotnet restore
@@ -251,10 +251,10 @@ jobs:
             $env:SDK_BIN="$env:SDK_PREFIX\bin"
             # Set USE_PATH_FOR_GDAL_PYTHON=YES and include a fake path in the PATH
             # to test robustness to nonexistent paths (only relevant for python>=3.8)
-            # See https://github.com/OSGeo/gdal/issues/3898
+            # See https://github.com/OSGeo/issues/3898
             $env:USE_PATH_FOR_GDAL_PYTHON="YES"
-            $env:PATH="$env:GITHUB_WORKSPACE\gdal;$env:GITHUB_WORKSPACE\gdal\apps;$env:SDK_PREFIX\dll;$env:SDK_PREFIX;$env:SDK_BIN;$env:GITHUB_WORKSPACE\not_a_real_path;$env:PATH"
-            $env:GDAL_DATA="$env:GITHUB_WORKSPACE\gdal\data"
+            $env:PATH="$env:GITHUB_WORKSPACE;$env:GITHUB_WORKSPACE\apps;$env:SDK_PREFIX\dll;$env:SDK_PREFIX;$env:SDK_BIN;$env:GITHUB_WORKSPACE\not_a_real_path;$env:PATH"
+            $env:GDAL_DATA="$env:GITHUB_WORKSPACE\data"
             $env:DO_NOT_FAIL_ON_RECODE_ERRORS="YES"
             $env:MDB_ODBC_DRIVER_INSTALLED="YES"
             # The ca-bundle.crt file which we could point to is invalid in the current SDK
@@ -265,5 +265,5 @@ jobs:
             cd $env:GITHUB_WORKSPACE\autotest
             pip install -Ur requirements.txt
             exec { pytest -vv }
-            cd $env:GITHUB_WORKSPACE\gdal\swig\csharp
+            cd $env:GITHUB_WORKSPACE\swig\csharp
             exec { nmake /f makefile.vc test }

.gitignore

@@ -1,11 +1,148 @@
-*.pyc
+GDALmake.opt
+autom4te.cache
+detectavx.dSYM
+detectsse.dSYM
+gdal.pc
+config.log
+config.status
+configure
+aclocal.m4
+libtool
+cpl_config.h
+clean_main_build_output.bat
 *.o
+*.res
 *.obj
-*.so
-*~
-*.swp
+*.lib
+*.exe
+*.exe.manifest
+*.dll
+*.pdb
+*.idb
+*.ilk
+*.dll.manifest
+*.exp
 *.lo
-
+*.la
+*.so
+.libs
+*.pyc
+*.sdf
+*.sln
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+*.VC.db
+*.VC.opendb
+*.swp
+/[Dd]ebug
+/[Rr]elease
+/x64
+/.vs
+/.vscode
+/nbproject
+frmts/jpipkak/kdu_cache.cpp
+frmts/jpipkak/kdu_cache_wrapper.h
+frmts/msg/PublicDecompWT/
+frmts/msg/PublicDecompWT_all.h
+frmts/jpeg/libjpeg12/*.c
+frmts/jpeg/libjpeg12/*.h
+gcore/gdal_version.h
+libgdal.a
+libgdal.so
+libgdal.so.*
+apps/gdal-config
+apps/gdal-config-inst
+apps/gdal_contour
+apps/gdal_grid
+apps/gdal_rasterize
+apps/gdal_translate
+apps/gdal_viewshed
+apps/gdaladdo
+apps/gdalbuildvrt
+apps/gdaldem
+apps/gdalenhance
+apps/gdalinfo
+apps/gdalmdiminfo
+apps/gdalmdimtranslate
+apps/gdallocationinfo
+apps/gdalmanage
+apps/gdalsrsinfo
+apps/gdaltindex
+apps/gdaltransform
+apps/gdalwarp
+apps/gnmanalyse
+apps/gnmmanage
+apps/nearblack
+apps/ogr2ogr
+apps/ogrinfo
+apps/ogrlineref
+apps/ogrtindex
+apps/testepsg
+apps/gdalserver
+apps/test_ogrsf
+apps/dumpoverviews
+apps/gdalwarpsimple
+apps/multireadtest
+apps/gdal_create
+port/dllbuild.prev
+port/prev_dllbuild.bat
+swig/java/build
+swig/java/gdal.jar
+swig/java/gdal_wrap.cpp
+swig/java/gdalconst_wrap.c
+swig/java/libgdalconstjni.so
+swig/java/libgdaljni.so
+swig/java/libogrjni.so
+swig/java/libosrjni.so
+swig/java/ogr_wrap.cpp
+swig/java/org/
+swig/java/osr_wrap.cpp
+swig/java/gnm_wrap.cpp
+swig/python/build
+swig/python/setup_vars.ini
+swig/python/record.txt
+swig/perl/Const.bs
+swig/perl/GDAL.bs
+swig/perl/Makefile_Geo__GDAL
+swig/perl/Makefile_Geo__GDAL__Const
+swig/perl/Makefile_Geo__OGR
+swig/perl/Makefile_Geo__OSR
+swig/perl/OGR.bs
+swig/perl/OSR.bs
+swig/perl/blib/
+swig/perl/lib/Geo/GDAL/*.pm
+swig/perl/lib/Geo/*.pm
+swig/perl/gdal_wrap.cpp
+swig/perl/gdalconst_wrap.c
+swig/perl/ogr_wrap.cpp
+swig/perl/osr_wrap.cpp
+swig/perl/pm_to_blib
+swig/perl/GNM.bs
+swig/perl/MYMETA.json
+swig/perl/MYMETA.yml
+swig/perl/Makefile_Geo__GNM
+swig/perl/gnm_wrap.cpp
+swig/csharp/*.cpp
+swig/csharp/*.c
+swig/csharp/*.mdb
+swig/csharp/*.config
+swig/csharp/osr
+swig/csharp/ogr
+swig/csharp/gdal
+swig/csharp/const
+fuzzers/libFuzzingEngine.a
+fuzzers/tests/test_gdal_fuzzer
+fuzzers/tests/test_ogr_fuzzer
+fuzzers/tests/test_osr_set_from_user_input_fuzzer
+fuzzers/tests/test_wkb_import_fuzzer
+fuzzers/tests/test_wkt_import_fuzzer
+man/
+html/
+nmake.local*
+*~
+*tmp
+.python-version
 .vagrant
 
 # IDE ignore
@@ -31,4 +168,3 @@ __pycache__/
 gdal/packages*
 gdal/share
 
-

.travis.yml

@@ -180,13 +180,13 @@ matrix:
 #        - DETAILS="debug build, libtool"
 
 before_install:
-  - ./gdal/ci/travis/${BUILD_NAME}/before_install.sh
+  - ./ci/travis/${BUILD_NAME}/before_install.sh
 
 install:
-  - ./gdal/ci/travis/${BUILD_NAME}/install.sh
+  - ./ci/travis/${BUILD_NAME}/install.sh
 
 script:
-  - ./gdal/ci/travis/${BUILD_NAME}/script.sh
+  - ./ci/travis/${BUILD_NAME}/script.sh
 
 notifications:
   irc:

CMakeLists.txt

@@ -193,13 +193,13 @@ else ()
 endif ()
 set_package_properties(Python PROPERTIES PURPOSE "SWIG_PYTHON: Python binding")
 #
-add_subdirectory(gdal)
+include(gdal.cmake)
 # unit tests
 add_subdirectory(autotest/cpp)
 # please comment out if you want to exclude autotest from distribution.
 add_subdirectory(autotest)
 # Google OSS-Fuzz project utilities
-add_subdirectory(gdal/fuzzers)
+add_subdirectory(fuzzers)
 # Google OSS-Fuzz tests
-add_subdirectory(gdal/fuzzers/tests)
+add_subdirectory(fuzzers/tests)
 # vim: ts=4 sw=4 sts=4 et