← Back to branch summary

~ubuntu-branches/ubuntu/saucy/monodevelop/saucy-proposed

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2012-06-22 20:35:35 UTC
  • mfrom: (10.3.2)
  • Revision ID: package-import@ubuntu.com-20120622203535-zrozwvcf6kfk6l6i
Tags: 3.0.3.2+dfsg-1
* [3fd89ae] Imported Upstream version 3.0.3.2+dfsg
* [379a680] Remove old patches we haven't used for ages from git.
* [d71161d] Remove correct_paths_in_monodevelop-core-addins.pc.patch.
  Upstream claim to have fixed this by moving assembly install locations.
* [15dbfb9] Fix install location for MonoDevelop.Gettext.dll.config.
* [26eb434] Fix install location for MonoDevelop.SourceEditor2.dll.config.
* [4169974] Upstream commit 53282c9 which finally reconciles the 
  MonoDevelop.Gettext.dll install location with the 
  monodevelop-core-addins.pc location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
75
75
                {
76
76
                        Counters.Initialization.BeginTiming ();
77
77
                        
78
 
                        if (options.LogCounters) {
79
 
                                string logFile = Path.Combine (Environment.CurrentDirectory, "monodevelop.clog");
 
78
                        if (options.PerfLog) {
 
79
                                string logFile = Path.Combine (Environment.CurrentDirectory, "monodevelop.perf-log");
80
80
                                LoggingService.LogInfo ("Logging instrumentation service data to file: " + logFile);
81
81
                                InstrumentationService.StartAutoSave (logFile, 1000);
82
82
                        }
135
135
                        //don't show the splash screen on the Mac, so instead we get the expected "Dock bounce" effect
136
136
                        //this also enables the Mac platform service to subscribe to open document events before the GUI loop starts.
137
137
                        if (Platform.IsMac)
138
 
                                options.NoLogo = true;
 
138
                                options.NoSplash = true;
139
139
                        
140
140
                        IProgressMonitor monitor;
141
141
                        
142
 
                        if (options.NoLogo) {
 
142
                        if (options.NoSplash) {
143
143
                                monitor = new MonoDevelop.Core.ProgressMonitoring.ConsoleProgressMonitor ();
144
144
                        } else {
145
145
                                monitor = SplashScreenForm.SplashScreen;
518
518
                        }
519
519
                        while (retry);
520
520
 
 
521
                        LoggingService.Shutdown ();
 
522
 
521
523
                        return ret;
522
524
                }
523
525
        }
527
529
                MonoDevelopOptions ()
528
530
                {
529
531
                        IpcTcp = (PlatformID.Unix != Environment.OSVersion.Platform);
 
532
                        RedirectOutput = true;
530
533
                }
531
534
                
532
535
                Mono.Options.OptionSet GetOptionSet ()
533
536
                {
534
537
                        return new Mono.Options.OptionSet () {
535
 
                                { "nologo", "Do not display splash screen.", s => NoLogo = true },
 
538
                                { "no-splash", "Do not display splash screen.", s => NoSplash = true },
536
539
                                { "ipc-tcp", "Use the Tcp channel for inter-process comunication.", s => IpcTcp = true },
537
 
                                { "newwindow", "Do not open in an existing instance of " + BrandingService.ApplicationName, s => NewWindow = true },
 
540
                                { "new-window", "Do not open in an existing instance of " + BrandingService.ApplicationName, s => NewWindow = true },
538
541
                                { "h|?|help", "Show help", s => ShowHelp = true },
539
 
                                { "clog", "Log internal counter data", s => LogCounters = true },
540
 
                                { "clog-interval=", "Interval between counter logs (in milliseconds)", (int i) => LogCountersInterval = i },
541
 
                                { "redirect-output", "Whether to redirect stdout/stderr to a log file", s => RedirectOutput = true },
 
542
                                { "perf-log", "Enable performance counter logging", s => PerfLog = true },
 
543
                                { "no-redirect", "Disable redirection of stdout/stderr to a log file", s => RedirectOutput = false },
542
544
                        };
543
545
                }
544
546
                
567
569
                        return opt;
568
570
                }
569
571
                
570
 
                public bool NoLogo { get; set; }
 
572
                public bool NoSplash { get; set; }
571
573
                public bool IpcTcp { get; set; }
572
574
                public bool NewWindow { get; set; }
573
575
                public bool ShowHelp { get; set; }
574
 
                public bool LogCounters { get; set; }
575
 
                public int LogCountersInterval { get; set; }
 
576
                public bool PerfLog { get; set; }
576
577
                public bool RedirectOutput { get; set; }
577
578
                public string Error { get; set; }
578
579
                public IList<string> RemainingArgs { get; set; }