diff options
| -rw-r--r-- | README.bootstrap | 10 | ||||
| -rw-r--r-- | erts/preloaded/src/Makefile | 22 | ||||
| -rwxr-xr-x | otp_build | 2 |
3 files changed, 7 insertions, 27 deletions
diff --git a/README.bootstrap b/README.bootstrap index b0c8a1cc20..f42bc7aa47 100644 --- a/README.bootstrap +++ b/README.bootstrap @@ -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 @@ -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
\ No newline at end of file +/Patrik, OTP diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index 785ad531f3..145638802f 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -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 @@ -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 @@ -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 @@ -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;; |