Pascal now installs in the apps/ directory

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3583 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 42 insertions, 42 deletions

diff --git a/misc/pascal/nuttx/INSTALL.sh b/misc/pascal/nuttx/INSTALL.sh
index ad9802d9f..f513967d3 100755
--- a/misc/pascal/nuttx/INSTALL.sh
+++ b/misc/pascal/nuttx/INSTALL.sh
@@ -2,7 +2,7 @@
 # nuttx/INSTALL.sh
 # Install the pascaldirl runtime into the NuttX source tree
 #
-#   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 wd=`pwd`
 
 modeldir=insn16
-unset nuttxdir
+unset installdir
 while [ ! -z "$1" ]; do
   case "$1" in
     -d )
@@ -52,22 +52,22 @@ while [ ! -z "$1" ]; do
       modeldir=insn32
       ;;
     -h )
-      echo "USAGE: $0 [-16|-32] <NuttX-path>"
+      echo "USAGE: $0 [-16|-32] <install-dir>"
       exit 0
       ;;
     *)
-      nuttxdir=$1
+      installdir=$1
       ;;
   esac
   shift
 done
 
-echo "Installing model $modeldir to $nuttxdir"
+echo "Installing model $modeldir to $installdir"
 
 # Verify that required parameters were provided
 
-if [ -z "${nuttxdir}" ]; then
-  echo "USAGE: $0 [-16|-32] <NuttX-path>"
+if [ -z "${installdir}" ]; then
+  echo "USAGE: $0 [-16|-32]  <install-dir>"
   exit 1
 fi
 
@@ -91,38 +91,38 @@ if [ ! -d ${pascaldir}/${modeldir} ]; then
   exit 1
 fi
 
-if [ ! -d ${nuttxdir} ]; then
-  echo "NuttX directory ${nuttxdir} does not exist"
+if [ ! -d ${installdir} ]; then
+  echo "NuttX apps/ sub-directory ${installdir} does not exist"
   exit 1
 fi
 
-if [ -d ${nuttxdir}/pcode ]; then
-  echo "${nuttxdir}/pcode already exists.  Remove it and try again."
+if [ -d ${installdir}/pcode ]; then
+  echo "${installdir}/pcode already exists.  Remove it and try again."
   exit 1
 fi
 
 # Looks good enough.  Create NuttX directories
 
-mkdir ${nuttxdir}/pcode || \
-  { echo "mkdir ${nuttxdir}/pcode failed" ; exit 1 ; }
+mkdir ${installdir}/pcode || \
+  { echo "mkdir ${installdir}/pcode failed" ; exit 1 ; }
 
-mkdir ${nuttxdir}/pcode/include || \
-  { echo "mkdir ${nuttxdir}/pcode/include failed" ; exit 1 ; }
+mkdir ${installdir}/pcode/include || \
+  { echo "mkdir ${installdir}/pcode/include failed" ; exit 1 ; }
 
-mkdir ${nuttxdir}/pcode/insn || \
-  { echo "mkdir ${nuttxdir}/pcode/insn failed" ; exit 1 ; }
+mkdir ${installdir}/pcode/insn || \
+  { echo "mkdir ${installdir}/pcode/insn failed" ; exit 1 ; }
 
-mkdir ${nuttxdir}/pcode/insn/include || \
-  { echo "mkdir ${nuttxdir}/pcode/insn/include failed" ; exit 1 ; }
+mkdir ${installdir}/pcode/insn/include || \
+  { echo "mkdir ${installdir}/pcode/insn/include failed" ; exit 1 ; }
 
-mkdir ${nuttxdir}/pcode/insn/prun || \
-  { echo "mkdir ${nuttxdir}/pcode/insn/prun failed" ; exit 1 ; }
+mkdir ${installdir}/pcode/insn/prun || \
+  { echo "mkdir ${installdir}/pcode/insn/prun failed" ; exit 1 ; }
 
-mkdir ${nuttxdir}/pcode/libpoff || \
-  { echo "mkdir ${nuttxdir}/pcode/libpoff failed" ; exit 1 ; }
+mkdir ${installdir}/pcode/libpoff || \
+  { echo "mkdir ${installdir}/pcode/libpoff failed" ; exit 1 ; }
 
-mkdir ${nuttxdir}/pcode/libpas || \
-  { echo "mkdir ${nuttxdir}/pcode/libpas failed" ; exit 1 ; }
+mkdir ${installdir}/pcode/libpas || \
+  { echo "mkdir ${installdir}/pcode/libpas failed" ; exit 1 ; }
 
 # Copy runtime files
 
