Skip to content

updated dependencies #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sethuchandan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

updated dependencies #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a82cf2f
updated dependencies
sethuchandan Dec 3, 2013
2fb893b
'Release: 1.0.4rc0'
sethuchandan Dec 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Webserver Component Change Log
==============================

1.0.4
-----

1.0.3
-----
* Various documentation updates
Expand Down
11 changes: 6 additions & 5 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Embedded Website Component
..........................

:Latest release: 1.0.2rc2
:Latest release: 1.0.4rc0
:Maintainer: davelxmos
:Description: Embedded website component repository

Expand All @@ -17,10 +17,11 @@ To Do
Required software (dependencies)
================================

* sc_util ([email protected]:xcore/sc_util)
* sc_xtcp ([email protected]:xcore/sc_xtcp)
* sc_ethernet ([email protected]:xcore/sc_ethernet)
* sc_otp ([email protected]:xcore/sc_otp)
* sc_ethernet ([email protected]:xcore/sc_ethernet.git)
* sc_slicekit_support ([email protected]:xcore/sc_slicekit_support)
* sc_wifi ([email protected]:xcore/sc_wifi)
* sc_spi ([email protected]:xcore/sc_spi)
* sc_otp ([email protected]:xcore/sc_otp)
* sc_util ([email protected]:xcore/sc_util)
* sc_spi (https://github.com/xcore/sc_spi.git)

204 changes: 99 additions & 105 deletions app_webserver_demo/.cproject
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions app_webserver_demo/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.xmos.cdt.core.IncludePathBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.xmos.cdt.core.ModulePathBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
Expand Down
2 changes: 1 addition & 1 deletion app_webserver_demo/src/itoa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ int itoa(unsigned int n, char buf[], int base, int fill)
fill--;
n = next;
}
for (;fill > 0;fill--) {
for (;fill > 0;fill--) {
buf[i] = '0';
i++;
}
Expand Down
468 changes: 228 additions & 240 deletions app_webserver_demo_flash/.cproject
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions app_webserver_demo_flash/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.xmos.cdt.core.IncludePathBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.xmos.cdt.core.ModulePathBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
Expand Down
2 changes: 1 addition & 1 deletion app_webserver_demo_flash/src/itoa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ int itoa(int n, char buf[], int base, int fill)
fill--;
n = next;
}
for (;fill > 0;fill--) {
for (;fill > 0;fill--) {
buf[i] = '0';
i++;
}
Expand Down
132 changes: 63 additions & 69 deletions module_webserver/.cproject
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions module_webserver/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.xmos.cdt.core.IncludePathBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.xmos.cdt.core.ModulePathBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
Expand Down
98 changes: 49 additions & 49 deletions xpd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,53 @@
<?xml version="1.0" ?>
<xpd>
<components>
<component description = "A simple demo of the embedded website component" type = "demoCode" scope = "Example" path = "app_webserver_demo_flash" local = "false" id = "app_webserver_demo_flash" name = "Embedded Webserver Demo (SPI Flash)">
<componentDependency>module_webserver</componentDependency>
<componentDependency>module_otp_board_info</componentDependency>
<componentDependency>module_locks</componentDependency>
<componentDependency>module_slicekit_support</componentDependency>
<componentDependency>module_wifi_tiwisl</componentDependency>
<componentDependency>module_xtcp</componentDependency>
<componentDependency>module_ethernet_board_support</componentDependency>
<componentDependency>module_spi_master</componentDependency>
<componentDependency>module_mutual_thread_comm</componentDependency>
<componentDependency>module_ethernet_smi</componentDependency>
<componentDependency>module_ethernet</componentDependency>
<component description = "A simple demo of the embedded website component" type = "demoCode" scope = "Example" path = "app_webserver_demo" local = "false" id = "app_webserver_demo" name = "Embedded Webserver Demo (No SPI Flash)">
<componentDependency repo = "git://github.com/xcore/sc_spi" version = "1.4.0">module_spi_master</componentDependency>
<componentDependency repo = "git://github.com/davelxmos/sc_xtcp" version = "3.1.5">module_xtcp</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_mutual_thread_comm</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.7">module_ethernet_board_support</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_locks</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.7">module_ethernet</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_otp" version = "1.0.0">module_otp_board_info</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_website" version = "1.0.2">module_webserver</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.7">module_ethernet_smi</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_wifi.git" version = "1.1.2">module_wifi_tiwisl</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_mutual_thread_comm</componentDependency>
<keyword>ethernet</keyword>
<keyword>http</keyword>
<keyword>tcp</keyword>
<keyword>ip</keyword>
<keyword>webserver</keyword>
</component>
<component description = "A simple demo of the embedded website component" type = "demoCode" scope = "Example" path = "app_webserver_demo" local = "false" id = "app_webserver_demo" name = "Embedded Webserver Demo (No SPI Flash)">
<componentDependency>module_webserver</componentDependency>
<componentDependency>module_otp_board_info</componentDependency>
<componentDependency>module_locks</componentDependency>
<componentDependency>module_wifi_tiwisl</componentDependency>
<componentDependency>module_ethernet</componentDependency>
<componentDependency>module_ethernet_board_support</componentDependency>
<componentDependency>module_spi_master</componentDependency>
<componentDependency>module_mutual_thread_comm</componentDependency>
<componentDependency>module_ethernet_smi</componentDependency>
<componentDependency>module_xtcp</componentDependency>
<component description = "A simple demo of the embedded website component" type = "demoCode" scope = "Example" path = "app_webserver_demo_flash" local = "false" id = "app_webserver_demo_flash" name = "Embedded Webserver Demo (SPI Flash)">
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_mutual_thread_comm</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_spi" version = "1.4.0">module_spi_master</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.7">module_ethernet_board_support</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_slicekit_support.git" version = "1.0.4">module_slicekit_support</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_website" version = "1.0.2">module_webserver</componentDependency>
<componentDependency repo = "git://github.com/davelxmos/sc_xtcp" version = "3.1.5">module_xtcp</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_otp" version = "1.0.0">module_otp_board_info</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_locks</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_mutual_thread_comm</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.7">module_ethernet_smi</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_wifi.git" version = "1.1.2">module_wifi_tiwisl</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.7">module_ethernet</componentDependency>
<keyword>ethernet</keyword>
<keyword>http</keyword>
<keyword>tcp</keyword>
<keyword>ip</keyword>
<keyword>webserver</keyword>
</component>
<component name = "Embedded Webserver Function Library" type = "component" buildresults_path = "module_webserver/.module_webserver.buildinfo" scope = "General Use" path = "module_webserver" metainfo_path = "module_webserver/module_webserver.metainfo" local = "false" id = "module_webserver" description = "A library for adding an embedded website to your code">
<componentDependency>module_otp_board_info</componentDependency>
<componentDependency>module_locks</componentDependency>
<componentDependency>module_wifi_tiwisl</componentDependency>
<componentDependency>module_xtcp</componentDependency>
<componentDependency>module_spi_master</componentDependency>
<componentDependency>module_mutual_thread_comm</componentDependency>
<componentDependency>module_ethernet_smi</componentDependency>
<componentDependency>module_ethernet</componentDependency>
<componentDependency repo = "git://github.com/davelxmos/sc_xtcp" version = "3.1.5">module_xtcp</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_mutual_thread_comm</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.7">module_ethernet_smi</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_locks</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_ethernet.git" version = "2.2.7">module_ethernet</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_otp" version = "1.0.0">module_otp_board_info</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_spi" version = "1.4.0">module_spi_master</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_wifi.git" version = "1.1.2">module_wifi_tiwisl</componentDependency>
<componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.3">module_mutual_thread_comm</componentDependency>
<keyword>ethernet</keyword>
<keyword>http</keyword>
<keyword>tcp</keyword>
Expand All @@ -53,34 +56,29 @@
</component>
</components>
<dependency repo = "sc_util">
<githash>c86abe3668ca7ec0444854a2be0c2aa94fed4d85</githash>
<githash>d0531d7c68ab67334582c324828e36d617baf8b3</githash>
<uri>[email protected]:xcore/sc_util</uri>
<version>1.0.2rc0</version>
<version>1.0.3rc0</version>
</dependency>
<dependency repo = "sc_xtcp">
<githash>fcc26ffd1d8e27ba7742ea089f846dcb102728a6</githash>
<githash>1382ce64c874bec0ef85acd4c46afde5d1d144f8</githash>
<uri>[email protected]:xcore/sc_xtcp</uri>
<version>3.1.3rc0</version>
<version>3.1.5rc1</version>
</dependency>
<dependency repo = "sc_ethernet">
<githash>dabdb3830df0c844a08f733a14fda32bd04144ee</githash>
<githash>5bdae446ff270dd9a8db34ce5c5164fd37bb43d0</githash>
<uri>[email protected]:xcore/sc_ethernet</uri>
<version>2.2.4rc0</version>
</dependency>
<dependency repo = "sc_otp">
<githash>062aa923a78bc603b254b2a99b78593ab3a816ec</githash>
<uri>[email protected]:xcore/sc_otp</uri>
<version>1.0.0rc0</version>
<version>2.2.7rc1</version>
</dependency>
<dependency repo = "sc_wifi">
<githash>11b769850eb5c2145238dc2cd5e116ccfd8881b3</githash>
<githash>ffa668c1d8b241d7a835eef4db317fe17f3c196d</githash>
<uri>[email protected]:xcore/sc_wifi</uri>
<version>1.0.0rc0</version>
<version>1.1.2rc0</version>
</dependency>
<dependency repo = "sc_spi">
<githash>16898e9423ff46c1516a436a865730df85457b6b</githash>
<uri>[email protected]:xcore/sc_spi</uri>
<version>1.3.0rc1</version>
<dependency repo = "sc_slicekit_support">
<githash>be8353686c6d9e22a6125ccdf979a31c379091d0</githash>
<uri>[email protected]:xcore/sc_slicekit_support</uri>
<version>1.0.4rc0</version>
</dependency>
<description>Embedded website component repository</description>
<docdir>doc</docdir>
Expand All @@ -98,9 +96,11 @@
<release parenthash = "9272a9f10d8588083e9e97cdd6d4931734cf65e1" version = "1.0.1beta0" githash = "58bf9be53dc2575c7e64e7493782f7335eec729c"></release>
<release parenthash = "657e8cf395becdfd609276d309670a487c97274d" version = "1.0.2rc0" githash = "0948f7bda1e7d505498dfd2ea9acbaf6cdef1553"></release>
<release parenthash = "a25e4997542e2558dad27d41fe772333e8f3e989" version = "1.0.2rc1" githash = "b0b63b6d6b3b3207efacfcdf9e83ef1a4e8a5e3e"></release>
<release parenthash = "32a8f1e8b9805670ee3b8c7f8c337d6462ecf640" version = "1.0.2rc2"></release>
<release parenthash = "32a8f1e8b9805670ee3b8c7f8c337d6462ecf640" version = "1.0.2rc2" githash = "a3c61917a449fda2f930c7bd43e14e9d014986aa"></release>
<release parenthash = "a82cf2fa9cd92982c4fe099b7ce1dba7e1da6ede" version = "1.0.4rc0"></release>
<subpartnumber>XM-002085-SM</subpartnumber>
<vendor>XMOS</vendor>
<version_defines></version_defines>
<xcore_repo>sc_website</xcore_repo>
<xpd_version>1.0</xpd_version>
</xpd>