sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pascal now installs in the apps/ directory

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3583 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-05-10 15:50:23 +00:00
parent 232585cd45
commit 6cece5a803
7 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1733,3 +1733,5 @@
* configs/pcblogic-pic32mx: Add directory structure for PCB Logic PIC32MX board
* apps/include: Move include/apps to apps/include. A symbolic link is created at
build time
* Makefile: Removed support for Pascal pcode interpreter. Support for that
interpreter has been moved to apps/interpreter/Makefile.

23
Documentation/NuttX.html
View File

@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
<p>Last Updated: May 6, 2011</p>
<p>Last Updated: May 10, 2011</p>
</td>
</tr>
</table>
@ -2189,9 +2189,28 @@ buildroot-1.10 2011-05-06 &lt;spudmonkey@racsa.co.cr&gt;
<ul><pre>
nuttx-6.3 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* Remove clock_getutc(). It is replaces with clock_gettime(CLOCK_ACTIVETIME).
Add other RTC related changes provided by Uros Platise.
* arch/arm/src/stm32/stm32_flash.c: Add support for access to on-chp STM32
FLASH; beginning of integration with NXFFS (Uros Platise).
* arch/mips: Added directory structure for PIC32 support
* configs/pcblogic-pic32mx: Add directory structure for PCB Logic PIC32MX board
* apps/include: Move include/apps to apps/include. A symbolic link is created at
build time
* Makefile: Removed support for Pascal pcode interpreter. Support for that
interpreter has been moved to apps/interpreter/Makefile.
apps-6.3 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
pascal-2.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* apps/interpreter: Add a directory to hold interpreters. The Pascal add-
on module now installs and builds under this directory.
pascal-3.0 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* nuttx/: The Pascal add-on module now installs and builds under the
apps/interpreters directory. This means that the pascal-2.1 module is
incompatible with will all releases of NuttX prior to nuttx-6.0 where the
apps/ module was introduced.
buildroot-1.11 2011-xx-xx &lt;spudmonkey@racsa.co.cr&gt;
</pre></ul>

16
Makefile
View File

@ -1,7 +1,6 @@
############################################################################
# Makefile
#
#
# Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
@ -70,16 +69,12 @@ CONFIG_APPS_DIR = ../apps
endif
APPDIR := ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi}
# The Pascal p-code add-on directory
PCODE_DIR := ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi}
# All add-on directories.
#
# NUTTX_ADDONS is the list of directories built into the NuttX kernel.
# USER_ADDONS is the list of directories that will be built into the user application
NUTTX_ADDONS := $(PCODE_DIR) $(NX_DIR)
NUTTX_ADDONS := $(NX_DIR)
USER_ADDONS :=
ifeq ($(CONFIG_NUTTX_KERNEL),y)
@ -228,12 +223,6 @@ else
NUTTXLIBS += fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT) binfmt/libbinfmt$(LIBEXT)
endif
# Add libraries for Pascall P-Code
ifneq ($(PCODE_DIR),)
NUTTXLIBS += $(PCODE_DIR)/libpcode$(LIBEXT)
endif
# Add libraries for the NX graphics sub-system
ifneq ($(NX_DIR),)
@ -357,9 +346,6 @@ drivers/libdrivers$(LIBEXT): context
binfmt/libbinfmt$(LIBEXT): context
@$(MAKE) -C binfmt TOPDIR="$(TOPDIR)" libbinfmt$(LIBEXT) EXTRADEFINES=$(KDEFINE)
pcode/libpcode$(LIBEXT): context
@$(MAKE) -C pcode TOPDIR="$(TOPDIR)" libpcode$(LIBEXT) EXTRADEFINES=$(KDEFINE)
graphics/libgraphics$(LIBEXT): context
@$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT) EXTRADEFINES=$(KDEFINE)

3
configs/sim/pashello/appconfig
View File

@ -37,3 +37,6 @@
CONFIGURED_APPS += examples/pashello
# Path to the Pascal p-code runtime interpreter module
CONFIGURED_APPS += interpreters/pcode

4
configs/xtrs/pashello/appconfig
View File

@ -37,3 +37,7 @@
CONFIGURED_APPS += examples/pashello
# Path to the Pascal p-code runtime interpreter module
CONFIGURED_APPS += interpreters/pcode

3
configs/z16f2800100zcog/pashello/appconfig
View File

@ -37,3 +37,6 @@
CONFIGURED_APPS += examples/pashello
# Path to the Pascal p-code runtime interpreter module
CONFIGURED_APPS += interpreters/pcode

4
configs/z80sim/pashello/appconfig
View File

@ -37,3 +37,7 @@
CONFIGURED_APPS += examples/pashello
# Path to the Pascal p-code runtime interpreter module
CONFIGURED_APPS += interpreters/pcode