diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.include | 12 | ||||
| -rw-r--r-- | Mono.Addins.CecilReflector/Makefile.am | 160 | ||||
| -rw-r--r-- | Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj | 28 | ||||
| -rw-r--r-- | Mono.Addins.Gui/Makefile.am | 90 | ||||
| -rw-r--r-- | Mono.Addins.Gui/Mono.Addins.Gui.csproj | 34 | ||||
| -rw-r--r-- | Mono.Addins.MSBuild/Makefile.am | 43 | ||||
| -rw-r--r-- | Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj | 4 | ||||
| -rw-r--r-- | Mono.Addins.Setup/Makefile.am | 68 | ||||
| -rw-r--r-- | Mono.Addins.Setup/Mono.Addins.Setup.csproj | 32 | ||||
| -rw-r--r-- | Mono.Addins.sln | 32 | ||||
| -rw-r--r-- | Mono.Addins/Makefile.am | 134 | ||||
| -rw-r--r-- | Mono.Addins/Mono.Addins.csproj | 32 | ||||
| -rw-r--r-- | docs/docs.mdproj | 2 | ||||
| -rw-r--r-- | mautil/Makefile.am | 32 | ||||
| -rw-r--r-- | mautil/mautil.csproj | 24 |
16 files changed, 127 insertions, 602 deletions
diff --git a/Makefile.am b/Makefile.am index e87ba74..5da1b66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = Mono.Addins Mono.Addins.CecilReflector Mono.Addins.Setup Mono.Addins.MSBuild Mono.Addins.Gui mautil Test docs -EXTRA_DIST = COPYING mono-addins.snk +EXTRA_DIST = COPYING mono-addins.snk Mono.Addins.sln SRC_PACKAGE_DIR=Mono.Addins-source-@VERSION@ BIN_PACKAGE_DIR=Mono.Addins-binary-@VERSION@ diff --git a/Makefile.include b/Makefile.include index 388afe3..b1e1311 100644 --- a/Makefile.include +++ b/Makefile.include @@ -1,15 +1,5 @@ -build_sources = $(addprefix $(srcdir)/, $(FILES) $(GENERATED_FILES)) -build_resources = $(addprefix $(srcdir)/, $(RESOURCES)) -build_resources_embed = $(foreach res,$(build_resources), $(addprefix -resource:,$(res)),$(RESOURCES_PREFIX)$(notdir $(res))) - -build_references_ref = $(REFERENCES) -build_references_ref += $(foreach ref, $(DLL_REFERENCES), -r:$(ref)) -build_references_ref += $(foreach ref, $(PROJECT_REFERENCES), -r:$(ref)) - pc_files = $(PC_FILES_IN:.pc.in=.pc) -build_datafiles = $(addprefix $(BUILD_DIR)/, $(DATA_FILES)) - POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY_NAME).dll, $(addprefix policy., $(POLICY_VERSIONS))) POLICY_CONFIGS = $(addsuffix .config, $(addprefix policy., $(POLICY_VERSIONS))) @@ -37,7 +27,7 @@ gac-uninstall: $(GACUTIL) /us $$p /f $(GACUTIL_POLICY_FLAGS) || exit 1; \ done -EXTRA_DIST = $(FILES) $(GENERATED_FILES) $(RESOURCES) $(ASSEMBLY_WRAPPER_IN) $(EXTRAS) $(DATA_FILES) $(PC_FILES_IN) +EXTRA_DIST = $(ASSEMBLY_WRAPPER_IN) $(PC_FILES_IN) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(DLL_REFERENCES) DISTCLEANFILES = $(GENERATED_FILES) $(build_datafiles) $(pc_files) diff --git a/Mono.Addins.CecilReflector/Makefile.am b/Mono.Addins.CecilReflector/Makefile.am index d8bf822..e546509 100644 --- a/Mono.Addins.CecilReflector/Makefile.am +++ b/Mono.Addins.CecilReflector/Makefile.am @@ -1,167 +1,11 @@ - -KEY_FILE=$(top_srcdir)/mono-addins.snk -ASSEMBLY_COMPILER_COMMAND = @MCS@ -ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG -d:READ_ONLY -d:NET_3_5 ASSEMBLY = ../bin/Mono.Addins.CecilReflector.dll ASSEMBLY_NAME=Mono.Addins.CecilReflector -COMPILE_TARGET = library -PROJECT_REFERENCES = -BUILD_DIR = ../bin - - -all: $(ASSEMBLY) - -FILES = \ - AssemblyInfo.cs \ - Mono.Addins.CecilReflector/Reflector.cs \ - Mono.Cecil/Mono.Cecil.Cil/Code.cs \ - Mono.Cecil/Mono.Cecil.Cil/CodeReader.cs \ - Mono.Cecil/Mono.Cecil.Cil/CodeWriter.cs \ - Mono.Cecil/Mono.Cecil.Cil/Document.cs \ - Mono.Cecil/Mono.Cecil.Cil/ExceptionHandler.cs \ - Mono.Cecil/Mono.Cecil.Cil/ILProcessor.cs \ - Mono.Cecil/Mono.Cecil.Cil/Instruction.cs \ - Mono.Cecil/Mono.Cecil.Cil/MethodBody.cs \ - Mono.Cecil/Mono.Cecil.Cil/OpCode.cs \ - Mono.Cecil/Mono.Cecil.Cil/OpCodes.cs \ - Mono.Cecil/Mono.Cecil.Cil/SequencePoint.cs \ - Mono.Cecil/Mono.Cecil.Cil/Symbols.cs \ - Mono.Cecil/Mono.Cecil.Cil/VariableDefinition.cs \ - Mono.Cecil/Mono.Cecil.Cil/VariableReference.cs \ - Mono.Cecil/Mono.Cecil.Metadata/BlobHeap.cs \ - Mono.Cecil/Mono.Cecil.Metadata/Buffers.cs \ - Mono.Cecil/Mono.Cecil.Metadata/CodedIndex.cs \ - Mono.Cecil/Mono.Cecil.Metadata/ElementType.cs \ - Mono.Cecil/Mono.Cecil.Metadata/GuidHeap.cs \ - Mono.Cecil/Mono.Cecil.Metadata/Heap.cs \ - Mono.Cecil/Mono.Cecil.Metadata/MetadataToken.cs \ - Mono.Cecil/Mono.Cecil.Metadata/Row.cs \ - Mono.Cecil/Mono.Cecil.Metadata/StringHeap.cs \ - Mono.Cecil/Mono.Cecil.Metadata/TableHeap.cs \ - Mono.Cecil/Mono.Cecil.Metadata/TokenType.cs \ - Mono.Cecil/Mono.Cecil.Metadata/UserStringHeap.cs \ - Mono.Cecil/Mono.Cecil.Metadata/Utilities.cs \ - Mono.Cecil/Mono.Cecil.PE/BinaryStreamReader.cs \ - Mono.Cecil/Mono.Cecil.PE/BinaryStreamWriter.cs \ - Mono.Cecil/Mono.Cecil.PE/ByteBuffer.cs \ - Mono.Cecil/Mono.Cecil.PE/ByteBufferEqualityComparer.cs \ - Mono.Cecil/Mono.Cecil.PE/DataDirectory.cs \ - Mono.Cecil/Mono.Cecil.PE/Image.cs \ - Mono.Cecil/Mono.Cecil.PE/ImageReader.cs \ - Mono.Cecil/Mono.Cecil.PE/ImageWriter.cs \ - Mono.Cecil/Mono.Cecil.PE/Section.cs \ - Mono.Cecil/Mono.Cecil.PE/TextMap.cs \ - Mono.Cecil/Mono.Cecil/ArrayType.cs \ - Mono.Cecil/Mono.Cecil/AssemblyDefinition.cs \ - Mono.Cecil/Mono.Cecil/AssemblyFlags.cs \ - Mono.Cecil/Mono.Cecil/AssemblyHashAlgorithm.cs \ - Mono.Cecil/Mono.Cecil/AssemblyLinkedResource.cs \ - Mono.Cecil/Mono.Cecil/AssemblyNameDefinition.cs \ - Mono.Cecil/Mono.Cecil/AssemblyNameReference.cs \ - Mono.Cecil/Mono.Cecil/AssemblyReader.cs \ - Mono.Cecil/Mono.Cecil/AssemblyWriter.cs \ - Mono.Cecil/Mono.Cecil/BaseAssemblyResolver.cs \ - Mono.Cecil/Mono.Cecil/CallSite.cs \ - Mono.Cecil/Mono.Cecil/CustomAttribute.cs \ - Mono.Cecil/Mono.Cecil/DefaultAssemblyResolver.cs \ - Mono.Cecil/Mono.Cecil/EmbeddedResource.cs \ - Mono.Cecil/Mono.Cecil/EventAttributes.cs \ - Mono.Cecil/Mono.Cecil/EventDefinition.cs \ - Mono.Cecil/Mono.Cecil/EventReference.cs \ - Mono.Cecil/Mono.Cecil/ExportedType.cs \ - Mono.Cecil/Mono.Cecil/FieldAttributes.cs \ - Mono.Cecil/Mono.Cecil/FieldDefinition.cs \ - Mono.Cecil/Mono.Cecil/FieldReference.cs \ - Mono.Cecil/Mono.Cecil/FileAttributes.cs \ - Mono.Cecil/Mono.Cecil/FunctionPointerType.cs \ - Mono.Cecil/Mono.Cecil/GenericInstanceMethod.cs \ - Mono.Cecil/Mono.Cecil/GenericInstanceType.cs \ - Mono.Cecil/Mono.Cecil/GenericParameter.cs \ - Mono.Cecil/Mono.Cecil/GenericParameterAttributes.cs \ - Mono.Cecil/Mono.Cecil/IConstantProvider.cs \ - Mono.Cecil/Mono.Cecil/ICustomAttributeProvider.cs \ - Mono.Cecil/Mono.Cecil/IGenericInstance.cs \ - Mono.Cecil/Mono.Cecil/IGenericParameterProvider.cs \ - Mono.Cecil/Mono.Cecil/IMarshalInfoProvider.cs \ - Mono.Cecil/Mono.Cecil/IMemberDefinition.cs \ - Mono.Cecil/Mono.Cecil/IMetadataScope.cs \ - Mono.Cecil/Mono.Cecil/IMetadataTokenProvider.cs \ - Mono.Cecil/Mono.Cecil/IMethodSignature.cs \ - Mono.Cecil/Mono.Cecil/Import.cs \ - Mono.Cecil/Mono.Cecil/LinkedResource.cs \ - Mono.Cecil/Mono.Cecil/ManifestResourceAttributes.cs \ - Mono.Cecil/Mono.Cecil/MarshalInfo.cs \ - Mono.Cecil/Mono.Cecil/MemberDefinitionCollection.cs \ - Mono.Cecil/Mono.Cecil/MemberReference.cs \ - Mono.Cecil/Mono.Cecil/MetadataResolver.cs \ - Mono.Cecil/Mono.Cecil/MetadataSystem.cs \ - Mono.Cecil/Mono.Cecil/MethodAttributes.cs \ - Mono.Cecil/Mono.Cecil/MethodCallingConvention.cs \ - Mono.Cecil/Mono.Cecil/MethodDefinition.cs \ - Mono.Cecil/Mono.Cecil/MethodImplAttributes.cs \ - Mono.Cecil/Mono.Cecil/MethodReference.cs \ - Mono.Cecil/Mono.Cecil/MethodReturnType.cs \ - Mono.Cecil/Mono.Cecil/MethodSemanticsAttributes.cs \ - Mono.Cecil/Mono.Cecil/MethodSpecification.cs \ - Mono.Cecil/Mono.Cecil/Modifiers.cs \ - Mono.Cecil/Mono.Cecil/ModuleDefinition.cs \ - Mono.Cecil/Mono.Cecil/ModuleKind.cs \ - Mono.Cecil/Mono.Cecil/ModuleReference.cs \ - Mono.Cecil/Mono.Cecil/NativeType.cs \ - Mono.Cecil/Mono.Cecil/ParameterAttributes.cs \ - Mono.Cecil/Mono.Cecil/ParameterDefinition.cs \ - Mono.Cecil/Mono.Cecil/ParameterDefinitionCollection.cs \ - Mono.Cecil/Mono.Cecil/ParameterReference.cs \ - Mono.Cecil/Mono.Cecil/PinnedType.cs \ - Mono.Cecil/Mono.Cecil/PInvokeAttributes.cs \ - Mono.Cecil/Mono.Cecil/PInvokeInfo.cs \ - Mono.Cecil/Mono.Cecil/PointerType.cs \ - Mono.Cecil/Mono.Cecil/PropertyAttributes.cs \ - Mono.Cecil/Mono.Cecil/PropertyDefinition.cs \ - Mono.Cecil/Mono.Cecil/PropertyReference.cs \ - Mono.Cecil/Mono.Cecil/ReferenceType.cs \ - Mono.Cecil/Mono.Cecil/Resource.cs \ - Mono.Cecil/Mono.Cecil/SecurityDeclaration.cs \ - Mono.Cecil/Mono.Cecil/SentinelType.cs \ - Mono.Cecil/Mono.Cecil/TargetRuntime.cs \ - Mono.Cecil/Mono.Cecil/TypeAttributes.cs \ - Mono.Cecil/Mono.Cecil/TypeDefinition.cs \ - Mono.Cecil/Mono.Cecil/TypeDefinitionCollection.cs \ - Mono.Cecil/Mono.Cecil/TypeParser.cs \ - Mono.Cecil/Mono.Cecil/TypeReference.cs \ - Mono.Cecil/Mono.Cecil/TypeSpecification.cs \ - Mono.Cecil/Mono.Cecil/TypeSystem.cs \ - Mono.Cecil/Mono.Cecil/VariantType.cs \ - Mono.Cecil/Mono.Collections.Generic/Collection.cs \ - Mono.Cecil/Mono.Security.Cryptography/CryptoConvert.cs \ - Mono.Cecil/Mono.Security.Cryptography/CryptoService.cs \ - Mono.Cecil/Mono/Actions.cs \ - Mono.Cecil/Mono/Empty.cs \ - Mono.Cecil/Mono/Funcs.cs \ - Mono.Cecil/System.Runtime.CompilerServices/ExtensionAttribute.cs - -DATA_FILES = - -RESOURCES = - -EXTRAS = - -REFERENCES = \ - -r:../bin/Mono.Addins.dll \ - -r:System.Core - -DLL_REFERENCES = - -$(ASSEMBLY).mdb: $(ASSEMBLY) - -$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(POLICY_ASSEMBLIES) - mkdir -p $(dir $(ASSEMBLY)) - $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref) install-data-local: gac-install - uninstall-local: gac-uninstall include $(top_srcdir)/Makefile.include +include $(top_srcdir)/xbuild.include CLEANFILES += $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS) + diff --git a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj index 0b5bd5e..62ed040 100644 --- a/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj +++ b/Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj @@ -9,30 +9,30 @@ <AssemblyName>Mono.Addins.CecilReflector</AssemblyName> <SchemaVersion>2.0</SchemaVersion> <RootNamespace>Mono.Addins.CecilReflector</RootNamespace> - <SignAssembly>true</SignAssembly> + <SignAssembly>True</SignAssembly> <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> + <DebugSymbols>True</DebugSymbols> <DebugType>full</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <DefineConstants>READ_ONLY</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> - <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <ConsolePause>False</ConsolePause> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <DefineConstants>READ_ONLY</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> - <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <ConsolePause>False</ConsolePause> </PropertyGroup> <ItemGroup> <Reference Include="System.Core" /> @@ -176,14 +176,14 @@ <ProjectExtensions> <MonoDevelop> <Properties> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true" IsAutotoolsProject="true" RelativeConfigureInPath=".."> - <BuildFilesVar Sync="true" Name="FILES" /> + <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath=".."> + <BuildFilesVar Sync="True" Name="FILES" /> <DeployFilesVar /> - <ResourcesVar Sync="true" Name="RESOURCES" /> + <ResourcesVar Sync="True" Name="RESOURCES" /> <OthersVar /> - <GacRefVar Sync="true" Name="REFERENCES" Prefix="-r:" /> - <AsmRefVar Sync="true" Name="REFERENCES" Prefix="-r:" /> - <ProjectRefVar Sync="true" Name="REFERENCES" Prefix="-r:" /> + <GacRefVar Sync="True" Name="REFERENCES" Prefix="-r:" /> + <AsmRefVar Sync="True" Name="REFERENCES" Prefix="-r:" /> + <ProjectRefVar Sync="True" Name="REFERENCES" Prefix="-r:" /> </MonoDevelop.Autotools.MakefileInfo> </Properties> </MonoDevelop> diff --git a/Mono.Addins.Gui/Makefile.am b/Mono.Addins.Gui/Makefile.am index 0705ae4..33bb60e 100644 --- a/Mono.Addins.Gui/Makefile.am +++ b/Mono.Addins.Gui/Makefile.am @@ -1,103 +1,17 @@ -KEY_FILE=$(top_srcdir)/mono-addins.snk -ASSEMBLY_COMPILER_COMMAND = gmcs -ASSEMBLY_COMPILER_FLAGS = -unsafe -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG ASSEMBLY = ../bin/Mono.Addins.Gui.dll ASSEMBLY_NAME=Mono.Addins.Gui -COMPILE_TARGET = library PC_FILES_IN = mono-addins-gui.pc.in -PROJECT_REFERENCES = \ - ../bin/Mono.Addins.dll \ - ../bin/Mono.Addins.Setup.dll -BUILD_DIR = ../bin - if ENABLE_GUI -all: $(ASSEMBLY) -else -all: -endif - -FILES = \ - AssemblyInfo.cs \ - gtk-gui/generated.cs \ - gtk-gui/Mono.Addins.Gui.AddinInfoView.cs \ - gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs \ - gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs \ - gtk-gui/Mono.Addins.Gui.ErrorDialog.cs \ - gtk-gui/Mono.Addins.Gui.InstallDialog.cs \ - gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs \ - gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs \ - gtk-gui/Mono.Addins.Gui.ProgressDialog.cs \ - Mono.Addins.Gui/AddinInfoView.cs \ - Mono.Addins.Gui/AddinInstaller.cs \ - Mono.Addins.Gui/AddinInstallerDialog.cs \ - Mono.Addins.Gui/AddinManagerDialog.cs \ - Mono.Addins.Gui/AddinManagerWindow.cs \ - Mono.Addins.Gui/AddinTreeWidget.cs \ - Mono.Addins.Gui/ErrorDialog.cs \ - Mono.Addins.Gui/HeaderBox.cs \ - Mono.Addins.Gui/HoverImageButton.cs \ - Mono.Addins.Gui/HslColor.cs \ - Mono.Addins.Gui/InstallDialog.cs \ - Mono.Addins.Gui/InstallMonitor.cs \ - Mono.Addins.Gui/ManageSitesDialog.cs \ - Mono.Addins.Gui/NewSiteDialog.cs \ - Mono.Addins.Gui/ProgressDialog.cs \ - Mono.Addins.Gui/SearchEntry.cs \ - Mono.Addins.Gui/Services.cs - -DATA_FILES = - -RESOURCES = \ - gtk-gui/gui.stetic \ - icons/download.png \ - icons/installed-overlay.png \ - icons/package-x-generic.png \ - icons/package-x-generic_16.png \ - icons/package-x-generic_22.png \ - icons/plugin-16.png \ - icons/plugin-22.png \ - icons/plugin-32.png \ - icons/plugin-avail-16.png \ - icons/plugin-avail-32.png \ - icons/plugin-disabled-32.png \ - icons/plugin-update-16.png \ - icons/plugin-update-22.png \ - icons/plugin-update-32.png \ - icons/software-update-available.png \ - icons/software-update-available-overlay.png \ - icons/system-software-update.png \ - icons/system-software-update_22.png \ - icons/user-package.png \ - icons/web.png - -EXTRAS = \ - ./Makefile.am - -REFERENCES = \ - -pkg:glib-sharp-2.0 \ - -pkg:gtk-sharp-2.0 \ - -r:Mono.Cairo \ - -r:Mono.Posix \ - -r:System \ - -r:System.Core -DLL_REFERENCES = - -$(ASSEMBLY).mdb: $(ASSEMBLY) - -$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(POLICY_ASSEMBLIES) - mkdir -p $(dir $(ASSEMBLY)) - $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref) - -if ENABLE_GUI install-data-local: gac-install - uninstall-local: gac-uninstall include $(top_srcdir)/Makefile.include +include $(top_srcdir)/xbuild.include CLEANFILES += $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS) endif + diff --git a/Mono.Addins.Gui/Mono.Addins.Gui.csproj b/Mono.Addins.Gui/Mono.Addins.Gui.csproj index 9e043c0..6531252 100644 --- a/Mono.Addins.Gui/Mono.Addins.Gui.csproj +++ b/Mono.Addins.Gui/Mono.Addins.Gui.csproj @@ -9,30 +9,30 @@ <AssemblyName>Mono.Addins.Gui</AssemblyName> <SchemaVersion>2.0</SchemaVersion> <RootNamespace>Mono.Addins.Gui</RootNamespace> - <SignAssembly>true</SignAssembly> + <SignAssembly>True</SignAssembly> <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> + <DebugSymbols>True</DebugSymbols> <DebugType>full</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> - <ConsolePause>false</ConsolePause> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <ConsolePause>False</ConsolePause> + <AllowUnsafeBlocks>True</AllowUnsafeBlocks> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> - <ConsolePause>false</ConsolePause> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <ConsolePause>False</ConsolePause> + <AllowUnsafeBlocks>True</AllowUnsafeBlocks> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -159,14 +159,14 @@ <ProjectExtensions> <MonoDevelop> <Properties> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true"> - <BuildFilesVar Sync="true" Name="FILES" /> - <DeployFilesVar Sync="true" Name="DATA_FILES" /> - <ResourcesVar Sync="true" Name="RESOURCES" /> + <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True"> + <BuildFilesVar Sync="True" Name="FILES" /> + <DeployFilesVar Sync="True" Name="DATA_FILES" /> + <ResourcesVar Sync="True" Name="RESOURCES" /> <OthersVar /> - <GacRefVar Sync="true" Name="REFERENCES" Prefix="-r:" /> - <AsmRefVar Sync="true" Name="DLL_REFERENCES" /> - <ProjectRefVar Sync="true" Name="PROJECT_REFERENCES" /> + <GacRefVar Sync="True" Name="REFERENCES" Prefix="-r:" /> + <AsmRefVar Sync="True" Name="DLL_REFERENCES" /> + <ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" /> </MonoDevelop.Autotools.MakefileInfo> </Properties> </MonoDevelop> diff --git a/Mono.Addins.MSBuild/Makefile.am b/Mono.Addins.MSBuild/Makefile.am index ecbd538..1a7f7ae 100644 --- a/Mono.Addins.MSBuild/Makefile.am +++ b/Mono.Addins.MSBuild/Makefile.am @@ -1,51 +1,14 @@ -KEY_FILE=$(top_srcdir)/mono-addins.snk -ASSEMBLY_COMPILER_COMMAND = gmcs -ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG ASSEMBLY = ../bin/Mono.Addins.MSBuild.dll ASSEMBLY_NAME=Mono.Addins.MSBuild -COMPILE_TARGET = library PC_FILES_IN = mono-addins-msbuild.pc.in -PROJECT_REFERENCES = \ - ../bin/Mono.Addins.dll \ - ../bin/Mono.Addins.Setup.dll -BUILD_DIR = ../bin - - -all: $(ASSEMBLY) - -FILES = \ - AssemblyInfo.cs \ - ResolveAddinReferences.cs - -DATA_FILES = - -RESOURCES = - -EXTRAS = \ - ./Makefile.am \ - ./Mono.Addins.targets - -REFERENCES = \ - -r:Microsoft.Build.Framework \ - -r:Microsoft.Build.Utilities.v3.5 \ - -r:System - -DLL_REFERENCES = - -$(ASSEMBLY).mdb: $(ASSEMBLY) - -$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(POLICY_ASSEMBLIES) - mkdir -p $(dir $(ASSEMBLY)) - $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref) - -xbuilddir = $(libdir)/mono/xbuild -xbuild_DATA = Mono.Addins.targets install-data-local: gac-install - uninstall-local: gac-uninstall include $(top_srcdir)/Makefile.include +include $(top_srcdir)/xbuild.include CLEANFILES += $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS) + + diff --git a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj index 487f817..846998f 100644 --- a/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj +++ b/Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj @@ -10,6 +10,8 @@ <AssemblyName>Mono.Addins.MSBuild</AssemblyName> <RootNamespace>Mono.Addins.MSBuild</RootNamespace> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <SignAssembly>True</SignAssembly> + <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -42,7 +44,7 @@ <ProjectExtensions> <MonoDevelop> <Properties> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath=".."> + <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath=".."> <BuildFilesVar Sync="True" Name="FILES" /> <DeployFilesVar /> <ResourcesVar Sync="True" Name="RESOURCES" /> diff --git a/Mono.Addins.Setup/Makefile.am b/Mono.Addins.Setup/Makefile.am index 598f62f..72615ce 100644 --- a/Mono.Addins.Setup/Makefile.am +++ b/Mono.Addins.Setup/Makefile.am @@ -1,75 +1,13 @@ - -KEY_FILE=$(top_srcdir)/mono-addins.snk -ASSEMBLY_COMPILER_COMMAND = gmcs -ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG ASSEMBLY = ../bin/Mono.Addins.Setup.dll ASSEMBLY_NAME=Mono.Addins.Setup -COMPILE_TARGET = library PC_FILES_IN = mono-addins-setup.pc.in -PROJECT_REFERENCES = ../bin/Mono.Addins.dll -BUILD_DIR = ../bin - - -all: $(ASSEMBLY) - -FILES = \ - AssemblyInfo.cs \ - Mono.Addins.Setup.ProgressMonitoring/ConsoleProgressMonitor.cs \ - Mono.Addins.Setup.ProgressMonitoring/LogTextWriter.cs \ - Mono.Addins.Setup.ProgressMonitoring/NullProgressMonitor.cs \ - Mono.Addins.Setup.ProgressMonitoring/ProgressStatusMonitor.cs \ - Mono.Addins.Setup.ProgressMonitoring/ProgressTracker.cs \ - Mono.Addins.Setup/AddinInfo.cs \ - Mono.Addins.Setup/AddinInfoCollection.cs \ - Mono.Addins.Setup/AddinPackage.cs \ - Mono.Addins.Setup/AddinRepositoryEntry.cs \ - Mono.Addins.Setup/AddinStore.cs \ - Mono.Addins.Setup/AddinSystemConfiguration.cs \ - Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs \ - Mono.Addins.Setup/AddinSystemConfigurationSerializer.cs \ - Mono.Addins.Setup/ConsoleAddinInstaller.cs \ - Mono.Addins.Setup/InstallException.cs \ - Mono.Addins.Setup/IProgressMonitor.cs \ - Mono.Addins.Setup/Package.cs \ - Mono.Addins.Setup/PackageCollection.cs \ - Mono.Addins.Setup/PcFileCache.cs \ - Mono.Addins.Setup/ReferenceRepositoryEntry.cs \ - Mono.Addins.Setup/Repository.cs \ - Mono.Addins.Setup/RepositoryEntry.cs \ - Mono.Addins.Setup/RepositoryEntryCollection.cs \ - Mono.Addins.Setup/RepositoryReaderWriter.cs \ - Mono.Addins.Setup/RepositoryRecord.cs \ - Mono.Addins.Setup/RepositoryRegistry.cs \ - Mono.Addins.Setup/RepositorySerializer.cs \ - Mono.Addins.Setup/SetupService.cs \ - Mono.Addins.Setup/SetupTool.cs \ - Mono.Addins.Setup/TextFormatter.cs - -DATA_FILES = - -RESOURCES = - -EXTRAS = \ - ./Makefile.am - -REFERENCES = \ - -r:ICSharpCode.SharpZipLib \ - -r:System \ - -r:System.Core \ - -r:System.Xml - -DLL_REFERENCES = - -$(ASSEMBLY).mdb: $(ASSEMBLY) - -$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(POLICY_ASSEMBLIES) - mkdir -p $(dir $(ASSEMBLY)) - $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref) install-data-local: gac-install - uninstall-local: gac-uninstall include $(top_srcdir)/Makefile.include +include $(top_srcdir)/xbuild.include CLEANFILES += $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS) + + diff --git a/Mono.Addins.Setup/Mono.Addins.Setup.csproj b/Mono.Addins.Setup/Mono.Addins.Setup.csproj index f3580b2..16a2978 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup.csproj +++ b/Mono.Addins.Setup/Mono.Addins.Setup.csproj @@ -9,30 +9,30 @@ <AssemblyName>Mono.Addins.Setup</AssemblyName> <SchemaVersion>2.0</SchemaVersion> <RootNamespace>Mono.Addins.Setup</RootNamespace> - <SignAssembly>true</SignAssembly> + <SignAssembly>True</SignAssembly> <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> + <DebugSymbols>True</DebugSymbols> <DebugType>full</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> - <ConsolePause>false</ConsolePause> - <GenerateDocumentation>true</GenerateDocumentation> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <ConsolePause>False</ConsolePause> + <GenerateDocumentation>True</GenerateDocumentation> <NoWarn>1574</NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> - <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <ConsolePause>False</ConsolePause> </PropertyGroup> <ItemGroup> <Reference Include="ICSharpCode.SharpZipLib" /> @@ -88,14 +88,14 @@ <MonoDevelop> <Properties> <Deployment.LinuxDeployData scriptName="mono.addins.setup" /> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true"> - <BuildFilesVar Sync="true" Name="FILES" /> - <DeployFilesVar Sync="true" Name="DATA_FILES" /> - <ResourcesVar Sync="true" Name="RESOURCES" /> + <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True"> + <BuildFilesVar Sync="True" Name="FILES" /> + <DeployFilesVar Sync="True" Name="DATA_FILES" /> + <ResourcesVar Sync="True" Name="RESOURCES" /> <OthersVar /> - <GacRefVar Sync="true" Name="REFERENCES" Prefix="-r:" /> - <AsmRefVar Sync="true" Name="DLL_REFERENCES" /> - <ProjectRefVar Sync="true" Name="PROJECT_REFERENCES" /> + <GacRefVar Sync="True" Name="REFERENCES" Prefix="-r:" /> + <AsmRefVar Sync="True" Name="DLL_REFERENCES" /> + <ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" /> </MonoDevelop.Autotools.MakefileInfo> </Properties> </MonoDevelop> diff --git a/Mono.Addins.sln b/Mono.Addins.sln index 5670b62..6df3458 100644 --- a/Mono.Addins.sln +++ b/Mono.Addins.sln @@ -42,90 +42,122 @@ Global DebugWin32|Any CPU = DebugWin32|Any CPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
+ DebugNoGui|Any CPU = DebugNoGui|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{04C62888-E58A-4C6E-8688-A4F6F5459E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{04C62888-E58A-4C6E-8688-A4F6F5459E14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {04C62888-E58A-4C6E-8688-A4F6F5459E14}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {04C62888-E58A-4C6E-8688-A4F6F5459E14}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{04C62888-E58A-4C6E-8688-A4F6F5459E14}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{04C62888-E58A-4C6E-8688-A4F6F5459E14}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{04C62888-E58A-4C6E-8688-A4F6F5459E14}.Release|Any CPU.Build.0 = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{1CD51E61-1985-4D22-9BFA-D14C8FC61B46}.Release|Any CPU.Build.0 = Debug|Any CPU
{2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{2FF5459A-495C-4FDF-81EA-D0A6C07E7C0D}.Release|Any CPU.Build.0 = Debug|Any CPU
{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{42D1CE65-A14B-4218-B787-58AD7AA68513}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{42D1CE65-A14B-4218-B787-58AD7AA68513}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.ActiveCfg = Release|Any CPU
{42D1CE65-A14B-4218-B787-58AD7AA68513}.Release|Any CPU.Build.0 = Release|Any CPU
{4F29F0C0-725A-4927-9931-AAB0A595F370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4F29F0C0-725A-4927-9931-AAB0A595F370}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4F29F0C0-725A-4927-9931-AAB0A595F370}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {4F29F0C0-725A-4927-9931-AAB0A595F370}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{4F29F0C0-725A-4927-9931-AAB0A595F370}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{4F29F0C0-725A-4927-9931-AAB0A595F370}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{4F29F0C0-725A-4927-9931-AAB0A595F370}.Release|Any CPU.Build.0 = Debug|Any CPU
{87EADEFB-B389-4479-9C36-CDAA07839983}.Debug|Any CPU.ActiveCfg = Default|Any CPU
{87EADEFB-B389-4479-9C36-CDAA07839983}.Debug|Any CPU.Build.0 = Default|Any CPU
+ {87EADEFB-B389-4479-9C36-CDAA07839983}.DebugNoGui|Any CPU.ActiveCfg = Default|Any CPU
+ {87EADEFB-B389-4479-9C36-CDAA07839983}.DebugNoGui|Any CPU.Build.0 = Default|Any CPU
{87EADEFB-B389-4479-9C36-CDAA07839983}.DebugWin32|Any CPU.ActiveCfg = Default|Any CPU
{87EADEFB-B389-4479-9C36-CDAA07839983}.Release|Any CPU.ActiveCfg = Default|Any CPU
{87EADEFB-B389-4479-9C36-CDAA07839983}.Release|Any CPU.Build.0 = Default|Any CPU
{8C374D09-E916-4C6C-A01B-43A06A0D0499}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8C374D09-E916-4C6C-A01B-43A06A0D0499}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8C374D09-E916-4C6C-A01B-43A06A0D0499}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {8C374D09-E916-4C6C-A01B-43A06A0D0499}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{8C374D09-E916-4C6C-A01B-43A06A0D0499}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{8C374D09-E916-4C6C-A01B-43A06A0D0499}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8C374D09-E916-4C6C-A01B-43A06A0D0499}.Release|Any CPU.Build.0 = Release|Any CPU
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91DD5A2D-9FE3-4C3C-9253-876141874DAD}.Release|Any CPU.Build.0 = Release|Any CPU
{A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{A32AFFBA-4B83-4D6E-8CB3-812908BA14A9}.Release|Any CPU.Build.0 = Debug|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.Release|Any CPU.Build.0 = Release|Any CPU
{B051C84E-48CC-448D-B00C-1525EB64E4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B051C84E-48CC-448D-B00C-1525EB64E4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B051C84E-48CC-448D-B00C-1525EB64E4BE}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {B051C84E-48CC-448D-B00C-1525EB64E4BE}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{B051C84E-48CC-448D-B00C-1525EB64E4BE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{B051C84E-48CC-448D-B00C-1525EB64E4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B051C84E-48CC-448D-B00C-1525EB64E4BE}.Release|Any CPU.Build.0 = Release|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4B44F14-32C3-4D50-8C6A-06AA30E56CA3}.Release|Any CPU.Build.0 = Release|Any CPU
{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EA2F08DC-8289-4A89-A405-1A70D8B4C569}.Release|Any CPU.Build.0 = Release|Any CPU
{EB38A832-1BA5-4073-910C-7ACC5F1D1AD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB38A832-1BA5-4073-910C-7ACC5F1D1AD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EB38A832-1BA5-4073-910C-7ACC5F1D1AD4}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {EB38A832-1BA5-4073-910C-7ACC5F1D1AD4}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{EB38A832-1BA5-4073-910C-7ACC5F1D1AD4}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{EB38A832-1BA5-4073-910C-7ACC5F1D1AD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB38A832-1BA5-4073-910C-7ACC5F1D1AD4}.Release|Any CPU.Build.0 = Release|Any CPU
{F109148D-849E-4044-8700-5E8EA0AB2476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F109148D-849E-4044-8700-5E8EA0AB2476}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F109148D-849E-4044-8700-5E8EA0AB2476}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
+ {F109148D-849E-4044-8700-5E8EA0AB2476}.DebugNoGui|Any CPU.Build.0 = Debug|Any CPU
{F109148D-849E-4044-8700-5E8EA0AB2476}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{F109148D-849E-4044-8700-5E8EA0AB2476}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{F109148D-849E-4044-8700-5E8EA0AB2476}.Release|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugNoGui|Any CPU.ActiveCfg = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{FEC19BDA-4904-4005-8C09-68E82E8BEF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Mono.Addins/Makefile.am b/Mono.Addins/Makefile.am index d5c1442..f0db1a5 100644 --- a/Mono.Addins/Makefile.am +++ b/Mono.Addins/Makefile.am @@ -1,143 +1,13 @@ -KEY_FILE=$(top_srcdir)/mono-addins.snk -ASSEMBLY_COMPILER_COMMAND = gmcs -ASSEMBLY_COMPILER_FLAGS = -keyfile:$(KEY_FILE) -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG ASSEMBLY = ../bin/Mono.Addins.dll ASSEMBLY_NAME=Mono.Addins -COMPILE_TARGET = exe PC_FILES_IN = mono-addins.pc.in -PROJECT_REFERENCES = -BUILD_DIR = ../bin - - -all: $(ASSEMBLY) - -FILES = \ - AssemblyInfo.cs \ - Mono.Addins.Database/AddinDatabase.cs \ - Mono.Addins.Database/AddinFileSystemExtension.cs \ - Mono.Addins.Database/AddinHostIndex.cs \ - Mono.Addins.Database/AddinScanFolderInfo.cs \ - Mono.Addins.Database/AddinScanner.cs \ - Mono.Addins.Database/AddinScanResult.cs \ - Mono.Addins.Database/AddinUpdateData.cs \ - Mono.Addins.Database/DatabaseConfiguration.cs \ - Mono.Addins.Database/DefaultAssemblyReflector.cs \ - Mono.Addins.Database/FileDatabase.cs \ - Mono.Addins.Database/IAssemblyReflector.cs \ - Mono.Addins.Database/ISetupHandler.cs \ - Mono.Addins.Database/ProcessProgressStatus.cs \ - Mono.Addins.Database/SetupDomain.cs \ - Mono.Addins.Database/SetupLocal.cs \ - Mono.Addins.Database/SetupProcess.cs \ - Mono.Addins.Database/Util.cs \ - Mono.Addins.Description/AddinDependency.cs \ - Mono.Addins.Description/AddinDescription.cs \ - Mono.Addins.Description/AddinFlags.cs \ - Mono.Addins.Description/AddinProperty.cs \ - Mono.Addins.Description/AddinPropertyCollection.cs \ - Mono.Addins.Description/AssemblyDependency.cs \ - Mono.Addins.Description/ConditionTypeDescription.cs \ - Mono.Addins.Description/ConditionTypeDescriptionCollection.cs \ - Mono.Addins.Description/Dependency.cs \ - Mono.Addins.Description/DependencyCollection.cs \ - Mono.Addins.Description/Extension.cs \ - Mono.Addins.Description/ExtensionCollection.cs \ - Mono.Addins.Description/ExtensionNodeDescription.cs \ - Mono.Addins.Description/ExtensionNodeDescriptionCollection.cs \ - Mono.Addins.Description/ExtensionNodeSet.cs \ - Mono.Addins.Description/ExtensionNodeSetCollection.cs \ - Mono.Addins.Description/ExtensionNodeType.cs \ - Mono.Addins.Description/ExtensionNodeTypeCollection.cs \ - Mono.Addins.Description/ExtensionPoint.cs \ - Mono.Addins.Description/ExtensionPointCollection.cs \ - Mono.Addins.Description/ModuleDescription.cs \ - Mono.Addins.Description/ModuleDescriptionCollection.cs \ - Mono.Addins.Description/NativeDependency.cs \ - Mono.Addins.Description/NodeTypeAttribute.cs \ - Mono.Addins.Description/NodeTypeAttributeCollection.cs \ - Mono.Addins.Description/ObjectDescription.cs \ - Mono.Addins.Description/ObjectDescriptionCollection.cs \ - Mono.Addins.Localization/GettextDomain.cs \ - Mono.Addins.Localization/GettextLocalizer.cs \ - Mono.Addins.Localization/IAddinLocalizer.cs \ - Mono.Addins.Localization/IAddinLocalizerFactory.cs \ - Mono.Addins.Localization/IPluralAddinLocalizer.cs \ - Mono.Addins.Localization/NullLocalizer.cs \ - Mono.Addins.Localization/StringResourceLocalizer.cs \ - Mono.Addins.Localization/StringTableLocalizer.cs \ - Mono.Addins.Serialization/BinaryXmlReader.cs \ - Mono.Addins.Serialization/BinaryXmlTypeMap.cs \ - Mono.Addins.Serialization/BinaryXmlWriter.cs \ - Mono.Addins.Serialization/IBinaryXmlElement.cs \ - Mono.Addins/Addin.cs \ - Mono.Addins/AddinAttribute.cs \ - Mono.Addins/AddinAuthorAttribute.cs \ - Mono.Addins/AddinDependencyAttribute.cs \ - Mono.Addins/AddinDescriptionAttribute.cs \ - Mono.Addins/AddinEngine.cs \ - Mono.Addins/AddinErrorEventArgs.cs \ - Mono.Addins/AddinEventArgs.cs \ - Mono.Addins/AddinInfo.cs \ - Mono.Addins/AddinLocalizer.cs \ - Mono.Addins/AddinLocalizerGettextAttribute.cs \ - Mono.Addins/AddinManager.cs \ - Mono.Addins/AddinModuleAttribute.cs \ - Mono.Addins/AddinNameAttribute.cs \ - Mono.Addins/AddinPropertyAttribute.cs \ - Mono.Addins/AddinRegistry.cs \ - Mono.Addins/AddinRootAttribute.cs \ - Mono.Addins/ConditionType.cs \ - Mono.Addins/ConsoleProgressStatus.cs \ - Mono.Addins/ContentType.cs \ - Mono.Addins/CustomExtensionAttribute.cs \ - Mono.Addins/ExtensionAttribute.cs \ - Mono.Addins/ExtensionAttributeAttribute.cs \ - Mono.Addins/ExtensionContext.cs \ - Mono.Addins/ExtensionNode.cs \ - Mono.Addins/ExtensionNodeAttribute.cs \ - Mono.Addins/ExtensionNodeChildAttribute.cs \ - Mono.Addins/ExtensionNodeList.cs \ - Mono.Addins/ExtensionPointAttribute.cs \ - Mono.Addins/ExtensionTree.cs \ - Mono.Addins/GettextCatalog.cs \ - Mono.Addins/IAddinInstaller.cs \ - Mono.Addins/ImportAddinAssemblyAttribute.cs \ - Mono.Addins/ImportAddinFileAttribute.cs \ - Mono.Addins/InstanceExtensionNode.cs \ - Mono.Addins/IProgressStatus.cs \ - Mono.Addins/MissingDependencyException.cs \ - Mono.Addins/NodeAttributeAttribute.cs \ - Mono.Addins/NodeElement.cs \ - Mono.Addins/RuntimeAddin.cs \ - Mono.Addins/TreeNode.cs \ - Mono.Addins/TreeNodeCollection.cs \ - Mono.Addins/TypeExtensionNode.cs \ - Mono.Addins/TypeExtensionPointAttribute.cs - -DATA_FILES = - -RESOURCES = - -EXTRAS = - -REFERENCES = \ - -r:System \ - -r:System.Core \ - -r:System.Xml - -DLL_REFERENCES = - -$(ASSEMBLY).mdb: $(ASSEMBLY) - -$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(POLICY_ASSEMBLIES) - mkdir -p $(dir $(ASSEMBLY)) - $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref) install-data-local: gac-install - uninstall-local: gac-uninstall include $(top_srcdir)/Makefile.include +include $(top_srcdir)/xbuild.include CLEANFILES += $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS) + diff --git a/Mono.Addins/Mono.Addins.csproj b/Mono.Addins/Mono.Addins.csproj index 4e37244..7ab99f7 100644 --- a/Mono.Addins/Mono.Addins.csproj +++ b/Mono.Addins/Mono.Addins.csproj @@ -9,30 +9,30 @@ <AssemblyName>Mono.Addins</AssemblyName> <SchemaVersion>2.0</SchemaVersion> <RootNamespace>Mono.Addins</RootNamespace> - <SignAssembly>true</SignAssembly> + <SignAssembly>True</SignAssembly> <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> + <DebugSymbols>True</DebugSymbols> <DebugType>full</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> - <ConsolePause>false</ConsolePause> - <GenerateDocumentation>true</GenerateDocumentation> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <ConsolePause>False</ConsolePause> + <GenerateDocumentation>True</GenerateDocumentation> <NoWarn>1574</NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> - <ConsolePause>false</ConsolePause> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> + <ConsolePause>False</ConsolePause> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -149,14 +149,14 @@ <ProjectExtensions> <MonoDevelop> <Properties> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true"> - <BuildFilesVar Sync="true" Name="FILES" /> - <DeployFilesVar Sync="true" Name="DATA_FILES" /> - <ResourcesVar Sync="true" Name="RESOURCES" /> + <MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True"> + <BuildFilesVar Sync="True" Name="FILES" /> + <DeployFilesVar Sync="True" Name="DATA_FILES" /> + <ResourcesVar Sync="True" Name="RESOURCES" /> <OthersVar /> - <GacRefVar Sync="true" Name="REFERENCES" Prefix="-r:" /> - <AsmRefVar Sync="true" Name="DLL_REFERENCES" /> - <ProjectRefVar Sync="true" Name="PROJECT_REFERENCES" /> + <GacRefVar Sync="True" Name="REFERENCES" Prefix="-r:" /> + <AsmRefVar Sync="True" Name="DLL_REFERENCES" /> + <ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" /> </MonoDevelop.Autotools.MakefileInfo> </Properties> </MonoDevelop> diff --git a/docs/docs.mdproj b/docs/docs.mdproj index 1c7e4b5..ce03f65 100644 --- a/docs/docs.mdproj +++ b/docs/docs.mdproj @@ -9,7 +9,7 @@ <SchemaVersion>2.0</SchemaVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Default|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> + <DebugSymbols>True</DebugSymbols> <OutputPath>.</OutputPath> </PropertyGroup> <ItemGroup> diff --git a/mautil/Makefile.am b/mautil/Makefile.am index cc48ac2..b93ac4c 100644 --- a/mautil/Makefile.am +++ b/mautil/Makefile.am @@ -1,40 +1,12 @@ -ASSEMBLY_COMPILER_COMMAND = gmcs -ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG ASSEMBLY = ../bin/mautil.exe -COMPILE_TARGET = exe ASSEMBLY_WRAPPER = mautil ASSEMBLY_WRAPPER_IN = mautil.in -PROJECT_REFERENCES = \ - ../bin/Mono.Addins.dll \ - ../bin/Mono.Addins.Setup.dll -BUILD_DIR = ../bin - -all: $(ASSEMBLY) - -FILES = \ - AssemblyInfo.cs \ - Main.cs - -DATA_FILES = - -RESOURCES = - -EXTRAS = - -REFERENCES = -r:System - -DLL_REFERENCES = - -$(ASSEMBLY).mdb: $(ASSEMBLY) - -$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) - mkdir -p $(dir $(ASSEMBLY)) - - $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref) +$(ASSEMBLY): csproj_build include $(top_srcdir)/Makefile.include +include $(top_srcdir)/xbuild.include programfilesdir = $(libdir)/mono/mono-addins programfiles_DATA = $(ASSEMBLY) $(build_datafiles) diff --git a/mautil/mautil.csproj b/mautil/mautil.csproj index 4e69087..038e3c4 100644 --- a/mautil/mautil.csproj +++ b/mautil/mautil.csproj @@ -12,22 +12,22 @@ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> + <DebugSymbols>True</DebugSymbols> <DebugType>full</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> <Commandlineparameters>rb /home/lluis/work/monodevelop/main/build/AddIns/NUnit</Commandlineparameters> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> - <Optimize>true</Optimize> + <Optimize>True</Optimize> <OutputPath>..\bin</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> + <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -50,14 +50,14 @@ <ProjectExtensions> <MonoDevelop> <Properties> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true"> - <BuildFilesVar Sync="true" Name="FILES" /> - <DeployFilesVar Sync="true" Name="DATA_FILES" /> - <ResourcesVar Sync="true" Name="RESOURCES" /> + <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True"> + <BuildFilesVar Sync="True" Name="FILES" /> + <DeployFilesVar Sync="True" Name="DATA_FILES" /> + <ResourcesVar Sync="True" Name="RESOURCES" /> <OthersVar /> - <GacRefVar Sync="true" Name="REFERENCES" Prefix="-r:" /> - <AsmRefVar Sync="true" Name="DLL_REFERENCES" /> - <ProjectRefVar Sync="true" Name="PROJECT_REFERENCES" /> + <GacRefVar Sync="True" Name="REFERENCES" Prefix="-r:" /> + <AsmRefVar Sync="True" Name="DLL_REFERENCES" /> + <ProjectRefVar Sync="True" Name="PROJECT_REFERENCES" /> </MonoDevelop.Autotools.MakefileInfo> </Properties> </MonoDevelop> |