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

Install .html files; install exe's in cgi-bin subdir

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2000 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-08-01 21:48:57 +00:00
parent d369294f8b
commit c07e541644
3 changed files with 11 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/thttpd/content/Makefile
View File

@ -34,17 +34,19 @@
############################################################################
SUBDIRS = hello
INSTALL_FILES = index.html style.css
THTTPD_DIR = $(TOPDIR)/examples/thttpd
CONTENT_DIR = $(THTTPD_DIR)/content
ROMFS_DIR = $(CONTENT_DIR)/romfs
ROMFS_IMG = $(CONTENT_DIR)/romfs.img
ROMFS_HDR = $(CONTENT_DIR)/romfs.h
ROMFSCGI_DIR = $(ROMFS_DIR)/cgi-bin
SYMTAB = $(CONTENT_DIR)/symtab.h
define DIR_template
$(1)_$(2):
@$(MAKE) -C $(1) $(3) TOPDIR=$(TOPDIR) ROMFS_DIR=$(ROMFS_DIR) CROSSDEV=$(CROSSDEV)
@$(MAKE) -C $(1) $(3) TOPDIR=$(TOPDIR) CROSSDEV=$(CROSSDEV) CGI_DIR=$(ROMFSCGI_DIR)
endef
all: $(ROMFS_HDR) $(SYMTAB)
@ -61,15 +63,21 @@ build: $(foreach DIR, $(SUBDIRS), $(DIR)_build)
# Install each program in the romfs directory
install: $(foreach DIR, $(SUBDIRS), $(DIR)_install)
@( for file in $(INSTALL_FILES); do\
install -m 0644 -D $${file} $(ROMFS_DIR)/$${file}; \
done; )
# Create the romfs directory
$(ROMFS_DIR):
@mkdir $(ROMFS_DIR)
$(ROMFSCGI_DIR): $(ROMFS_DIR)
@mkdir $(ROMFSCGI_DIR)
# Populate the romfs directory
populate: $(ROMFS_DIR) build install
populate: $(ROMFSCGI_DIR) build install
# Create the romfs.img file from the populated romfs directory

69
examples/thttpd/content/hello.c
View File

@ -1,69 +0,0 @@
/****************************************************************************
* examples/thttpd/content/hello.c
* Manatory "Hello, World!" Example
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name Gregory Nutt nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
/****************************************************************************
* Public Functions
****************************************************************************/
int main(int argc, char *argv[])
{
fprintf(stderr, "Hello requested from: %s\n", getenv("REMOTE_ADDR"));
(void)printf(
"Content-type: text/html\r\n"
"Status: 200/html\r\n"
"\r\n"
"<HTML>"
"<HEAD>"
"<TITLE>Hello</TITLE>"
"</HEAD>\r\n"
"<BODY>"
"<H2>Hello, World!</H2>"
"<P>Requested by: %s</P>"
"</BODY></HTML>\r\n",
getenv("REMOTE_ADDR"));
return 0;
}

2
examples/thttpd/content/hello/Makefile
View File

@ -74,5 +74,5 @@ clean:
@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
@install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)