Merge pull request #3547 from GordonSmith/HPCC-8111

HPCC-8111 Revert unneeded change to esp/files/CMakelists.txt

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

esp/files/CMakeLists.txt

@@ -16,167 +16,21 @@
 
 project( web_files ) 
 
-set ( HTML_FILES
-    html/searchfile.html
-)
+add_subdirectory (css)
+source_group(css FILES ${CSS_FILES})
+add_subdirectory (html)
 source_group(html FILES ${HTML_FILES})
-
-set ( IMG_FILES
-    img/collapse.gif
-    img/expand.gif
-    img/save.gif
-    img/cloud.jpg
-    img/wizard.gif
-    img/tooltip.jpg
-    img/hpcc_logo.png
-    img/favicon.ico
-    img/base.gif
-    img/blank.png
-    img/information.png
-    img/cal.gif
-    img/close_wnd.gif
-    img/config.png
-    img/copyurl.png
-    img/downsimple.png
-    img/espbtns_tiled.gif
-    img/folder.gif
-    img/folderopen.gif
-    img/form_minus.gif
-    img/form_more.gif
-    img/form_plus.gif
-    img/home.png
-    img/join.gif
-    img/joinbottom.gif
-    img/keyfile.png
-    img/hpccsystemsECLWatch.png
-    img/hpccsystemsWsECL.png
-    img/line.gif
-    img/loading.gif
-    img/locked.gif
-    img/menu1.png
-    img/menudown.png
-    img/menuup.png
-    img/minus.gif
-    img/minusbottom.gif
-    img/next.gif
-    img/next_year.gif
-    img/outlet.png
-    img/page.gif
-    img/pixel.gif
-    img/plus.gif
-    img/plusbottom.gif
-    img/prev.gif
-    img/prev_year.gif
-    img/refresh.png
-    img/refreshdisabled.png
-    img/refreshenabled.png
-    img/relogin.png
-    img/reqxml.gif
-    img/respxml.gif
-    img/selectall.gif
-    img/tab_bottom.gif
-    img/topurl.png
-    img/unselectall.gif
-    img/upsimple.png
-    img/wsdl.gif
-    img/xsd.gif
-    img/zip.gif
-    img/zipbig.gif
-    img/accept.png
-    img/bullet_green.png
-    img/bullet_orange.png
-    img/cog.png
-    img/delete.png
-    img/folder_table.png
-    img/control_pause_blue.png
-    img/bullet_error.png
-    img/bullet_red.png
-    img/bullet_white.png
-    img/bullet_yellow.png
-    img/loadingAnimation.gif
-)
+add_subdirectory (img)
 source_group(img FILES ${IMG_FILES})
-
-set ( LOGO_FILES
-    logo/ln_small.gif
-    logo/seisint_small.gif
-    logo/slogo.gif
-)
+add_subdirectory (logo)
 source_group(logo FILES ${LOGO_FILES})
-
-set ( CSS_FILES
-    css/espdefault.css
-    css/eclwatch.css
-    css/graph.css
-    css/winclassic.css
-    css/headerFooter.css
-    css/list.css
-    css/rightSideBar.css
-    css/sortabletable.css
-    css/tabs.css
-    css/hpcc.css
-    css/ecl.css
-)
-source_group(css FILES ${CSS_FILES})
-
-set ( TEMPLATES_FILES
-    templates/ECLPlaygroundWidget.html
-    templates/GraphPageWidget.html
-    templates/GraphWidget.html
-    templates/ResultsWidget.html
-    templates/SampleSelectWidget.html
-    templates/TargetSelectWidget.html
-    templates/TimingTreeMapWidget.html
-    templates/ECLSourceWidget.html
-)
-source_group(templates FILES ${TEMPLATES_FILES})
-
-set ( SCRIPTS_FILES
-    scripts/espdefault.js
-    scripts/CMultiSelect.js
-    scripts/bpsreport.js
-    scripts/builder.js
-    scripts/controls.js
-    scripts/dragdrop.js
-    scripts/effects.js
-    scripts/fixedTables.js
-    scripts/graphgvc.js
-    scripts/multiselect.js
-    scripts/objtree.js
-    scripts/prototype.js
-    scripts/range.js
-    scripts/timer.js
-    scripts/slider.js
-    scripts/prototype_helpers.js
-    scripts/rightSideBar.js
-    scripts/scriptaculous.js
-    scripts/sortabletable.js
-    scripts/tabularForm.js
-    scripts/tooltip.js
-    scripts/tree.js
-    scripts/tree_template.js
-    scripts/ui_engine.js
-
-    scripts/ESPBase.js
-    scripts/ESPWorkunit.js
-    scripts/ESPResult.js
-    scripts/WsWorkunits.js
-
-    scripts/ResultsControl.js
-
-    scripts/ECLPlaygroundWidget.js
-    scripts/GraphPageWidget.js
-    scripts/GraphWidget.js
-    scripts/ResultsWidget.js
-    scripts/SampleSelectWidget.js
-    scripts/TargetSelectWidget.js
-    scripts/TimingTreeMapWidget.js
-    scripts/ECLSourceWidget.js
-)
+add_subdirectory (scripts)
 source_group(scripts FILES ${SCRIPTS_FILES})
