Skip to content

Commit

Permalink
Move README and INSTALL to HOWTO folder
Browse files Browse the repository at this point in the history
  • Loading branch information
garazdawi committed Jul 19, 2012
1 parent 4ba364c commit 6bb1cd1
Show file tree
Hide file tree
Showing 18 changed files with 629 additions and 605 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ JAVADOC-GENERATED
/system/doc/installation_guide/INSTALL.xml
/system/doc/installation_guide/INSTALL-CROSS.xml
/system/doc/installation_guide/INSTALL-WIN32.xml
/system/doc/installation_guide/MARKDOWN.xml

# test_server

Expand Down
24 changes: 12 additions & 12 deletions README.bootstrap → HOWTO/BOOTSTRAP.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Notes about prebuilt beam files under version control
-----------------------------------------------------
=====================================================

This information applies mostly to developers, some parts only
to developers of the main branch i.e. Ericsson and HiPE personel.

There are two types of derived code under version control, namely:

primary bootstrap - Resides in the $ERL_TOP/bootstrap/{lib,bin} directories.
preloaded code - Resides in the $ERL_TOP/erts/preloaded directory.
primary bootstrap - Resides in the `$ERL_TOP/bootstrap/{lib,bin}` directories.
preloaded code - Resides in the `$ERL_TOP/erts/preloaded` directory.

Primary bootstrap
.................
-----------------

The two types of version controlled code are fundamentally
different. The primary bootstrap is code compiled from source files in
Expand All @@ -19,39 +19,39 @@ lib/orber/include. They are checked in in the version control system
to make it possible to build directly from the code base tree without
the need for an earlier version of the compiler. When a new version of
OTP is released, these files are updated manually (or rather, by using
the $ERL_TOP/otp_build script) and checked in. The files can also be
the `$ERL_TOP/otp_build` script) and checked in. The files can also be
updated due to changes in the compiler during the development
process. The primary bootstrap is always updated as a separate
deliberate process, never during a normal development build.

If a prebuilt open source version of erlang is used, the directory
bootstrap initially does not contain any beam files, the directory is
instead populated by copying beam files from the
$ERL_TOP/lib/{kernel,stdlib,compiler}/ebin directories. This
`$ERL_TOP/lib/{kernel,stdlib,compiler}/ebin` directories. This
construction is to save space in the distribution, but the result
would be the same. Open source developers need not provide patches for
the precompiled beam files in the primary bootstrap, the bootstrap
update is always performed by the main developers.

Preloaded code
..............
--------------

The directory $ERL_TOP/preloaded contains both src and ebin
The directory `$ERL_TOP/preloaded` contains both src and ebin
subdirectories. The preloaded code is compiled into the virtual
machine and always present. When compiling the virtual machine, those
beam files need to be present and they are considered a part of the
virtual machine rather than a part of the kernel application. When
preloaded files are to be updated, the source code is built using a
special Makefile in the $ERL_TOP/preloaded/src directory, which
special Makefile in the `$ERL_TOP/preloaded/src` directory, which
creates beam files in the same directory. When they seem to compile
successfully, they can be used in an emulator build by being copied
to the ebin directory. otp_build update_preloaded can be used to
to the ebin directory. `otp_build update_preloaded` can be used to
ease the process (there are also similar targets in the
$ERL_TOP/preloaded/src/Makefile).
`$ERL_TOP/preloaded/src/Makefile`).

In prebuilt open source distributions, these beam files are also
present, but to update them one might need to change permission on the
$ERL_TOP/preloaded/ebin directory, then build and then manually copy
`$ERL_TOP/preloaded/ebin` directory, then build and then manually copy
the beam files from the source directory to ../ebin. If patches are
created that involve the source files used to build preloaded code,
always note this specially as the preloaded/ebin directory needs
Expand Down
7 changes: 4 additions & 3 deletions README.dtrace.md → HOWTO/DTRACE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ History
-------

The first implementation of DTrace probes for the Erlang virtual
machine was presented at the [2008 Erlang User Conference] [4]. That
machine was presented at the [2008 Erlang User Conference] [1]. That
work, based on the Erlang/OTP R12 release, was discontinued due to
what appears to be miscommunication with the original developers.

Expand Down Expand Up @@ -33,8 +33,8 @@ Supported platforms
OpenIndiana release 151a, and both appear to work.
* FreeBSD 9.0, though please see the "FreeBSD 9.0 Release Notes"
section below!
* Linux via SystemTap compatibility. Please see the file
`README.systemtap.md` for more details.
* Linux via SystemTap compatibility. Please see
[$ERL_TOP/HOWTO/SYSTEMTAP.md][] for more details.

Just add the `--with-dynamic-trace=dtrace` option to your command when you
run the `configure` script. If you are using systemtap, the configure option
Expand Down Expand Up @@ -391,3 +391,4 @@ Guide to efile_drv.c probe arguments
probe arg9 = C driver dt_i4 = advise_type;

[1]: http://www.erlang.org/euc/08/
[$ERL_TOP/HOWTO/SYSTEMTAP.md]: SYSTEMTAP.md
Loading

0 comments on commit 6bb1cd1

Please sign in to comment.