From 630c045397cf03f8fbb721089e1af4ffb5decf76 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Fri, 1 May 2015 09:34:42 -0600 Subject: [PATCH] Move resources to "prebuilts" folder. Fixes #904 --- TShockAPI/TShockAPI.csproj | 10 +++++----- create_release.py | 8 ++++---- {BCryptBins => prebuilts}/BCrypt.Net.XML | 0 {BCryptBins => prebuilts}/BCrypt.Net.dll | Bin prebuilts/BCrypt.Net.pdb | Bin 0 -> 24064 bytes {HttpBins => prebuilts}/HttpServer.dll | Bin {HttpBins => prebuilts}/HttpServer.pdb | Bin {HttpBins => prebuilts}/HttpServer.xml | 0 {SqlBins => prebuilts}/Mono.Data.Sqlite.dll | Bin {SqlBins => prebuilts}/MySql.Data.dll | Bin {SqlBins => prebuilts}/MySql.Web.dll | Bin {TShockAPI => prebuilts}/Newtonsoft.Json.dll | Bin {SqlBins => prebuilts}/sqlite3.def | 0 {SqlBins => prebuilts}/sqlite3.dll | Bin 14 files changed, 9 insertions(+), 9 deletions(-) rename {BCryptBins => prebuilts}/BCrypt.Net.XML (100%) rename {BCryptBins => prebuilts}/BCrypt.Net.dll (100%) create mode 100644 prebuilts/BCrypt.Net.pdb rename {HttpBins => prebuilts}/HttpServer.dll (100%) rename {HttpBins => prebuilts}/HttpServer.pdb (100%) rename {HttpBins => prebuilts}/HttpServer.xml (100%) rename {SqlBins => prebuilts}/Mono.Data.Sqlite.dll (100%) rename {SqlBins => prebuilts}/MySql.Data.dll (100%) rename {SqlBins => prebuilts}/MySql.Web.dll (100%) rename {TShockAPI => prebuilts}/Newtonsoft.Json.dll (100%) rename {SqlBins => prebuilts}/sqlite3.def (100%) rename {SqlBins => prebuilts}/sqlite3.dll (100%) diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj index 8302e0eb..ff3d0b9e 100644 --- a/TShockAPI/TShockAPI.csproj +++ b/TShockAPI/TShockAPI.csproj @@ -54,21 +54,21 @@ - ..\HttpBins\HttpServer.dll + ..\prebuilts\HttpServer.dll - ..\SqlBins\Mono.Data.Sqlite.dll + ..\prebuilts\Mono.Data.Sqlite.dll False - ..\SqlBins\MySql.Data.dll + ..\prebuilts\MySql.Data.dll True - .\Newtonsoft.Json.dll + ..\prebuilts\Newtonsoft.Json.dll - ..\BCryptBins\BCrypt.Net.dll + ..\prebuilts\BCrypt.Net.dll diff --git a/create_release.py b/create_release.py index 8002ef4c..8e2bd256 100644 --- a/create_release.py +++ b/create_release.py @@ -21,10 +21,10 @@ bcrypt_bin_name = "BCrypt.Net.dll" terraria_release_bin = os.path.join(cur_wd, "TerrariaServerAPI", "bin", "Release", terraria_bin_name) terraria_debug_bin = os.path.join(cur_wd, "TerrariaServerAPI", "bin", "Debug", terraria_bin_name) -sql_dep = os.path.join(cur_wd, "SqlBins") -http_bin = os.path.join(cur_wd, "HttpBins", http_bin_name) -json_bin = os.path.join(cur_wd, "TShockAPI", json_bin_name) -bcrypt_bin = os.path.join(cur_wd, "BCryptBins", bcrypt_bin_name) +sql_dep = os.path.join(cur_wd, "prebuilts") +http_bin = os.path.join(cur_wd, "prebuilts", http_bin_name) +json_bin = os.path.join(cur_wd, "prebuilts", json_bin_name) +bcrypt_bin = os.path.join(cur_wd, "prebuilts", bcrypt_bin_name) release_bin = os.path.join(cur_wd, "TShockAPI", "bin", "Release", tshock_bin_name) debug_folder = os.path.join(cur_wd, "TShockAPI", "bin", "Debug") diff --git a/BCryptBins/BCrypt.Net.XML b/prebuilts/BCrypt.Net.XML similarity index 100% rename from BCryptBins/BCrypt.Net.XML rename to prebuilts/BCrypt.Net.XML diff --git a/BCryptBins/BCrypt.Net.dll b/prebuilts/BCrypt.Net.dll similarity index 100% rename from BCryptBins/BCrypt.Net.dll rename to prebuilts/BCrypt.Net.dll diff --git a/prebuilts/BCrypt.Net.pdb b/prebuilts/BCrypt.Net.pdb new file mode 100644 index 0000000000000000000000000000000000000000..58306278a01845a5564db234324b5a7d80192db2 GIT binary patch literal 24064 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 literal 0 HcmV?d00001 diff --git a/HttpBins/HttpServer.dll b/prebuilts/HttpServer.dll similarity index 100% rename from HttpBins/HttpServer.dll rename to prebuilts/HttpServer.dll diff --git a/HttpBins/HttpServer.pdb b/prebuilts/HttpServer.pdb similarity index 100% rename from HttpBins/HttpServer.pdb rename to prebuilts/HttpServer.pdb diff --git a/HttpBins/HttpServer.xml b/prebuilts/HttpServer.xml similarity index 100% rename from HttpBins/HttpServer.xml rename to prebuilts/HttpServer.xml diff --git a/SqlBins/Mono.Data.Sqlite.dll b/prebuilts/Mono.Data.Sqlite.dll similarity index 100% rename from SqlBins/Mono.Data.Sqlite.dll rename to prebuilts/Mono.Data.Sqlite.dll diff --git a/SqlBins/MySql.Data.dll b/prebuilts/MySql.Data.dll similarity index 100% rename from SqlBins/MySql.Data.dll rename to prebuilts/MySql.Data.dll diff --git a/SqlBins/MySql.Web.dll b/prebuilts/MySql.Web.dll similarity index 100% rename from SqlBins/MySql.Web.dll rename to prebuilts/MySql.Web.dll diff --git a/TShockAPI/Newtonsoft.Json.dll b/prebuilts/Newtonsoft.Json.dll similarity index 100% rename from TShockAPI/Newtonsoft.Json.dll rename to prebuilts/Newtonsoft.Json.dll diff --git a/SqlBins/sqlite3.def b/prebuilts/sqlite3.def similarity index 100% rename from SqlBins/sqlite3.def rename to prebuilts/sqlite3.def diff --git a/SqlBins/sqlite3.dll b/prebuilts/sqlite3.dll similarity index 100% rename from SqlBins/sqlite3.dll rename to prebuilts/sqlite3.dll