Merge pull request #46643 from pathmapper/lp_cmake

[server] Integrate landingpage build process with cmake
qgis · Jan 10, 2022 · ecdc190 · ecdc190
2 parents fd1b819 + 4f41405
commit ecdc190
Show file tree

Hide file tree

Showing 36 changed files with 4,304 additions and 7,283 deletions.
diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
@@ -80,6 +80,7 @@ cmake \
  -DWITH_ASTYLE=OFF \
  -DWITH_BINDINGS=${WITH_QT5} \
  -DWITH_SERVER=${WITH_QT5} \
+ -DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_QT5} \
  -DWITH_ORACLE=${WITH_QT5} \
  -DWITH_PDAL=${WITH_QT5} \
  -DWITH_QT5SERIALPORT=${WITH_QT5} \

diff --git a/.docker/qgis3-qt5-build-deps.dockerfile b/.docker/qgis3-qt5-build-deps.dockerfile
@@ -102,6 +102,11 @@ RUN  apt-get update \
     hdbcli \
   && apt-get clean
 
+# Node.js and Yarn for server landingpage webapp
+RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
+RUN apt-get install -y nodejs
+RUN corepack enable
+
 # Oracle : client side
 RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-basic-linux.x64-19.9.0.0.0dbru.zip > instantclient-basic-linux.x64-19.9.0.0.0dbru.zip
 RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip > instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip

diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml
@@ -39,6 +39,14 @@ jobs:
       - name: Install build dependencies
         run: ./ms-windows/mingw/mingwdeps.sh
 
+      # Node.js and Yarn for server landingpage webapp
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '17'
+
+      - name: Make yarn available
+        run: corepack enable
+
       - name: Create ccache dir
         run: mkdir -p /w/.ccache/QGIS
 

diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,8 @@ qgis.kdev4
 qgis.supp
 qgis-test.ctest
 qtcreator-build/
