← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/debugger/src/dbg_wx_mon.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/debugger/src/dbg_wx_mon.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
 
%% 
4
 
%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
5
 
%% 
 
3
%%
 
4
%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
 
5
%%
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
8
8
%% compliance with the License. You should have received a copy of the
9
9
%% Erlang Public License along with this software. If not, it can be
10
10
%% retrieved online at http://www.erlang.org/.
11
 
%% 
 
11
%%
12
12
%% Software distributed under the License is distributed on an "AS IS"
13
13
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
14
14
%% the License for the specific language governing rights and limitations
15
15
%% under the License.
16
 
%% 
 
16
%%
17
17
%% %CopyrightEnd%
18
18
%%
19
19
 
144
144
 
145
145
                    win     = Win,
146
146
                    focus   = undefined,
147
 
                    coords  = {0,0},
 
147
                    coords  = {20,20},
148
148
 
149
149
                    intdir  = element(2, file:get_cwd()),
150
150
                    pinfos  = [],
170
170
    CallingPid ! {initialization_complete, self()},
171
171
 
172
172
    if
173
 
        SFile==default ->
 
173
        SFile =:= default ->
174
174
            loop(State3);
175
175
        true ->
176
176
            loop(load_settings(SFile, State3))
268
268
    State;
269
269
gui_cmd(stopped, State) ->
270
270
    if
271
 
        State#state.starter==true -> int:stop();
 
271
        State#state.starter =:= true -> int:stop();
272
272
        true -> int:auto_attach(false)
273
273
    end,
274
274
    exit(stop);
420
420
    State2;
421
421
gui_cmd({'Auto Attach', When}, State) ->
422
422
    if
423
 
        When==[] -> int:auto_attach(false);
 
423
        When =:= [] -> int:auto_attach(false);
424
424
        true ->
425
 
            Flags = lists:map(fun(Name) -> map(Name) end, When),
 
425
            Flags = [map(Name) || Name <- When],
426
426
            int:auto_attach(Flags, trace_function(State))
427
427
    end,
428
428
    State;
442
442
 
443
443
%% Help Menu
444
444
gui_cmd('Debugger', State) ->
445
 
    HelpFile = filename:join([code:lib_dir(debugger),
446
 
                              "doc", "html", "part_frame.html"]),
 
445
    HelpFile = filename:join([code:lib_dir(debugger), "doc", "html", "index.html"]),
447
446
    Window = dbg_wx_mon_win:get_window(State#state.win),
448
447
    dbg_wx_win:open_help(Window, HelpFile),
449
448
    State;
692
691
                              Break,
693
692
                          int:break(Mod, Line),
694
693
                          if
695
 
                              Status==inactive ->
 
694
                              Status =:= inactive ->
696
695
                                  int:disable_break(Mod, Line);
697
696
                              true -> ignore
698
697
                          end,
699
698
                          if
700
 
                              Action/=enable ->
 
699
                              Action =/= enable ->
701
700
                                  int:action_at_break(Mod,Line,Action);
702
701
                              true -> ignore
703
702
                          end,
716
715
                int:auto_attach(),
717
716
                int:stack_trace(),
718
717
                State#state.backtrace,
719
 
                lists:map(fun(Mod) ->
720
 
                                  int:file(Mod)
721
 
                          end,
722
 
                          int:interpreted()),
 
718
                [int:file(Mod) || Mod <- int:interpreted()],
723
719
                int:all_breaks()},
724
720
 
725
721
    Binary = term_to_binary({debugger_settings, Settings}),
742
738
 
743
739
    Node = node(Pid),
744
740
    if
745
 
        Node==node() ->
 
741
        Node =:= node() ->
746
742
            case erlang:process_info(Pid, registered_name) of
747
743
                {registered_name, Name} -> Name;
748
744
                _ -> undefined