add -i to gst-load

2008-03-11  Paolo Bonzini  <bonzini@gnu.org>

	* scripts/Load.st: Add -i.
	* gst-tool.c: Likewise.

ChangeLog

@@ -1,3 +1,8 @@
+2008-03-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	* scripts/Load.st: Add -i.
+	* gst-tool.c: Likewise.
+
 2008-03-10  Paolo Bonzini  <bonzini@gnu.org>
 
 	* kernel/CharArray.st: Move #startsWith: and #endsWith:...

doc/gst.texi

@@ -1912,6 +1912,11 @@ Then it will save the Smalltalk image, and finally exit.
 @itemx --image-file
 Load the packages inside the given image.
 
+@item -i
+@itemx --rebuild-image
+Build an image from scratch and load the package into it.  Useful
+when the image specified with @option{-I} does not exist yet.
+
 @item -q
 @itemx --quiet
 Hide the script's output.
@@ -2034,7 +2039,7 @@ To install your package, you only have to do
 a @file{.star} archive in the current image directory, with the
 files specified in the @code{file} tags.  By default the package is
 placed in the system-wide package directory; you can use the option
-@option{--target-directory} to create the @file{.star} file elsewhere).
+@option{--target-directory} to create the @file{.star} file elsewhere.
 
 Alternatively, @code{gst-package} can be used to create a skeleton
 GNU style source tree.  This includes a @file{configure.ac} that will

gst-tool.c

@@ -92,13 +92,15 @@ struct tool tools[] = {
   {
     "gst-load", "scripts/Load.st",
     "-h|--help --version -q|--quiet -v|-V|--verbose -n|--dry-run -f|--force \
-	--start:: -t|--test -I|--image-file: --kernel-directory:",
+	--start:: -t|--test -I|--image-file: --kernel-directory: \
+	-i|--rebuild-image",
     NULL
   },
   {
     "gst-reload", "scripts/Load.st",
     "-h|--help --version -q|--quiet -v|-V|--verbose -n|--dry-run -f|--force \
-	--start:: -t|--test -I|--image-file: --kernel-directory:",
+	--start:: -t|--test -I|--image-file: --kernel-directory: \
+	-i|--rebuild-image",
     "--force"
   },
   {
@@ -257,6 +259,10 @@ parse_option (int short_opt, const char *long_opt, const char *arg)
       kernel_dir = arg;
     }
 
+  if (short_opt == 'i'
+      || (long_opt && !strcmp (long_opt, "rebuild-image")))
+    flags |= GST_REBUILD_IMAGE;
+
   if (long_opt && !strcmp (long_opt, "daemon"))
     {
 #ifdef HAVE_FORK

scripts/Load.st

@@ -53,6 +53,7 @@ Options:
     -n --dry-run          don''t save the image after loading
     -t --test             run SUnit tests if available
        --start[=ARG]      start the package and keep running the image
+    -i --rebuild-image    load into a newly-created image
     -I --image-file=FILE  load into the specified image
        --kernel-dir=PATH  use the specified kernel directory
     -h --help             show this message
@@ -63,7 +64,7 @@ Options:
 Smalltalk
     arguments: '-h|--help --version -q|--quiet -v|-V|--verbose -n|--dry-run
 		-f|--force -t|--test -I|--image-file: --kernel-directory:
-		--start::'
+		--start:: -i|--rebuild-image'
     do: [ :opt :arg |
 
     opt = 'help' ifTrue: [