From 38911fa409be660c6cf4137a570d7e6d920fd59c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 12 Oct 2016 06:29:15 +0200 Subject: [PATCH] Specifying globalNadeko as a configuration during build will not load music --- NadekoBot.sln | 9 +++++++++ src/NadekoBot/Modules/Music/Music.cs | 2 +- src/NadekoBot/NadekoBot.cs | 5 ++++- src/NadekoBot/project.json | 10 ++++++++-- src/tests/project.json | 3 +++ 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/NadekoBot.sln b/NadekoBot.sln index aba14bf4..e844576d 100644 --- a/NadekoBot.sln +++ b/NadekoBot.sln @@ -21,23 +21,32 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + GlobalNadeko|Any CPU = GlobalNadeko|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {45EC1473-C678-4857-A544-07DFE0D0B478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {45EC1473-C678-4857-A544-07DFE0D0B478}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45EC1473-C678-4857-A544-07DFE0D0B478}.GlobalNadeko|Any CPU.ActiveCfg = GlobalNadeko|Any CPU + {45EC1473-C678-4857-A544-07DFE0D0B478}.GlobalNadeko|Any CPU.Build.0 = GlobalNadeko|Any CPU {45EC1473-C678-4857-A544-07DFE0D0B478}.Release|Any CPU.ActiveCfg = Release|Any CPU {45EC1473-C678-4857-A544-07DFE0D0B478}.Release|Any CPU.Build.0 = Release|Any CPU {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.GlobalNadeko|Any CPU.ActiveCfg = GlobalNadeko|Any CPU + {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.GlobalNadeko|Any CPU.Build.0 = GlobalNadeko|Any CPU {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Release|Any CPU.ActiveCfg = Release|Any CPU {91E9E7BD-75C9-4E98-84AA-2C271922E5C2}.Release|Any CPU.Build.0 = Release|Any CPU {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.GlobalNadeko|Any CPU.ActiveCfg = GlobalNadeko|Any CPU + {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.GlobalNadeko|Any CPU.Build.0 = GlobalNadeko|Any CPU {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Release|Any CPU.ActiveCfg = Release|Any CPU {078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}.Release|Any CPU.Build.0 = Release|Any CPU {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.GlobalNadeko|Any CPU.ActiveCfg = GlobalNadeko|Any CPU + {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.GlobalNadeko|Any CPU.Build.0 = GlobalNadeko|Any CPU {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU {14CBADA0-971C-44E3-B331-C7D01DD74F0B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/src/NadekoBot/Modules/Music/Music.cs b/src/NadekoBot/Modules/Music/Music.cs index aabe19cf..3e45fd48 100644 --- a/src/NadekoBot/Modules/Music/Music.cs +++ b/src/NadekoBot/Modules/Music/Music.cs @@ -18,7 +18,7 @@ using NadekoBot.Services.Database.Models; namespace NadekoBot.Modules.Music { - [NadekoModule("Music", "!!")] + [NadekoModule("Music", "!!", AutoLoad = false)] public partial class Music : DiscordModule { public static ConcurrentDictionary MusicPlayers = new ConcurrentDictionary(); diff --git a/src/NadekoBot/NadekoBot.cs b/src/NadekoBot/NadekoBot.cs index ed935011..584f7cbc 100644 --- a/src/NadekoBot/NadekoBot.cs +++ b/src/NadekoBot/NadekoBot.cs @@ -18,6 +18,7 @@ using NadekoBot.Modules.Permissions; using Module = Discord.Commands.Module; using NadekoBot.TypeReaders; using System.Collections.Concurrent; +using NadekoBot.Modules.Music; namespace NadekoBot { @@ -93,7 +94,9 @@ namespace NadekoBot await CommandHandler.StartHandling(); await CommandService.LoadAssembly(Assembly.GetEntryAssembly(), depMap).ConfigureAwait(false); - +#if !GLOBAL_NADEKO + await CommandService.Load(new Music(Localizer, CommandService, Client, Google)).ConfigureAwait(false); +#endif Console.WriteLine(await Stats.Print().ConfigureAwait(false)); await Task.Delay(-1); diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index bf7a5c54..d7b2273a 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -10,12 +10,13 @@ "exclude": [ ], }, "copyToOutput": { - "include": [ "data" , "libs"], + "include": [ "data", "libs" ], "exclude": [ "data/musicdata" ], "mappings": { "./": "./libs" } - } + }, + "define": [] }, "dependencies": { "Microsoft.NETCore.App": { @@ -51,5 +52,10 @@ "portable-net45+win8+wpa81" ] } + }, + "configurations": { + "GlobalNadeko": { + "buildOptions": {"define": ["GLOBAL_NADEKO"]} + } } } diff --git a/src/tests/project.json b/src/tests/project.json index 4408273b..252ce594 100644 --- a/src/tests/project.json +++ b/src/tests/project.json @@ -23,5 +23,8 @@ "portable-net451+win8" ] } + }, + "configurations": { + "GlobalNadeko": {} } }