HPCC-17528 Include esdl.bat in windows clienttools builds

- Rebases Michael's original commit into 6.4
- Includes ESDL.bat file provided by IDE team
- Packages ESDL.bat into clienttools package

Signed-off-by: Rodrigo Pastrana <rodrigo.pastrana@lexisnexis.com>

CMakeLists.txt

@@ -181,7 +181,9 @@ elseif ( NOT MAKE_DOCS_ONLY OR MAKE_CONFIGURATOR )
         HPCC_ADD_SUBDIRECTORY (thorlcr "PLATFORM")
         HPCC_ADD_SUBDIRECTORY (testing)
 
-        if ( NOT WIN32 )
+        if ( WIN32 )
+            HPCC_ADD_SUBDIRECTORY (clienttools/IDEPlugins "CLIENTTOOLS_ONLY")
+        else()
             HPCC_ADD_SUBDIRECTORY (clienttools "CLIENTTOOLS_ONLY")
         endif()
 

clienttools/IDEPlugins/CMakeLists.txt

@@ -0,0 +1,17 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2017 HPCC Systems®.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+
+add_subdirectory(ESDL)

clienttools/IDEPlugins/ESDL/CMakeLists.txt

@@ -0,0 +1,27 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2017 HPCC Systems®.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+
+project(IDEPlugins-ESDL)
+
+set(SRC
+    esdl.bat.in
+    )
+
+foreach(source ${SRC})
+    string(REGEX REPLACE "\\.in$" "" configured_source ${source})
+    configure_file(${source} ${configured_source} @ONLY)
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${configured_source} DESTINATION IDEPlugins/ESDL)
+endforeach()

clienttools/IDEPlugins/ESDL/esdl.bat.in

@@ -58,7 +58,7 @@ esdl publish %newinput% --server %server%  --port %port% --version 1.0 --usernam
 goto end
 
 :genecl
-esdl ecl %newinput% %TMP% --includes --rollup -cde "C:\Program Files (x86)\HPCCSystems\6.2.0\clienttools\componentfiles" 2>%5 >>%TMP%\log.txt
+esdl ecl %newinput% %TMP% --includes --rollup -cde "@ORIG_PREFIX@\@DIR_NAME@\@version@\clienttools\componentfiles" 2>%5 >>%TMP%\log.txt
 goto end
 
 :end

cmake_modules/optionDefaults.cmake

@@ -10,10 +10,12 @@ if ( WIN32 )
     else()
         set( PREFIX "$ENV{${prog86key}}" )
     endif()
+    set(ORIG_PREFIX ${PREFIX})
     string(REGEX REPLACE "\\\\" "/" PREFIX ${PREFIX})    
 else (WIN32)
     set( PREFIX "${DESTDIR}/opt" )
-endif (WIN32)    
+    set( ORIG_PREFIX ${PREFIX})
+endif (WIN32)
 endif()
 
 if ( NOT EXEC_PREFIX )