HPCC-29554 Improve XSD form generation

Converted form generation to use new schema generation using service XML and XSLT transforms Signed-Off-By: Kenneth Rowland [email protected]
hpcc-systems · Jul 13, 2023 · f5cc2ad · f5cc2ad
1 parent 75bc83c
commit f5cc2ad
Show file tree

Hide file tree

Showing 46 changed files with 260 additions and 489 deletions.
diff --git a/dali/dfuplus/CMakeLists.txt b/dali/dfuplus/CMakeLists.txt
@@ -43,6 +43,7 @@ include_directories (
          ./../../system/xmllib
          ./../../esp/platform
          ./../../esp/clients
+         ${HPCC_SOURCE_DIR}/esp/esdllib
          ./../../rtl/include
          ./../../system/include
          ./../../system/jlib
@@ -69,5 +70,3 @@ target_link_libraries ( dfuplus
          xmllib
          esphttp
     )
-
-
diff --git a/ecl/ecl-bundle/CMakeLists.txt b/ecl/ecl-bundle/CMakeLists.txt
@@ -49,6 +49,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp
          ${HPCC_SOURCE_DIR}/esp/platform
          ${HPCC_SOURCE_DIR}/esp/smc/SMCLib
+         ${HPCC_SOURCE_DIR}/esp/esdllib
          ${HPCC_SOURCE_DIR}/system/security/shared
          ${HPCC_SOURCE_DIR}/system/include
          ${HPCC_SOURCE_DIR}/system/xmllib

diff --git a/ecl/ecl-package/CMakeLists.txt b/ecl/ecl-package/CMakeLists.txt
@@ -48,6 +48,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp
          ${HPCC_SOURCE_DIR}/esp/platform
          ${HPCC_SOURCE_DIR}/esp/smc/SMCLib
+         ${HPCC_SOURCE_DIR}/esp/esdllib
          ${HPCC_SOURCE_DIR}/system/security/shared
          ${HPCC_SOURCE_DIR}/system/include
          ${HPCC_SOURCE_DIR}/system/xmllib
@@ -73,4 +74,3 @@ if ( UNIX )
     install ( PROGRAMS ecl-package.install DESTINATION etc/init.d/install COMPONENT Runtime )
     install ( PROGRAMS ecl-package.uninstall DESTINATION etc/init.d/uninstall COMPONENT Runtime )
 endif ( UNIX )
-
diff --git a/ecl/eclcmd/CMakeLists.txt b/ecl/eclcmd/CMakeLists.txt
@@ -65,6 +65,7 @@ include_directories (
          ./../../esp/bindings/http/client
          ./../../system/include
          ./../../esp/bindings
+         ${HPCC_SOURCE_DIR}/esp/esdllib
          ./../../ecl/hql
          ./../../ecl/eclcc
          ./../../dali/base

diff --git a/ecl/eclcmd/queries/CMakeLists.txt b/ecl/eclcmd/queries/CMakeLists.txt
@@ -41,6 +41,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp
          ${HPCC_SOURCE_DIR}/esp/platform
          ${HPCC_SOURCE_DIR}/esp/smc/SMCLib
+         ${HPCC_SOURCE_DIR}/esp/esdllib
          ${HPCC_SOURCE_DIR}/system/security/shared
          ${HPCC_SOURCE_DIR}/system/include
          ${HPCC_SOURCE_DIR}/system/xmllib

diff --git a/ecl/eclcmd/roxie/CMakeLists.txt b/ecl/eclcmd/roxie/CMakeLists.txt
@@ -39,6 +39,7 @@ include_directories (
          ${HPCC_SOURCE_DIR}/esp/bindings/SOAP/xpp
          ${HPCC_SOURCE_DIR}/esp/platform
          ${HPCC_SOURCE_DIR}/esp/smc/SMCLib
+         ${HPCC_SOURCE_DIR}/esp/esdllib
          ${HPCC_SOURCE_DIR}/system/security/shared
          ${HPCC_SOURCE_DIR}/system/include
          ${HPCC_SOURCE_DIR}/system/xmllib

diff --git a/ecl/eclplus/CMakeLists.txt b/ecl/eclplus/CMakeLists.txt
@@ -15,53 +15,54 @@
 ################################################################################
 
 
-# Component: eclplus 
+# Component: eclplus
 #####################################################
 # Description:
 # ------------
 #    Cmake Input File for eclplus
 #####################################################
 
-project( eclplus ) 
+project( eclplus )
 
 include(${HPCC_SOURCE_DIR}/esp/scm/smcscm.cmake)
 include(${HPCC_SOURCE_DIR}/esp/scm/espscm.cmake)
 
 
-set (    SRCS 
-         ../../esp/bindings/bindutil.cpp 
+set (    SRCS
+         ../../esp/bindings/bindutil.cpp
          ${ESPSCM_GENERATED_DIR}/common_esp.cpp
          ${ESPSCM_GENERATED_DIR}/ws_workunits_struct_esp.cpp
          ${ESPSCM_GENERATED_DIR}/ws_workunits_req_resp_esp.cpp
          ${ESPSCM_GENERATED_DIR}/ws_workunits_queryset_req_resp_esp.cpp
-         ${ESPSCM_GENERATED_DIR}/ws_workunits_esp.cpp 
+         ${ESPSCM_GENERATED_DIR}/ws_workunits_esp.cpp
          ${ESPSCM_GENERATED_DIR}/ws_logaccess_esp.cpp
-         DeleteHelper.cpp 
-         DumpHelper.cpp 
-         eclplus.cpp 
-         formattypes.cpp 
-         ListHelper.cpp 
-         main.cpp 
-         QueryHelper.cpp 
-         ViewHelper.cpp 
+         DeleteHelper.cpp
+         DumpHelper.cpp
+         eclplus.cpp
+         formattypes.cpp
+         ListHelper.cpp
+         main.cpp
+         QueryHelper.cpp
+         ViewHelper.cpp
     )
 
-include_directories ( 
+include_directories (
          ./../../system/security/shared
-         ./../../system/mp 
-         ./../../common/dllserver 
-         ./../../common/fileview2 
-         ./../../common/workunit 
-         ./../../esp/clients 
-         ./../../common/environment 
-         ./../../esp/bindings/SOAP/xpp 
-         ./../../system/include 
-         ./../../esp/bindings 
-         ./../../ecl/hql 
-         ./../../dali/base 
-         ./../../esp/platform 
-         ./../../system/jlib 
-         ./../../system/xmllib 
+         ./../../system/mp
+         ./../../common/dllserver
+         ./../../common/fileview2
+         ./../../common/workunit
+         ./../../esp/clients
+         ./../../common/environment
+         ./../../esp/bindings/SOAP/xpp
+         ./../../system/include
+         ./../../esp/bindings
+         ${HPCC_SOURCE_DIR}/esp/esdllib
+         ./../../ecl/hql
+         ./../../dali/base
+         ./../../esp/platform
+         ./../../system/jlib
+         ./../../system/xmllib
          ${HPCC_SOURCE_DIR}/common/thorhelper
     )
 
@@ -70,8 +71,7 @@ ADD_DEFINITIONS( -DECLPLUS_EXPORTS -D_CONSOLE -DWSWU_API_LOCAL -Dws_logaccess_AP
 HPCC_ADD_EXECUTABLE ( eclplus ${SRCS} )
 add_dependencies ( eclplus espscm )
 install ( TARGETS eclplus RUNTIME DESTINATION ${EXEC_DIR} )
-target_link_libraries (  eclplus 
+target_link_libraries (  eclplus
          jlib
-         esphttp 
+         esphttp
     )
-