diff options
author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-16 05:53:37 +0300 |
---|---|---|
committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-16 05:53:37 +0300 |
commit | 78a8f95819f579a96ce1dd8a55c9f5f1a7e9aae5 (patch) | |
tree | 9b29dab5aeb30a7ca2a85083a6f00c2434b8d046 /main/Makefile.am | |
parent | 3f1be30cc19bbefbdd46c4151c2b38f8acf52c6f (diff) |
Remove redundant build infrastructure
The old autotools build infrastructure is largely redundant,
as projects are now built with msbuild. Remove as much as can
be done easily, along with some other obsolete stuff.
Diffstat (limited to 'main/Makefile.am')
-rw-r--r-- | main/Makefile.am | 100 |
1 files changed, 6 insertions, 94 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index 3a27778177..93786a80ed 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -1,6 +1,10 @@ include $(top_srcdir)/xbuild.include -SUBDIRS = external . src po man theme-icons msbuild build tests +if ENABLE_MACPLATFORM +SUBDIRS = external po theme-icons tests build/MacOSX +else +SUBDIRS = external po theme-icons tests +endif MD_CONFIGURE=$(top_srcdir)/../scripts/configure.sh @@ -28,8 +32,6 @@ NUGET_RESTORE = mono external/nuget-binary/nuget.exe restore -DisableParallelPro # see: https://github.com/kzu/NuGet.Restore restore-packages: @$(NUGET_RESTORE) - msbuild /t:Restore /p:RestoreDisableParallel=true external/RefactoringEssentials/RefactoringEssentials/RefactoringEssentials.csproj - msbuild /t:Restore /p:RestoreDisableParallel=true external/vs-editor-core/src/CocoaControls/CocoaControls.csproj mono external/fsharpbinding/.paket/paket.bootstrapper.exe pushd . && cd external/fsharpbinding && mono .paket/paket.exe restore && popd @@ -58,69 +60,6 @@ appdata_DATA = monodevelop.appdata.xml xdgmimedir = $(datadir)/mime/packages xdgmime_DATA = monodevelop.xml -pkgconfig_in_files = monodevelop.pc.in monodevelop-core-addins.pc.in - -pkgconfigdir= $(prefix)/lib/pkgconfig -pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc) - -if ENABLE_UPDATE_MIMEDB - -install-data-hook: - $(UPDATE_MIME_DB) $(DESTDIR)$(datadir)/mime - -uninstall-hook: - $(UPDATE_MIME_DB) $(DESTDIR)$(datadir)/mime - -endif # ENABLE_UPDATE_MIMEDB - -PACKAGES = \ - build/bin/MonoDevelop.Core.Gui.addin.xml \ - build/AddIns/MonoDevelop.Documentation.addin.xml \ - build/bin/MonoDevelop.Ide.addin.xml \ - build/bin/MonoDevelop.Projects.addin.xml \ - build/bin/MonoDevelop.Projects.Gui.addin.xml \ - build/AddIns/MonoDevelop.SourceEditor.addin.xml \ - build/AddIns/BackendBindings/BooBinding.addin.xml \ - build/AddIns/BackendBindings/CSharpBinding.addin.xml \ - external/fsharpbinding/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml \ - build/AddIns/BackendBindings/ILAsmBinding.addin.xml \ - build/AddIns/BackendBindings/JavaBinding.addin.xml \ - build/AddIns/BackendBindings/VBNetBinding.addin.xml \ - build/AddIns/MonoQuery/MonoQuery.addin.xml \ - build/AddIns/NUnit/MonoDevelopNUnit.addin.xml \ - build/AddIns/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml \ - build/AddIns/prj2makesharp/prj2make-sharp-lib.addin.xml \ - build/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml \ - build/AddIns/ChangeLogAddIn/ChangeLogAddIn.addin.xml \ - build/AddIns/WelcomePage/WelcomePage.addin.xml \ - build/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml \ - build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml \ - build/AddIns/AspNetAddIn/AspNetAddIn.addin.xml \ - build/AddIns/AspNetAddIn/AspNetEdit.addin.xml - -DOCFILES = \ - build/bin/MonoDevelop.Core.dll \ - build/bin/MonoDevelop.Components.dll \ - build/bin/MonoDevelop.Core.Gui.dll \ - build/AddIns/MonoDevelop.Documentation.dll \ - build/bin/MonoDevelop.Ide.dll \ - build/bin/MonoDevelop.Projects.dll \ - build/bin/MonoDevelop.Projects.Gui.dll - -mpacks: $(PACKAGES) - test -z "packages" || mkdir -p packages - $(MDTOOL_RUN) setup p $(PACKAGES:%=%) -d:packages - $(MDTOOL_RUN) setup rb packages - -apidocs: - monodocer $(DOCFILES:%=--assembly:%) -delete --path docs/api - mkdir -p docs/sources - mdassembler --out docs/sources/monodevelop-reference --ecma docs/api - mautil -reg build/bin reg-build - mautil -reg build/bin -p build/bin info --all --xml > docs/extension-model.xml - mdassembler --out docs/sources/monodevelop-extension-guide --addins docs/extension-model.xml -# cd docs/apiguide && mdassembler --out monodevelop-api-guide --xhtml toc.xhtml && mv monodevelop-api-guide.zip ../web/sources - MD_LAUNCH=$(MD_LAUNCH_SETUP) $(MD_LAUNCH_EXTRA_ENV) UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 exec -a "monodevelop" $(RUNTIME) if ENABLE_MACPLATFORM @@ -204,35 +143,8 @@ coverage: cd tests && $(MAKE) coverage app-dir: all - cd build && make app-dir -#mkdir -p $(MAC_APP_DIR)/Contents/{MacOS,Resources} -#mkdir -p $(MAC_APP_LIB_DIR) -#cp -a build/AddIns $(MAC_APP_LIB_DIR) -#cp -a build/data $(MAC_APP_LIB_DIR) -#cp -a build/bin $(MAC_APP_LIB_DIR) - -# 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 MonoDevelop.props Directory.Build.props - -DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update \ - $(pkgconfig_DATA) + cd build/MacOSX && make app-dir include $(top_srcdir)/Makefile.include -# -# Force distuninstallcheck to ignore files created by cache-rebuilding commands (update-mime-database etc) -# -# From BEAST (LGPL license): http://svn.gnome.org/viewvc/beast/trunk/Makefile.am -filter_stale_uninstalled = \ - | egrep -v '^.*/share/mime/.*$$' \ - | egrep -v '^.*./share/icons/hicolor/icon-theme\.cache$$' - -filter_stale_buildfiles = | egrep -v '^./report.out$$' -distuninstallcheck_listfiles = find . -type f -print # automake-1.9 setting -distuninstallcheck_listfiles += $(filter_stale_uninstalled) # amend by required filtering -distcleancheck_listfiles = find . -type f -print # automake-1.9 setting -distcleancheck_listfiles += $(filter_stale_buildfiles) # amend by required filtering - .PHONY: vcrevision buildinfo |