← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/dialyzer/src/dialyzer_gui.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/dialyzer/src/dialyzer_gui.erl
2
2
%%------------------------------------------------------------------------
3
3
%% %CopyrightBegin%
4
4
%% 
5
 
%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
 
5
%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
6
6
%% 
7
7
%% The contents of this file are subject to the Erlang Public License,
8
8
%% Version 1.1, (the "License"); you may not use this file except in
88
88
 
89
89
-spec start(#options{}) -> ?RET_NOTHING_SUSPICIOUS.
90
90
 
91
 
start(DialyzerOptions = #options{from = From, init_plt = InitPltFile,
92
 
                                 legal_warnings = LegalWarnings}) ->
 
91
start(#options{from = From, init_plts = InitPltFiles,
 
92
               legal_warnings = LegalWarnings} = DialyzerOptions) ->
93
93
  process_flag(trap_exit, true),
94
94
 
95
95
  GS = gs:start(),
336
336
  gs:config(Packer, WH),
337
337
  {ok, CWD} = file:get_cwd(),
338
338
  
339
 
  InitPlt = try dialyzer_plt:from_file(InitPltFile)
340
 
            catch throw:{dialyzer_error, _} -> dialyzer_plt:new()
341
 
            end,
 
339
  InitPlt =
 
340
    case InitPltFiles of
 
341
      [] -> dialyzer_plt:new();
 
342
      _ ->
 
343
        Plts = [dialyzer_plt:from_file(F) || F <- InitPltFiles],
 
344
        dialyzer_plt:merge_plts_or_report_conflicts(InitPltFiles, Plts)
 
345
    end,
342
346
 
343
347
  State = #gui_state{add_all = AddAll,
344
348
                     add_file = AddFile,