From a22f8d3b2de88b9bb6f80f0c2780846ae23ab389 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 15 Jul 2010 22:55:02 -0400 Subject: Moved some files and diretories around, made cmake skip files it knows it can't compile because of missing dependices. --- Anope.cmake | 501 --------- CMakeLists.txt | 11 +- NSIS.template.in | 825 -------------- ReadFile.cmake | 5 - anope.bat | 3 - cmake/Anope.cmake | 540 +++++++++ cmake/NSIS.template.in | 825 ++++++++++++++ cmake/ReadFile.cmake | 5 + docs/CMakeLists.txt | 2 +- docs/PROXY | 41 - include/hashcomp.h | 13 + modules/CMakeLists.txt | 187 ++++ modules/core/bs_act.cpp | 85 ++ modules/core/bs_assign.cpp | 95 ++ modules/core/bs_badwords.cpp | 282 +++++ modules/core/bs_bot.cpp | 411 +++++++ modules/core/bs_botlist.cpp | 93 ++ modules/core/bs_help.cpp | 53 + modules/core/bs_info.cpp | 233 ++++ modules/core/bs_kick.cpp | 388 +++++++ modules/core/bs_say.cpp | 91 ++ modules/core/bs_set.cpp | 215 ++++ modules/core/bs_unassign.cpp | 73 ++ modules/core/cs_access.cpp | 623 ++++++++++ modules/core/cs_akick.cpp | 584 ++++++++++ modules/core/cs_ban.cpp | 111 ++ modules/core/cs_clear.cpp | 178 +++ modules/core/cs_drop.cpp | 116 ++ modules/core/cs_forbid.cpp | 129 +++ modules/core/cs_getkey.cpp | 75 ++ modules/core/cs_help.cpp | 73 ++ modules/core/cs_info.cpp | 158 +++ modules/core/cs_invite.cpp | 94 ++ modules/core/cs_kick.cpp | 97 ++ modules/core/cs_list.cpp | 176 +++ modules/core/cs_modes.cpp | 451 ++++++++ modules/core/cs_register.cpp | 131 +++ modules/core/cs_saset.cpp | 122 ++ modules/core/cs_saset_noexpire.cpp | 82 ++ modules/core/cs_set.cpp | 127 +++ modules/core/cs_set_bantype.cpp | 110 ++ modules/core/cs_set_description.cpp | 104 ++ modules/core/cs_set_entrymsg.cpp | 111 ++ modules/core/cs_set_founder.cpp | 138 +++ modules/core/cs_set_keeptopic.cpp | 109 ++ modules/core/cs_set_mlock.cpp | 182 +++ modules/core/cs_set_opnotice.cpp | 109 ++ modules/core/cs_set_peace.cpp | 109 ++ modules/core/cs_set_persist.cpp | 154 +++ modules/core/cs_set_private.cpp | 109 ++ modules/core/cs_set_restricted.cpp | 112 ++ modules/core/cs_set_secure.cpp | 109 ++ modules/core/cs_set_securefounder.cpp | 115 ++ modules/core/cs_set_secureops.cpp | 109 ++ modules/core/cs_set_signkick.cpp | 109 ++ modules/core/cs_set_successor.cpp | 140 +++ modules/core/cs_set_topiclock.cpp | 109 ++ modules/core/cs_set_xop.cpp | 139 +++ modules/core/cs_status.cpp | 74 ++ modules/core/cs_suspend.cpp | 195 ++++ modules/core/cs_topic.cpp | 98 ++ modules/core/cs_unban.cpp | 88 ++ modules/core/cs_xop.cpp | 661 +++++++++++ modules/core/db_plain.cpp | 1166 +++++++++++++++++++ modules/core/enc_md5.cpp | 373 ++++++ modules/core/enc_none.cpp | 67 ++ modules/core/enc_old.cpp | 381 +++++++ modules/core/enc_sha1.cpp | 229 ++++ modules/core/enc_sha256.cpp | 316 ++++++ modules/core/hs_del.cpp | 73 ++ modules/core/hs_delall.cpp | 78 ++ modules/core/hs_group.cpp | 66 ++ modules/core/hs_help.cpp | 51 + modules/core/hs_list.cpp | 132 +++ modules/core/hs_off.cpp | 62 + modules/core/hs_on.cpp | 76 ++ modules/core/hs_set.cpp | 165 +++ modules/core/hs_setall.cpp | 164 +++ modules/core/ms_cancel.cpp | 87 ++ modules/core/ms_check.cpp | 106 ++ modules/core/ms_del.cpp | 162 +++ modules/core/ms_help.cpp | 52 + modules/core/ms_info.cpp | 215 ++++ modules/core/ms_list.cpp | 176 +++ modules/core/ms_read.cpp | 159 +++ modules/core/ms_rsend.cpp | 90 ++ modules/core/ms_send.cpp | 61 + modules/core/ms_sendall.cpp | 77 ++ modules/core/ms_set.cpp | 272 +++++ modules/core/ms_staff.cpp | 74 ++ modules/core/ns_access.cpp | 181 +++ modules/core/ns_alist.cpp | 155 +++ modules/core/ns_drop.cpp | 130 +++ modules/core/ns_forbid.cpp | 122 ++ modules/core/ns_getemail.cpp | 83 ++ modules/core/ns_getpass.cpp | 94 ++ modules/core/ns_ghost.cpp | 103 ++ modules/core/ns_group.cpp | 287 +++++ modules/core/ns_help.cpp | 67 ++ modules/core/ns_identify.cpp | 125 +++ modules/core/ns_info.cpp | 191 ++++ modules/core/ns_list.cpp | 219 ++++ modules/core/ns_logout.cpp | 96 ++ modules/core/ns_recover.cpp | 124 ++ modules/core/ns_register.cpp | 395 +++++++ modules/core/ns_release.cpp | 106 ++ modules/core/ns_resetpass.cpp | 169 +++ modules/core/ns_saset.cpp | 245 ++++ modules/core/ns_saset_noexpire.cpp | 84 ++ modules/core/ns_sendpass.cpp | 100 ++ modules/core/ns_set.cpp | 229 ++++ modules/core/ns_set_autoop.cpp | 128 +++ modules/core/ns_set_email.cpp | 157 +++ modules/core/ns_set_greet.cpp | 127 +++ modules/core/ns_set_hide.cpp | 197 ++++ modules/core/ns_set_kill.cpp | 180 +++ modules/core/ns_set_language.cpp | 140 +++ modules/core/ns_set_message.cpp | 146 +++ modules/core/ns_set_private.cpp | 134 +++ modules/core/ns_set_secure.cpp | 134 +++ modules/core/ns_status.cpp | 77 ++ modules/core/ns_suspend.cpp | 199 ++++ modules/core/ns_update.cpp | 67 ++ modules/core/os_akill.cpp | 410 +++++++ modules/core/os_chankill.cpp | 117 ++ modules/core/os_chanlist.cpp | 99 ++ modules/core/os_clearmodes.cpp | 189 ++++ modules/core/os_defcon.cpp | 499 +++++++++ modules/core/os_global.cpp | 62 + modules/core/os_help.cpp | 51 + modules/core/os_ignore.cpp | 203 ++++ modules/core/os_jupe.cpp | 78 ++ modules/core/os_kick.cpp | 80 ++ modules/core/os_mode.cpp | 71 ++ modules/core/os_modinfo.cpp | 100 ++ modules/core/os_modlist.cpp | 230 ++++ modules/core/os_modload.cpp | 73 ++ modules/core/os_modunload.cpp | 75 ++ modules/core/os_news.cpp | 476 ++++++++ modules/core/os_noop.cpp | 89 ++ modules/core/os_oline.cpp | 83 ++ modules/core/os_quit.cpp | 62 + modules/core/os_reload.cpp | 64 ++ modules/core/os_restart.cpp | 62 + modules/core/os_session.cpp | 509 +++++++++ modules/core/os_set.cpp | 312 ++++++ modules/core/os_shutdown.cpp | 61 + modules/core/os_snline.cpp | 431 +++++++ modules/core/os_sqline.cpp | 412 +++++++ modules/core/os_staff.cpp | 82 ++ modules/core/os_stats.cpp | 392 +++++++ modules/core/os_svsnick.cpp | 99 ++ modules/core/os_szline.cpp | 409 +++++++ modules/core/os_umode.cpp | 86 ++ modules/core/os_update.cpp | 54 + modules/core/os_userlist.cpp | 100 ++ modules/core/ss_main.cpp | 63 ++ modules/extra/cs_appendtopic.cpp | 227 ++++ modules/extra/cs_enforce.cpp | 444 ++++++++ modules/extra/cs_set_misc.cpp | 196 ++++ modules/extra/cs_tban.cpp | 209 ++++ modules/extra/hs_request.cpp | 835 ++++++++++++++ modules/extra/m_helpchan.cpp | 47 + modules/extra/m_ssl.cpp | 142 +++ modules/extra/mysql/db_mysql.h | 211 ++++ modules/extra/mysql/db_mysql_execute.cpp | 159 +++ modules/extra/mysql/db_mysql_read.cpp | 618 ++++++++++ modules/extra/mysql/db_mysql_write.cpp | 1040 +++++++++++++++++ modules/extra/ns_maxemail.cpp | 169 +++ modules/extra/ns_set_misc.cpp | 213 ++++ modules/protocol/bahamut.cpp | 832 ++++++++++++++ modules/protocol/inspircd11.cpp | 1171 +++++++++++++++++++ modules/protocol/inspircd12.cpp | 1371 +++++++++++++++++++++++ modules/protocol/inspircd20.cpp | 1351 ++++++++++++++++++++++ modules/protocol/ratbox.cpp | 899 +++++++++++++++ modules/protocol/unreal32.cpp | 1345 ++++++++++++++++++++++ modules/socketengines/m_socketengine_epoll.cpp | 157 +++ modules/socketengines/m_socketengine_select.cpp | 134 +++ src/CMakeLists.txt | 43 +- src/anope-icon.ico | Bin 3774 -> 0 bytes src/bin/register | 101 -- src/core/CMakeLists.txt | 54 - src/core/bs_act.cpp | 85 -- src/core/bs_assign.cpp | 95 -- src/core/bs_badwords.cpp | 282 ----- src/core/bs_bot.cpp | 411 ------- src/core/bs_botlist.cpp | 93 -- src/core/bs_help.cpp | 53 - src/core/bs_info.cpp | 233 ---- src/core/bs_kick.cpp | 388 ------- src/core/bs_say.cpp | 91 -- src/core/bs_set.cpp | 215 ---- src/core/bs_unassign.cpp | 73 -- src/core/cs_access.cpp | 623 ---------- src/core/cs_akick.cpp | 584 ---------- src/core/cs_ban.cpp | 111 -- src/core/cs_clear.cpp | 178 --- src/core/cs_drop.cpp | 116 -- src/core/cs_forbid.cpp | 129 --- src/core/cs_getkey.cpp | 75 -- src/core/cs_help.cpp | 73 -- src/core/cs_info.cpp | 158 --- src/core/cs_invite.cpp | 94 -- src/core/cs_kick.cpp | 97 -- src/core/cs_list.cpp | 176 --- src/core/cs_modes.cpp | 451 -------- src/core/cs_register.cpp | 131 --- src/core/cs_saset.cpp | 122 -- src/core/cs_saset_noexpire.cpp | 82 -- src/core/cs_set.cpp | 127 --- src/core/cs_set_bantype.cpp | 110 -- src/core/cs_set_description.cpp | 104 -- src/core/cs_set_entrymsg.cpp | 111 -- src/core/cs_set_founder.cpp | 138 --- src/core/cs_set_keeptopic.cpp | 109 -- src/core/cs_set_mlock.cpp | 182 --- src/core/cs_set_opnotice.cpp | 109 -- src/core/cs_set_peace.cpp | 109 -- src/core/cs_set_persist.cpp | 154 --- src/core/cs_set_private.cpp | 109 -- src/core/cs_set_restricted.cpp | 112 -- src/core/cs_set_secure.cpp | 109 -- src/core/cs_set_securefounder.cpp | 115 -- src/core/cs_set_secureops.cpp | 109 -- src/core/cs_set_signkick.cpp | 109 -- src/core/cs_set_successor.cpp | 140 --- src/core/cs_set_topiclock.cpp | 109 -- src/core/cs_set_xop.cpp | 139 --- src/core/cs_status.cpp | 74 -- src/core/cs_suspend.cpp | 195 ---- src/core/cs_topic.cpp | 98 -- src/core/cs_unban.cpp | 88 -- src/core/cs_xop.cpp | 661 ----------- src/core/db_plain.cpp | 1166 ------------------- src/core/enc_md5.cpp | 373 ------ src/core/enc_none.cpp | 67 -- src/core/enc_old.cpp | 381 ------- src/core/enc_sha1.cpp | 229 ---- src/core/enc_sha256.cpp | 316 ------ src/core/hs_del.cpp | 73 -- src/core/hs_delall.cpp | 78 -- src/core/hs_group.cpp | 66 -- src/core/hs_help.cpp | 51 - src/core/hs_list.cpp | 132 --- src/core/hs_off.cpp | 62 - src/core/hs_on.cpp | 76 -- src/core/hs_set.cpp | 165 --- src/core/hs_setall.cpp | 164 --- src/core/m_socketengine_epoll.cpp | 155 --- src/core/m_socketengine_select.cpp | 134 --- src/core/ms_cancel.cpp | 87 -- src/core/ms_check.cpp | 106 -- src/core/ms_del.cpp | 162 --- src/core/ms_help.cpp | 52 - src/core/ms_info.cpp | 215 ---- src/core/ms_list.cpp | 176 --- src/core/ms_read.cpp | 159 --- src/core/ms_rsend.cpp | 90 -- src/core/ms_send.cpp | 61 - src/core/ms_sendall.cpp | 77 -- src/core/ms_set.cpp | 272 ----- src/core/ms_staff.cpp | 74 -- src/core/ns_access.cpp | 181 --- src/core/ns_alist.cpp | 155 --- src/core/ns_drop.cpp | 130 --- src/core/ns_forbid.cpp | 122 -- src/core/ns_getemail.cpp | 83 -- src/core/ns_getpass.cpp | 94 -- src/core/ns_ghost.cpp | 103 -- src/core/ns_group.cpp | 287 ----- src/core/ns_help.cpp | 67 -- src/core/ns_identify.cpp | 125 --- src/core/ns_info.cpp | 191 ---- src/core/ns_list.cpp | 219 ---- src/core/ns_logout.cpp | 96 -- src/core/ns_recover.cpp | 124 -- src/core/ns_register.cpp | 395 ------- src/core/ns_release.cpp | 106 -- src/core/ns_resetpass.cpp | 169 --- src/core/ns_saset.cpp | 245 ---- src/core/ns_saset_noexpire.cpp | 84 -- src/core/ns_sendpass.cpp | 100 -- src/core/ns_set.cpp | 229 ---- src/core/ns_set_autoop.cpp | 128 --- src/core/ns_set_email.cpp | 157 --- src/core/ns_set_greet.cpp | 127 --- src/core/ns_set_hide.cpp | 197 ---- src/core/ns_set_kill.cpp | 180 --- src/core/ns_set_language.cpp | 140 --- src/core/ns_set_message.cpp | 146 --- src/core/ns_set_private.cpp | 134 --- src/core/ns_set_secure.cpp | 134 --- src/core/ns_status.cpp | 77 -- src/core/ns_suspend.cpp | 199 ---- src/core/ns_update.cpp | 67 -- src/core/os_akill.cpp | 410 ------- src/core/os_chankill.cpp | 117 -- src/core/os_chanlist.cpp | 99 -- src/core/os_clearmodes.cpp | 189 ---- src/core/os_defcon.cpp | 499 --------- src/core/os_global.cpp | 62 - src/core/os_help.cpp | 51 - src/core/os_ignore.cpp | 203 ---- src/core/os_jupe.cpp | 78 -- src/core/os_kick.cpp | 80 -- src/core/os_mode.cpp | 71 -- src/core/os_modinfo.cpp | 100 -- src/core/os_modlist.cpp | 230 ---- src/core/os_modload.cpp | 73 -- src/core/os_modunload.cpp | 75 -- src/core/os_news.cpp | 476 -------- src/core/os_noop.cpp | 89 -- src/core/os_oline.cpp | 83 -- src/core/os_quit.cpp | 62 - src/core/os_reload.cpp | 64 -- src/core/os_restart.cpp | 62 - src/core/os_session.cpp | 509 --------- src/core/os_set.cpp | 312 ------ src/core/os_shutdown.cpp | 61 - src/core/os_snline.cpp | 431 ------- src/core/os_sqline.cpp | 412 ------- src/core/os_staff.cpp | 82 -- src/core/os_stats.cpp | 392 ------- src/core/os_svsnick.cpp | 99 -- src/core/os_szline.cpp | 409 ------- src/core/os_umode.cpp | 86 -- src/core/os_update.cpp | 54 - src/core/os_userlist.cpp | 100 -- src/core/ss_main.cpp | 63 -- src/hashcomp.cpp | 1 - src/modules/CMakeLists.txt | 144 --- src/modules/cs_appendtopic.cpp | 227 ---- src/modules/cs_enforce.cpp | 444 -------- src/modules/cs_set_misc.cpp | 196 ---- src/modules/cs_tban.cpp | 209 ---- src/modules/hs_request.cpp | 835 -------------- src/modules/m_helpchan.cpp | 47 - src/modules/mysql/db_mysql.h | 212 ---- src/modules/mysql/db_mysql_execute.cpp | 159 --- src/modules/mysql/db_mysql_read.cpp | 618 ---------- src/modules/mysql/db_mysql_write.cpp | 1040 ----------------- src/modules/ns_maxemail.cpp | 169 --- src/modules/ns_set_misc.cpp | 213 ---- src/modules/ssl/m_ssl.cpp | 142 --- src/protocol/CMakeLists.txt | 54 - src/protocol/bahamut.cpp | 832 -------------- src/protocol/inspircd11.cpp | 1171 ------------------- src/protocol/inspircd12.cpp | 1371 ----------------------- src/protocol/inspircd20.cpp | 1351 ---------------------- src/protocol/ratbox.cpp | 899 --------------- src/protocol/unreal32.cpp | 1345 ---------------------- src/threadengine_pthread.cpp | 108 -- src/threadengine_win32.cpp | 106 -- src/threadengines/threadengine_pthread.cpp | 108 ++ src/threadengines/threadengine_win32.cpp | 106 ++ src/tools/CMakeLists.txt | 47 +- src/tools/smtp.h | 1 - src/win32.rc.cmake | 92 -- src/win32/anope-icon.ico | Bin 0 -> 3774 bytes src/win32/anope.bat | 3 + src/win32/vsvars32.bat | 66 ++ src/win32/win32.rc.cmake | 92 ++ src/win32/win32_memory.cpp | 64 ++ src/win32/windows.cpp | 106 ++ src/win32_memory.cpp | 64 -- src/windows.cpp | 106 -- vsvars32.bat | 66 -- 367 files changed, 38680 insertions(+), 38835 deletions(-) delete mode 100644 Anope.cmake delete mode 100644 NSIS.template.in delete mode 100644 ReadFile.cmake delete mode 100644 anope.bat create mode 100644 cmake/Anope.cmake create mode 100644 cmake/NSIS.template.in create mode 100644 cmake/ReadFile.cmake delete mode 100644 docs/PROXY create mode 100644 modules/CMakeLists.txt create mode 100644 modules/core/bs_act.cpp create mode 100644 modules/core/bs_assign.cpp create mode 100644 modules/core/bs_badwords.cpp create mode 100644 modules/core/bs_bot.cpp create mode 100644 modules/core/bs_botlist.cpp create mode 100644 modules/core/bs_help.cpp create mode 100644 modules/core/bs_info.cpp create mode 100644 modules/core/bs_kick.cpp create mode 100644 modules/core/bs_say.cpp create mode 100644 modules/core/bs_set.cpp create mode 100644 modules/core/bs_unassign.cpp create mode 100644 modules/core/cs_access.cpp create mode 100644 modules/core/cs_akick.cpp create mode 100644 modules/core/cs_ban.cpp create mode 100644 modules/core/cs_clear.cpp create mode 100644 modules/core/cs_drop.cpp create mode 100644 modules/core/cs_forbid.cpp create mode 100644 modules/core/cs_getkey.cpp create mode 100644 modules/core/cs_help.cpp create mode 100644 modules/core/cs_info.cpp create mode 100644 modules/core/cs_invite.cpp create mode 100644 modules/core/cs_kick.cpp create mode 100644 modules/core/cs_list.cpp create mode 100644 modules/core/cs_modes.cpp create mode 100644 modules/core/cs_register.cpp create mode 100644 modules/core/cs_saset.cpp create mode 100644 modules/core/cs_saset_noexpire.cpp create mode 100644 modules/core/cs_set.cpp create mode 100644 modules/core/cs_set_bantype.cpp create mode 100644 modules/core/cs_set_description.cpp create mode 100644 modules/core/cs_set_entrymsg.cpp create mode 100644 modules/core/cs_set_founder.cpp create mode 100644 modules/core/cs_set_keeptopic.cpp create mode 100644 modules/core/cs_set_mlock.cpp create mode 100644 modules/core/cs_set_opnotice.cpp create mode 100644 modules/core/cs_set_peace.cpp create mode 100644 modules/core/cs_set_persist.cpp create mode 100644 modules/core/cs_set_private.cpp create mode 100644 modules/core/cs_set_restricted.cpp create mode 100644 modules/core/cs_set_secure.cpp create mode 100644 modules/core/cs_set_securefounder.cpp create mode 100644 modules/core/cs_set_secureops.cpp create mode 100644 modules/core/cs_set_signkick.cpp create mode 100644 modules/core/cs_set_successor.cpp create mode 100644 modules/core/cs_set_topiclock.cpp create mode 100644 modules/core/cs_set_xop.cpp create mode 100644 modules/core/cs_status.cpp create mode 100644 modules/core/cs_suspend.cpp create mode 100644 modules/core/cs_topic.cpp create mode 100644 modules/core/cs_unban.cpp create mode 100644 modules/core/cs_xop.cpp create mode 100644 modules/core/db_plain.cpp create mode 100644 modules/core/enc_md5.cpp create mode 100644 modules/core/enc_none.cpp create mode 100644 modules/core/enc_old.cpp create mode 100644 modules/core/enc_sha1.cpp create mode 100644 modules/core/enc_sha256.cpp create mode 100644 modules/core/hs_del.cpp create mode 100644 modules/core/hs_delall.cpp create mode 100644 modules/core/hs_group.cpp create mode 100644 modules/core/hs_help.cpp create mode 100644 modules/core/hs_list.cpp create mode 100644 modules/core/hs_off.cpp create mode 100644 modules/core/hs_on.cpp create mode 100644 modules/core/hs_set.cpp create mode 100644 modules/core/hs_setall.cpp create mode 100644 modules/core/ms_cancel.cpp create mode 100644 modules/core/ms_check.cpp create mode 100644 modules/core/ms_del.cpp create mode 100644 modules/core/ms_help.cpp create mode 100644 modules/core/ms_info.cpp create mode 100644 modules/core/ms_list.cpp create mode 100644 modules/core/ms_read.cpp create mode 100644 modules/core/ms_rsend.cpp create mode 100644 modules/core/ms_send.cpp create mode 100644 modules/core/ms_sendall.cpp create mode 100644 modules/core/ms_set.cpp create mode 100644 modules/core/ms_staff.cpp create mode 100644 modules/core/ns_access.cpp create mode 100644 modules/core/ns_alist.cpp create mode 100644 modules/core/ns_drop.cpp create mode 100644 modules/core/ns_forbid.cpp create mode 100644 modules/core/ns_getemail.cpp create mode 100644 modules/core/ns_getpass.cpp create mode 100644 modules/core/ns_ghost.cpp create mode 100644 modules/core/ns_group.cpp create mode 100644 modules/core/ns_help.cpp create mode 100644 modules/core/ns_identify.cpp create mode 100644 modules/core/ns_info.cpp create mode 100644 modules/core/ns_list.cpp create mode 100644 modules/core/ns_logout.cpp create mode 100644 modules/core/ns_recover.cpp create mode 100644 modules/core/ns_register.cpp create mode 100644 modules/core/ns_release.cpp create mode 100644 modules/core/ns_resetpass.cpp create mode 100644 modules/core/ns_saset.cpp create mode 100644 modules/core/ns_saset_noexpire.cpp create mode 100644 modules/core/ns_sendpass.cpp create mode 100644 modules/core/ns_set.cpp create mode 100644 modules/core/ns_set_autoop.cpp create mode 100644 modules/core/ns_set_email.cpp create mode 100644 modules/core/ns_set_greet.cpp create mode 100644 modules/core/ns_set_hide.cpp create mode 100644 modules/core/ns_set_kill.cpp create mode 100644 modules/core/ns_set_language.cpp create mode 100644 modules/core/ns_set_message.cpp create mode 100644 modules/core/ns_set_private.cpp create mode 100644 modules/core/ns_set_secure.cpp create mode 100644 modules/core/ns_status.cpp create mode 100644 modules/core/ns_suspend.cpp create mode 100644 modules/core/ns_update.cpp create mode 100644 modules/core/os_akill.cpp create mode 100644 modules/core/os_chankill.cpp create mode 100644 modules/core/os_chanlist.cpp create mode 100644 modules/core/os_clearmodes.cpp create mode 100644 modules/core/os_defcon.cpp create mode 100644 modules/core/os_global.cpp create mode 100644 modules/core/os_help.cpp create mode 100644 modules/core/os_ignore.cpp create mode 100644 modules/core/os_jupe.cpp create mode 100644 modules/core/os_kick.cpp create mode 100644 modules/core/os_mode.cpp create mode 100644 modules/core/os_modinfo.cpp create mode 100644 modules/core/os_modlist.cpp create mode 100644 modules/core/os_modload.cpp create mode 100644 modules/core/os_modunload.cpp create mode 100644 modules/core/os_news.cpp create mode 100644 modules/core/os_noop.cpp create mode 100644 modules/core/os_oline.cpp create mode 100644 modules/core/os_quit.cpp create mode 100644 modules/core/os_reload.cpp create mode 100644 modules/core/os_restart.cpp create mode 100644 modules/core/os_session.cpp create mode 100644 modules/core/os_set.cpp create mode 100644 modules/core/os_shutdown.cpp create mode 100644 modules/core/os_snline.cpp create mode 100644 modules/core/os_sqline.cpp create mode 100644 modules/core/os_staff.cpp create mode 100644 modules/core/os_stats.cpp create mode 100644 modules/core/os_svsnick.cpp create mode 100644 modules/core/os_szline.cpp create mode 100644 modules/core/os_umode.cpp create mode 100644 modules/core/os_update.cpp create mode 100644 modules/core/os_userlist.cpp create mode 100644 modules/core/ss_main.cpp create mode 100644 modules/extra/cs_appendtopic.cpp create mode 100644 modules/extra/cs_enforce.cpp create mode 100644 modules/extra/cs_set_misc.cpp create mode 100644 modules/extra/cs_tban.cpp create mode 100644 modules/extra/hs_request.cpp create mode 100644 modules/extra/m_helpchan.cpp create mode 100644 modules/extra/m_ssl.cpp create mode 100644 modules/extra/mysql/db_mysql.h create mode 100644 modules/extra/mysql/db_mysql_execute.cpp create mode 100644 modules/extra/mysql/db_mysql_read.cpp create mode 100644 modules/extra/mysql/db_mysql_write.cpp create mode 100644 modules/extra/ns_maxemail.cpp create mode 100644 modules/extra/ns_set_misc.cpp create mode 100644 modules/protocol/bahamut.cpp create mode 100644 modules/protocol/inspircd11.cpp create mode 100644 modules/protocol/inspircd12.cpp create mode 100644 modules/protocol/inspircd20.cpp create mode 100644 modules/protocol/ratbox.cpp create mode 100644 modules/protocol/unreal32.cpp create mode 100644 modules/socketengines/m_socketengine_epoll.cpp create mode 100644 modules/socketengines/m_socketengine_select.cpp delete mode 100644 src/anope-icon.ico delete mode 100755 src/bin/register delete mode 100644 src/core/CMakeLists.txt delete mode 100644 src/core/bs_act.cpp delete mode 100644 src/core/bs_assign.cpp delete mode 100644 src/core/bs_badwords.cpp delete mode 100644 src/core/bs_bot.cpp delete mode 100644 src/core/bs_botlist.cpp delete mode 100644 src/core/bs_help.cpp delete mode 100644 src/core/bs_info.cpp delete mode 100644 src/core/bs_kick.cpp delete mode 100644 src/core/bs_say.cpp delete mode 100644 src/core/bs_set.cpp delete mode 100644 src/core/bs_unassign.cpp delete mode 100644 src/core/cs_access.cpp delete mode 100644 src/core/cs_akick.cpp delete mode 100644 src/core/cs_ban.cpp delete mode 100644 src/core/cs_clear.cpp delete mode 100644 src/core/cs_drop.cpp delete mode 100644 src/core/cs_forbid.cpp delete mode 100644 src/core/cs_getkey.cpp delete mode 100644 src/core/cs_help.cpp delete mode 100644 src/core/cs_info.cpp delete mode 100644 src/core/cs_invite.cpp delete mode 100644 src/core/cs_kick.cpp delete mode 100644 src/core/cs_list.cpp delete mode 100644 src/core/cs_modes.cpp delete mode 100644 src/core/cs_register.cpp delete mode 100644 src/core/cs_saset.cpp delete mode 100644 src/core/cs_saset_noexpire.cpp delete mode 100644 src/core/cs_set.cpp delete mode 100644 src/core/cs_set_bantype.cpp delete mode 100644 src/core/cs_set_description.cpp delete mode 100644 src/core/cs_set_entrymsg.cpp delete mode 100644 src/core/cs_set_founder.cpp delete mode 100644 src/core/cs_set_keeptopic.cpp delete mode 100644 src/core/cs_set_mlock.cpp delete mode 100644 src/core/cs_set_opnotice.cpp delete mode 100644 src/core/cs_set_peace.cpp delete mode 100644 src/core/cs_set_persist.cpp delete mode 100644 src/core/cs_set_private.cpp delete mode 100644 src/core/cs_set_restricted.cpp delete mode 100644 src/core/cs_set_secure.cpp delete mode 100644 src/core/cs_set_securefounder.cpp delete mode 100644 src/core/cs_set_secureops.cpp delete mode 100644 src/core/cs_set_signkick.cpp delete mode 100644 src/core/cs_set_successor.cpp delete mode 100644 src/core/cs_set_topiclock.cpp delete mode 100644 src/core/cs_set_xop.cpp delete mode 100644 src/core/cs_status.cpp delete mode 100644 src/core/cs_suspend.cpp delete mode 100644 src/core/cs_topic.cpp delete mode 100644 src/core/cs_unban.cpp delete mode 100644 src/core/cs_xop.cpp delete mode 100644 src/core/db_plain.cpp delete mode 100644 src/core/enc_md5.cpp delete mode 100644 src/core/enc_none.cpp delete mode 100644 src/core/enc_old.cpp delete mode 100644 src/core/enc_sha1.cpp delete mode 100644 src/core/enc_sha256.cpp delete mode 100644 src/core/hs_del.cpp delete mode 100644 src/core/hs_delall.cpp delete mode 100644 src/core/hs_group.cpp delete mode 100644 src/core/hs_help.cpp delete mode 100644 src/core/hs_list.cpp delete mode 100644 src/core/hs_off.cpp delete mode 100644 src/core/hs_on.cpp delete mode 100644 src/core/hs_set.cpp delete mode 100644 src/core/hs_setall.cpp delete mode 100644 src/core/m_socketengine_epoll.cpp delete mode 100644 src/core/m_socketengine_select.cpp delete mode 100644 src/core/ms_cancel.cpp delete mode 100644 src/core/ms_check.cpp delete mode 100644 src/core/ms_del.cpp delete mode 100644 src/core/ms_help.cpp delete mode 100644 src/core/ms_info.cpp delete mode 100644 src/core/ms_list.cpp delete mode 100644 src/core/ms_read.cpp delete mode 100644 src/core/ms_rsend.cpp delete mode 100644 src/core/ms_send.cpp delete mode 100644 src/core/ms_sendall.cpp delete mode 100644 src/core/ms_set.cpp delete mode 100644 src/core/ms_staff.cpp delete mode 100644 src/core/ns_access.cpp delete mode 100644 src/core/ns_alist.cpp delete mode 100644 src/core/ns_drop.cpp delete mode 100644 src/core/ns_forbid.cpp delete mode 100644 src/core/ns_getemail.cpp delete mode 100644 src/core/ns_getpass.cpp delete mode 100644 src/core/ns_ghost.cpp delete mode 100644 src/core/ns_group.cpp delete mode 100644 src/core/ns_help.cpp delete mode 100644 src/core/ns_identify.cpp delete mode 100644 src/core/ns_info.cpp delete mode 100644 src/core/ns_list.cpp delete mode 100644 src/core/ns_logout.cpp delete mode 100644 src/core/ns_recover.cpp delete mode 100644 src/core/ns_register.cpp delete mode 100644 src/core/ns_release.cpp delete mode 100644 src/core/ns_resetpass.cpp delete mode 100644 src/core/ns_saset.cpp delete mode 100644 src/core/ns_saset_noexpire.cpp delete mode 100644 src/core/ns_sendpass.cpp delete mode 100644 src/core/ns_set.cpp delete mode 100644 src/core/ns_set_autoop.cpp delete mode 100644 src/core/ns_set_email.cpp delete mode 100644 src/core/ns_set_greet.cpp delete mode 100644 src/core/ns_set_hide.cpp delete mode 100644 src/core/ns_set_kill.cpp delete mode 100644 src/core/ns_set_language.cpp delete mode 100644 src/core/ns_set_message.cpp delete mode 100644 src/core/ns_set_private.cpp delete mode 100644 src/core/ns_set_secure.cpp delete mode 100644 src/core/ns_status.cpp delete mode 100644 src/core/ns_suspend.cpp delete mode 100644 src/core/ns_update.cpp delete mode 100644 src/core/os_akill.cpp delete mode 100644 src/core/os_chankill.cpp delete mode 100644 src/core/os_chanlist.cpp delete mode 100644 src/core/os_clearmodes.cpp delete mode 100644 src/core/os_defcon.cpp delete mode 100644 src/core/os_global.cpp delete mode 100644 src/core/os_help.cpp delete mode 100644 src/core/os_ignore.cpp delete mode 100644 src/core/os_jupe.cpp delete mode 100644 src/core/os_kick.cpp delete mode 100644 src/core/os_mode.cpp delete mode 100644 src/core/os_modinfo.cpp delete mode 100644 src/core/os_modlist.cpp delete mode 100644 src/core/os_modload.cpp delete mode 100644 src/core/os_modunload.cpp delete mode 100644 src/core/os_news.cpp delete mode 100644 src/core/os_noop.cpp delete mode 100644 src/core/os_oline.cpp delete mode 100644 src/core/os_quit.cpp delete mode 100644 src/core/os_reload.cpp delete mode 100644 src/core/os_restart.cpp delete mode 100644 src/core/os_session.cpp delete mode 100644 src/core/os_set.cpp delete mode 100644 src/core/os_shutdown.cpp delete mode 100644 src/core/os_snline.cpp delete mode 100644 src/core/os_sqline.cpp delete mode 100644 src/core/os_staff.cpp delete mode 100644 src/core/os_stats.cpp delete mode 100644 src/core/os_svsnick.cpp delete mode 100644 src/core/os_szline.cpp delete mode 100644 src/core/os_umode.cpp delete mode 100644 src/core/os_update.cpp delete mode 100644 src/core/os_userlist.cpp delete mode 100644 src/core/ss_main.cpp delete mode 100644 src/modules/CMakeLists.txt delete mode 100644 src/modules/cs_appendtopic.cpp delete mode 100644 src/modules/cs_enforce.cpp delete mode 100644 src/modules/cs_set_misc.cpp delete mode 100644 src/modules/cs_tban.cpp delete mode 100644 src/modules/hs_request.cpp delete mode 100644 src/modules/m_helpchan.cpp delete mode 100644 src/modules/mysql/db_mysql.h delete mode 100644 src/modules/mysql/db_mysql_execute.cpp delete mode 100644 src/modules/mysql/db_mysql_read.cpp delete mode 100644 src/modules/mysql/db_mysql_write.cpp delete mode 100644 src/modules/ns_maxemail.cpp delete mode 100644 src/modules/ns_set_misc.cpp delete mode 100644 src/modules/ssl/m_ssl.cpp delete mode 100644 src/protocol/CMakeLists.txt delete mode 100644 src/protocol/bahamut.cpp delete mode 100644 src/protocol/inspircd11.cpp delete mode 100644 src/protocol/inspircd12.cpp delete mode 100644 src/protocol/inspircd20.cpp delete mode 100644 src/protocol/ratbox.cpp delete mode 100644 src/protocol/unreal32.cpp delete mode 100644 src/threadengine_pthread.cpp delete mode 100644 src/threadengine_win32.cpp create mode 100644 src/threadengines/threadengine_pthread.cpp create mode 100644 src/threadengines/threadengine_win32.cpp delete mode 100644 src/win32.rc.cmake create mode 100644 src/win32/anope-icon.ico create mode 100644 src/win32/anope.bat create mode 100644 src/win32/vsvars32.bat create mode 100644 src/win32/win32.rc.cmake create mode 100644 src/win32/win32_memory.cpp create mode 100644 src/win32/windows.cpp delete mode 100644 src/win32_memory.cpp delete mode 100644 src/windows.cpp delete mode 100644 vsvars32.bat diff --git a/Anope.cmake b/Anope.cmake deleted file mode 100644 index 3a45a4b44..000000000 --- a/Anope.cmake +++ /dev/null @@ -1,501 +0,0 @@ -############################################################################### -# strip_string( ) -# -# A macro to handle stripping the leading and trailing spaces from a string, -# uses string(STRIP) if using CMake 2.6.x or better, otherwise uses -# string(REGEX REPLACE). -############################################################################### -macro(strip_string INPUT_STRING OUTPUT_STRING) - if(CMAKE26_OR_BETTER) - # For CMake 2.6.x or better, we can just use the STRIP sub-command of string() - string(STRIP ${INPUT_STRING} ${OUTPUT_STRING}) - else(CMAKE26_OR_BETTER) - # For CMake 2.4.x, we will have to use the REGEX REPLACE sub-command of string() instead - # First check if the input string is empty or not - if (${INPUT_STRING} STREQUAL "") - set(${OUTPUT_STRING} "") - else(${INPUT_STRING} STREQUAL "") - # Determine if the string is entirely empty or not - string(REGEX MATCH "^[ \t]*$" EMPTY_STRING "${INPUT_STRING}") - if(EMPTY_STRING) - set(${OUTPUT_STRING} "") - else(EMPTY_STRING) - # We detect if there is any leading whitespace and remove any if there is - string(SUBSTRING "${INPUT_STRING}" 0 1 FIRST_CHAR) - if(FIRST_CHAR STREQUAL " " OR FIRST_CHAR STREQUAL "\t") - string(REGEX REPLACE "^[ \t]+" "" TEMP_STRING "${INPUT_STRING}") - else(FIRST_CHAR STREQUAL " " OR FIRST_CHAR STREQUAL "\t") - set(TEMP_STRING "${INPUT_STRING}") - endif(FIRST_CHAR STREQUAL " " OR FIRST_CHAR STREQUAL "\t") - # Next we detect if there is any trailing whitespace and remove any if there is - string(LENGTH "${TEMP_STRING}" STRING_LEN) - math(EXPR STRING_LEN "${STRING_LEN} - 1") - string(SUBSTRING "${TEMP_STRING}" ${STRING_LEN} 1 LAST_CHAR) - if(LAST_CHAR STREQUAL " " OR LAST_CHAR STREQUAL "\t") - string(REGEX REPLACE "[ \t]+$" "" ${OUTPUT_STRING} "${TEMP_STRING}") - else(LAST_CHAR STREQUAL " " OR LAST_CHAR STREQUAL "\t") - set(${OUTPUT_STRING} "${TEMP_STRING}") - endif(LAST_CHAR STREQUAL " " OR LAST_CHAR STREQUAL "\t") - endif(EMPTY_STRING) - endif(${INPUT_STRING} STREQUAL "") - endif(CMAKE26_OR_BETTER) -endmacro(strip_string) - -############################################################################### -# append_to_list( ...) -# -# A macro to handle appending to lists, uses list(APPEND) if using CMake 2.4.2 -# or better, otherwise uses set() instead. -############################################################################### -macro(append_to_list LIST) - if(CMAKE242_OR_BETTER) - # For CMake 2.4.2 or better, we can just use the APPEND sub-command of list() - list(APPEND ${LIST} ${ARGN}) - else(CMAKE242_OR_BETTER) - # For CMake 2.4.x before 2.4.2, we have to do this manually use set() instead - set(${LIST} ${${LIST}} ${ARGN}) - endif(CMAKE242_OR_BETTER) -endmacro(append_to_list) - -############################################################################### -# find_in_list( ) -# -# A macro to handle searching within a list, will store the result in the -# given , uses list(FIND) if using CMake 2.6.x or better -# (or CMake 2.4.8 or better), otherwise it iterates through the list to find -# the item. -############################################################################### -macro(find_in_list LIST ITEM_TO_FIND FOUND) - if(CMAKE248_OR_BETTER) - # For CMake 2.4.8 or better, we can use the FIND sub-command of list() - list(FIND ${LIST} ${ITEM_TO_FIND} ITEM_FOUND) - else(CMAKE248_OR_BETTER) - # For CMake 2.4.x before 2.4.8, we have to do this ourselves (NOTE: This is very slow due to a lack of break() as well) - # Firstly we set the position to -1 indicating nothing found, we also use a temporary position - set(ITEM_FOUND -1) - set(POS 0) - # Iterate through the list - foreach(ITEM ${${LIST}}) - # If the item we are looking at is the item we are trying to find, set that we've found the item - if(${ITEM} STREQUAL ${ITEM_TO_FIND}) - set(ITEM_FOUND ${POS}) - endif(${ITEM} STREQUAL ${ITEM_TO_FIND}) - # Increase the position value by 1 - math(EXPR POS "${POS} + 1") - endforeach(ITEM) - endif(CMAKE248_OR_BETTER) - # Set the given FOUND variable to the result - set(${FOUND} ${ITEM_FOUND}) -endmacro(find_in_list) - -############################################################################### -# remove_list_duplicates() -# -# A macro to handle removing duplicates from a list, uses -# list(REMOVE_DUPLICATES) if using CMake 2.6.x or better, otherwise it uses -# a slower method of creating a temporary list and only adding to it when -# a duplicate item hasn't been found. -############################################################################### -macro(remove_list_duplicates LIST) - if(CMAKE26_OR_BETTER) - # For CMake 2.6.x or better, this can be done automatically - list(REMOVE_DUPLICATES ${LIST}) - else(CMAKE26_OR_BETTER) - # For CMake 2.4.x, we have to do this ourselves, firstly we'll clear a temporary list - set(NEW_LIST) - # Iterate through the old list - foreach(ITEM ${${LIST}}) - # Check if the item is in the new list - find_in_list(NEW_LIST ${ITEM} FOUND_ITEM) - if(FOUND_ITEM EQUAL -1) - # If the item was not found, append it to the list - append_to_list(NEW_LIST ${ITEM}) - endif(FOUND_ITEM EQUAL -1) - endforeach(ITEM) - # Replace the old list with the new list - set(${LIST} ${NEW_LIST}) - endif(CMAKE26_OR_BETTER) -endmacro(remove_list_duplicates) - -############################################################################### -# remove_item_from_list( ) -# -# A macro to handle removing a value from a list, uses list(REMOVE_ITEM) in -# both cases, but can remove the value itself using CMake 2.4.2 or better, -# while older versions use a slower method of iterating the list to find the -# index of the value to remove. -############################################################################### -macro(remove_item_from_list LIST VALUE) - if(CMAKE242_OR_BETTER) - # For CMake 2.4.2 or better, this can be done automatically - list(REMOVE_ITEM ${LIST} ${VALUE}) - else(CMAKE242_OR_BETTER) - # For CMake 2.4.x before 2.4.2, we have to do this ourselves, firstly we set the index and a variable to indicate if the item was found - set(INDEX 0) - set(FOUND FALSE) - # Iterate through the old list - foreach(ITEM ${${LIST}}) - # If the item hasn't been found yet, but the current item is the same, remove it - if(NOT FOUND) - if(ITEM STREQUAL ${VALUE}) - set(FOUND TRUE) - list(REMOVE_ITEM ${LIST} ${INDEX}) - endif(ITEM STREQUAL ${VALUE}) - endif(NOT FOUND) - # Increase the index value by 1 - math(EXPR INDEX "${INDEX} + 1") - endforeach(ITEM) - endif(CMAKE242_OR_BETTER) -endmacro(remove_item_from_list) - -############################################################################### -# sort_list() -# -# A macro to handle sorting a list, uses list(SORT) if using CMake 2.4.4 or -# better, otherwise it uses a slower method of creating a temporary list and -# adding elements in alphabetical order. -############################################################################### -macro(sort_list LIST) - if(CMAKE244_OR_BETTER) - # For CMake 2.4.4 or better, this can be done automatically - list(SORT ${LIST}) - else(CMAKE244_OR_BETTER) - # For CMake 2.4.x before 2.4.4, we have to do this ourselves, firstly we'll create a teporary list - set(NEW_LIST) - # Iterate through the old list - foreach(ITEM ${${LIST}}) - # Temporary index position for the new list, as well as temporary value to store if the item was ever found - set(INDEX 0) - set(FOUND FALSE) - # Iterate through the new list - foreach(NEW_ITEM ${NEW_LIST}) - # Compare the items, only if nothing was found before - if(NOT FOUND) - if(NEW_ITEM STRGREATER "${ITEM}") - set(FOUND TRUE) - list(INSERT NEW_LIST ${INDEX} ${ITEM}) - endif(NEW_ITEM STRGREATER "${ITEM}") - endif(NOT FOUND) - # Increase the index value by 1 - math(EXPR INDEX "${INDEX} + 1") - endforeach(NEW_ITEM) - # If the item was never found, just append it to the end - if(NOT FOUND) - append_to_list(NEW_LIST ${ITEM}) - endif(NOT FOUND) - endforeach(ITEM) - # Replace the old list with the new list - set(${LIST} ${NEW_LIST}) - endif(CMAKE244_OR_BETTER) -endmacro(sort_list) - -############################################################################### -# read_from_file( ) -# -# A macro to handle reading specific lines from a file, uses file(STRINGS) if -# using CMake 2.6.x or better, otherwise we read in the entire file and -# perform a string(REGEX MATCH) on each line of the file instead. This -# macro can also be used to read in all the lines of a file if REGEX is set -# to "". -############################################################################### -macro(read_from_file FILE REGEX STRINGS) - if(CMAKE26_OR_BETTER) - # For CMake 2.6.x or better, we can just use the STRINGS sub-command to get the lines that match the given regular expression (if one is given, otherwise get all lines) - if(REGEX STREQUAL "") - file(STRINGS ${FILE} RESULT) - else(REGEX STREQUAL "") - file(STRINGS ${FILE} RESULT REGEX ${REGEX}) - endif(REGEX STREQUAL "") - else(CMAKE26_OR_BETTER) - # For CMake 2.4.x, we need to do this manually, firstly we read the file in - execute_process(COMMAND ${CMAKE_COMMAND} -DFILE:STRING=${FILE} -P ${Anope_SOURCE_DIR}/ReadFile.cmake ERROR_VARIABLE ALL_STRINGS) - # Next we replace all newlines with semicolons - string(REGEX REPLACE "\n" ";" ALL_STRINGS ${ALL_STRINGS}) - if(REGEX STREQUAL "") - # For no regular expression, just set the result to all the lines - set(RESULT ${ALL_STRINGS}) - else(REGEX STREQUAL "") - # Clear the result list - set(RESULT) - # Iterate through all the lines of the file - foreach(STRING ${ALL_STRINGS}) - # Check for a match against the given regular expression - string(REGEX MATCH ${REGEX} STRING_MATCH ${STRING}) - # If we had a match, append the match to the list - if(STRING_MATCH) - append_to_list(RESULT ${STRING}) - endif(STRING_MATCH) - endforeach(STRING) - endif(REGEX STREQUAL "") - endif(CMAKE26_OR_BETTER) - # Set the given STRINGS variable to the result - set(${STRINGS} ${RESULT}) -endmacro(read_from_file) - -############################################################################### -# extract_include_filename( []) -# -# This macro will take a #include line and extract the filename. -############################################################################### -macro(extract_include_filename INCLUDE FILENAME) - # Strip the leading and trailing spaces from the include line - strip_string(${INCLUDE} INCLUDE_STRIPPED) - # Make sure to only do the following if there is a string - if(INCLUDE_STRIPPED STREQUAL "") - set(FILE "") - else(INCLUDE_STRIPPED STREQUAL "") - # Extract the filename including the quotes or angle brackets - string(REGEX REPLACE "^.*([\"<].*[\">]).*$" "\\1" FILE "${INCLUDE_STRIPPED}") - # If an optional 3rd argument is given, we'll store if the quote style was quoted or angle bracketed - if(${ARGC} GREATER 2) - string(SUBSTRING ${FILE} 0 1 QUOTE) - if(QUOTE STREQUAL "<") - set(${ARGV2} "angle brackets") - else(QUOTE STREQUAL "<") - set(${ARGV2} "quotes") - endif(QUOTE STREQUAL "<") - endif(${ARGC} GREATER 2) - # Now remove the quotes or angle brackets - string(REGEX REPLACE "^[\"<](.*)[\">]$" "\\1" FILE "${FILE}") - endif(INCLUDE_STRIPPED STREQUAL "") - # Set the filename to the the given variable - set(${FILENAME} "${FILE}") -endmacro(extract_include_filename) - -############################################################################### -# find_includes( ) -# -# This macro will search through a file for #include lines, regardless of -# whitespace, but only returns the lines that are valid for the current -# platform CMake is running on. -############################################################################### -macro(find_includes SRC INCLUDES) - # Read all lines from the file that start with #, regardless of whitespace before the # - read_from_file(${SRC} "^[ \t]*#.*$" LINES) - # Set that any #include lines found are valid, and create temporary variables for the last found #ifdef/#ifndef - set(VALID_LINE TRUE) - set(LAST_DEF) - set(LAST_CHECK) - # Create an empty include list - set(INCLUDES_LIST) - # Iterate through all the # lines - foreach(LINE ${LINES}) - # Search for #ifdef, #ifndef, #else, #endif, and #include - string(REGEX MATCH "^[ \t]*#[ \t]*ifdef[ \t]*.*$" FOUND_IFDEF ${LINE}) - string(REGEX MATCH "^[ \t]*#[ \t]*ifndef[ \t]*.*$" FOUND_IFNDEF ${LINE}) - string(REGEX MATCH "^[ \t]*#[ \t]*else.*$" FOUND_ELSE ${LINE}) - string(REGEX MATCH "^[ \t]*#[ \t]*endif.*$" FOUND_ENDIF ${LINE}) - string(REGEX MATCH "^[ \t]*#[ \t]*include[ \t]*[\"<].*[\">][\ t]*.*$" FOUND_INCLUDE ${LINE}) - # If we found a #ifdef on the line, extract the data after the #ifdef and set if the lines after it are valid based on the variables in CMake - if(FOUND_IFDEF) - # Extract the define - string(REGEX REPLACE "^[ \t]*#[ \t]*ifdef[ \t]*(.*)$" "\\1" DEFINE ${LINE}) - # Replace _WIN32 with WIN32, so we can check if the WIN32 variable of CMake is set instead of _WIN32 - if(DEFINE STREQUAL "_WIN32") - set(DEFINE WIN32) - endif(DEFINE STREQUAL "_WIN32") - # Set the last define to this one, and set the last check to true, so when #else is encountered, we can do an opposing check - set(LAST_DEF ${DEFINE}) - set(LAST_CHECK TRUE) - # If the define is true (it either exists or is a non-false result), the lines following will be checked, otherwise they will be skipped - if(${DEFINE}) - set(VALID_LINE TRUE) - else(${DEFINE}) - set(VALID_LINE FALSE) - endif(${DEFINE}) - else(FOUND_IFDEF) - # If we found a #ifndef on the line, the same thing as #ifdef is done, except with the checks in the opposite direction - if(FOUND_IFNDEF) - # Extract the define - string(REGEX REPLACE "^[ \t]*#[ \t]*ifndef[ \t]*(.*)$" "\\1" DEFINE ${LINE}) - # Replace _WIN32 with WIN32, so we can check if the WIN32 variable of CMake is set instead of _WIN32 - if(DEFINE STREQUAL "_WIN32") - set(DEFINE WIN32) - endif(DEFINE STREQUAL "_WIN32") - # Set the last define to this one, and set the last check to false, so when #else is encountered, we can do an opposing check - set(LAST_DEF ${DEFINE}) - set(LAST_CHECK FALSE) - # If the define is not true (it either doesn't exists or is a false result), the lines following will be checked, otherwise they will be skipped - if(${DEFINE}) - set(VALID_LINE FALSE) - else(${DEFINE}) - set(VALUE_LINE TRUE) - endif(${DEFINE}) - else(FOUND_IFNDEF) - # If we found a #else on the line, we check the last define in the opposite direction - if(FOUND_ELSE) - # When LAST_CHECK is true, we were inside a #ifdef, now act as if we are entering a #ifndef section by doing an opposing check - if(LAST_CHECK) - if(${LAST_DEF}) - set(VALID_LINE FALSE) - else(${LAST_DEF}) - set(VALID_LINE TRUE) - endif(${LAST_DEF}) - # When LAST_CHECK is false, we were inside a #ifndef, now act as if we are entering a #ifdef section by doing an opposing check - else(LAST_CHECK) - if(${LAST_DEF}) - set(VALID_LINE TRUE) - else(${LAST_DEF}) - set(VALID_LINE FALSE) - endif(${LAST_DEF}) - endif(LAST_CHECK) - else(FOUND_ELSE) - # If we found a #endif on the line, we'll assume everything following the line is valid until we meet another one of the above lines - if(FOUND_ENDIF) - set(VALID_LINE TRUE) - else(FOUND_ENDIF) - # If we found a #include on the line, add the entire line to the list of includes unless the line isn't valid - if(FOUND_INCLUDE) - if(VALID_LINE) - append_to_list(INCLUDES_LIST "${LINE}") - endif(VALID_LINE) - endif(FOUND_INCLUDE) - endif(FOUND_ENDIF) - endif(FOUND_ELSE) - endif(FOUND_IFNDEF) - endif(FOUND_IFDEF) - endforeach(LINE) - set(${INCLUDES} ${INCLUDES_LIST}) -endmacro(find_includes) - -############################################################################### -# calculate_depends( []) -# -# This macro is used in most of the src (sub)directories to calculate the -# header file dependencies for the given source file. -############################################################################### -macro(calculate_depends SRC) - # Temporarily set that we didn't get a 2nd argument before we actually check if we did get one or not - set(CHECK_ANGLE_INCLUDES FALSE) - # Check for a second argument - if(${ARGC} GREATER 1) - set(CHECK_ANGLE_INCLUDES TRUE) - endif(${ARGC} GREATER 1) - # Find all the lines in the given source file that have any form of #include on them, regardless of whitespace, but only if they are valid for the platform we are on - find_includes(${SRC} INCLUDES) - # Reset the list of headers to empty - set(HEADERS) - # Iterate through the strings containing #include (if any) - foreach(INCLUDE ${INCLUDES}) - # Extract the filename from the #include line - extract_include_filename(${INCLUDE} FILENAME QUOTE_TYPE) - if(QUOTE_TYPE STREQUAL "angle brackets") - # The following checks will only be done if there was a request for angle includes to be checked - if(CHECK_ANGLE_INCLUDES) - # Find the path of the include file - if(DEFAULT_INCLUDE_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR}) - find_path(FOUND_${FILENAME}_INCLUDE NAMES ${FILENAME} PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include) - else(DEFAULT_INCLUDE_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR}) - find_path(FOUND_${FILENAME}_INCLUDE NAMES ${FILENAME}) - endif(DEFAULT_INCLUDE_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR}) - # If the include file was found, add it's path to the list of include paths, but only if it doesn't already exist and isn't in the defaults for the compiler - if(FOUND_${FILENAME}_INCLUDE) - find_in_list(DEFAULT_INCLUDE_DIRS "${FOUND_${FILENAME}_INCLUDE}" FOUND_IN_DEFAULTS) - if(FOUND_IN_DEFAULTS EQUAL -1) - find_in_list(${ARGV1} "${FOUND_${FILENAME}_INCLUDE}" FOUND_IN_INCLUDES) - if(FOUND_IN_INCLUDES EQUAL -1) - append_to_list(${ARGV1} "${FOUND_${FILENAME}_INCLUDE}") - endif(FOUND_IN_INCLUDES EQUAL -1) - endif(FOUND_IN_DEFAULTS EQUAL -1) - else(FOUND_${FILENAME}_INCLUDE) - message(FATAL_ERROR "${SRC} needs header file ${FILENAME} but we were unable to locate that header file! Check that the header file is within the search path of your OS.") - endif(FOUND_${FILENAME}_INCLUDE) - endif(CHECK_ANGLE_INCLUDES) - endif(QUOTE_TYPE STREQUAL "angle brackets") - endforeach(INCLUDE) -endmacro(calculate_depends) - -############################################################################### -# calculate_libraries( ) -# -# This macro is used in most of the src (sub)directories to calculate the -# library dependencies for the given source file. -############################################################################### -macro(calculate_libraries SRC SRC_LDFLAGS EXTRA_DEPENDS) - # Set up a temporary LDFLAGS for this file - set(THIS_LDFLAGS "${LDFLAGS}") - # Reset extra dependencies - set(EXTRA_DEPENDENCIES) - # Reset library paths - set(LIBRARY_PATHS) - # Reset libraries - set(LIBRARIES) - # Check to see if there are any lines matching: /* RequiredLibraries: [something] */ - read_from_file(${SRC} "/\\\\*[ \t]*RequiredLibraries:[ \t]*.*[ \t]*\\\\*/" REQUIRED_LIBRARIES) - # Iterate through those lines - foreach(REQUIRED_LIBRARY ${REQUIRED_LIBRARIES}) - # Strip off the /* RequiredLibraries: and */ from the line - string(REGEX REPLACE "/\\*[ \t]*RequiredLibraries:[ \t]*([^ \t]*)[ \t]*\\*/" "\\1" REQUIRED_LIBRARY ${REQUIRED_LIBRARY}) - # Replace all commas with semicolons - string(REGEX REPLACE "," ";" REQUIRED_LIBRARY ${REQUIRED_LIBRARY}) - # Iterate through the libraries given - foreach(LIBRARY ${REQUIRED_LIBRARY}) - # Locate the library to see if it exists - if(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR}) - find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib) - else(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR}) - find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY}) - endif(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR}) - # If the library was found, we will add it to the linker flags - if(FOUND_${LIBRARY}_LIBRARY) - # Get the path only of the library, to add it to linker flags - get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH) - if(MSVC) - # For Visual Studio, instead of editing the linker flags, we'll add the library to a separate list of extra dependencies - append_to_list(EXTRA_DEPENDENCIES "${FOUND_${LIBRARY}_LIBRARY}") - else(MSVC) - # For all others, add the library paths and libraries - append_to_list(LIBRARY_PATHS "${LIBRARY_PATH}") - append_to_list(LIBRARIES "${LIBRARY}") - endif(MSVC) - else(FOUND_${LIBRARY}_LIBRARY) - # In the case of the library not being found, we fatally error so CMake stops trying to generate - message(FATAL_ERROR "${SRC} needs library ${LIBRARY} but we were unable to locate that library! Check that the library is within the search path of your OS.") - endif(FOUND_${LIBRARY}_LIBRARY) - endforeach(LIBRARY) - endforeach(REQUIRED_LIBRARY) - # Remove duplicates from the library paths - if(LIBRARY_PATHS) - remove_list_duplicates(LIBRARY_PATHS) - endif(LIBRARY_PATHS) - # Remove diplicates from the libraries - if(LIBRARIES) - remove_list_duplicates(LIBRARIES) - endif(LIBRARIES) - # Iterate through library paths and add them to the linker flags - foreach(LIBRARY_PATH ${LIBRARY_PATHS}) - find_in_list(DEFAULT_LIBRARY_DIRS "${LIBRARY_PATH}" FOUND_IN_DEFAULTS) - if(FOUND_IN_DEFAULTS EQUAL -1) - set(THIS_LDFLAGS "${THIS_LDFLAGS} -L${LIBRARY_PATH}") - endif(FOUND_IN_DEFAULTS EQUAL -1) - endforeach(LIBRARY_PATH) - # Iterate through libraries and add them to the linker flags - foreach(LIBRARY ${LIBRARIES}) - set(THIS_LDFLAGS "${THIS_LDFLAGS} -l${LIBRARY}") - endforeach(LIBRARY) - set(${SRC_LDFLAGS} "${THIS_LDFLAGS}") - set(${EXTRA_DEPENDS} "${EXTRA_DEPENDENCIES}") -endmacro(calculate_libraries) - -############################################################################### -# add_to_cpack_ignored_files( [TRUE]) -# -# A macro to update the environment variable CPACK_IGNORED_FILES which -# contains a list of files for CPack to ignore. If the optional 2nd argument -# of TRUE is given, periods will be converted to \\. for CPack. -############################################################################### -macro(add_to_cpack_ignored_files ITEM) - # Temporary copy of the orignal item - set(REAL_ITEM "${ITEM}") - # If we have 2+ arguments, assume that the second one was something like TRUE (doesn't matter really) and convert periods so they will be \\. for CPack - if(${ARGC} GREATER 1) - string(REPLACE "." "\\\\." REAL_ITEM ${REAL_ITEM}) - endif(${ARGC} GREATER 1) - # If the environment variable is already defined, just tack the item to the end - if(DEFINED ENV{CPACK_IGNORED_FILES}) - set(ENV{CPACK_IGNORED_FILES} "$ENV{CPACK_IGNORED_FILES};${REAL_ITEM}") - # Otherwise set the environment variable to the item - else(DEFINED ENV{CPACK_IGNORED_FILES}) - set(ENV{CPACK_IGNORED_FILES} "${REAL_ITEM}") - endif(DEFINED ENV{CPACK_IGNORED_FILES}) -endmacro(add_to_cpack_ignored_files) diff --git a/CMakeLists.txt b/CMakeLists.txt index 702aad6a0..795d04b09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ else(MINOR_VERSION GREATER 5) endif(MINOR_VERSION GREATER 5) # Override the module include path to include our directory, for our Anope.cmake, as well as we are using our own version of the NSIS template -set(CMAKE_MODULE_PATH ${Anope_SOURCE_DIR}) +set(CMAKE_MODULE_PATH ${Anope_SOURCE_DIR}/cmake) include(Anope) @@ -411,7 +411,7 @@ set(VERSION_FULL_NOBUILD "${VERSION_DOTTED_NOBUILD}${VERSION_EXTRA}") # Only do the following for Windows if(WIN32) # Generate the win32.rc file using the above variables - configure_file(${Anope_SOURCE_DIR}/src/win32.rc.cmake ${Anope_BINARY_DIR}/src/win32.rc) + configure_file(${Anope_SOURCE_DIR}/src/win32/win32.rc.cmake $