* gen-all-doc: Ensure run from cgen src dir.

	* gen-all-opcodes: Build in ./tmp-opcodes.  Don't delete dir when done.
	* gen-all-sid: Similarily, in ./tmp-sid.
	* gen-all-sim: Similarily, in ./tmp-sim.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 0dc2dd7..7e1ba81 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-08  Doug Evans  <dje@sebabeach.org>
+
+       * gen-all-doc: Ensure run from cgen src dir.
+       * gen-all-opcodes: Build in ./tmp-opcodes.  Don't delete dir when done.
+       * gen-all-sid: Similarily, in ./tmp-sid.
+       * gen-all-sim: Similarily, in ./tmp-sim.
+
 2003-06-20  Doug Evans  <dje@sebabeach.org>
 
        * gen-all-sim: Add fr30,sh64 support.  Only generate m32r by default.

diff --git a/cgen/gen-all-doc b/cgen/gen-all-doc
index 23fef95..40023a8 100644 (file)
--- a/cgen/gen-all-doc
+++ b/cgen/gen-all-doc
@@ -12,6 +12,12 @@ set -x
 # ??? Some are missing, need to add them after some research.
 archs="arm frv i960 m32r openrisc xstormy16"
 
+if [ ! -f sim.scm ]
+then
+    echo "Not in the src/cgen directory." >& 2
+    exit 1
+fi
+
 builddir=tmp-doc
 
 rm -rf $builddir

diff --git a/cgen/gen-all-opcodes b/cgen/gen-all-opcodes
index 2d4402d..ac9b403 100755 (executable)
--- a/cgen/gen-all-opcodes
+++ b/cgen/gen-all-opcodes
@@ -16,13 +16,13 @@ then
     exit 1
 fi
 
-export cgendir=`pwd`
+builddir=tmp-opc
+
+rm -rf $builddir
+mkdir $builddir
 
-rm -rf /tmp/tmp-opcodes
-mkdir /tmp/tmp-opcodes
+export cgendir=`pwd`
 
-cd /tmp/tmp-opcodes
+cd $builddir
 $cgendir/../opcodes/configure --prefix /tmp/junk --target m32r-elf --enable-targets=all
 make run-cgen-all
-
-rm -rf /tmp/tmp-opcodes

diff --git a/cgen/gen-all-sid b/cgen/gen-all-sid
index e3c77e2..3857706 100755 (executable)
--- a/cgen/gen-all-sid
+++ b/cgen/gen-all-sid
@@ -31,13 +31,13 @@ then
     exit 1
 fi
 
-rm -rf /tmp/tmp-sid
-mkdir /tmp/tmp-sid
+builddir=tmp-sid
 
-cd /tmp/tmp-sid
+rm -rf $builddir
+mkdir $builddir
+
+cd $builddir
 $siddir/configure --prefix /tmp/junk --enable-ltdl-install
 make configure-sid
 cd sid/component/cgen-cpu
 make cgen-all
-
-rm -rf /tmp/tmp-sid

diff --git a/cgen/gen-all-sim b/cgen/gen-all-sim
index 9b493df..36f01f7 100755 (executable)
--- a/cgen/gen-all-sim
+++ b/cgen/gen-all-sim
@@ -22,19 +22,21 @@ then
     exit 1
 fi
 
+builddir=tmp-sim
+
 export cgendir=`pwd`
 
 for c in $cpus
 do
-  rm -rf ./tmp-sim
-  mkdir ./tmp-sim
+  rm -rf $builddir
+  mkdir $builddir
 
   case $c in
   i960)
     (
        set -e
        set -x
-       cd ./tmp-sim
+       cd $builddir
        $cgendir/../sim/i960/configure --prefix /tmp/junk --target i960-coff
        make stamp-arch stamp-cpu stamp-desc
     )
@@ -45,7 +47,7 @@ do
     (
        set -e
        set -x
-       cd ./tmp-sim
+       cd $builddir
        $cgendir/../sim/m32r/configure --prefix /tmp/junk --target m32r-elf
        make stamp-arch stamp-cpu stamp-xcpu
     )
@@ -56,7 +58,7 @@ do
     (
        set -e
        set -x
-       cd ./tmp-sim
+       cd $builddir
        $cgendir/../sim/fr30/configure --prefix /tmp/junk --target fr30-elf
        make stamp-arch stamp-cpu
     )
@@ -67,7 +69,7 @@ do
     (
        set -e
        set -x
-       cd ./tmp-sim
+       cd $builddir
        $cgendir/../sim/sh64/configure --prefix /tmp/junk --target ???
        make stamp-all
     )
@@ -80,5 +82,3 @@ do
     ;;
   esac
 done
-
-rm -rf ./tmp-sim