@@ -130,37 +130,37 @@ cp -a ${pascaldir}/include/poff.h   ${pascaldir}/include/pofflib.h \
       ${pascaldir}/include/pedefs.h ${pascaldir}/include/perr.h \
       ${pascaldir}/include/pdefs.h  ${pascaldir}/include/pfdefs.h \
       ${pascaldir}/include/pxdefs.h ${pascaldir}/include/paslib.h \
-      ${nuttxdir}/pcode/include/. || \
+      ${installdir}/pcode/include/. || \
   { echo "Failed to copy ${pascaldir}/include" ; exit 1; }
 
-echo "#ifndef __CONFIG_H" >${nuttxdir}/pcode/include/config.h
-echo "#define __CONFIG_H 1" >>${nuttxdir}/pcode/include/config.h
-echo "" >>${nuttxdir}/pcode/include/config.h
-echo "#undef  CONFIG_DEBUG" >>${nuttxdir}/pcode/include/config.h
-echo "#undef  CONFIG_TRACE" >>${nuttxdir}/pcode/include/config.h
-echo "#define CONFIG_INSN16 1" >>${nuttxdir}/pcode/include/config.h
-echo "#undef  CONFIG_INSN32" >>${nuttxdir}/pcode/include/config.h
-echo "" >>${nuttxdir}/pcode/include/config.h
-echo "#endif /* __CONFIG_H */" >>${nuttxdir}/pcode/include/config.h
-
-cp -a ${pascaldir}/nuttx/Makefile ${nuttxdir}/pcode/. || \
+echo "#ifndef __CONFIG_H" >${installdir}/pcode/include/config.h
+echo "#define __CONFIG_H 1" >>${installdir}/pcode/include/config.h
+echo "" >>${installdir}/pcode/include/config.h
+echo "#undef  CONFIG_DEBUG" >>${installdir}/pcode/include/config.h
+echo "#undef  CONFIG_TRACE" >>${installdir}/pcode/include/config.h
+echo "#define CONFIG_INSN16 1" >>${installdir}/pcode/include/config.h
+echo "#undef  CONFIG_INSN32" >>${installdir}/pcode/include/config.h
+echo "" >>${installdir}/pcode/include/config.h
+echo "#endif /* __CONFIG_H */" >>${installdir}/pcode/include/config.h
+
+cp -a ${pascaldir}/nuttx/Makefile ${installdir}/pcode/. || \
   { echo "Failed to copy ${pascaldir}/nuttx/Makefile" ; exit 1; }
 
-cp -a ${pascaldir}/nuttx/keywords.h ${nuttxdir}/pcode/include/. || \
+cp -a ${pascaldir}/nuttx/keywords.h ${installdir}/pcode/include/. || \
   { echo "Failed to copy ${pascaldir}/nuttx/keywords.h" ; exit 1; }
 
 cp -a ${pascaldir}/libpoff/*.c ${pascaldir}/libpoff/*.h \
-      ${pascaldir}/libpoff/Make.defs ${nuttxdir}/pcode/libpoff/. || \
+      ${pascaldir}/libpoff/Make.defs ${installdir}/pcode/libpoff/. || \
   { echo "Failed to copy ${pascaldir}/libpoff" ; exit 1; }
 
 cp -a ${pascaldir}/libpas/psignextend16.c ${pascaldir}/libpas/pswap.c \
-      ${pascaldir}/libpas/Make.defs ${nuttxdir}/pcode/libpas/. || \
+      ${pascaldir}/libpas/Make.defs ${installdir}/pcode/libpas/. || \
   { echo "Failed to copy ${pascaldir}/libpas" ; exit 1; }
 
 cp -a ${pascaldir}/${modeldir}/include/pexec.h  ${pascaldir}/${modeldir}/include/pinsn16.h \
-      ${nuttxdir}/pcode/insn/include/. || \
+      ${installdir}/pcode/insn/include/. || \
   { echo "Failed to copy ${pascaldir}/${modeldir}/include" ; exit 1; }
 
 cp -a ${pascaldir}/${modeldir}/prun/pexec.c   ${pascaldir}/${modeldir}/prun/pload.c \
-      ${pascaldir}/${modeldir}/prun/Make.defs ${nuttxdir}/pcode/insn/prun/. || \
+      ${pascaldir}/${modeldir}/prun/Make.defs ${installdir}/pcode/insn/prun/. || \
   { echo "Failed to copy ${pascaldir}/${modeldir}/prun" ; exit 1; }