aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-04-05 21:15:53 -0700
committerGlenn Morris2011-04-05 21:15:53 -0700
commit11043dbd42f18b18f174dca8f04693907ff47a5c (patch)
tree4ec33fc3f367583f1924e43871a4dcb05e994bbc
parent12fd53e24373b44c14d0a479fbad6e9937403696 (diff)
downloademacs-11043dbd42f18b18f174dca8f04693907ff47a5c.tar.gz
emacs-11043dbd42f18b18f174dca8f04693907ff47a5c.zip
* autogen/update_autogen: Add a separate -L option for ldefs-boot.el.
-rwxr-xr-xautogen/update_autogen10
1 files changed, 7 insertions, 3 deletions
diff --git a/autogen/update_autogen b/autogen/update_autogen
index 6c9766ead52..d1687b293e9 100755
--- a/autogen/update_autogen
+++ b/autogen/update_autogen
@@ -51,7 +51,7 @@ cd ../
51usage () 51usage ()
52{ 52{
53 cat 1>&2 <<EOF 53 cat 1>&2 <<EOF
54Usage: ${PN} [-f] [-c] [-q] [-l] [-C] [-- make-flags] 54Usage: ${PN} [-f] [-c] [-q] [-l [-L]] [-C] [-- make-flags]
55Update the generated files in the Emacs autogen/ directory. 55Update the generated files in the Emacs autogen/ directory.
56Options: 56Options:
57-f: force an update even if the source files are locally modified. 57-f: force an update even if the source files are locally modified.
@@ -60,6 +60,7 @@ Options:
60-q: be quiet; only give error messages, not status messages. 60-q: be quiet; only give error messages, not status messages.
61-l: also update the versioned loaddefs-like files in lisp/. 61-l: also update the versioned loaddefs-like files in lisp/.
62This requires a build. Passes any non-option args to make (eg -- -j2). 62This requires a build. Passes any non-option args to make (eg -- -j2).
63-L: also update ldefs-boot.el.
63-C: start from a clean state. Slower, but more correct. 64-C: start from a clean state. Slower, but more correct.
64EOF 65EOF
65 exit 1 66 exit 1
@@ -73,6 +74,7 @@ commit=
73quiet= 74quiet=
74clean= 75clean=
75ldefs_flag= 76ldefs_flag=
77lboot_flag=
76 78
77## Parameters. 79## Parameters.
78ldefs_in=lisp/loaddefs.el 80ldefs_in=lisp/loaddefs.el
@@ -91,7 +93,7 @@ tempfile=/tmp/$PN.$$
91trap "rm -f $tempfile 2> /dev/null" EXIT 93trap "rm -f $tempfile 2> /dev/null" EXIT
92 94
93 95
94while getopts ":hcflqC" option ; do 96while getopts ":hcflqCL" option ; do
95 case $option in 97 case $option in
96 (h) usage ;; 98 (h) usage ;;
97 99
@@ -105,6 +107,8 @@ while getopts ":hcflqC" option ; do
105 107
106 (C) clean=1 ;; 108 (C) clean=1 ;;
107 109
110 (L) lboot_flag=1 ;;
111
108 (\?) die "Bad option -$OPTARG" ;; 112 (\?) die "Bad option -$OPTARG" ;;
109 113
110 (:) die "Option -$OPTARG requires an argument" ;; 114 (:) die "Option -$OPTARG requires an argument" ;;
@@ -264,7 +268,7 @@ echo "Running lisp/ make..."
264make -C lisp "$@" autoloads EMACS=../src/bootstrap-emacs || die "make src error" 268make -C lisp "$@" autoloads EMACS=../src/bootstrap-emacs || die "make src error"
265 269
266 270
267cp $ldefs_in $ldefs_out || die "cp ldefs_boot error" 271[ ! "$lboot_flag" ] || cp $ldefs_in $ldefs_out || die "cp ldefs_boot error"
268 272
269 273
270cd lisp 274cd lisp