mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-09 07:19:11 +00:00
Merge e8e78419fb into f78dec6e00
This commit is contained in:
commit
9b92aabec7
|
|
@ -40,12 +40,12 @@ if(CMAKE_HOST_WIN32)
|
|||
|
||||
elseif(CMAKE_HOST_UNIX)
|
||||
execute_process(
|
||||
COMMAND rsync -av ${COPY_SOURCE} "${COPY_DEST}/"
|
||||
RESULT_VARIABLE rs
|
||||
COMMAND cp -av "${COPY_SOURCE}/" "${COPY_DEST}/"
|
||||
RESULT_VARIABLE cp
|
||||
)
|
||||
|
||||
if(rs GREATER 0) # Any non-zero exit code indicates an error
|
||||
message(FATAL_ERROR "rsync failed (exit code ${rs})")
|
||||
if(cp GREATER 0) # Any non-zero exit code indicates an error
|
||||
message(FATAL_ERROR "cp failed (exit code ${cp})")
|
||||
endif()
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported host platform for asset copying.")
|
||||
|
|
|
|||
|
|
@ -46,24 +46,25 @@ if(CMAKE_HOST_WIN32)
|
|||
message(FATAL_ERROR "robocopy failed (exit code ${rc})")
|
||||
endif()
|
||||
elseif(CMAKE_HOST_UNIX)
|
||||
set(rsync_args -av)
|
||||
set(tar_args)
|
||||
|
||||
foreach(pattern IN LISTS EXCLUDE_FILES)
|
||||
list(APPEND rsync_args "--exclude=${pattern}")
|
||||
list(APPEND tar_args "--exclude=${pattern}")
|
||||
endforeach()
|
||||
|
||||
foreach(pattern IN LISTS EXCLUDE_FOLDERS)
|
||||
list(APPEND rsync_args "--exclude=${pattern}")
|
||||
list(APPEND tar_args "--exclude=${pattern}")
|
||||
endforeach()
|
||||
|
||||
# Trailing slashes ensure rsync copies contents, not the directory itself
|
||||
# Trailing slashes ensure tar copies contents, not the directory itself
|
||||
execute_process(
|
||||
COMMAND rsync ${rsync_args} "${COPY_SOURCE}/" "${COPY_DEST}/"
|
||||
RESULT_VARIABLE rs
|
||||
COMMAND tar ${tar_args} -cf - -C "${COPY_SOURCE}/" .
|
||||
COMMAND tar -xvf - -C "${COPY_DEST}/"
|
||||
RESULT_VARIABLE tr
|
||||
)
|
||||
|
||||
if(rs GREATER 0) # Any non-zero exit code indicates an error
|
||||
message(FATAL_ERROR "rsync failed (exit code ${rs})")
|
||||
if(tr GREATER 0) # Any non-zero exit code indicates an error
|
||||
message(FATAL_ERROR "tar failed (exit code ${tr})")
|
||||
endif()
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported host platform for asset copying.")
|
||||
|
|
|
|||
Loading…
Reference in a new issue