diff options
42 files changed, 138 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore index 75964db98f..9f405ea34f 100644 --- a/.gitignore +++ b/.gitignore @@ -195,6 +195,7 @@ Thumbs.db /main/tests/MacPlatform.Tests/Makefile /main/tests/MonoDevelop.CSharpBinding.Tests/Makefile /main/tests/MonoDevelop.MacDev.Tests/Makefile +/main/tests/MonoDevelop.Refactoring.Tests/Makefile /main/tests/UserInterfaceTests/Makefile /main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/Makefile /main/src/addins/MonoDevelop.PackageManagement/Makefile @@ -204,6 +205,29 @@ Thumbs.db /main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Makefile /main/src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Makefile /main/src/addins/MonoDevelop.UnitTesting/Makefile +/main/msbuild/Makefile +/main/src/addins/MonoDevelop.AspNetCore/Makefile +/main/src/addins/MonoDevelop.AzureFunctions/Makefile +/main/src/addins/MonoDevelop.ConnectedServices/Makefile +/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile +/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile +/main/src/addins/MonoDevelop.Debugger.Win32/Makefile +/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile +/main/src/addins/MonoDevelop.DotNetCore/Makefile +/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile +/main/src/addins/MonoDevelop.Packaging/Makefile +/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile +/main/src/addins/PerformanceDiagnostics/Makefile +/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile +/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile +/main/src/addins/VersionControl/Subversion.Win32.Tests/Makefile +/main/src/addins/VersionControl/Subversion.Win32/Makefile +/main/src/core/Mono.TextEditor.Platform/Makefile +/main/src/core/Mono.TextEditor.Shared/Makefile +/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile +/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile +/main/tests/MonoDevelop.Core.Tests/Makefile +/main/tests/WindowsPlatform.Tests/Makefile # extras configure junk /extras/MonoDevelop.Database/INSTALL @@ -103,15 +103,11 @@ dist: update_submodules remove-stale-tarballs dist-recursive @echo Decompressing monodevelop-$(PACKAGE_VERSION).tar.bz2 @cd tarballs && tar xvjf monodevelop-$(PACKAGE_VERSION).tar.bz2 @cp version.config tarballs/monodevelop-$(PACKAGE_VERSION) + @cp NuGet.config tarballs/monodevelop-$(PACKAGE_VERSION) @rm -f main/build/bin/buildinfo @cd main && make buildinfo @cp main/build/bin/buildinfo tarballs/monodevelop-$(PACKAGE_VERSION)/ @echo Generating merged tarball - @find tarballs/monodevelop-$(PACKAGE_VERSION)/ -type f -a \ - \( -name \*.exe -o \ - -name \*.dll -o \ - -name \*.mdb \) \ - -delete @cd tarballs && tar -cjf monodevelop-$(PACKAGE_VERSION).tar.bz2 monodevelop-$(PACKAGE_VERSION) @cd tarballs && rm -rf monodevelop-$(PACKAGE_VERSION) diff --git a/main/Makefile.am b/main/Makefile.am index 7f0efcc233..9a8c1aa67f 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/xbuild.include -SUBDIRS = external . contrib src po man theme-icons build tests +SUBDIRS = external . contrib src po man theme-icons msbuild build tests MD_CONFIGURE=$(top_srcdir)/../scripts/configure.sh @@ -207,7 +207,7 @@ app-dir: all # we can't use the variables that are conditionally defined EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(appdata_DATA) $(pixmap_DATA) \ monodevelop.xml $(pkgconfig_in_files) external/Makefile.in \ - Main.sln \ + Main.sln MonoDevelop.props Directory.Build.props \ md.targets DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update \ diff --git a/main/configure.ac b/main/configure.ac index 4d6ee39a30..2ee270eba6 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -292,12 +292,17 @@ build/MacOSX/Makefile contrib/Makefile contrib/ICSharpCode.Decompiler/Makefile external/Makefile +msbuild/Makefile src/Makefile src/core/Makefile src/core/Mono.Texteditor/Makefile +src/core/Mono.TextEditor.Platform/Makefile +src/core/Mono.TextEditor.Shared/Makefile src/core/MonoDevelop.Core/Makefile src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile +src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile src/core/MonoDevelop.Ide/Makefile +src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile src/core/MonoDevelop.Startup/Makefile src/core/MonoDevelop.TextEditor.Tests/Makefile src/tools/Makefile @@ -311,12 +316,17 @@ src/addins/MonoDevelop.UnitTesting/Makefile src/addins/MonoDevelop.UnitTesting.NUnit/Makefile src/addins/MonoDevelop.UnitTesting.NUnit/NUnitRunner/Makefile src/addins/MonoDevelop.UnitTesting.NUnit/NUnit3Runner/Makefile +src/addins/PerformanceDiagnostics/Makefile +src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile +src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile src/addins/VersionControl/MonoDevelop.VersionControl/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/Makefile +src/addins/VersionControl/Subversion.Win32.Tests/Makefile +src/addins/VersionControl/Subversion.Win32/Makefile src/addins/VersionControl/Makefile src/addins/CSharpBinding/Makefile src/addins/CSharpBinding/Autotools/Makefile @@ -349,13 +359,24 @@ src/addins/MonoDevelop.AssemblyBrowser/Makefile src/addins/MonoDevelop.SourceEditor2/Makefile src/addins/Xml/Makefile src/addins/MonoDevelop.Refactoring/Makefile +src/addins/MonoDevelop.AspNetCore/Makefile +src/addins/MonoDevelop.AzureFunctions/Makefile +src/addins/MonoDevelop.ConnectedServices/Makefile +src/addins/MonoDevelop.DotNetCore/Makefile +src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile src/addins/MonoDevelop.Debugger/Makefile src/addins/MonoDevelop.Debugger.Gdb/Makefile src/addins/MonoDevelop.Debugger.Soft/Makefile src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Makefile src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Makefile +src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile +src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile +src/addins/MonoDevelop.Debugger.Win32/Makefile +src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile src/addins/MonoDevelop.HexEditor/Makefile src/addins/MonoDevelop.DocFood/Makefile +src/addins/MonoDevelop.Packaging/Makefile +src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile src/addins/MonoDevelop.PackageManagement/Makefile src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/Makefile tests/Makefile @@ -364,7 +385,10 @@ tests/UserInterfaceTests/Makefile tests/TestRunner/Makefile tests/Ide.Tests/Makefile tests/MacPlatform.Tests/Makefile +tests/MonoDevelop.Core.Tests/Makefile tests/MonoDevelop.CSharpBinding.Tests/Makefile +tests/MonoDevelop.Refactoring.Tests/Makefile +tests/WindowsPlatform.Tests/Makefile Makefile monodevelop mdtool diff --git a/main/external/nrefactory b/main/external/nrefactory -Subproject db19caaa86f80ddc6cf8d0cd7d167d22e4e1c25 +Subproject 0607a4ad96ebdd16817e47dcae85b1cfcb5b5bf diff --git a/main/msbuild/Makefile.am b/main/msbuild/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/msbuild/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/po/Makefile.am b/main/po/Makefile.am index 14d6750416..26584e928b 100644 --- a/main/po/Makefile.am +++ b/main/po/Makefile.am @@ -54,6 +54,6 @@ uninstall-local: done CLEANFILES = $(GMO_FILES) -EXTRA_DIST = Makefile $(FILES) +EXTRA_DIST = Makefile po.mdproj $(FILES) include $(top_srcdir)/Makefile.include diff --git a/main/src/addins/AspNet/Makefile.am b/main/src/addins/AspNet/Makefile.am index 270cff592f..9039c5e753 100644 --- a/main/src/addins/AspNet/Makefile.am +++ b/main/src/addins/AspNet/Makefile.am @@ -2,4 +2,10 @@ include $(top_srcdir)/xbuild.include EXTRA_DIST += \ $(wildcard lib/*) \ $(wildcard Templates/MvcCommon/*.cshtml)\ + $(wildcard Templates/*.cshtml)\ + $(wildcard Templates/*.ts)\ + $(wildcard Templates/*.css)\ + $(wildcard Templates/*.scss)\ + $(wildcard Templates/*.less)\ + $(wildcard Templates/*.json)\ $(wildcard Templates/Projects/Files/*.aspx) diff --git a/main/src/addins/Makefile.am b/main/src/addins/Makefile.am index 6dd237dad5..9cb3223977 100644 --- a/main/src/addins/Makefile.am +++ b/main/src/addins/Makefile.am @@ -30,5 +30,13 @@ SUBDIRS = \ WindowsPlatform \
MonoDevelop.HexEditor \
MonoDevelop.DocFood \
+ MonoDevelop.AspNetCore \
+ MonoDevelop.AzureFunctions \
+ MonoDevelop.DotNetCore \
+ MonoDevelop.ConnectedServices \
+ MonoDevelop.Packaging \
+ MonoDevelop.Debugger.Win32 \
+ PerformanceDiagnostics \
+ MonoDevelop.Debugger.VSCodeDebugProtocol \
MonoDevelop.PackageManagement
diff --git a/main/src/addins/MonoDevelop.AspNetCore/Makefile.am b/main/src/addins/MonoDevelop.AspNetCore/Makefile.am new file mode 100644 index 0000000000..0c03503f0f --- /dev/null +++ b/main/src/addins/MonoDevelop.AspNetCore/Makefile.am @@ -0,0 +1,4 @@ +include $(top_srcdir)/xbuild.include + +EXTRA_DIST += \ + $(wildcard Templates/*.cshtml) diff --git a/main/src/addins/MonoDevelop.AzureFunctions/Makefile.am b/main/src/addins/MonoDevelop.AzureFunctions/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/addins/MonoDevelop.AzureFunctions/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/MonoDevelop.ConnectedServices/Makefile.am b/main/src/addins/MonoDevelop.ConnectedServices/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/addins/MonoDevelop.ConnectedServices/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile.am b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile.am new file mode 100644 index 0000000000..8f41a600f1 --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + MonoDevelop.Debugger.VsCodeDebugProtocol + diff --git a/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile.am b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger.VSCodeDebugProtocol/MonoDevelop.Debugger.VsCodeDebugProtocol/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Win32/Makefile.am new file mode 100644 index 0000000000..c4345c4a6f --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger.Win32/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + MonoDevelop.Debugger.Win32 + diff --git a/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile.am b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/MonoDevelop.DotNetCore/Makefile.am b/main/src/addins/MonoDevelop.DotNetCore/Makefile.am new file mode 100644 index 0000000000..96b2dda016 --- /dev/null +++ b/main/src/addins/MonoDevelop.DotNetCore/Makefile.am @@ -0,0 +1,5 @@ +include $(top_srcdir)/xbuild.include + +SUBDIRS = \ + MonoDevelop.DotNetCore.Tests + diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile.am b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Tests/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/MonoDevelop.Packaging/Makefile.am b/main/src/addins/MonoDevelop.Packaging/Makefile.am new file mode 100644 index 0000000000..55e630e362 --- /dev/null +++ b/main/src/addins/MonoDevelop.Packaging/Makefile.am @@ -0,0 +1,7 @@ +include $(top_srcdir)/xbuild.include + +SUBDIRS = \ + MonoDevelop.Packaging.Tests + +EXTRA_DIST += \ + PostBuild.proj diff --git a/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile.am b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile.am new file mode 100644 index 0000000000..c93d6852fa --- /dev/null +++ b/main/src/addins/MonoDevelop.Packaging/MonoDevelop.Packaging.Tests/Makefile.am @@ -0,0 +1,2 @@ +include $(top_srcdir)/xbuild.include + diff --git a/main/src/addins/PerformanceDiagnostics/Makefile.am b/main/src/addins/PerformanceDiagnostics/Makefile.am new file mode 100644 index 0000000000..ead76902f1 --- /dev/null +++ b/main/src/addins/PerformanceDiagnostics/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = \ + PerformanceDiagnostics \ + UIThreadMonitorDaemon + diff --git a/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile.am b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/addins/PerformanceDiagnostics/PerformanceDiagnostics/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile.am b/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/addins/PerformanceDiagnostics/UIThreadMonitorDaemon/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/VersionControl/Makefile.am b/main/src/addins/VersionControl/Makefile.am index 19a1809c7a..9b8e787dbb 100644 --- a/main/src/addins/VersionControl/Makefile.am +++ b/main/src/addins/VersionControl/Makefile.am @@ -5,4 +5,6 @@ SUBDIRS = \ MonoDevelop.VersionControl.Subversion.Unix \ MonoDevelop.VersionControl.Git \ MonoDevelop.VersionControl.Subversion.Tests \ + Subversion.Win32 \ + Subversion.Win32.Tests \ MonoDevelop.VersionControl.Git.Tests diff --git a/main/src/addins/VersionControl/Subversion.Win32.Tests/Makefile.am b/main/src/addins/VersionControl/Subversion.Win32.Tests/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/addins/VersionControl/Subversion.Win32.Tests/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/addins/VersionControl/Subversion.Win32/Makefile.am b/main/src/addins/VersionControl/Subversion.Win32/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/addins/VersionControl/Subversion.Win32/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/core/Makefile.am b/main/src/core/Makefile.am index a71f67828c..c1366fb682 100644 --- a/main/src/core/Makefile.am +++ b/main/src/core/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = \ MonoDevelop.Projects.Formats.MSBuild \ MonoDevelop.Core \ + Mono.TextEditor.Shared \ + Mono.TextEditor.Platform \ Mono.Texteditor \ MonoDevelop.Ide MonoDevelop.Startup \ MonoDevelop.TextEditor.Tests diff --git a/main/src/core/Mono.TextEditor.Platform/Makefile.am b/main/src/core/Mono.TextEditor.Platform/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/core/Mono.TextEditor.Platform/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/core/Mono.TextEditor.Shared/Makefile.am b/main/src/core/Mono.TextEditor.Shared/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/core/Mono.TextEditor.Shared/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/core/Mono.Texteditor/Makefile.am b/main/src/core/Mono.Texteditor/Makefile.am index f9131dc780..c9cc87438f 100644 --- a/main/src/core/Mono.Texteditor/Makefile.am +++ b/main/src/core/Mono.Texteditor/Makefile.am @@ -1,14 +1 @@ include $(top_srcdir)/xbuild.include - -EXTRA_DIST += \ - Styles/DarkStyle.json \ - Styles/GruvboxStyle.json \ - Styles/LightStyle.json \ - Styles/MonokaiStyle.json \ - Styles/NightshadeStyle.json \ - Styles/OblivionStyle.json \ - Styles/SolarizedDarkStyle.json \ - Styles/SolarizedLightStyle.json \ - Styles/TangoStyle.json \ - Styles/VisualStudioStyle.json - diff --git a/main/src/core/MonoDevelop.Core/Makefile.am b/main/src/core/MonoDevelop.Core/Makefile.am index 0f98ef2b7e..2e4bd93ffb 100644 --- a/main/src/core/MonoDevelop.Core/Makefile.am +++ b/main/src/core/MonoDevelop.Core/Makefile.am @@ -1,4 +1,7 @@ include $(top_srcdir)/xbuild.include EXTRA_DIST += \ - BuildVariables.cs.in + BuildVariables.cs + +BuildVariables.cs: + $(XBUILD) $(XBUILD_ARGS) /t:BeforeBuild diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj index 30bc990dc2..9fdd2d303a 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj @@ -800,7 +800,7 @@ <InternalsVisibleTo Include="MonoDevelop.Ide.Tests" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <Target Name="BeforeBuild" Inputs="BuildVariables.cs.in; $(MSBuildProjectDirectory)\..\..\..\..\version.config" Outputs="BuildVariables.cs"> + <Target Name="BeforeBuild" Inputs="BuildVariables.cs.in; $(MSBuildProjectDirectory)\..\..\..\..\version.config" Outputs="BuildVariables.cs" Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\..\version.config')" > <MakeDir Directories="$(FullBuildInfo)" /> <Csc Sources="$(ConfigureScript)" OutputAssembly="$(ConfigureScriptExe)" ToolExe="$(CscToolExe)" ToolPath="$(CscToolPath)" Condition="!Exists('$(ConfigureScriptExe)')" /> <Exec Command="$(MonoLauncher)$(ConfigureScriptExe) gen-buildinfo $(FullBuildInfo)" WorkingDirectory="$(MSBuildProjectDirectory)" /> diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am index 76417ba6d3..fe8940e113 100644 --- a/main/src/core/MonoDevelop.Ide/Makefile.am +++ b/main/src/core/MonoDevelop.Ide/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/xbuild.include +SUBDIRS = \ + MonoDevelop.Ide.Editor.Highlighting + EXTRA_DIST += \ gtkrc \ gtkrc.mac \ diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile.am b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile.am new file mode 100644 index 0000000000..fc16b3af83 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Makefile.am @@ -0,0 +1,6 @@ +include $(top_srcdir)/xbuild.include + +EXTRA_DIST += \ + $(wildcard syntaxes/*) \ + $(wildcard themes/*) \ + $(wildcard VSCodeImport/*) diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am index c9cc87438f..ab6bc88576 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/Makefile.am @@ -1 +1,4 @@ include $(top_srcdir)/xbuild.include + +SUBDIRS = \ + MonoDevelop.Projects.MSBuild.Shared diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile.am b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.MSBuild.Shared/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/src/core/MonoDevelop.Startup/Makefile.am b/main/src/core/MonoDevelop.Startup/Makefile.am index deb0ebdaf3..71cf1aec64 100644 --- a/main/src/core/MonoDevelop.Startup/Makefile.am +++ b/main/src/core/MonoDevelop.Startup/Makefile.am @@ -1 +1,4 @@ -include $(top_srcdir)/xbuild.include
\ No newline at end of file +include $(top_srcdir)/xbuild.include + +EXTRA_DIST += \ + app.manifest diff --git a/main/tests/Makefile.am b/main/tests/Makefile.am index e5b1f244d2..8c7a05944a 100644 --- a/main/tests/Makefile.am +++ b/main/tests/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/xbuild.include -SUBDIRS=UnitTests MacPlatform.Tests UserInterfaceTests TestRunner Ide.Tests MonoDevelop.CSharpBinding.Tests +SUBDIRS=UnitTests MacPlatform.Tests UserInterfaceTests TestRunner Ide.Tests MonoDevelop.CSharpBinding.Tests WindowsPlatform.Tests MonoDevelop.Core.Tests MonoDevelop.Refactoring.Tests MONO=mono$(SGEN_SUFFIX) RUN_TEST=$(MDTOOL_RUN) run-md-tests diff --git a/main/tests/MonoDevelop.Core.Tests/Makefile.am b/main/tests/MonoDevelop.Core.Tests/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/tests/MonoDevelop.Core.Tests/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/tests/MonoDevelop.Refactoring.Tests/Makefile.am b/main/tests/MonoDevelop.Refactoring.Tests/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/tests/MonoDevelop.Refactoring.Tests/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/tests/WindowsPlatform.Tests/Makefile.am b/main/tests/WindowsPlatform.Tests/Makefile.am new file mode 100644 index 0000000000..c9cc87438f --- /dev/null +++ b/main/tests/WindowsPlatform.Tests/Makefile.am @@ -0,0 +1 @@ +include $(top_srcdir)/xbuild.include diff --git a/main/xbuild.include b/main/xbuild.include index 5f98a55672..65d3860f94 100644 --- a/main/xbuild.include +++ b/main/xbuild.include @@ -60,7 +60,7 @@ sln_clean: print_extradist: @echo $(WILDCARDED_FILES) -EXTS:=*.bmp *.cs *.csproj *.html *.png *.snk *.config *.stetic *.glade *.xml *.xsd *.exe.addins *.template *.tt *.txt *.targets *.props *.sh +EXTS:=*.bmp *.cs *.csproj *.shproj *.projitems *.mdproj *.html *.png *.snk *.config *.stetic *.glade *.xml *.xsd *.exe.addins *.template *.tt *.txt *.targets *.props *.sh ALL_FILES:= $(EXTS) \ $(addprefix */,$(EXTS)) \ @@ -69,6 +69,7 @@ ALL_FILES:= $(EXTS) \ $(addprefix */*/*/*/,$(EXTS)) \ $(addprefix */*/*/*/*/,$(EXTS)) \ $(wildcard icons/*) \ + $(wildcard themes/*) \ $(wildcard templates/*) WILDCARDED_FILES:=$(wildcard $(ALL_FILES)) |