diff options
| author | Marius Ungureanu <teromario@yahoo.com> | 2018-02-16 22:31:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 22:31:46 +0300 |
| commit | e1de20f0eec6d66e78cf0640f00b03c1afcf7f23 (patch) | |
| tree | 95b19ddbcb127cbb8e28498f6d8f85eda99e2fa9 /main/src | |
| parent | e3dd7658390a3c13231449cbc3fac9cdf11e1775 (diff) | |
Make dist2 (#3879)
* Fix `make dist`
(cherry picked from commit 7732445e89434e17ff1e0217a640d841b29d5fc9)
* Don't strip assemblies from tarballs.
It'll make distro packagers cry, but the tarballs will actually work.
(cherry picked from commit b1820981f8acced4d4b721ce44ed5860ce8fb758)
* Include case-sensitivity fix from NRefactory
* Ensure BuildVariables.cs is up to date and in `make dist` tarballs
Diffstat (limited to 'main/src')
30 files changed, 79 insertions, 16 deletions
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 |