diff --git a/tools/builder/ABuilder.cs b/tools/builder/ABuilder.cs index 44b0d3a7..562cc0ce 100644 --- a/tools/builder/ABuilder.cs +++ b/tools/builder/ABuilder.cs @@ -53,7 +53,16 @@ namespace builder { return false; } - string new_loc = Config.PathFormat("{0}/{1}/addons/sourcemod/plugins/{2}.smx", cfg.OutputBase, pkg.GetBaseFolder(), pl.Source); + + string new_loc; + if (pl.disabled) + { + new_loc = Config.PathFormat("{0}/{1}/addons/sourcemod/plugins/disabled/{2}.smx", cfg.OutputBase, pkg.GetBaseFolder(), pl.Source); + } + else + { + new_loc = Config.PathFormat("{0}/{1}/addons/sourcemod/plugins/{2}.smx", cfg.OutputBase, pkg.GetBaseFolder(), pl.Source); + } try { diff --git a/tools/builder/Package.cs b/tools/builder/Package.cs index 3d92c0ad..b39792fc 100644 --- a/tools/builder/Package.cs +++ b/tools/builder/Package.cs @@ -25,14 +25,22 @@ namespace builder public Plugin(string file) { Source = file; + disabled = false; } public Plugin (string file, string folder) { Source = file; Folder = folder; + disabled = false; + } + public Plugin (string file, bool is_disabled) + { + Source = file; + disabled = is_disabled; } public string Folder; /* Source folder relative to scripting (null for default) */ public string Source; /* Source file name */ + public bool disabled; /* Is the plugin disabled? */ }; public abstract class Package diff --git a/tools/builder/PkgCore.cs b/tools/builder/PkgCore.cs index f42b4ea3..0d5880d5 100644 --- a/tools/builder/PkgCore.cs +++ b/tools/builder/PkgCore.cs @@ -29,7 +29,7 @@ namespace builder */ public override string [] GetFolders() { - string [] folders = new string[12]; + string [] folders = new string[13]; folders[0] = "addons/sourcemod/bin"; folders[1] = "addons/sourcemod/plugins/disabled"; @@ -43,6 +43,7 @@ namespace builder folders[9] = "addons/sourcemod/scripting/admin-flatfile"; folders[10] = "addons/sourcemod/scripting/testsuite"; folders[11] = "cfg/sourcemod"; + folders[12] = "addons/sourcemod/configs/sql-init-scripts"; return folders; } @@ -63,6 +64,7 @@ namespace builder builder.CopyFolder(this, "configs", "addons/sourcemod/configs", null); builder.CopyFolder(this, "configs/geoip", "addons/sourcemod/configs/geoip", null); builder.CopyFolder(this, "configs/cfg", "cfg/sourcemod", null); + builder.CopyFolder(this, "configs/sql-init-scripts", "addons/sourcemod/configs/sql-init-scripts", null); string [] plugin_omits = new string[1]; plugin_omits[0] = "spcomp.exe"; @@ -139,7 +141,7 @@ namespace builder */ public override Plugin [] GetPlugins() { - Plugin [] plugins = new Plugin[11]; + Plugin [] plugins = new Plugin[14]; plugins[0] = new Plugin("admin-flatfile", "admin-flatfile"); plugins[1] = new Plugin("adminhelp"); @@ -152,6 +154,9 @@ namespace builder plugins[8] = new Plugin("basefuncommands"); plugins[9] = new Plugin("basevotes"); plugins[10] = new Plugin("basefunvotes"); + plugins[11] = new Plugin("admin-sql-prefetch", true); + plugins[12] = new Plugin("admin-sql-threaded", true); + plugins[13] = new Plugin("sql-admin-manager", true); return plugins; }