Skip to content

Commit

Permalink
Clean up bootstrap targets and documentation
Browse files Browse the repository at this point in the history
Remove cleartool invocation and adapt docs to reflect git transition.
  • Loading branch information
Tuncer Ayaz authored and bjorng committed Sep 15, 2010
1 parent eec38e0 commit c9a40f4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 27 deletions.
10 changes: 4 additions & 6 deletions README.bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,11 @@ preloaded files are to be updated, the source code is built using a
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 (although, in Clearcase that requires checking
out the files in the ebin directory first). For developers using the
main Clearcase branch, otp_build {prepare,update,commit}_preloaded can
be used to ease the process (there are also similar targets in the
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).

In prebuilt open source distributions, these .beam files are also
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
the beam files from the source directory to ../ebin. If patches are
Expand All @@ -60,4 +58,4 @@ always note this specially as the preloaded/ebin directory needs
updating, or provide the new derived files in the patch or as complete
binaries.

/Patrik, OTP
/Patrik, OTP
22 changes: 2 additions & 20 deletions erts/preloaded/src/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
# Copyright Ericsson AB 2008-2009. All Rights Reserved.
# Copyright Ericsson AB 2008-2010. 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
Expand All @@ -20,8 +20,7 @@
# be used when the preloaded modules actually are to be updated (i.e. the
# beam files are to be recompiled, which is normally not done).
# The beam files are placed in the current directory and should be copied
# to the ../ebin directory by using the commit target (only works in
# clearcase).
# to the ../ebin directory by using the copy target.

include $(ERL_TOP)/make/target.mk
include $(ERL_TOP)/make/$(TARGET)/otp.mk
Expand Down Expand Up @@ -62,26 +61,9 @@ debug opt: $(TARGET_FILES)
clean:
rm -f $(TARGET_FILES)

prepare:
cleartool co -nc $(STATIC_EBIN)/*
cleartool co -nc $(STATIC_EBIN)

copy:
for x in *.beam; do\
if test '!' -f $(STATIC_EBIN)/$$x; then\
cleartool mkelem -nc $$x;\
fi;\
done
cp *.beam $(STATIC_EBIN)

commit:
cleartool ci -ident -nc $(STATIC_EBIN)/*.beam
cleartool ci -ident -nc $(STATIC_EBIN)

cancel:
-cleartool unco -rm $(STATIC_EBIN)
-cleartool unco -rm $(STATIC_EBIN)/*.beam


include $(ERL_TOP)/make/otp_release_targets.mk

Expand Down
2 changes: 1 addition & 1 deletion otp_build
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ case "$1" in
esac ;;
primary)
echo "Primary bootstrap is under version control since R13";
echo "Use {prepare,update,commit}_primary if you really are";
echo "Use update_primary if you really are";
echo "updating the primary bootstrap...";;
boot)
do_boot;;
Expand Down

0 comments on commit c9a40f4

Please sign in to comment.