+add_subdirectory (templates)
+source_group(templates FILES ${TEMPLATES_FILES})
 
 set ( MAIN_FILES 
-	dummy.cpp
+    dummy.cpp
     default.css
     gen_form.css
     wsecl2_form.css
@@ -213,33 +67,12 @@ set ( MAIN_FILES
     groupadd.html
     stub.htm
     stub.js
-    )
+)
 source_group("Source Files" FILES ${MAIN_FILES})
 
 set ( SRCS ${MAIN_FILES} ${HTML_FILES} ${IMG_FILES} ${LOGO_FILES} ${CSS_FILES} ${SCRIPTS_FILES} ${TEMPLATES_FILES})
-HPCC_ADD_LIBRARY( web_files ${SRCS} )
-
-Install ( FILES html/searchfile.html DESTINATION componentfiles/files COMPONENT Runtime )
-FOREACH( iFile ${IMG_FILES} )
-    Install( FILES ${iFile} DESTINATION componentfiles/files/img COMPONENT Runtime )
-ENDFOREACH ( iFile )
-Install ( FILES img/favlogo.png DESTINATION componentfiles/files COMPONENT Runtime )
 
-FOREACH( iFile ${LOGO_FILES} )
-    Install( FILES ${iFile} DESTINATION componentfiles/files/logo COMPONENT Runtime )
-ENDFOREACH ( iFile )
-
-FOREACH( iFile ${CSS_FILES} )
-    Install( FILES ${iFile} DESTINATION componentfiles/files/css COMPONENT Runtime )
-ENDFOREACH ( iFile )
-
-FOREACH( iFile ${SCRIPTS_FILES} )
-    Install( FILES ${iFile} DESTINATION componentfiles/files/scripts COMPONENT Runtime )
-ENDFOREACH ( iFile )
-
-FOREACH( iFile ${TEMPLATES_FILES} )
-    Install( FILES ${iFile} DESTINATION componentfiles/files/templates COMPONENT Runtime )
-ENDFOREACH ( iFile )
+HPCC_ADD_LIBRARY( web_files ${SRCS} )
 
 FOREACH( iFile ${MAIN_FILES} )
     Install( FILES ${iFile} DESTINATION componentfiles/files COMPONENT Runtime )

esp/files/css/CMakeLists.txt

@@ -14,7 +14,7 @@
 #    limitations under the License.
 ################################################################################
 
-FOREACH( iFILES
+set ( CSS_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/espdefault.css
     ${CMAKE_CURRENT_SOURCE_DIR}/eclwatch.css
     ${CMAKE_CURRENT_SOURCE_DIR}/graph.css
@@ -24,7 +24,11 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/rightSideBar.css
     ${CMAKE_CURRENT_SOURCE_DIR}/sortabletable.css
     ${CMAKE_CURRENT_SOURCE_DIR}/tabs.css
+    ${CMAKE_CURRENT_SOURCE_DIR}/hpcc.css
     ${CMAKE_CURRENT_SOURCE_DIR}/ecl.css
 )
-    Install( FILES ${iFILES} DESTINATION componentfiles/files/css COMPONENT Runtime )
-ENDFOREACH ( iFILES )
+set ( CSS_FILES ${CSS_FILES} PARENT_SCOPE)
+
+FOREACH( iFile ${CSS_FILES} )
+    Install( FILES ${iFile} DESTINATION componentfiles/files/css COMPONENT Runtime )
+ENDFOREACH ( iFile )

esp/files/html/CMakeLists.txt

@@ -14,4 +14,9 @@
 #    limitations under the License.
 ################################################################################
 
+set ( HTML_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/searchfile.html
+)
+set ( HTML_FILES ${HTML_FILES} PARENT_SCOPE)
+
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/searchfile.html DESTINATION componentfiles/files COMPONENT Runtime )

