mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-09 10:39:02 -04:00
Convert all files to use UNIX-style line endings.
This commit is contained in:
Sadie Powell
parent
978524b9ac
commit
c86cc240d9
4
win/.gitignore
vendored
4
win/.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
config.h
|
config.h
|
||||||
inspircd.rc
|
inspircd.rc
|
||||||
|
|||||||
2000
win/NSIS.template.in
2000
win/NSIS.template.in
File diff suppressed because it is too large
Load Diff
2
win/build/.gitignore
vendored
2
win/build/.gitignore
vendored
@ -1 +1 @@
|
|||||||
*
|
*
|
||||||
|
|||||||
@ -1,35 +1,35 @@
|
|||||||
101 ICON "inspircd.ico"
|
101 ICON "inspircd.ico"
|
||||||
|
|
||||||
1 VERSIONINFO
|
1 VERSIONINFO
|
||||||
FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@
|
FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@
|
||||||
PRODUCTVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@
|
PRODUCTVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
#else
|
#else
|
||||||
FILEFLAGS 0x0L
|
FILEFLAGS 0x0L
|
||||||
#endif
|
#endif
|
||||||
FILEOS 0x40004L
|
FILEOS 0x40004L
|
||||||
FILETYPE 0x1L
|
FILETYPE 0x1L
|
||||||
FILESUBTYPE 0x0L
|
FILESUBTYPE 0x0L
|
||||||
BEGIN
|
BEGIN
|
||||||
BLOCK "StringFileInfo"
|
BLOCK "StringFileInfo"
|
||||||
BEGIN
|
BEGIN
|
||||||
BLOCK "040904b0"
|
BLOCK "040904b0"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "Comments", "InspIRCd @VERSION_MAJOR@.@VERSION_MINOR@ IRC Daemon"
|
VALUE "Comments", "InspIRCd @VERSION_MAJOR@.@VERSION_MINOR@ IRC Daemon"
|
||||||
VALUE "CompanyName", "InspIRCd Development Team"
|
VALUE "CompanyName", "InspIRCd Development Team"
|
||||||
VALUE "FileDescription", "InspIRCd"
|
VALUE "FileDescription", "InspIRCd"
|
||||||
VALUE "FileVersion", "@FULL_VERSION@"
|
VALUE "FileVersion", "@FULL_VERSION@"
|
||||||
VALUE "InternalName", "InspIRCd"
|
VALUE "InternalName", "InspIRCd"
|
||||||
VALUE "LegalCopyright", "Copyright (C) InspIRCd Development Team"
|
VALUE "LegalCopyright", "Copyright (C) InspIRCd Development Team"
|
||||||
VALUE "OriginalFilename", "inspircd.exe"
|
VALUE "OriginalFilename", "inspircd.exe"
|
||||||
VALUE "ProductName", "InspIRCd - Internet Relay Chat Daemon"
|
VALUE "ProductName", "InspIRCd - Internet Relay Chat Daemon"
|
||||||
VALUE "ProductVersion", "@FULL_VERSION@"
|
VALUE "ProductVersion", "@FULL_VERSION@"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "Translation", 0x809, 1200
|
VALUE "Translation", 0x809, 1200
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
|
|||||||
@ -1,104 +1,104 @@
|
|||||||
#
|
#
|
||||||
# InspIRCd -- Internet Relay Chat Daemon
|
# InspIRCd -- Internet Relay Chat Daemon
|
||||||
#
|
#
|
||||||
# Copyright (C) 2021-2022 Sadie Powell <sadie@witchery.services>
|
# Copyright (C) 2021-2022 Sadie Powell <sadie@witchery.services>
|
||||||
# Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
|
# Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
|
||||||
# Copyright (C) 2013 Adam <Adam@anope.org>
|
# Copyright (C) 2013 Adam <Adam@anope.org>
|
||||||
#
|
#
|
||||||
# This file is part of InspIRCd. InspIRCd is free software: you can
|
# This file is part of InspIRCd. InspIRCd is free software: you can
|
||||||
# redistribute it and/or modify it under the terms of the GNU General Public
|
# redistribute it and/or modify it under the terms of the GNU General Public
|
||||||
# License as published by the Free Software Foundation, version 2.
|
# License as published by the Free Software Foundation, version 2.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful, but WITHOUT
|
# This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||||
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||||
# details.
|
# details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
# These modules can always be built on all platforms.
|
# These modules can always be built on all platforms.
|
||||||
file(GLOB INSPIRCD_MODULES
|
file(GLOB INSPIRCD_MODULES
|
||||||
"${INSPIRCD_BASE}/src/coremods/core_*"
|
"${INSPIRCD_BASE}/src/coremods/core_*"
|
||||||
"${INSPIRCD_BASE}/src/modules/m_*")
|
"${INSPIRCD_BASE}/src/modules/m_*")
|
||||||
|
|
||||||
# These modules have their dependencies provided by Windows.
|
# These modules have their dependencies provided by Windows.
|
||||||
list(APPEND INSPIRCD_MODULES
|
list(APPEND INSPIRCD_MODULES
|
||||||
"${INSPIRCD_BASE}/src/modules/extra/m_ldap.cpp")
|
"${INSPIRCD_BASE}/src/modules/extra/m_ldap.cpp")
|
||||||
|
|
||||||
if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
|
if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
|
||||||
include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
|
include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
|
||||||
|
|
||||||
function(enable_extra NAME PACKAGE)
|
function(enable_extra NAME PACKAGE)
|
||||||
if(DEFINED "CONAN_${PACKAGE}_ROOT")
|
if(DEFINED "CONAN_${PACKAGE}_ROOT")
|
||||||
message("Enabling the ${NAME} module")
|
message("Enabling the ${NAME} module")
|
||||||
list(APPEND INSPIRCD_MODULES "${INSPIRCD_BASE}/src/modules/extra/m_${NAME}.cpp")
|
list(APPEND INSPIRCD_MODULES "${INSPIRCD_BASE}/src/modules/extra/m_${NAME}.cpp")
|
||||||
set(INSPIRCD_MODULES ${INSPIRCD_MODULES} PARENT_SCOPE)
|
set(INSPIRCD_MODULES ${INSPIRCD_MODULES} PARENT_SCOPE)
|
||||||
else()
|
else()
|
||||||
message("Unable to enable the ${NAME} module (missing library)")
|
message("Unable to enable the ${NAME} module (missing library)")
|
||||||
endif()
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
enable_extra("argon2" "ARGON2")
|
enable_extra("argon2" "ARGON2")
|
||||||
enable_extra("geo_maxmind" "LIBMAXMINDDB")
|
enable_extra("geo_maxmind" "LIBMAXMINDDB")
|
||||||
enable_extra("log_json" "RAPIDJSON")
|
enable_extra("log_json" "RAPIDJSON")
|
||||||
enable_extra("mysql" "LIBMYSQLCLIENT")
|
enable_extra("mysql" "LIBMYSQLCLIENT")
|
||||||
enable_extra("pgsql" "LIBPQ")
|
enable_extra("pgsql" "LIBPQ")
|
||||||
enable_extra("regex_pcre" "PCRE2")
|
enable_extra("regex_pcre" "PCRE2")
|
||||||
enable_extra("regex_posix" "PCRE2")
|
enable_extra("regex_posix" "PCRE2")
|
||||||
enable_extra("regex_re2" "RE2")
|
enable_extra("regex_re2" "RE2")
|
||||||
enable_extra("ssl_mbedtls" "MBEDTLS")
|
enable_extra("ssl_mbedtls" "MBEDTLS")
|
||||||
enable_extra("ssl_openssl" "OPENSSL")
|
enable_extra("ssl_openssl" "OPENSSL")
|
||||||
enable_extra("sqlite3" "SQLITE3")
|
enable_extra("sqlite3" "SQLITE3")
|
||||||
|
|
||||||
link_directories("${CMAKE_BINARY_DIR}/extradll" "${CMAKE_BINARY_DIR}/extralib")
|
link_directories("${CMAKE_BINARY_DIR}/extradll" "${CMAKE_BINARY_DIR}/extralib")
|
||||||
file(GLOB EXTRA_DLLS "${CMAKE_BINARY_DIR}/extradll/*.dll")
|
file(GLOB EXTRA_DLLS "${CMAKE_BINARY_DIR}/extradll/*.dll")
|
||||||
install(FILES ${EXTRA_DLLS} DESTINATION .)
|
install(FILES ${EXTRA_DLLS} DESTINATION .)
|
||||||
|
|
||||||
conan_basic_setup(TARGETS)
|
conan_basic_setup(TARGETS)
|
||||||
else()
|
else()
|
||||||
message("Unable to build extras: conanbuildinfo.cmake does not exist in the build directory!")
|
message("Unable to build extras: conanbuildinfo.cmake does not exist in the build directory!")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
list(SORT INSPIRCD_MODULES)
|
list(SORT INSPIRCD_MODULES)
|
||||||
|
|
||||||
add_definitions("-DDLL_BUILD")
|
add_definitions("-DDLL_BUILD")
|
||||||
|
|
||||||
foreach(MODULE_NAME ${INSPIRCD_MODULES})
|
foreach(MODULE_NAME ${INSPIRCD_MODULES})
|
||||||
if(IS_DIRECTORY "${MODULE_NAME}")
|
if(IS_DIRECTORY "${MODULE_NAME}")
|
||||||
string(REGEX REPLACE "^.*[/\\](.*)$" "\\1" BASE_NAME ${MODULE_NAME})
|
string(REGEX REPLACE "^.*[/\\](.*)$" "\\1" BASE_NAME ${MODULE_NAME})
|
||||||
else()
|
else()
|
||||||
string(REGEX REPLACE "^.*[/\\](.*).cpp$" "\\1" BASE_NAME ${MODULE_NAME})
|
string(REGEX REPLACE "^.*[/\\](.*).cpp$" "\\1" BASE_NAME ${MODULE_NAME})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(IS_DIRECTORY "${MODULE_NAME}")
|
if(IS_DIRECTORY "${MODULE_NAME}")
|
||||||
file(GLOB MODULES_SUBDIR_SRCS "${MODULE_NAME}/*.cpp")
|
file(GLOB MODULES_SUBDIR_SRCS "${MODULE_NAME}/*.cpp")
|
||||||
list(SORT MODULES_SUBDIR_SRCS)
|
list(SORT MODULES_SUBDIR_SRCS)
|
||||||
add_library(${BASE_NAME} MODULE ${MODULES_SUBDIR_SRCS})
|
add_library(${BASE_NAME} MODULE ${MODULES_SUBDIR_SRCS})
|
||||||
else()
|
else()
|
||||||
add_library(${BASE_NAME} MODULE ${MODULE_NAME})
|
add_library(${BASE_NAME} MODULE ${MODULE_NAME})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Generate the module and set its linker flags, also set it to depend on the main executable to be built beforehand
|
# Generate the module and set its linker flags, also set it to depend on the main executable to be built beforehand
|
||||||
target_link_libraries(${BASE_NAME} inspircd)
|
target_link_libraries(${BASE_NAME} inspircd)
|
||||||
add_dependencies(${BASE_NAME} inspircd)
|
add_dependencies(${BASE_NAME} inspircd)
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
target_link_libraries(${BASE_NAME} win32memory)
|
target_link_libraries(${BASE_NAME} win32memory)
|
||||||
add_dependencies(${BASE_NAME} win32memory)
|
add_dependencies(${BASE_NAME} win32memory)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CONAN_CXX_FLAGS)
|
if(CONAN_CXX_FLAGS)
|
||||||
conan_target_link_libraries(${BASE_NAME})
|
conan_target_link_libraries(${BASE_NAME})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(${BASE_NAME} PROPERTIES
|
set_target_properties(${BASE_NAME} PROPERTIES
|
||||||
PREFIX ""
|
PREFIX ""
|
||||||
FOLDER "Modules"
|
FOLDER "Modules"
|
||||||
COMPILE_DEFINITIONS "FMT_SHARED;MODNAME=\"${BASE_NAME}\""
|
COMPILE_DEFINITIONS "FMT_SHARED;MODNAME=\"${BASE_NAME}\""
|
||||||
)
|
)
|
||||||
|
|
||||||
# Set the module to be installed to the module directory
|
# Set the module to be installed to the module directory
|
||||||
install(TARGETS ${BASE_NAME} LIBRARY DESTINATION ${MODULE_DIR})
|
install(TARGETS ${BASE_NAME} LIBRARY DESTINATION ${MODULE_DIR})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user