From 773af3ad7fdb25cd95e0b01d764128f29cb12e3f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 19 Jun 2007 20:02:05 +0000 Subject: [PATCH] updated build script to create cfg folder with configs --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40990 --- tools/builder/ABuilder.cs | 6 ++-- tools/builder/PkgCore.cs | 60 ++++++++++++++++++----------------- tools/builder/build-win32.cfg | 2 -- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/tools/builder/ABuilder.cs b/tools/builder/ABuilder.cs index 97f01a08..44b0d3a7 100644 --- a/tools/builder/ABuilder.cs +++ b/tools/builder/ABuilder.cs @@ -20,7 +20,7 @@ namespace builder public bool CompilePlugin(Package pkg, Plugin pl) { - string local_dir = Config.PathFormat("{0}/{1}/scripting", cfg.OutputBase, pkg.GetBaseFolder()); + string local_dir = Config.PathFormat("{0}/{1}/addons/sourcemod/scripting", cfg.OutputBase, pkg.GetBaseFolder()); string filepath = null; if (pl.Folder != null) @@ -48,12 +48,12 @@ namespace builder Console.WriteLine(output); - string binary = Config.PathFormat("{0}/{1}/scripting/{2}.smx", cfg.OutputBase, pkg.GetBaseFolder(), pl.Source); + string binary = Config.PathFormat("{0}/{1}/addons/sourcemod/scripting/{2}.smx", cfg.OutputBase, pkg.GetBaseFolder(), pl.Source); if (!File.Exists(binary)) { return false; } - string new_loc = Config.PathFormat("{0}/{1}/plugins/{2}.smx", cfg.OutputBase, pkg.GetBaseFolder(), pl.Source); + string new_loc = Config.PathFormat("{0}/{1}/addons/sourcemod/plugins/{2}.smx", cfg.OutputBase, pkg.GetBaseFolder(), pl.Source); try { diff --git a/tools/builder/PkgCore.cs b/tools/builder/PkgCore.cs index 2b571536..dd146cb2 100644 --- a/tools/builder/PkgCore.cs +++ b/tools/builder/PkgCore.cs @@ -10,7 +10,7 @@ namespace builder public override string GetBaseFolder() { - return "base/addons/sourcemod"; + return "base"; } public override void GetCompressBases(ref string path, ref string folder) @@ -29,19 +29,20 @@ namespace builder */ public override string [] GetFolders() { - string [] folders = new string[11]; + string [] folders = new string[12]; - folders[0] = "bin"; - folders[1] = "plugins/disabled"; - folders[2] = "gamedata"; - folders[3] = "configs/geoip"; - folders[4] = "translations"; - folders[5] = "logs"; - folders[6] = "extensions"; - folders[7] = "data"; - folders[8] = "scripting/include"; - folders[9] = "scripting/admin-flatfile"; - folders[10] = "scripting/testsuite"; + folders[0] = "addons/sourcemod/bin"; + folders[1] = "addons/sourcemod/plugins/disabled"; + folders[2] = "addons/sourcemod/gamedata"; + folders[3] = "addons/sourcemod/configs/geoip"; + folders[4] = "addons/sourcemod/translations"; + folders[5] = "addons/sourcemod/logs"; + folders[6] = "addons/sourcemod/extensions"; + folders[7] = "addons/sourcemod/data"; + folders[8] = "addons/sourcemod/scripting/include"; + folders[9] = "addons/sourcemod/scripting/admin-flatfile"; + folders[10] = "addons/sourcemod/scripting/testsuite"; + folders[11] = "cfg/sourcemod"; return folders; } @@ -58,8 +59,9 @@ namespace builder */ public override void OnCopyFolders(ABuilder builder) { - builder.CopyFolder(this, "configs", "configs", null); - builder.CopyFolder(this, "configs/geoip", "configs/geoip", null); + 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); string [] plugin_omits = new string[1]; plugin_omits[0] = "spcomp.exe"; @@ -67,13 +69,13 @@ namespace builder string [] include_omits = new string[1]; include_omits[0] = "version.tpl"; - builder.CopyFolder(this, "gamedata", "gamedata", null); - builder.CopyFolder(this, "plugins", "scripting", plugin_omits); - builder.CopyFolder(this, "plugins/include", "scripting/include", include_omits); - builder.CopyFolder(this, "translations", "translations", null); - builder.CopyFolder(this, "public/licenses", null, null); - builder.CopyFolder(this, "plugins/admin-flatfile", "scripting/admin-flatfile", null); - builder.CopyFolder(this, "plugins/testsuite", "scripting/testsuite", null); + builder.CopyFolder(this, "gamedata", "addons/sourcemod/gamedata", null); + builder.CopyFolder(this, "plugins", "addons/sourcemod/scripting", plugin_omits); + builder.CopyFolder(this, "plugins/include", "addons/sourcemod/scripting/include", include_omits); + builder.CopyFolder(this, "translations", "addons/sourcemod/translations", null); + builder.CopyFolder(this, "public/licenses", "addons/sourcemod", null); + builder.CopyFolder(this, "plugins/admin-flatfile", "addons/sourcemod/scripting/admin-flatfile", null); + builder.CopyFolder(this, "plugins/testsuite", "addons/sourcemod/scripting/testsuite", null); } /** @@ -88,37 +90,37 @@ namespace builder libs[i] = new Library(); } - libs[0].Destination = "bin"; + libs[0].Destination = "addons/sourcemod/bin"; libs[0].LocalPath = "core"; libs[0].Name = "sourcemod_mm"; libs[0].PlatformExt = true; - libs[1].Destination = "bin"; + libs[1].Destination = "addons/sourcemod/bin"; libs[1].LocalPath = "sourcepawn/jit/x86"; libs[1].Name = "sourcepawn.jit.x86"; libs[1].ProjectFile = "jit-x86"; - libs[2].Destination = "scripting"; + libs[2].Destination = "addons/sourcemod/scripting"; libs[2].LocalPath = "sourcepawn/compiler"; libs[2].Name = "spcomp"; libs[2].IsExecutable = true; - libs[3].Destination = "extensions"; + libs[3].Destination = "addons/sourcemod/extensions"; libs[3].LocalPath = "extensions/geoip"; libs[3].Name = "geoip.ext"; libs[3].ProjectFile = "geoip"; - libs[4].Destination = "extensions"; + libs[4].Destination = "addons/sourcemod/extensions"; libs[4].LocalPath = "extensions/bintools"; libs[4].Name = "bintools.ext"; libs[4].ProjectFile = "bintools"; - libs[5].Destination = "extensions"; + libs[5].Destination = "addons/sourcemod/extensions"; libs[5].LocalPath = "extensions/mysql"; libs[5].Name = "dbi.mysql.ext"; libs[5].ProjectFile = "sm_mysql"; - libs[6].Destination = "extensions"; + libs[6].Destination = "addons/sourcemod/extensions"; libs[6].LocalPath = "extensions/sdktools"; libs[6].Name = "sdktools.ext"; libs[6].ProjectFile = "sdktools"; diff --git a/tools/builder/build-win32.cfg b/tools/builder/build-win32.cfg index 586d44e2..75d2c77d 100644 --- a/tools/builder/build-win32.cfg +++ b/tools/builder/build-win32.cfg @@ -1,6 +1,4 @@ OutputBase = c:\real\done\sourcemod SourceBase = r:\sourcemod\trunk BuilderPath = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com -SVNVersion = C:\Program Files\Subversion\bin\svnversion.exe ProductVersion = 1.0.0 -Compressor = c:\Windows\zip.exe