esp/files/img/CMakeLists.txt

@@ -14,7 +14,7 @@
 #    limitations under the License.
 ################################################################################
 
-FOREACH( iFILES
+set ( IMG_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/collapse.gif
     ${CMAKE_CURRENT_SOURCE_DIR}/expand.gif
     ${CMAKE_CURRENT_SOURCE_DIR}/save.gif
@@ -89,7 +89,10 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/bullet_yellow.png
     ${CMAKE_CURRENT_SOURCE_DIR}/loadingAnimation.gif
 )
-    Install ( FILES ${iFILES} DESTINATION componentfiles/files/img COMPONENT Runtime)
-ENDFOREACH( iFILES )
+set ( IMG_FILES ${IMG_FILES} PARENT_SCOPE)
+
+FOREACH( iFile ${IMG_FILES} )
+    Install( FILES ${iFile} DESTINATION componentfiles/files/img COMPONENT Runtime )
+ENDFOREACH ( iFile )
 
 Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/favlogo.png DESTINATION componentfiles/files COMPONENT Runtime )

esp/files/logo/CMakeLists.txt

@@ -14,10 +14,14 @@
 #    limitations under the License.
 ################################################################################
 
-FOREACH( iFILES
+set ( LOGO_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/ln_small.gif
     ${CMAKE_CURRENT_SOURCE_DIR}/seisint_small.gif
     ${CMAKE_CURRENT_SOURCE_DIR}/slogo.gif
 )
-    Install( FILES ${iFILES} DESTINATION componentfiles/files/logo COMPONENT Runtime )
-ENDFOREACH ( iFILES )
+set ( LOGO_FILES ${LOGO_FILES} PARENT_SCOPE)
+
+FOREACH( iFile ${LOGO_FILES} )
+    Install( FILES ${iFile} DESTINATION componentfiles/files/logo COMPONENT Runtime )
+ENDFOREACH ( iFile )
+

esp/files/scripts/CMakeLists.txt

@@ -15,7 +15,7 @@
 ################################################################################
 add_subdirectory (configmgr)
 
-FOREACH( iFILES
+set ( SCRIPTS_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/espdefault.js
     ${CMAKE_CURRENT_SOURCE_DIR}/CMultiSelect.js
     ${CMAKE_CURRENT_SOURCE_DIR}/bpsreport.js
@@ -40,14 +40,24 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/tree.js
     ${CMAKE_CURRENT_SOURCE_DIR}/tree_template.js
     ${CMAKE_CURRENT_SOURCE_DIR}/ui_engine.js
-    ${CMAKE_CURRENT_SOURCE_DIR}/EclEditorControl.js
     ${CMAKE_CURRENT_SOURCE_DIR}/ESPBase.js
     ${CMAKE_CURRENT_SOURCE_DIR}/ESPWorkunit.js
     ${CMAKE_CURRENT_SOURCE_DIR}/ESPResult.js
     ${CMAKE_CURRENT_SOURCE_DIR}/WsWorkunits.js
-    ${CMAKE_CURRENT_SOURCE_DIR}/GraphControl.js
     ${CMAKE_CURRENT_SOURCE_DIR}/ResultsControl.js
     ${CMAKE_CURRENT_SOURCE_DIR}/SampleSelectControl.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/ECLPlaygroundWidget.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/GraphPageWidget.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/GraphWidget.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/ResultsWidget.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/SampleSelectWidget.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/TargetSelectWidget.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/TimingTreeMapWidget.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/ECLSourceWidget.js
 )
-    Install ( FILES ${iFILES} DESTINATION componentfiles/files/scripts COMPONENT Runtime )
-ENDFOREACH ( iFILES )
+set ( SCRIPTS_FILES ${SCRIPTS_FILES} PARENT_SCOPE)
+
+FOREACH( iFile ${SCRIPTS_FILES} )
+    Install( FILES ${iFile} DESTINATION componentfiles/files/scripts COMPONENT Runtime )
+ENDFOREACH ( iFile )
+