aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src/systools_make.erl
AgeCommit message (Collapse)Author
2014-03-26Merge branch 'dumbbell/function_clause-in-systools_make-format_error'Siri Hansen
* dumbbell/function_clause-in-systools_make-format_error: sasl: Fix crash in systools_make:format_error/1 OTP-11819
2014-03-24sasl: Fix crash in systools_make:format_error/1Jean-Sébastien Pédron
The crash occurred when systools:make_script/2 raises the 'duplicate_modules' error. Depending on the 'silent' option, systools_make:format_error/1 is called to either format and display an error message, or return a tuple containing the error properties. When displaying a 'duplicate_modules' error message, format_error/1 receives a list of applications providing the same module(s): [ {{Mod,App1,_}, {Mod,App2,_}}, ... ] However, before this fix, format_error/1 expected the following structure, leading to a 'function_clause' exception: [ {{Mod,_,App1,_,_}, {Mod,_,App2,_,_}}, ... ] The crash never occurred with the 'silent' option, because the error and its properties are returned as is to the caller.
2013-11-29Merge branch 'maint'Dan Gudmundsson
Conflicts: erts/etc/win32/Install.c
2013-10-03sasl: Add no_dot_erlang start scriptDan Gudmundsson
Sometimes it is wanted to start erlang without loading the user dependent .erlang file, for example in scripts and configure tests.
2013-06-03Merge branch 'maint'Fredrik Gustafsson
2013-05-28Fix receive support in erl_eval with a BEAM moduleAnthony Ramine
Using the low-level BEAM instructions, we can loop over each message in the process queue and removes the first message that matches, without receiving them all to later send them back to itself. The function prim_eval:'receive'/2 is equivalent to the following pseudo-code: 'receive'(F, T) -> RESET MESSAGE QUEUE POINTER, LOOP: case PEEK CURRENT MESSAGE WITH TIMEOUT T of {ok,Msg} -> case F(Msg) of nomatch -> DECREMENT TIMEOUT T, ADVANCE MESSAGE QUEUE POINTER, GOTO LOOP; Result -> RESET MESSAGE QUEUE POINTER, Result end; timeout -> RESET MESSAGE QUEUE POINTER, timeout end. To not break Dialyzer and other tools, we use a stub Erlang module which abstract code is forcefully inserted into prim_inet.erl afterwards compilation.
2013-05-06Fix unmatched_return warnings in saslSiri Hansen
2013-02-22[sasl] Adapt release handling mechanisms to unicodeSiri Hansen
* Update systool_lib:read_term/1 to honour magic encoding comment in file. * Add unicode option to re:compile and re:run when appropriate, allowing e.g. unicode filenames. * systools_make to allow unicode strings in .rel and .app files
2013-01-09sasl: Remove support for packagesBjörn Gustavsson
2012-12-07Merge branch 'rickard/port-optimizations/OTP-10336' into ↵Rickard Green
rickard/r16/port-optimizations/OTP-10336 * rickard/port-optimizations/OTP-10336: Change annotate level for emacs-22 in cerl Update etp-commands Add documentation on communication in Erlang Add support for busy port message queue Add driver callback epilogue Implement true asynchronous signaling between processes and ports Add erl_drv_[send|output]_term Move busy port flag Use rwlock for driver list Optimize management of port tasks Improve configuration of process and port tables Remove R9 compatibility features Use ptab functionality also for ports Prepare for use of ptab functionality also for ports Atomic port state Generalize process table implementation Implement functionality for delaying thread progress from unmanaged threads Conflicts: erts/doc/src/erl_driver.xml erts/doc/src/erlang.xml erts/emulator/beam/beam_bif_load.c erts/emulator/beam/beam_bp.c erts/emulator/beam/beam_emu.c erts/emulator/beam/bif.c erts/emulator/beam/copy.c erts/emulator/beam/erl_alloc.c erts/emulator/beam/erl_alloc.types erts/emulator/beam/erl_bif_info.c erts/emulator/beam/erl_bif_port.c erts/emulator/beam/erl_bif_trace.c erts/emulator/beam/erl_init.c erts/emulator/beam/erl_message.c erts/emulator/beam/erl_port_task.c erts/emulator/beam/erl_process.c erts/emulator/beam/erl_process.h erts/emulator/beam/erl_process_lock.c erts/emulator/beam/erl_trace.c erts/emulator/beam/export.h erts/emulator/beam/global.h erts/emulator/beam/io.c erts/emulator/sys/unix/sys.c erts/emulator/sys/vxworks/sys.c erts/emulator/test/port_SUITE.erl erts/etc/unix/cerl.src erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/prim_inet.beam erts/preloaded/src/prim_inet.erl lib/hipe/cerl/erl_bif_types.erl lib/kernel/doc/src/inet.xml lib/kernel/src/inet.erl
2012-12-07Implement true asynchronous signaling between processes and portsRickard Green
2012-09-13Don't allow {Mod,Vsn} in modules list in .app fileSiri Hansen
It was possible to insert {Mod::atom(),Vsn::term()} instead of Mod::atom() in the modules list in a .app file. This was not visible in the documentation of .app files, but it was visible in the documentation of application:load/[1,2] (where the .app file term can be used directly as first argument). The Vsn part was never used, so this possibility has now been removed.
2012-03-23Merge branch 'jc/omit-undefined-start_phases-3' into maintSiri Hansen
* jc/omit-undefined-start_phases-3: Avoid undefined start_phases entry in .script Avoid creating an undefined start_phases entry when generating a release OTP-10003
2012-03-23Merge branch 'siri/sasl/correct-app-name-in-error/OTP-9888' into maintSiri Hansen
* siri/sasl/correct-app-name-in-error/OTP-9888: Fix error message if stdlib has faulty start type in .rel file
2012-03-20Fix error message if stdlib has faulty start type in .rel fileSiri Hansen
If stdlib had a different start type than permanent, systools_make would fail but it would say that it was sasl that had faulty start type. This has been corrected.
2012-03-20Avoid undefined start_phases entry in .scriptSiri Hansen
Inorder to align with reltool a {start_phases,undefined} entry in will no longer occur in the application specification in .script files. The start_phases entry will only exist if it contains real start phases. Also, the default value for #application.start_phases is no longer set to [] in systools.hrl. This value was actually never used, since it was always explicitly set in systools_make:parse_applications - by default to 'undefined', so the default value in the record definition was only a confusing detail. Anyway - now corrected.
2012-03-19[sasl] Sort applications used by other applications correctly in .scriptSiri Hansen
OTP-9984 Applications that are listed in {applications,Apps} in the app file were not sorted correctly in the script file. They were loaded/started in the reverse order of how they were listed in the .app file. This is corrected so they are now sorted (internally between each other) in the same way as they are listed in the .rel file.
2011-12-21Merge branch 'siri/sasl/check-config-in-tar/OTP-9539' into maintSiri Hansen
* siri/sasl/check-config-in-tar/OTP-9539: Check that sys.config and relup have valid content when added to tar
2011-12-20Check that sys.config and relup have valid content when added to tarSiri Hansen
systools:make_tar now does a minor check of the content of sys.config and relup before adding them to the tar file. If the content is not readable or in expected format, the function fails.
2011-12-20Reject systools:make_script if kernel and stdlib are not permanent in .relSiri Hansen
It should not be possible to create a .boot file unless kernel and stdlib are stated as permanent applications in the .rel file. Note that 'permanent' is the default start type, so not specifying a start type for kernel and stdlib is, as always, ok.
2011-11-28Add copy of rel file in releases/<vsn> in release tar fileSiri Hansen
systool:make_tar stores the rel file in the releases directory. When unpacking with release_handler:unpack_release, the file is automatically moved to releases/<vsn>/. If, however, the tar file is unpacked manually, the rel file might not be moved, and the next release unpacked might overwrite the rel file. To overcome this, systools:make_tar now stores a copy of the rel file in releases/<vsn>/ directly and it is not longer necessary to move the file after unpacking. The reason for keeping the file in the releases directory also is that is needs to be extracted separately before the release version <vsn> is known.
2011-11-23Add option no_warn_sasl to systools:make_scriptSiri Hansen
This option will suppress the 'missing-sasl' warning which otherwise is issued when compiling a .rel file which does not include the sasl application.
2011-11-17Check for sasl application in systools:make_script and make_relupSiri Hansen
make_script will give warning but allow it make_relup will fail since it is not possible to upgrade if sasl is not included in both releases.
2011-11-17Upgrade erts: merge sys.config for tmp release instead of using oldSiri Hansen
The sys.config file used for the temporary release in an erts upgrade is now a hybrid where kernel, stdlib and sasl configuration is taken from the new release, and other configuration is taken from the old release. I.e. similar to how the temporary boot file is created.
2011-11-17Restart emulator before running upgrade script when erts is upgradedSiri Hansen
If the version of erts differs between two releases, the release handler automatically adds a 'restart_new_emulator' instruction to the upgrade script (relup). Earlier, this instruction was always added at the end of the upgrade script, causing the following sequence of operations during an upgrade (a bit simplified): 1. suspend processes 2. load new code 3. execute code_change functions 4. resume processes 5. restart emulator with new erts version Obviously, this caused the new code to be loaded into the old emulator and this would fail if the beam format had been changed in the new version of the emulator. To overcome this problem, this commit changes the order of the instructions, so for upgrade with changed erts version we now have: 1. restart emulator with new erts, kernel, stdlib and sasl versions, but old versions of all other applications. 2. suspend processes 3. load new code 4. execute code_change functions 5. resume processes This is implemented by creating a temporary release, including new erts, kernel, stdlib and sasl from the new release and all other applications from the old release. A new boot file for this temporary release is created, which includes a new 'apply' instruction to run release_handler:new_emulator_upgrade/2. Then the emulator is restarted using this boot file - and release_handler:new_emulator_upgrade/2 executes the rest of the upgrade script. For downgrade, the order will be as before: 1. suspend processes 2. execute code_change functions with 'down'-indication 3. load old code 4. resume processes 5. restart emulator with old erts version
2011-09-08systools: add warnings_as_errors optionTuncer Ayaz
2011-09-05Fix bug in systools:make_tar when path given as just 'ebin'Siri Hansen
If a path was given as ONLY 'ebin' and not for example './ebin', then systools:make_tar would fail with a function_clause exception in filename:join/1. The bug was in systools_make:appDir/1, which tried to find the parent directory of the given path. This function now uses library functions filename:basename and filename:dirname instead of general list manipulations.
2011-03-30Change default behaviour to not check src code when creating releaseSiri Hansen
Add new option <c>src_tests</c> to systools:make_script and systools:make_tar. The old option <c>no_module_tests</c> is now ignored as this is the default behaviour.
2009-11-20The R13B03 release.OTP_R13B03Erlang/OTP