Skip to content

Commit

Permalink
Merge pull request #1602 from satya-bodapati/PXB-trunk-3316
Browse files Browse the repository at this point in the history
(Trunk) Follow up fix to PXB-3316 : Remove doc folder to fix Snyk issues
  • Loading branch information
satya-bodapati authored Aug 23, 2024
2 parents fdeaa50 + 5139a5a commit 7c4977d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 16 deletions.
12 changes: 0 additions & 12 deletions cmake/make_dist.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,6 @@ IF(NOT EXISTS ${PACKAGE_DIR}/Docs/INFO_SRC)
CREATE_INFO_SRC(${PACKAGE_DIR}/Docs)
ENDIF()

# Add xtrabackup man pages
SET(MAN_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/storage/innobase/xtrabackup/doc/source/build/man)
SET(MAN_PKG_DIR ${PACKAGE_DIR}/storage/innobase/xtrabackup/doc/source/build/man)

IF(EXISTS ${MAN_BIN_DIR})
FILE(GLOB MAN_FILES RELATIVE ${MAN_BIN_DIR} ${MAN_BIN_DIR}/*.1)
FOREACH(MAN_FILE ${MAN_FILES})
CONFIGURE_FILE(${MAN_BIN_DIR}/${MAN_FILE}
${MAN_PKG_DIR}/${MAN_FILE} COPYONLY)
ENDFOREACH()
ENDIF()

# In case we used CPack, it could have copied some
# extra files that are not usable on different machines.
FILE(REMOVE ${PACKAGE_DIR}/CMakeCache.txt)
Expand Down
4 changes: 4 additions & 0 deletions man/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ FILE(GLOB MAN1_NDB ndb*.1)
FILE(GLOB MAN8 *.8)
FILE(GLOB MAN8_NDB ndb*.8)

IF (WITH_XTRABACKUP)
RETURN()
ENDIF()

IF(MAN1_NDB AND NOT WITH_NDB)
LIST(REMOVE_ITEM MAN1 ${MAN1_NDB})
ENDIF()
Expand Down
4 changes: 0 additions & 4 deletions sql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1268,10 +1268,6 @@ ADD_CUSTOM_TARGET(dist
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)

IF(WITH_MAN_PAGES)
ADD_DEPENDENCIES(dist man)
ENDIF()

ADD_CUSTOM_TARGET(distclean
COMMAND ${CMAKE_COMMAND} -E echo WARNING: distclean target is not functional
COMMAND ${CMAKE_COMMAND} -E echo Use 'git clean -fdx' instead
Expand Down

0 comments on commit 7c4977d

Please sign in to comment.