Added the shell server to the Win32 platform.

This commit is contained in:
oliverschmidt 2007-04-13 21:55:55 +00:00
parent 59c2158274
commit 766878f5c9
5 changed files with 419 additions and 4 deletions

View File

@ -29,17 +29,20 @@
#
# Author: Oliver Schmidt <ol.sc@web.de>
#
# $Id: Makefile,v 1.2 2007/04/11 01:08:46 oliverschmidt Exp $
# $Id: Makefile,v 1.3 2007/04/13 21:55:55 oliverschmidt Exp $
#
PRGS = about calc dhcp directory email ftp irc netconf processes shell \
telnet webserver www
telnet telnetd webserver www
DSCS = about calc dhcp email ftp irc netconf processes shell telnet \
webserver
telnetd webserver
all: contiki-main $(PRGS:=.prg) $(DSCS:=.dsc)
APPNAME = ${subst processes,process-list,${subst www,webbrowser,$(1)}}
# Add telnetd-gui.c to get CTK support
override telnetd_src = telnetd.c telnetd-gui.c memb.c shell.c
# Use webserver.c instead of webserver-nogui.c to get CTK support
override webserver_src = webserver.c httpd.c http-strings.c psock.c \
uipbuf.c memb.c httpd-fs.c httpd-cgi.c

View File

@ -145,5 +145,6 @@ typedef unsigned short uip_stats_t;
#define TELNETD_CONF_LINELEN 64
#define TELNETD_CONF_NUMLINES 16
#define TELNETD_CONF_GUI 1
#endif /* __CONTIKI_CONF_H__ */

View File

@ -80,6 +80,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "telnet.prg", "vcproj\telnet
{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "telnetd.prg", "vcproj\telnetd.prg.vcproj", "{ED41B93E-1FEF-477A-AFCC-7CAC0A324E24}"
ProjectSection(ProjectDependencies) = postProject
{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "telnetd.dsc", "vcproj\telnetd.dsc.vcproj", "{3A99D8B2-44AC-4B56-A746-61A677BCAFC8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webserver.dsc", "vcproj\webserver.dsc.vcproj", "{BE742A25-4F10-4741-B307-850C61BE0883}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webserver.prg", "vcproj\webserver.prg.vcproj", "{C741203A-ADD3-4C4A-9BF1-82978105F057}"
@ -192,6 +199,14 @@ Global
{C511175A-BD2B-4ED9-87A6-05040E4DD823}.Debug|Win32.Build.0 = Debug|Win32
{C511175A-BD2B-4ED9-87A6-05040E4DD823}.Release|Win32.ActiveCfg = Release|Win32
{C511175A-BD2B-4ED9-87A6-05040E4DD823}.Release|Win32.Build.0 = Release|Win32
{ED41B93E-1FEF-477A-AFCC-7CAC0A324E24}.Debug|Win32.ActiveCfg = Debug|Win32
{ED41B93E-1FEF-477A-AFCC-7CAC0A324E24}.Debug|Win32.Build.0 = Debug|Win32
{ED41B93E-1FEF-477A-AFCC-7CAC0A324E24}.Release|Win32.ActiveCfg = Release|Win32
{ED41B93E-1FEF-477A-AFCC-7CAC0A324E24}.Release|Win32.Build.0 = Release|Win32
{3A99D8B2-44AC-4B56-A746-61A677BCAFC8}.Debug|Win32.ActiveCfg = Debug|Win32
{3A99D8B2-44AC-4B56-A746-61A677BCAFC8}.Debug|Win32.Build.0 = Debug|Win32
{3A99D8B2-44AC-4B56-A746-61A677BCAFC8}.Release|Win32.ActiveCfg = Release|Win32
{3A99D8B2-44AC-4B56-A746-61A677BCAFC8}.Release|Win32.Build.0 = Release|Win32
{BE742A25-4F10-4741-B307-850C61BE0883}.Debug|Win32.ActiveCfg = Debug|Win32
{BE742A25-4F10-4741-B307-850C61BE0883}.Debug|Win32.Build.0 = Debug|Win32
{BE742A25-4F10-4741-B307-850C61BE0883}.Release|Win32.ActiveCfg = Release|Win32

View File

@ -0,0 +1,180 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="telnetd.dsc"
ProjectGUID="{3A99D8B2-44AC-4B56-A746-61A677BCAFC8}"
RootNamespace="telnetddsc"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;../../../core"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)"
LinkIncremental="2"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..;../../../core"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)"
LinkIncremental="1"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath="..\..\..\apps\telnetd\telnetd-dsc.c"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -0,0 +1,216 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="telnetd.prg"
ProjectGUID="{ED41B93E-1FEF-477A-AFCC-7CAC0A324E24}"
RootNamespace="telnetdprg"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler;../../../apps/shell"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="&quot;$(OutDir)\contiki.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler;../../../apps/shell"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="&quot;$(OutDir)\contiki.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="lib"
>
<File
RelativePath="..\..\..\core\lib\memb.c"
>
</File>
<File
RelativePath="..\..\..\core\lib\memb.h"
>
</File>
</Filter>
<Filter
Name="shell"
>
<File
RelativePath="..\..\..\apps\shell\shell.c"
>
</File>
<File
RelativePath="..\..\..\apps\shell\shell.h"
>
</File>
</Filter>
<File
RelativePath="..\..\..\apps\telnetd\telnetd-gui.c"
>
</File>
<File
RelativePath="..\..\..\apps\telnetd\telnetd.c"
>
</File>
<File
RelativePath="..\..\..\apps\telnetd\telnetd.h"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>