Skip to content

Commit

Permalink
[Build] Change the build system to use xbuild instead of makefiles (a…
Browse files Browse the repository at this point in the history
…gain)

The build 'regression' was a problem in some makefiles. It was fixed in
aea26c1
  • Loading branch information
alanmcgovern committed Jun 26, 2012
1 parent aea26c1 commit 7b7ecee
Show file tree
Hide file tree
Showing 93 changed files with 206 additions and 8,002 deletions.
6 changes: 0 additions & 6 deletions MonoDevelop.mdw

This file was deleted.

30 changes: 0 additions & 30 deletions extras/MonoDevelop.MonoMac/Makefile

This file was deleted.

71 changes: 0 additions & 71 deletions extras/MonoDevelop.MonoMac/configure

This file was deleted.

26 changes: 4 additions & 22 deletions main/Main.sln
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\addins\ILAsmBinding\ILAsmBinding.csproj", "{961B9266-C44A-42B6-BA3D-3FB229C9C417}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VersionControl", "VersionControl", "{DEEB9163-3966-4E5E-9AB5-FBB3E01AC82A}"
ProjectSection(MonoDevelopProperties) = preProject
outputpath = ../../build/AddIns/VersionControl
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.VersionControl", "src\addins\VersionControl\MonoDevelop.VersionControl\MonoDevelop.VersionControl.csproj", "{19DE0F35-D204-4FD8-A553-A19ECE05E24D}"
EndProject
Expand Down Expand Up @@ -186,12 +183,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdtool", "src\tools\mdtool\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdmonitor", "src\tools\mdmonitor\mdmonitor.csproj", "{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.CrashLog", "src\tools\mdcrashlog\MonoDevelop.CrashLog.csproj", "{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}"
ProjectSection(MonoDevelopProperties) = preProject
BaseDirectory = tests
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "tests\UnitTests\UnitTests.csproj", "{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}"
EndProject
Expand Down Expand Up @@ -513,12 +505,12 @@ Global
{875D389F-48D1-4D46-BFC6-998837DD6AE0}.DebugWin32|x86.Build.0 = Debug|Any CPU
{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{875D389F-48D1-4D46-BFC6-998837DD6AE0}.Release|Any CPU.Build.0 = Release|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.ActiveCfg = Debug|x86
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.Build.0 = Debug|x86
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|x86.ActiveCfg = Debug|x86
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|x86.Build.0 = Debug|x86
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.DebugWin32|x86.Build.0 = Debug|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}.Release|Any CPU.Build.0 = Release|Any CPU
{8CCA39DD-8412-4547-BE7F-0C3D3ACC6FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -621,7 +613,6 @@ Global
{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}.Release|Any CPU.Build.0 = Release|Any CPU
{AC7D119C-980B-4712-8811-5368C14412D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC7D119C-980B-4712-8811-5368C14412D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC7D119C-980B-4712-8811-5368C14412D7}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
{AC7D119C-980B-4712-8811-5368C14412D7}.DebugWin32|x86.Build.0 = Debug|Any CPU
Expand Down Expand Up @@ -717,14 +708,6 @@ Global
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.DebugWin32|x86.Build.0 = net_4_0_Debug|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU
{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Debug|Any CPU.ActiveCfg = Debug|x86
{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Debug|Any CPU.Build.0 = Debug|x86
{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.DebugMac|Any CPU.ActiveCfg = Debug|x86
{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.DebugMac|Any CPU.Build.0 = Debug|x86
{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.DebugWin32|x86.ActiveCfg = Debug|x86
{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.DebugWin32|x86.Build.0 = Debug|x86
{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Release|Any CPU.ActiveCfg = Release|x86
{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}.Release|Any CPU.Build.0 = Release|x86
{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -902,7 +885,6 @@ Global
{BFE8691A-D323-4622-9021-7B8B27F81599} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
{1497D0A8-AFF1-4938-BC22-BE79B358BA5B} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
{07F55155-51A8-4072-9F80-FA473666F086} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
{76495467-E8BF-43B0-A03C-18C6341966B9} = {78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}
Expand Down
14 changes: 12 additions & 2 deletions main/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
SUBDIRS = external contrib src po man theme-icons build tests
include $(top_srcdir)/xbuild.include

SUBDIRS = external . contrib src po man theme-icons build tests

#capture aclocal flags for autoreconf
ACLOCAL_AMFLAGS=$(ACLOCAL_FLAGS)
Expand All @@ -9,6 +11,12 @@ buildinfo = $(top_builddir)/build/bin/buildinfo

all: vcrevision

all-local: sln_build

clean: clean-local

clean-local: sln_clean

vcrevision:
@if test -d ../.git; then \
version=$$(cd ..; \
Expand Down Expand Up @@ -149,7 +157,9 @@ app-dir: all

# we can't use the variables that are conditionally defined
EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(pixmap_DATA) \
monodevelop.xml $(pkgconfig_in_files) vcrevision external/Makefile.in
monodevelop.xml $(pkgconfig_in_files) vcrevision external/Makefile.in \
Main.sln \
md.targets

DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update \
$(pkgconfig_DATA)
Expand Down
1 change: 0 additions & 1 deletion main/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ build_sources = $(addprefix $(srcdir)/, $(FILES)) $(GENERATED_FILES)
build_resources = $(addprefix $(srcdir)/, $(RES))
build_test_sources = $(addprefix $(srcdir)/, $(TESTFILES)) $(GENERATED_FILES)


# workaroundfor lack of abs_top_builddir variable in automake < 1.10. Will break if mdtool isn't
# launched from top_srcdir (i.e. where this script is located)
abs_top_builddir ?= $(top_builddir)
Expand Down
7 changes: 7 additions & 0 deletions main/build/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ endif

all:

install:
mkdir -p $(DESTDIR)$(prefix)/lib/monodevelop/bin
cp -rf bin $(DESTDIR)$(prefix)/lib/monodevelop/
cp -rf AddIns $(DESTDIR)$(prefix)/lib/monodevelop/AddIns
cp -rf locale $(DESTDIR)$(prefix)/lib/monodevelop/locale
cp -rf data $(DESTDIR)$(prefix)/lib/monodevelop/data

clean-local:
rm -rf bin AddIns locale data

Expand Down
11 changes: 7 additions & 4 deletions main/configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ platform_bindings=""
# Gnome platform addin
AC_ARG_ENABLE(gnomeplatform,
AC_HELP_STRING([--enable-gnomeplatform],
[enable Gnome platform support [default=autodetect]]),
[enable Gnome platform support [default=no]]),
enable_gnomeplatform=${enableval}, enable_gnomeplatform=$default_gnomeplatform)

if test x$enable_gnomeplatform = xyes; then
Expand All @@ -205,7 +205,7 @@ AM_CONDITIONAL(ENABLE_GNOMEPLATFORM, [test x$enable_gnomeplatform = xyes])
# Mac platform addin
AC_ARG_ENABLE(macplatform,
AC_HELP_STRING([--enable-macplatform],
[enable Mac platform support [default=autodetect]]),
[enable Mac platform support [default=no]]),
enable_macplatform=${enableval}, enable_macplatform=$default_macplatform)

if test x$enable_macplatform = xyes; then
Expand All @@ -225,7 +225,7 @@ AM_CONDITIONAL(ENABLE_MACBUNDLE, [test x$enable_macbundle = xyes])
AC_ARG_ENABLE(windowsplatform,
AC_HELP_STRING([--enable-windowsplatform],
[enable Windows platform support [default=no]]),
enable_windowsplatform=${enableval}, enable_windowsplatform=no)
enable_windowsplatform=${enableval}, enable_windowsplatform=$default_windowsplatform)

if test x$enable_windowsplatform = xyes; then
platform_bindings="${platform_bindings}Windows "
Expand Down Expand Up @@ -284,7 +284,6 @@ src/core/MonoDevelop.Ide/Makefile
src/core/MonoDevelop.Ide/BuildVariables.cs
src/core/MonoDevelop.Startup/Makefile
src/tools/Makefile
src/tools/mdcrashlog/Makefile
src/tools/mdhost/Makefile
src/tools/mdtool/Makefile
src/tools/SharpCoco/Makefile
Expand Down Expand Up @@ -313,6 +312,7 @@ src/addins/TextTemplating/Makefile
src/addins/TextTemplating/Mono.TextTemplating/Makefile
src/addins/TextTemplating/TextTransform/Makefile
src/addins/TextTemplating/MonoDevelop.TextTemplating/Makefile
src/addins/TextTemplating/Mono.TextTemplating.Tests/Makefile
src/addins/AspNet/Makefile
src/addins/AspNet/MonoDevelop.AspNet/Makefile
src/addins/AspNet/MonoDevelop.AspNet.Mvc/Makefile
Expand Down Expand Up @@ -342,6 +342,9 @@ src/addins/MonoDevelop.DocFood/Makefile
src/addins/MonoDevelop.MacDev/Makefile
tests/Makefile
tests/UnitTests/Makefile
tests/UserInterfaceTests/Makefile
tests/MonoDevelop.MacDev.Tests/Makefile
tests/MacPlatform.Tests/Makefile
Makefile
monodevelop
mdtool
Expand Down
103 changes: 1 addition & 102 deletions main/contrib/ICSharpCode.Decompiler/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,102 +1 @@

ASSEMBLY = $(top_builddir)/build/bin/ICSharpCode.Decompiler.dll


REFS = \
-r:../../build/bin/ICSharpCode.NRefactory.CSharp.dll \
-r:../../build/bin/ICSharpCode.NRefactory.dll \
-r:../../external/cecil/bin/net_4_0_Debug/Mono.Cecil.dll \
-r:System \
-r:System.Core \
-r:System.Xml \
-r:System.Xml.Linq

SIGNING_KEY=$(srcdir)/../ICSharpCode.NRefactory/ICSharpCode.NRefactory.snk

FILES = \
Ast/Annotations.cs \
Ast/AstBuilder.cs \
Ast/AstMethodBodyBuilder.cs \
Ast/CommentStatement.cs \
Ast/DecompilerContext.cs \
Ast/NameVariables.cs \
Ast/NRefactoryExtensions.cs \
Ast/TextOutputFormatter.cs \
Ast/Transforms/AddCheckedBlocks.cs \
Ast/Transforms/CombineQueryExpressions.cs \
Ast/Transforms/ContextTrackingVisitor.cs \
Ast/Transforms/ConvertConstructorCallIntoInitializer.cs \
Ast/Transforms/CustomPatterns.cs \
Ast/Transforms/DecimalConstantTransform.cs \
Ast/Transforms/DeclareVariables.cs \
Ast/Transforms/DelegateConstruction.cs \
Ast/Transforms/ExpressionTreeConverter.cs \
Ast/Transforms/FlattenSwitchBlocks.cs \
Ast/Transforms/IntroduceExtensionMethods.cs \
Ast/Transforms/IntroduceQueryExpressions.cs \
Ast/Transforms/IntroduceUnsafeModifier.cs \
Ast/Transforms/IntroduceUsingDeclarations.cs \
Ast/Transforms/PatternStatementTransform.cs \
Ast/Transforms/PushNegation.cs \
Ast/Transforms/ReplaceMethodCallsWithOperators.cs \
Ast/Transforms/TransformationPipeline.cs \
Ast/TypesHierarchyHelpers.cs \
CecilExtensions.cs \
CodeMappings.cs \
DecompilerException.cs \
DecompilerSettings.cs \
Disassembler/DisassemblerHelpers.cs \
Disassembler/ILStructure.cs \
Disassembler/MethodBodyDisassembler.cs \
Disassembler/ReflectionDisassembler.cs \
FlowAnalysis/ControlFlowEdge.cs \
FlowAnalysis/ControlFlowGraph.cs \
FlowAnalysis/ControlFlowGraphBuilder.cs \
FlowAnalysis/ControlFlowNode.cs \
FlowAnalysis/ControlStructureDetector.cs \
FlowAnalysis/OpCodeInfo.cs \
FlowAnalysis/SimplifyByRefCalls.cs \
FlowAnalysis/SsaBlock.cs \
FlowAnalysis/SsaForm.cs \
FlowAnalysis/SsaFormBuilder.cs \
FlowAnalysis/SsaInstruction.cs \
FlowAnalysis/SsaOptimization.cs \
FlowAnalysis/SsaVariable.cs \
FlowAnalysis/TransformToSsa.cs \
ILAst/AsyncDecompiler.cs \
ILAst/DefaultDictionary.cs \
ILAst/GotoRemoval.cs \
ILAst/ILAstBuilder.cs \
ILAst/ILAstOptimizer.cs \
ILAst/ILAstTypes.cs \
ILAst/ILCodes.cs \
ILAst/ILInlining.cs \
ILAst/InitializerPeepholeTransforms.cs \
ILAst/LiftedOperators.cs \
ILAst/LoopsAndConditions.cs \
ILAst/PatternMatching.cs \
ILAst/PeepholeTransform.cs \
ILAst/SimpleControlFlow.cs \
ILAst/StateRange.cs \
ILAst/SymbolicExecution.cs \
ILAst/TypeAnalysis.cs \
ILAst/YieldReturnDecompiler.cs \
ITextOutput.cs \
PlainTextOutput.cs \
ReferenceResolvingException.cs \
TextOutputWriter.cs
all: $(ASSEMBLY) $(ASSEMBLY).mdb

$(ASSEMBLY): $(build_sources)
$(CSC) $(CSC_FLAGS) -keyfile:"$(SIGNING_KEY)" -define:NET35 -debug -out:$@ -target:library $(REFS) $(build_sources)

$(ASSEMBLY).mdb: $(ASSEMBLY)

assemblydir = $(MD_ASSEMBLY_DIR)
assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb

CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb

EXTRA_DIST = $(FILES) $(SIGNING_KEY)

include $(top_srcdir)/Makefile.include
include $(top_srcdir)/xbuild.include
Loading

0 comments on commit 7b7ecee

Please sign in to comment.