+resources/server/api/ogc/static/landingpage
+resources/server/src/landingpage/node_modules
 resources/themes/*/style.qss.auto
 scripts/astyle.exe
 scripts/Debug

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -198,6 +198,8 @@ if(WITH_CORE)
   # server disabled default because it needs FastCGI (which is optional dependency)
   set (WITH_SERVER FALSE CACHE BOOL "Determines whether QGIS server should be built")
   if(WITH_SERVER)
+    set (WITH_SERVER_LANDINGPAGE_WEBAPP FALSE CACHE BOOL "Determines whether QGIS server landingpage webapp should be built (requires nodejs and yarn)")
+
     set (SERVER_SKIP_ECW FALSE CACHE BOOL "Determines whether QGIS server should disable ECW (ECW in server apps requires a special license)")
 
     set (WITH_SERVER_PLUGINS ${WITH_BINDINGS} CACHE BOOL "Determines whether QGIS server support for python plugins should be built")

diff --git a/INSTALL.md b/INSTALL.md
@@ -192,6 +192,12 @@ See [debian-ubuntu](https://qgis.org/en/site/forusers/alldownloads.html#debian-u
 currently supported distributions (plain xenial's GDAL for instance is too old
 and we build with GDAL2 from ubuntugis).
 
+To build QGIS server landingpage webapp additional dependencies are required:
+
+Node.js (current LTS recommended): https://nodejs.org/en/download/<br>
+Yarn Package Manager: https://yarnpkg.com/getting-started/install
+
+
 ## 3.4. Setup ccache (Optional, but recommended)
 
 You should also setup ccache to speed up compile times:
@@ -435,6 +441,12 @@ To build QGIS server additional dependencies are required:
 dnf install fcgi-devel
 ```
 
+And for building QGIS server landingpage webapp:
+
+```bash
+dnf install nodejs yarnpkg
+```
+
 Make sure that your build directory is completely empty when you enter the
 following command. Do never try to "re-use" an existing Qt5 build directory.
 If you want to use `ccmake` or other interactive tools, run the following

diff --git a/ms-windows/mingw/build.sh b/ms-windows/mingw/build.sh
@@ -95,6 +95,7 @@ mkdir -p "$BUILDDIR"
     -DBINDINGS_GLOBAL_INSTALL=ON \
     -DSIP_GLOBAL_INSTALL=ON \
     -DWITH_SERVER=ON \
+    -DWITH_SERVER_LANDINGPAGE_WEBAPP=ON \
     -DTXT2TAGS_EXECUTABLE= \
     ..
 )

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -34,6 +34,27 @@ if (WITH_SERVER)
   set(RESOURCES_FILES ${RESOURCES_FILES} ${SERVER_RESOURCE_FILES})
 endif()
 
+# Server landingpage webapp
+if (WITH_SERVER_LANDINGPAGE_WEBAPP)
+  find_program(YARN yarn REQUIRED)
+
+  file(GLOB_RECURSE LANDINGPAGE_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} server/src/landingpage/*)
+  set(LANDINGPAGE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/output/data/resources/server/src/landingpage)
+
+  add_custom_target (server_landingpage ALL DEPENDS ${LANDINGPAGE_OUTPUT_PATH}/landingpage.stamp)
+
+  add_custom_command(
+    POST_BUILD
+    OUTPUT ${LANDINGPAGE_OUTPUT_PATH}/landingpage.stamp
+    DEPENDS ${LANDINGPAGE_SOURCE_FILES}
+    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/
+    ${LANDINGPAGE_OUTPUT_PATH}/
+    COMMAND ${CMAKE_COMMAND} -E touch ${LANDINGPAGE_OUTPUT_PATH}/landingpage.stamp
+    COMMAND cd ${LANDINGPAGE_OUTPUT_PATH} && ${YARN} install --frozen-lockfile && ${YARN} build
+  )
+endif()
+
 # Apple specific handling
 if (APPLE)
   # ASN.1 definition files of PKIX elements

diff --git a/resources/server/api/ogc/static/landingpage/css/app.ca3f5643.css b/resources/server/api/ogc/static/landingpage/css/app.ca3f5643.css
diff --git a/resources/server/api/ogc/static/landingpage/css/chunk-26945ca0.4bfbed8f.css b/resources/server/api/ogc/static/landingpage/css/chunk-26945ca0.4bfbed8f.css
diff --git a/resources/server/api/ogc/static/landingpage/css/chunk-a28d6c70.182dac32.css b/resources/server/api/ogc/static/landingpage/css/chunk-a28d6c70.182dac32.css
diff --git a/resources/server/api/ogc/static/landingpage/css/chunk-d04d025e.a393ec5d.css b/resources/server/api/ogc/static/landingpage/css/chunk-d04d025e.a393ec5d.css
diff --git a/resources/server/api/ogc/static/landingpage/css/chunk-vendors.a728f495.css b/resources/server/api/ogc/static/landingpage/css/chunk-vendors.a728f495.css
diff --git a/resources/server/api/ogc/static/landingpage/favicon.ico b/resources/server/api/ogc/static/landingpage/favicon.ico
diff --git a/resources/server/api/ogc/static/landingpage/index.html b/resources/server/api/ogc/static/landingpage/index.html
diff --git a/resources/server/api/ogc/static/landingpage/js/app.13f18e4d.js b/resources/server/api/ogc/static/landingpage/js/app.13f18e4d.js
diff --git a/resources/server/api/ogc/static/landingpage/js/app.13f18e4d.js.map b/resources/server/api/ogc/static/landingpage/js/app.13f18e4d.js.map
diff --git a/resources/server/api/ogc/static/landingpage/js/chunk-26945ca0.432ae155.js b/resources/server/api/ogc/static/landingpage/js/chunk-26945ca0.432ae155.js
diff --git a/resources/server/api/ogc/static/landingpage/js/chunk-26945ca0.432ae155.js.map b/resources/server/api/ogc/static/landingpage/js/chunk-26945ca0.432ae155.js.map
diff --git a/resources/server/api/ogc/static/landingpage/js/chunk-a28d6c70.c3f6a2e7.js b/resources/server/api/ogc/static/landingpage/js/chunk-a28d6c70.c3f6a2e7.js
diff --git a/resources/server/api/ogc/static/landingpage/js/chunk-a28d6c70.c3f6a2e7.js.map b/resources/server/api/ogc/static/landingpage/js/chunk-a28d6c70.c3f6a2e7.js.map