Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update SmartIrc4net, hopefully it's less cpu hungry.

  • Loading branch information...
commit 45488a47d5010367ee5c864ef7d4c0ef579b94a5 1 parent 3128c7a
@rolfbjarne rolfbjarne authored
View
3  .gitmodules
@@ -0,0 +1,3 @@
+[submodule "SmartIrc4net/external"]
+ path = SmartIrc4net/external
+ url = git@github.com:meebey/SmartIrc4net.git
View
1  MonkeyWrench.Web.WebService/Makefile
@@ -45,6 +45,7 @@ install: all
@cp -p $(OUT_DIR)/MonkeyWrench.Database.dll* bin
@cp -p $(OUT_DIR)/Meebey.SmartIrc4net.dll* bin
@cp -p $(OUT_DIR)/Newtonsoft.Json.dll* bin
+ @cp -p $(OUT_DIR)/StarkSoftProxy.dll* bin
dataclasses:
$(MAKE) -C $(TOPDIR)/MonkeyWrench.DataClasses
View
9 MonkeyWrench.Web.WebService/MonkeyWrench.Web.WebService.csproj
@@ -64,14 +64,14 @@
<Project>{EBFBC3BF-10E1-4482-B9BE-A516934C099A}</Project>
<Name>MonkeyWrench</Name>
</ProjectReference>
- <ProjectReference Include="..\SmartIrc4net\smartirc4net-0.4.5.1\SmartIrc4net.csproj">
- <Project>{19607F57-B521-4477-9DE0-F0D9B1A68BC7}</Project>
- <Name>SmartIrc4net</Name>
- </ProjectReference>
<ProjectReference Include="..\Newtonsoft.Json\Src\Newtonsoft.Json\Newtonsoft.Json.csproj">
<Project>{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}</Project>
<Name>Newtonsoft.Json</Name>
</ProjectReference>
+ <ProjectReference Include="..\SmartIrc4net\external\SmartIrc4net.csproj">
+ <Project>{91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}</Project>
+ <Name>SmartIrc4net</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<WebReferences Include="Web References\" />
@@ -104,6 +104,7 @@
<DependentUpon>Notification.ashx</DependentUpon>
</Compile>
<Compile Include="WrenchBuild.cs" />
+ <Compile Include="Maintenance.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
View
2  MonkeyWrench.Web.WebService/Notifications.cs
@@ -342,7 +342,7 @@ public bool WaitForEmptySendBuffer (TimeSpan timeout)
DateTime start = DateTime.Now;
while (!Client.IsSendBufferEmpty) {
- Thread.Sleep (10);
+ Thread.Sleep (100);
if (start.Add (timeout) < DateTime.Now)
return false;
}
View
45 MonkeyWrench.sln
@@ -19,8 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonkeyWrench.Database.Manag
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonkeyWrench.Test", "MonkeyWrench.Test\MonkeyWrench.Test.csproj", "{3737EDC2-5785-424C-92BC-7013B931AF21}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmartIrc4net", "SmartIrc4net\smartirc4net-0.4.5.1\SmartIrc4net.csproj", "{19607F57-B521-4477-9DE0-F0D9B1A68BC7}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json", "Newtonsoft.Json\Src\Newtonsoft.Json\Newtonsoft.Json.csproj", "{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceStack", "ServiceStack", "{0383DE2B-50A5-449C-AAC0-4DDD753764DD}"
@@ -37,6 +35,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.ServiceInterfa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonkeyWrench.Web.ServiceStack", "MonkeyWrench.Web.ServiceStack\MonkeyWrench.Web.ServiceStack.csproj", "{616B7099-222A-4EF1-AA46-17156B7EA102}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmartIrc4net", "SmartIrc4net\external\SmartIrc4net.csproj", "{91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarkSoftProxy", "SmartIrc4net\external\src\starksoftproxy\StarkSoftProxy.csproj", "{3F8CF2C1-EA37-444F-8693-A3A00B1131D2}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -51,10 +53,6 @@ Global
{01AAA129-3B2B-4093-A7B4-6153B6BEBED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01AAA129-3B2B-4093-A7B4-6153B6BEBED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01AAA129-3B2B-4093-A7B4-6153B6BEBED4}.Release|Any CPU.Build.0 = Release|Any CPU
- {19607F57-B521-4477-9DE0-F0D9B1A68BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {19607F57-B521-4477-9DE0-F0D9B1A68BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {19607F57-B521-4477-9DE0-F0D9B1A68BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {19607F57-B521-4477-9DE0-F0D9B1A68BC7}.Release|Any CPU.Build.0 = Release|Any CPU
{1C38937B-F45F-4EB1-B4D1-893FF684C525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C38937B-F45F-4EB1-B4D1-893FF684C525}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C38937B-F45F-4EB1-B4D1-893FF684C525}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -63,6 +61,18 @@ Global
{3737EDC2-5785-424C-92BC-7013B931AF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3737EDC2-5785-424C-92BC-7013B931AF21}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3737EDC2-5785-424C-92BC-7013B931AF21}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.DEBUG MONO|Any CPU.ActiveCfg = Debug|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.DEBUG MONO|Any CPU.Build.0 = Debug|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.MONOTOUCH|Any CPU.ActiveCfg = Debug|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.MonoTouch|Any CPU.ActiveCfg = Debug|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.MONOTOUCH|Any CPU.Build.0 = Debug|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.MonoTouch|Any CPU.Build.0 = Debug|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.STATIC_ONLY NO_EXPRESSIONS|Any CPU.ActiveCfg = Debug|Any CPU
+ {3F8CF2C1-EA37-444F-8693-A3A00B1131D2}.STATIC_ONLY NO_EXPRESSIONS|Any CPU.Build.0 = Debug|Any CPU
{42E1C8C0-A163-44CC-92B1-8F416F2C0B01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{42E1C8C0-A163-44CC-92B1-8F416F2C0B01}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42E1C8C0-A163-44CC-92B1-8F416F2C0B01}.MonoTouch|Any CPU.ActiveCfg = Debug|Any CPU
@@ -89,10 +99,10 @@ Global
{616B7099-222A-4EF1-AA46-17156B7EA102}.DEBUG MONO|Any CPU.Build.0 = Debug|Any CPU
{616B7099-222A-4EF1-AA46-17156B7EA102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{616B7099-222A-4EF1-AA46-17156B7EA102}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {616B7099-222A-4EF1-AA46-17156B7EA102}.MONOTOUCH|Any CPU.ActiveCfg = Debug|Any CPU
{616B7099-222A-4EF1-AA46-17156B7EA102}.MonoTouch|Any CPU.ActiveCfg = Debug|Any CPU
- {616B7099-222A-4EF1-AA46-17156B7EA102}.MonoTouch|Any CPU.Build.0 = Debug|Any CPU
+ {616B7099-222A-4EF1-AA46-17156B7EA102}.MONOTOUCH|Any CPU.ActiveCfg = Debug|Any CPU
{616B7099-222A-4EF1-AA46-17156B7EA102}.MONOTOUCH|Any CPU.Build.0 = Debug|Any CPU
+ {616B7099-222A-4EF1-AA46-17156B7EA102}.MonoTouch|Any CPU.Build.0 = Debug|Any CPU
{616B7099-222A-4EF1-AA46-17156B7EA102}.Release|Any CPU.ActiveCfg = Release|Any CPU
{616B7099-222A-4EF1-AA46-17156B7EA102}.Release|Any CPU.Build.0 = Release|Any CPU
{616B7099-222A-4EF1-AA46-17156B7EA102}.STATIC_ONLY NO_EXPRESSIONS|Any CPU.ActiveCfg = Debug|Any CPU
@@ -113,10 +123,10 @@ Global
{6E240294-9D93-4C09-9BB0-38D82A22DEEE}.DEBUG MONO|Any CPU.Build.0 = Debug|Any CPU
{6E240294-9D93-4C09-9BB0-38D82A22DEEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6E240294-9D93-4C09-9BB0-38D82A22DEEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6E240294-9D93-4C09-9BB0-38D82A22DEEE}.MONOTOUCH|Any CPU.ActiveCfg = Debug|Any CPU
{6E240294-9D93-4C09-9BB0-38D82A22DEEE}.MonoTouch|Any CPU.ActiveCfg = Debug|Any CPU
- {6E240294-9D93-4C09-9BB0-38D82A22DEEE}.MonoTouch|Any CPU.Build.0 = Debug|Any CPU
+ {6E240294-9D93-4C09-9BB0-38D82A22DEEE}.MONOTOUCH|Any CPU.ActiveCfg = Debug|Any CPU
{6E240294-9D93-4C09-9BB0-38D82A22DEEE}.MONOTOUCH|Any CPU.Build.0 = Debug|Any CPU
+ {6E240294-9D93-4C09-9BB0-38D82A22DEEE}.MonoTouch|Any CPU.Build.0 = Debug|Any CPU
{6E240294-9D93-4C09-9BB0-38D82A22DEEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E240294-9D93-4C09-9BB0-38D82A22DEEE}.Release|Any CPU.Build.0 = Release|Any CPU
{6E240294-9D93-4C09-9BB0-38D82A22DEEE}.STATIC_ONLY NO_EXPRESSIONS|Any CPU.ActiveCfg = Debug|Any CPU
@@ -133,6 +143,18 @@ Global
{8E126CCA-C7B2-4108-99F0-1F675C23A69B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E126CCA-C7B2-4108-99F0-1F675C23A69B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E126CCA-C7B2-4108-99F0-1F675C23A69B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.DEBUG MONO|Any CPU.ActiveCfg = Debug|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.DEBUG MONO|Any CPU.Build.0 = Debug|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.MONOTOUCH|Any CPU.ActiveCfg = Debug|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.MonoTouch|Any CPU.ActiveCfg = Debug|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.MonoTouch|Any CPU.Build.0 = Debug|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.MONOTOUCH|Any CPU.Build.0 = Debug|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.STATIC_ONLY NO_EXPRESSIONS|Any CPU.ActiveCfg = Debug|Any CPU
+ {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.STATIC_ONLY NO_EXPRESSIONS|Any CPU.Build.0 = Debug|Any CPU
{982416DB-C143-4028-A0C3-CF41892D18D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{982416DB-C143-4028-A0C3-CF41892D18D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{982416DB-C143-4028-A0C3-CF41892D18D3}.MonoTouch|Any CPU.ActiveCfg = MonoTouch|Any CPU
@@ -166,8 +188,7 @@ Global
{5A315F92-80D2-4C60-A5A4-22E027AC7E7E} = {0383DE2B-50A5-449C-AAC0-4DDD753764DD}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
- version = 0.1
- StartupItem = Builder.csproj
+ StartupItem = MonkeyWrench.Scheduler\MonkeyWrench.Scheduler.csproj
Policies = $0
$0.VersionControlPolicy = $1
$1.CommitMessageStyle = $2
View
14 SmartIrc4net/Makefile
@@ -1,7 +1,4 @@
-DIR = SmartIrc4net-0.4.5.1
-SOURCES = \
- $(wildcard $(DIR)/src/*.cs) \
- $(wildcard $(DIR)/src/*/*.cs)
+DIR = external
TOPDIR = ..
@@ -9,9 +6,9 @@ LIBRARY = Meebey.SmartIrc4net.dll
OUT_DIR = $(TOPDIR)/class/lib
OUT = $(OUT_DIR)/$(LIBRARY)
-$(OUT): $(SOURCES) $(BUILDABLE_REFS)
- @echo " DMCS $(LIBRARY)"
- @dmcs -target:library -debug:full -out:$@ $(SOURCES) -warn:0 -D:NET_2_0
+$(OUT): $(SOURCES) $(BUILDABLE_REFS) external/src/starksoftproxy/.git
+ cd $(DIR) && mdtool -v build -t:Build "-c:Release"
+ cp $(DIR)/bin/release/*.dll* $(OUT_DIR)
all: $(OUT)
@@ -20,3 +17,6 @@ clean:
publish install: all
@:
+
+external/src/starksoftproxy/.git:
+ cd .. && git submodule update --init --recursive
1  SmartIrc4net/external
@@ -0,0 +1 @@
+Subproject commit 860f38af6b358b1fcd7b3a43f7022ffb62650048
Please sign in to comment.
Something went wrong with that request. Please try again.