Add AvalonEdit, NRefactory, and Cecil submodules.

icsharpcode · Dec 25, 2015 · 2a6eff2 · 2a6eff2
1 parent a5776d4
commit 2a6eff2
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "src/Libraries/AvalonEdit"]
+	path = src/Libraries/AvalonEdit
+	url = https://github.com/icsharpcode/AvalonEdit.git
+[submodule "src/Libraries/NRefactory"]
+	path = src/Libraries/NRefactory
+	url = https://github.com/icsharpcode/NRefactory.git
+[submodule "src/Libraries/cecil"]
+	path = src/Libraries/cecil
+	url = https://github.com/jbevain/cecil.git
diff --git a/clean.bat b/clean.bat
@@ -1,5 +1,8 @@
 @set PROGFILES=%PROGRAMFILES%
 @if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
+@if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" (
+	git submodule update --init || exit /b 1
+)
 "%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
 @IF %ERRORLEVEL% NEQ 0 PAUSE
 "%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release

diff --git a/debugbuild.bat b/debugbuild.bat
@@ -1,5 +1,8 @@
 @set PROGFILES=%PROGRAMFILES%
 @if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
+@if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" (
+	git submodule update --init || exit /b 1
+)
 "%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" %*
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0

diff --git a/releasebuild.bat b/releasebuild.bat
@@ -1,5 +1,8 @@
 @set PROGFILES=%PROGRAMFILES%
 @if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
+@if not exist "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.sln" (
+	git submodule update --init || exit /b 1
+)
 "%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU" %*
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0

diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/CSharpSymbolSearch.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/CSharpSymbolSearch.cs
@@ -193,7 +193,7 @@ public Task RenameAsync(SymbolRenameArgs args, Action<PatchedFile> callback, Act
 			var cancellationToken = args.ProgressMonitor.CancellationToken;
 			return Task.Run(
 				() => {
-					bool isNameValid = Mono.CSharp.Tokenizer.IsValidIdentifier(args.NewName);
+					bool isNameValid = ICSharpCode.NRefactory.MonoCSharp.Tokenizer.IsValidIdentifier(args.NewName);
 					object progressLock = new object();
 					Parallel.ForEach(
 						searchScopesPerFile.Keys,

diff --git a/src/Libraries/AvalonEdit b/src/Libraries/AvalonEdit
diff --git a/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstOptimizer.cs b/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstOptimizer.cs
@@ -24,7 +24,6 @@
 using ICSharpCode.NRefactory.Utils;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
-using Mono.CSharp;
 
 namespace ICSharpCode.Decompiler.ILAst
 {

diff --git a/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstTypes.cs b/src/Libraries/ICSharpCode.Decompiler/ILAst/ILAstTypes.cs
@@ -27,7 +27,6 @@
 using ICSharpCode.NRefactory.Utils;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
-using Mono.CSharp;
 using Cecil = Mono.Cecil;
 
 namespace ICSharpCode.Decompiler.ILAst

diff --git a/src/Libraries/NRefactory b/src/Libraries/NRefactory
diff --git a/src/Libraries/cecil b/src/Libraries/cecil