Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[Build] Include MonoMac.dll as part of monodevelops regular build pro…

…cess

This commit contains a number of changes:

1) MonoMac and MacCore are included as git submodules. The regular readonly
git url is used so that external contributors can check the submodules out.
They are stored in external/monomac and external/maccore.

2) MonoMac.dll is built by MacPlatform as this is the first place we require
it.

3) All projects have been updated to use the assembly built in external/monomac

4) The MacCrashLogger project has been removed from git as the application does
absolutely nothing. All logic and classes were moved to monodevelop itself.

5) MonoMac and MacCore have been removed from the version-checks directory as
they are now integrated into the regular monodevelop build.
  • Loading branch information...
commit 6bad5fa2bb3177ee16236d0a5a14d565bd620a10 1 parent 45ef551
@alanmcgovern alanmcgovern authored
View
6 .gitmodules
@@ -0,0 +1,6 @@
+[submodule "external/maccore"]
+ path = external/maccore
+ url = git://github.com/mono/maccore.git
+[submodule "external/monomac"]
+ path = external/monomac
+ url = git://github.com/mono/monomac.git
1  external/maccore
@@ -0,0 +1 @@
+Subproject commit 7e40e242bba671315834c1af0dbb83acca76242e
1  external/monomac
@@ -0,0 +1 @@
+Subproject commit 31dc2e02222c421cf688e2f27f126e6153e2f2df
View
14 extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoDevelop.MonoMac.csproj
@@ -120,12 +120,6 @@
<None Include="templates\MonoMacProject.xpt.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="MonoMac.dll">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="MonoMac.dll.mdb">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
<None Include="MonoMacLaunchScript.sh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -165,6 +159,14 @@
<None Include="mono-version-check">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="..\..\..\external\monomac\src\MonoMac.dll">
+ <Link>MonoMac.dll</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="..\..\..\external\monomac\src\MonoMac.dll.mdb">
+ <Link>MonoMac.dll.mdb</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
View
BIN  extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll
Binary file not shown
View
BIN  extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll.mdb
Binary file not shown
View
9 main/Main.sln
@@ -192,8 +192,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdmonitor", "src\tools\mdmo
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDevelop.CrashLog", "src\tools\mdcrashlog\MonoDevelop.CrashLog.csproj", "{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MacCrashLogger", "src\tools\MacCrashLogger\MacCrashLogger.csproj", "{E414CD46-33C8-4CE1-986F-B601F941EBB9}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78C10DAE-D3D7-44FC-93DF-831D8D54ECF9}"
ProjectSection(MonoDevelopProperties) = preProject
BaseDirectory = tests
@@ -782,12 +780,6 @@ Global
{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.DebugWin32|x86.Build.0 = Debug|Any CPU
{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E3BFF8B4-189C-496A-A817-7E8B31E22B91}.Release|Any CPU.Build.0 = Release|Any CPU
- {E414CD46-33C8-4CE1-986F-B601F941EBB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E414CD46-33C8-4CE1-986F-B601F941EBB9}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {E414CD46-33C8-4CE1-986F-B601F941EBB9}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {E414CD46-33C8-4CE1-986F-B601F941EBB9}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
- {E414CD46-33C8-4CE1-986F-B601F941EBB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E414CD46-33C8-4CE1-986F-B601F941EBB9}.Release|Any CPU.Build.0 = Release|Any CPU
{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF91D0B8-53F6-4622-9F26-3ED27815878A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF91D0B8-53F6-4622-9F26-3ED27815878A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -927,7 +919,6 @@ Global
{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}
- {E414CD46-33C8-4CE1-986F-B601F941EBB9} = {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}
View
1  main/configure.in
@@ -285,7 +285,6 @@ src/core/MonoDevelop.Ide/Makefile
src/core/MonoDevelop.Ide/BuildVariables.cs
src/core/MonoDevelop.Startup/Makefile
src/tools/Makefile
-src/tools/MacCrashLogger/Makefile
src/tools/mdcrashlog/Makefile
src/tools/mdhost/Makefile
src/tools/mdtool/Makefile
View
7 main/src/addins/MacPlatform/Makefile.am
@@ -2,7 +2,7 @@
ADDIN_BUILD = $(top_builddir)/build/AddIns
ASSEMBLY = $(ADDIN_BUILD)/MacPlatform.dll
-MONOMAC_SRC = $(top_srcdir)/../extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll
+MONOMAC_SRC = $(top_srcdir)/../external/monomac/src/MonoMac.dll
MONOMAC = $(ADDIN_BUILD)/MonoMac.dll
DEPS = \
@@ -12,7 +12,7 @@ DEPS = \
REFS = \
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
- -r:../../../../extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll \
+ -r:$(MONOMAC_SRC) \
-r:Mono.Posix \
-r:System \
-r:System.Core \
@@ -58,6 +58,9 @@ else
all:
endif
+$(MONOMAC_SRC):
+ make -C $(top_srcdir)/../external/monomac/src
+
$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS)
mkdir -p $(ADDIN_BUILD)
$(CSC) $(CSC_FLAGS) -unsafe $(REFS) $(build_deps) $(build_resources:%=/resource:%) $(build_sources) -out:$@ -target:library
View
2  main/src/addins/MonoDevelop.MacDev/Makefile.am
@@ -15,7 +15,7 @@ REFS = \
$(GLIB_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
$(MONO_ADDINS_LIBS) \
- -r:../../../../extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll \
+ -r:../../../../external/monomac/src/MonoMac.dll \
-r:Mono.Cairo \
-r:Mono.Posix \
-r:System \
View
2  main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
@@ -46,8 +46,8 @@
<Reference Include="Mono.Posix" />
<Reference Include="Mono.Cairo" />
<Reference Include="MonoMac">
- <HintPath>..\..\..\..\extras\MonoDevelop.MonoMac\MonoDevelop.MonoMac\MonoMac.dll</HintPath>
<Private>False</Private>
+ <HintPath>..\..\..\..\external\monomac\src\MonoMac.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
View
96 main/src/tools/MacCrashLogger/AppDelegate.cs
@@ -1,96 +0,0 @@
-//
-// AppDelegate.cs
-//
-// Author:
-// Alan McGovern <alan@xamarin.com>
-//
-// Copyright 2011, Xamarin Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Drawing;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-
-using MonoDevelop;
-using MonoDevelop.Core.LogReporting;
-
-namespace MacCrashLogger
-{
- public partial class AppDelegate : NSApplicationDelegate
- {
-// ICrashMonitor Monitor {
-// get; set;
-// }
-//
-// bool ProcessingCrashLog {
-// get; set;
-// }
-//
-// CrashReporter Reporter {
-// get; set;
-// }
-//
-// bool ShouldExit {
-// get; set;
-// }
-//
-// public AppDelegate ()
-// {
-// Reporter = new CrashReporter (CrashLogOptions.LogPath, CrashLogOptions.Email);
-//
-// Monitor = CrashMonitor.Create (CrashLogOptions.Pid);
-// Monitor.ApplicationExited += HandleMonitorApplicationExited;
-// Monitor.CrashDetected += HandleMonitorCrashDetected;
-// }
-//
-// public override void FinishedLaunching (NSObject notification)
-// {
-// Monitor.Start ();
-// Reporter.ProcessCache ();
-// }
-//
-// void HandleMonitorCrashDetected (object sender, CrashEventArgs e)
-// {
-// InvokeOnMainThread (() => {
-// try {
-// ProcessingCrashLog = true;
-// Reporter.UploadOrCache (e.CrashLogPath);
-//
-// if (ShouldExit)
-// NSApplication.SharedApplication.Terminate (this);
-// } finally {
-// ProcessingCrashLog = false;
-// }
-// });
-// }
-//
-// void HandleMonitorApplicationExited (object sender, EventArgs e)
-// {
-// InvokeOnMainThread (() => {
-// ShouldExit = true;
-// if (!ProcessingCrashLog) {
-// NSApplication.SharedApplication.Terminate (null);
-// }
-// });
-// }
- }
-}
View
32 main/src/tools/MacCrashLogger/Info.plist
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>MonoDevelopLogAgent</string>
- <key>CFBundleIdentifier</key>
- <string>com.monodevelop.MonoDevelopLogAgent</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>MonoDevelop Log Agent</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- <key>LSMinimumSystemVersion</key>
- <string>10.5</string>
- <key>NSMainNibFile</key>
- <string>MainMenu</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
- <key>NSUIElement</key>
- <string>1</string>
-</dict>
-</plist>
View
80 main/src/tools/MacCrashLogger/MacCrashLogger.csproj
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>10.0.0</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{E414CD46-33C8-4CE1-986F-B601F941EBB9}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <RootNamespace>MacCrashLogger</RootNamespace>
- <AssemblyName>MonoDevelopLogAgent</AssemblyName>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\build\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\build\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Drawing" />
- <Reference Include="MonoMac">
- <HintPath>..\..\..\..\extras\MonoDevelop.MonoMac\MonoDevelop.MonoMac\MonoMac.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Main.cs" />
- <Compile Include="AppDelegate.cs">
- <DependentUpon>MainMenu.xib</DependentUpon>
- </Compile>
- <Compile Include="MainMenu.xib.designer.cs">
- <DependentUpon>MainMenu.xib</DependentUpon>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <None Include="Info.plist" />
- <None Include="Makefile.am" />
- <None Include="MonoMacLaunchScript.sh" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <InterfaceDefinition Include="MainMenu.xib" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" SyncReferences="true">
- <BuildFilesVar Sync="true" Name="FILES" />
- <DeployFilesVar />
- <ResourcesVar />
- <OthersVar />
- <GacRefVar Sync="true" Name="REFS" Prefix="/r:" />
- <AsmRefVar Sync="true" Name="REFS" Prefix="/r:" />
- <ProjectRefVar Sync="true" Name="DEPS" />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
- <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
- <Name>MonoDevelop.Core</Name>
- </ProjectReference>
- </ItemGroup>
-</Project>
View
53 main/src/tools/MacCrashLogger/Main.cs
@@ -1,53 +0,0 @@
-//
-// Main.cs
-//
-// Author:
-// Alan McGovern <alan@xamarin.com>
-//
-// Copyright 2011, Xamarin Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Drawing;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
-using MonoMac.ObjCRuntime;
-using MonoDevelop;
-using System.IO;
-
-namespace MacCrashLogger
-{
- class MainClass
- {
- static int Main (string [] args)
- {
-// string error;
-// if (!MonoDevelop.CrashLog.CrashLogOptions.TryParse (args, out error)) {
-// Console.Error.WriteLine (error);
-// return 1;
-// }
-//
-// NSApplication.Init ();
-// NSApplication.Main (args);
-// return 0;
- return 0;
- }
- }
-}
View
4,074 main/src/tools/MacCrashLogger/MainMenu.xib
0 additions, 4,074 deletions not shown
View
10 main/src/tools/MacCrashLogger/MainMenu.xib.designer.cs
@@ -1,10 +0,0 @@
-
-namespace MacCrashLogger
-{
- // Should subclass MonoMac.AppKit.NSResponder
- [MonoMac.Foundation.Register("AppDelegate")]
- public partial class AppDelegate
- {
- }
-}
-
View
81 main/src/tools/MacCrashLogger/Makefile.am
@@ -1,81 +0,0 @@
-APP_NAME = MonoDevelopLogAgent
-APP_BUNDLE = $(top_builddir)/build/bin/$(APP_NAME).app
-APP_BUNDLE_MACOS = $(APP_BUNDLE)/Contents/MacOS
-APP_BUNDLE_RESOURCES = $(APP_BUNDLE)/Contents/Resources
-
-ASSEMBLY = $(APP_BUNDLE_RESOURCES)/$(APP_NAME).exe
-
-FILES = \
- AppDelegate.cs \
- Main.cs \
- MainMenu.xib.designer.cs
-
-REFS = \
- /r:../../../../extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMac.dll \
- /r:System \
- /r:System.Core \
- /r:System.Drawing \
- /r:System.Xml \
- /r:System.Xml.Linq
-
-DEPS = ../../../build/bin/MonoDevelop.Core.dll
-
-BUNDLE_INFOPLIST = $(APP_BUNDLE)/Contents/Info.plist
-BUNDLE_MAINNIB = $(APP_BUNDLE_RESOURCES)/MainMenu.nib
-BUNDLE_SCRIPT = $(APP_BUNDLE_MACOS)/$(APP_NAME)
-BUNDLE_MONOMAC = $(APP_BUNDLE_RESOURCES)/MonoMac.dll
-BUNDLE_CRASHLOG = $(APP_BUNDLE_RESOURCES)/MonoDevelop.CrashLog.dll
-BUNDLE_MONO = $(APP_BUNDLE)/$(APP_NAME)
-
-#after upgrading to xcode 4.3, the /usr/bin/ibtool link is broken, so override PATH
-XC43_TOOLS=/Applications/Xcode.app/Contents/Developer/usr/bin
-IBTOOL=PATH='$(XC43_TOOLS):$(PATH)' ibtool
-
-INFOPLIST = $(srcdir)/Info.plist
-MAINXIB = $(srcdir)/MainMenu.xib
-SCRIPT = $(srcdir)/MonoMacLaunchScript.sh
-
-if ENABLE_MACPLATFORM
-all: $(ASSEMBLY) $(BUNDLE_INFOPLIST) $(BUNDLE_MAINNIB) $(BUNDLE_SCRIPT) $(BUNDLE_MONOMAC) $(BUNDLE_MONO) $(BUNDLE_CRASHLOG)
-else
-all:
-endif
-
-$(ASSEMBLY): $(build_sources) $(DEPS)
- mkdir -p $(APP_BUNDLE_RESOURCES)
- $(CSC) $(CSC_FLAGS) $(build_sources) $(REFS) $(build_deps) /out:$(ASSEMBLY)
-
-$(BUNDLE_MAINNIB): $(MAINXIB)
- mkdir -p $(APP_BUNDLE_RESOURCES)
- $(IBTOOL) "$^" --compile "$@"
-
-$(BUNDLE_INFOPLIST): $(INFOPLIST)
- mkdir -p $(APP_BUNDLE_MACOS)
- cp "$^" "$@"
-
-$(BUNDLE_SCRIPT): $(SCRIPT)
- mkdir -p $(APP_BUNDLE_MACOS)
- cp "$^" "$@"
- chmod +x "$@"
-
-$(BUNDLE_MONO):
- mkdir -p $(APP_BUNDLE_MACOS)
- ln -s /Library/Frameworks/Mono.framework/Versions/Current/bin/mono "$@"
-
-$(BUNDLE_MONOMAC):
- mkdir -p $(APP_BUNDLE_RESOURCES)
- cd $(APP_BUNDLE_RESOURCES) \
- && ln -s ../../../../AddIns/MonoMac.dll MonoMac.dll \
- && ln -s ../../../../AddIns/MonoMac.dll.mdb MonoMac.dll.mdb
-
-$(BUNDLE_CRASHLOG):
- mkdir -p $(APP_BUNDLE_RESOURCES)
- cd $(APP_BUNDLE_RESOURCES) \
- && ln -s ../../../MonoDevelop.CrashLog.dll MonoDevelop.CrashLog.dll \
- && ln -s ../../../MonoDevelop.CrashLog.dll.mdb MonoDevelop.CrashLog.dll.mdb
-
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BUNDLE_INFOPLIST) $(BUNDLE_MAINXIB)
-EXTRA_DIST = $(FILES) $(INFOPLIST) $(MAINXIB)
-
-include $(top_srcdir)/Makefile.include
View
27 main/src/tools/MacCrashLogger/MonoMacLaunchScript.sh
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Determine locations
-
-MACOS_DIR=$(cd "$(dirname "$0")"; pwd)
-APP_ROOT=${MACOS_DIR%%/Contents/MacOS}
-
-CONTENTS_DIR="$APP_ROOT/Contents"
-RESOURCES_PATH="$CONTENTS_DIR/Resources"
-
-APP_NAME=MonoDevelopLogAgent
-ASSEMBLY=MonoDevelopLogAgent.exe
-
-MONO_FRAMEWORK_PATH=/Library/Frameworks/Mono.framework/Versions/Current
-
-#Environment setup
-export DYLD_FALLBACK_LIBRARY_PATH="$MONO_FRAMEWORK_PATH/lib:$DYLD_FALLBACK_LIBRARY_PATH"
-export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH"
-export DYLD_LIBRARY_PATH="$RESOURCES_PATH:$DYLD_LIBRARY_PATH"
-
-# Pass the executable name as the last parameter of MONO_ENV_OPTIONS
-# since some NSApplication APIs will poke at the startup arguments and do not
-# like the .exe there
-export MONO_ENV_OPTIONS="$MONO_OPTIONS $RESOURCES_PATH/$ASSEMBLY"
-
-#run the app
-exec "$APP_ROOT/$APP_NAME" $@
View
2  main/src/tools/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = SharpCoco mdhost mdtool mdmonitor mdcrashlog MacCrashLogger
+SUBDIRS = SharpCoco mdhost mdtool mdmonitor mdcrashlog
include $(top_srcdir)/Makefile.include
View
19 version-checks
@@ -24,27 +24,12 @@ DEP_BRANCH_AND_REMOTE[0]="master origin/master"
DEP[1]=heap-shot
DEP_NAME[1]=HEAPSHOT
DEP_PATH[1]=${top_srcdir}/../heap-shot
-DEP_MODULE[1]=git@github.com:mono/heap-shot.git
+DEP_MODULE[1]=git://github.com/mono/heap-shot.git
DEP_NEEDED_VERSION[1]=552005b42194a80af313393f06ca7dcfe91ec957
DEP_BRANCH_AND_REMOTE[1]="master origin/master"
-#monomac & maccore both for macdoc
-DEP[2]=maccore
-DEP_NAME[2]=MACCORE
-DEP_PATH[2]=${top_srcdir}/../maccore
-DEP_MODULE[2]=git@github.com:mono/maccore.git
-DEP_NEEDED_VERSION[2]=e82e9c57878fe71360fefc17d26346f5fbd2dfea
-DEP_BRANCH_AND_REMOTE[2]="master origin/master"
-
-DEP[3]=monomac
-DEP_NAME[3]=MONOMAC
-DEP_PATH[3]=${top_srcdir}/../monomac
-DEP_MODULE[3]=git@github.com:mono/monomac.git
-DEP_NEEDED_VERSION[3]=ac5a706fc63b65bb9bea1009eca222e76708831d
-DEP_BRANCH_AND_REMOTE[3]="master origin/master"
-
# other dependencies
-# DEP[4]=...
+# DEP[2]=...
# ...
function fetch_variables
Please sign in to comment.
Something went wrong with that request. Please try again.