octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nx_tzdb: Directly reference variables in if statements

Browse Source 
Addresses review feedback.
This commit is contained in:
lat9nq
2023-06-17 01:35:35 -04:00
parent 1fa16bc594
commit 4cbdce17b6
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
externals/nx_tzdb/CMakeLists.txt vendored
View File

@@ -11,16 +11,16 @@ find_program(GNU_DATE date)
set(CAN_BUILD_NX_TZDB true) set(CAN_BUILD_NX_TZDB true)
if ("${GIT}" STREQUAL "GIT-NOTFOUND") if (NOT GIT)
set(CAN_BUILD_NX_TZDB false) set(CAN_BUILD_NX_TZDB false)
endif() endif()
if ("${GNU_MAKE}" STREQUAL "GNU_MAKE-NOTFOUND") if (NOT GNU_MAKE)
set(CAN_BUILD_NX_TZDB false) set(CAN_BUILD_NX_TZDB false)
endif() endif()
if ("${GNU_DATE}" STREQUAL "GNU_DATE-NOTFOUND") if (NOT GNU_DATE)
set(CAN_BUILD_NX_TZDB false) set(CAN_BUILD_NX_TZDB false)
endif() endif()
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR ANDROID) if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR ANDROID)
# tzdb_to_nx currently requires a posix-compliant host # tzdb_to_nx currently requires a posix-compliant host
# MinGW and Android are handled here due to the executable format being different from the host system # MinGW and Android are handled here due to the executable format being different from the host system
# TODO (lat9nq): cross-compiling support # TODO (lat9nq): cross-compiling support
@@ -32,14 +32,14 @@ set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip")
set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb") set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")
if ((NOT ${CAN_BUILD_NX_TZDB} OR ${YUZU_DOWNLOAD_TIME_ZONE_DATA}) AND NOT EXISTS ${NX_TZDB_ARCHIVE}) if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ARCHIVE})
set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip") set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...") message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")
file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE} file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE}
STATUS NX_TZDB_DOWNLOAD_STATUS) STATUS NX_TZDB_DOWNLOAD_STATUS)
list(GET NX_TZDB_DOWNLOAD_STATUS 0 NX_TZDB_DOWNLOAD_STATUS_CODE) list(GET NX_TZDB_DOWNLOAD_STATUS 0 NX_TZDB_DOWNLOAD_STATUS_CODE)
if (NOT "${NX_TZDB_DOWNLOAD_STATUS_CODE}" STREQUAL "0") if (NOT NX_TZDB_DOWNLOAD_STATUS_CODE EQUAL 0)
message(FATAL_ERROR "Time zone data download failed (status code ${NX_TZDB_DOWNLOAD_STATUS_CODE})") message(FATAL_ERROR "Time zone data download failed (status code ${NX_TZDB_DOWNLOAD_STATUS_CODE})")
endif() endif()
@@ -48,7 +48,7 @@ if ((NOT ${CAN_BUILD_NX_TZDB} OR ${YUZU_DOWNLOAD_TIME_ZONE_DATA}) AND NOT EXISTS
${NX_TZDB_ARCHIVE} ${NX_TZDB_ARCHIVE}
DESTINATION DESTINATION
${NX_TZDB_ROMFS_DIR}) ${NX_TZDB_ROMFS_DIR})
elseif (${CAN_BUILD_NX_TZDB} AND NOT ${YUZU_DOWNLOAD_TIME_ZONE_DATA}) elseif (CAN_BUILD_NX_TZDB AND NOT YUZU_DOWNLOAD_TIME_ZONE_DATA)
add_subdirectory(tzdb_to_nx) add_subdirectory(tzdb_to_nx)
add_dependencies(nx_tzdb x80e) add_dependencies(nx_tzdb x80e)

8
externals/nx_tzdb/NxTzdbCreateHeader.cmake vendored
View File

@@ -15,7 +15,7 @@ set(DIRECTORY_NAME ${HEADER_NAME})
set(FILE_DATA "") set(FILE_DATA "")
foreach(ZONE_FILE ${FILE_LIST}) foreach(ZONE_FILE ${FILE_LIST})
if ("${ZONE_FILE}" STREQUAL "\n") if (ZONE_FILE STREQUAL "\n")
continue() continue()
endif() endif()
@@ -26,13 +26,13 @@ foreach(ZONE_FILE ${FILE_LIST})
foreach(I RANGE 0 ${ZONE_DATA_LEN} 2) foreach(I RANGE 0 ${ZONE_DATA_LEN} 2)
math(EXPR BREAK_LINE "(${I} + 2) % 38") math(EXPR BREAK_LINE "(${I} + 2) % 38")
string(SUBSTRING "${ZONE_DATA}" "${I}" "2" HEX_DATA) string(SUBSTRING "${ZONE_DATA}" "${I}" 2 HEX_DATA)
if ("${HEX_DATA}" STREQUAL "") if (NOT HEX_DATA)
break() break()
endif() endif()
string(APPEND FILE_DATA "0x${HEX_DATA},") string(APPEND FILE_DATA "0x${HEX_DATA},")
if ("${BREAK_LINE}" STREQUAL "0") if (BREAK_LINE EQUAL 0)
string(APPEND FILE_DATA "\n") string(APPEND FILE_DATA "\n")
else() else()
string(APPEND FILE_DATA " ") string(APPEND FILE_DATA " ")