← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MonoTargetRuntime.cs
106
106
                }
107
107
 
108
108
                public bool HasMultitargetingMcs { get; private set; }
109
 
                
 
109
 
110
110
                public override IEnumerable<FilePath> GetReferenceFrameworkDirectories ()
111
111
                {
 
112
                        //during initializion, only return the global directory once (for the running runtime) so that it doesn't
 
113
                        //get scanned multiple times
 
114
                        return GetReferenceFrameworkDirectories (IsInitialized || IsRunning);
 
115
                }
 
116
 
 
117
                internal IEnumerable<FilePath> GetReferenceFrameworkDirectories (bool includeMacGlobalDir)
 
118
                {
112
119
                        //duplicate xbuild's framework folders path logic
113
120
                        //see xbuild man page
114
121
                        string env;
116
123
                                foreach (var dir in env.Split (new char[] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries))
117
124
                                        yield return (FilePath) dir;
118
125
                        }
119
 
                        if (Platform.IsMac)
 
126
 
 
127
                        if (Platform.IsMac && true) {
120
128
                                yield return "/Library/Frameworks/Mono.framework/External/xbuild-frameworks";
 
129
                        }
 
130
 
121
131
                        //can't return $(TargetFrameworkRoot) MSBuild var, since that's per-project
122
132
                        yield return Path.Combine (monoDir, "xbuild-frameworks");
123
133
                }
150
160
                        pinfo.FileName = Path.Combine (Path.Combine (MonoRuntimeInfo.Prefix, "bin"), "mono");
151
161
                }
152
162
 
 
163
                public override string GetToolPath (TargetFramework fx, string toolName)
 
164
                {
 
165
                        if (fx.ClrVersion == ClrVersion.Net_2_0 && toolName == "al")
 
166
                                toolName = "al2";
 
167
                        return base.GetToolPath (fx, toolName);
 
168
                }
153
169
                
154
170
                internal protected override IEnumerable<string> GetGacDirectories ()
155
171
                {
206
222
                                return;
207
223
                        foreach (string pcfile in GetAllPkgConfigFiles ()) {
208
224
                                try {
209
 
                                        ParsePCFile (pcfile);
 
225
                                        ParsePCFile (FileService.ResolveFullPath (pcfile));
210
226
                                        if (ShuttingDown)
211
227
                                                return;
212
228
                                }
278
294
                                        if (newfx == null)
279
295
                                                inconsistentFrameworks = true;
280
296
                                        else {
281
 
                                                if (newfx.IsCompatibleWithFramework (commonFramework.Id))
 
297
                                                if (newfx.CanReferenceAssembliesTargetingFramework (commonFramework))
282
298
                                                        commonFramework = newfx;
283
 
                                                else if (!commonFramework.IsCompatibleWithFramework (newfx.Id))
 
299
                                                else if (!commonFramework.CanReferenceAssembliesTargetingFramework (newfx))
284
300
                                                        inconsistentFrameworks = true;
285
301
                                        }
286
302
                                }