diff options
| author | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
| commit | 77426493dc04593cc00c166e6fb17dd5fc985255 (patch) | |
| tree | 868060b6e16d4e9f6a347202ac1ba9c78761f404 /lib/wx/api_gen/gen_util.erl | |
| parent | 6510ee4abddbecf10b41d0474a35af1e780ea5be (diff) | |
| parent | 6628dbe4ba097a5abed4ca7439a5b515adb0f556 (diff) | |
| download | otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.gz otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.bz2 otp-77426493dc04593cc00c166e6fb17dd5fc985255.zip | |
Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maint
* dgud/wx/misc-improvements/OTP-9947:
[wx] Add simple taskbaricon test
[wx] Add missing stc function
[wx] Add wxTaskBarIcon class
[wx] Doc overloaded functions
[wx] Fix spec errors
[wx] Fix api bugs in wxDC
[wx] Fix wxGraphicContext bugs
[wx] Remove redundant erts version check
[wx] Generated types for all wx classes
[wx] Generate GL api from latest version
[wx] Cleanup Makefiles
Diffstat (limited to 'lib/wx/api_gen/gen_util.erl')
| -rw-r--r-- | lib/wx/api_gen/gen_util.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl index df5b4c3405..4638d4c7ea 100644 --- a/lib/wx/api_gen/gen_util.erl +++ b/lib/wx/api_gen/gen_util.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2011. All Rights Reserved. +%% Copyright Ericsson AB 2008-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -96,8 +96,8 @@ check_diff(Diff) -> [<<>>] -> ok; _ -> throw(diff) end, - <<_, _, "%% Copyright", _/binary>> = D1, - <<_, _, "%% Copyright", _/binary>> = D2, + copyright(D1), + copyright(D2), copyright catch throw:_ -> diff; @@ -108,6 +108,10 @@ check_diff(Diff) -> diff end. +copyright(<<_, _, "%% Copyright", _/binary>>) -> ok; +copyright(<<_, _, " * Copyright", _/binary>>) -> ok; +copyright(_) -> throw(diff). + w(Str) -> w(Str, []). w(Str,Args) -> @@ -217,7 +221,7 @@ erl_copyright() -> w("%%~n",[]), w("%% %CopyrightBegin%~n",[]), w("%%~n",[]), - w("%% Copyright Ericsson AB ~p-2011. All Rights Reserved.~n", + w("%% Copyright Ericsson AB ~p-2012. All Rights Reserved.~n", [StartYear]), w("%%~n",[]), w("%% The contents of this file are subject to the Erlang Public License,~n",[]), @@ -237,7 +241,7 @@ c_copyright() -> w("/*~n",[]), w(" * %CopyrightBegin%~n",[]), w(" *~n",[]), - w(" * Copyright Ericsson AB 2008-2011. All Rights Reserved.~n",[]), + w(" * Copyright Ericsson AB 2008-2012. All Rights Reserved.~n",[]), w(" *~n",[]), w(" * The contents of this file are subject to the Erlang Public License,~n",[]), w(" * Version 1.1, (the \"License\"); you may not use this file except in~n",[]), |