Skip to content

Commit 7bbc45d

Browse files
committed
Moved the generated html files (from markdown) to the build directory.
1 parent 2e83c44 commit 7bbc45d

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
/build
22
/install
33
/third_parties
4-
/README.html
5-
/UserManual.html
6-
/CONTRIBUTING.html

CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ if (SHELLANYTHING_BUILD_DOC)
180180
endif()
181181

182182
##############################################################################################################################################
183-
# Convert markdown files to html for publishing with installers.
183+
# Convert markdown/text files to html/txt for publishing with installers.
184184
##############################################################################################################################################
185185

186186
# Set the default filenames to be published with the install/package.
@@ -190,23 +190,23 @@ set (CONTRIBUTING_FILENAME CONTRIBUTING.md)
190190

191191
if (GRIP_FOUND)
192192
# Convert README.md
193-
execute_process(COMMAND grip README.md --export README.html --user-content --context=end2endzone/ShellAnything RESULT_VARIABLE res_var WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
193+
execute_process(COMMAND grip README.md --export ${CMAKE_BINARY_DIR}/README.html --user-content --context=end2endzone/ShellAnything RESULT_VARIABLE res_var WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
194194
if("${res_var}" STREQUAL "0")
195195
set (README_FILENAME README.html)
196196
else()
197197
message(FATAL_ERROR "grip failed converting README.md with res_var='${res_var}'")
198198
endif()
199199

200200
# Convert UserManual.md
201-
execute_process(COMMAND grip UserManual.md --export UserManual.html --user-content --context=end2endzone/ShellAnything RESULT_VARIABLE res_var WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
201+
execute_process(COMMAND grip UserManual.md --export ${CMAKE_BINARY_DIR}/UserManual.html --user-content --context=end2endzone/ShellAnything RESULT_VARIABLE res_var WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
202202
if("${res_var}" STREQUAL "0")
203203
set (USERMANUAL_FILENAME UserManual.html)
204204
else()
205205
message(FATAL_ERROR "grip failed converting UserManual.md with res_var='${res_var}'")
206206
endif()
207207

208208
# Convert CONTRIBUTING.md
209-
execute_process(COMMAND grip CONTRIBUTING.md --export CONTRIBUTING.html --user-content --context=end2endzone/ShellAnything RESULT_VARIABLE res_var WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
209+
execute_process(COMMAND grip CONTRIBUTING.md --export ${CMAKE_BINARY_DIR}/CONTRIBUTING.html --user-content --context=end2endzone/ShellAnything RESULT_VARIABLE res_var WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
210210
if("${res_var}" STREQUAL "0")
211211
set (CONTRIBUTING_FILENAME CONTRIBUTING.html)
212212
else()
@@ -218,19 +218,19 @@ endif()
218218

219219
# AUTHORS.txt
220220
set(SHELLANYTHING_AUTHOR_TXT ${CMAKE_BINARY_DIR}/AUTHORS.txt)
221-
message("Generating ${SHELLANYTHING_AUTHOR_TXT}...")
221+
message("Exporting to ${SHELLANYTHING_AUTHOR_TXT}...")
222222
configure_file( ${CMAKE_SOURCE_DIR}/AUTHORS ${SHELLANYTHING_AUTHOR_TXT} )
223223
get_filename_component(AUTHOR_FILENAME ${SHELLANYTHING_AUTHOR_TXT} NAME)
224224

225225
# CHANGES.txt
226226
set(SHELLANYTHING_CHANGES_TXT ${CMAKE_BINARY_DIR}/CHANGES.txt)
227-
message("Generating ${SHELLANYTHING_CHANGES_TXT}...")
227+
message("Exporting to ${SHELLANYTHING_CHANGES_TXT}...")
228228
configure_file( ${CMAKE_SOURCE_DIR}/CHANGES ${SHELLANYTHING_CHANGES_TXT} )
229229
get_filename_component(CHANGES_FILENAME ${SHELLANYTHING_CHANGES_TXT} NAME)
230230

231231
# LICENSE.txt
232232
set(SHELLANYTHING_LICENSE_TXT ${CMAKE_BINARY_DIR}/LICENSE.txt)
233-
message("Generating ${SHELLANYTHING_LICENSE_TXT}...")
233+
message("Exporting to ${SHELLANYTHING_LICENSE_TXT}...")
234234
configure_file( ${CMAKE_SOURCE_DIR}/LICENSE ${SHELLANYTHING_LICENSE_TXT} )
235235
get_filename_component(LICENSE_FILENAME ${SHELLANYTHING_LICENSE_TXT} NAME)
236236

@@ -269,10 +269,10 @@ install(FILES ${CMAKE_SOURCE_DIR}/docs/screenshot_file.png
269269

270270
install(FILES ${CMAKE_SOURCE_DIR}/README.md
271271
${CMAKE_SOURCE_DIR}/UserManual.md
272-
${CMAKE_SOURCE_DIR}/${README_FILENAME}
273-
${CMAKE_SOURCE_DIR}/${USERMANUAL_FILENAME}
274272
${CMAKE_SOURCE_DIR}/CONTRIBUTING.md
275-
${CMAKE_SOURCE_DIR}/${CONTRIBUTING_FILENAME}
273+
${CMAKE_BINARY_DIR}/${README_FILENAME}
274+
${CMAKE_BINARY_DIR}/${USERMANUAL_FILENAME}
275+
${CMAKE_BINARY_DIR}/${CONTRIBUTING_FILENAME}
276276
${CMAKE_BINARY_DIR}/${AUTHOR_FILENAME}
277277
${CMAKE_BINARY_DIR}/${CHANGES_FILENAME}
278278
${CMAKE_BINARY_DIR}/${LICENSE_FILENAME}

0 commit comments

Comments
 (0)