From c489d8d047c55aea9738acee7e8aa4a9fd1c2c6d Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Tue, 5 Nov 2013 23:45:16 +0100 Subject: [PATCH] Bumped the version number from Contiki 2.6 to Contiki 2.7 --- apps/webbrowser/http-user-agent-string | 2 +- apps/webbrowser/http-user-agent-string.c | 4 ++-- apps/webserver/http-strings | 4 ++-- apps/webserver/http-strings.c | 8 ++++---- core/contiki-version.h | 2 +- doc/Doxyfile | 2 +- tools/release-tools/README.md | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/webbrowser/http-user-agent-string b/apps/webbrowser/http-user-agent-string index ad3f0f23757..bef8d4f34cc 100644 --- a/apps/webbrowser/http-user-agent-string +++ b/apps/webbrowser/http-user-agent-string @@ -1 +1 @@ -http_user_agent_fields "Connection: close\r\nUser-Agent: Contiki/2.6 (; http://www.contiki-os.org/)\r\n\r\n" +http_user_agent_fields "Connection: close\r\nUser-Agent: Contiki/2.7 (; http://www.contiki-os.org/)\r\n\r\n" diff --git a/apps/webbrowser/http-user-agent-string.c b/apps/webbrowser/http-user-agent-string.c index 4b0b0608636..cd0f32b8371 100644 --- a/apps/webbrowser/http-user-agent-string.c +++ b/apps/webbrowser/http-user-agent-string.c @@ -1,3 +1,3 @@ const char http_user_agent_fields[78] = -/* "Connection: close\r\nUser-Agent: Contiki/2.6 (; http://www.contiki-os.org/)\r\n\r\n" */ -{0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, 0x55, 0x73, 0x65, 0x72, 0x2d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x36, 0x20, 0x28, 0x3b, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2d, 0x6f, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x29, 0xd, 0xa, 0xd, 0xa, }; +/* "Connection: close\r\nUser-Agent: Contiki/2.7 (; http://www.contiki-os.org/)\r\n\r\n" */ +{0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, 0x55, 0x73, 0x65, 0x72, 0x2d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x37, 0x20, 0x28, 0x3b, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2d, 0x6f, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x29, 0xd, 0xa, 0xd, 0xa, }; diff --git a/apps/webserver/http-strings b/apps/webserver/http-strings index 7a3d51c0319..ce7222f8369 100644 --- a/apps/webserver/http-strings +++ b/apps/webserver/http-strings @@ -13,8 +13,8 @@ http_index_htm "/index.htm" http_index_html "/index.html" http_404_html "/404.html" http_referer "Referer:" -http_header_200 "HTTP/1.0 200 OK\r\nServer: Contiki/2.6 http://www.contiki-os.org/\r\nConnection: close\r\n" -http_header_404 "HTTP/1.0 404 Not found\r\nServer: Contiki/2.6 http://www.contiki-os.org/\r\nConnection: close\r\n" +http_header_200 "HTTP/1.0 200 OK\r\nServer: Contiki/2.7 http://www.contiki-os.org/\r\nConnection: close\r\n" +http_header_404 "HTTP/1.0 404 Not found\r\nServer: Contiki/2.7 http://www.contiki-os.org/\r\nConnection: close\r\n" http_content_type_plain "Content-type: text/plain\r\n\r\n" http_content_type_html "Content-type: text/html\r\n\r\n" http_content_type_css "Content-type: text/css\r\n\r\n" diff --git a/apps/webserver/http-strings.c b/apps/webserver/http-strings.c index 5c02fedefae..0e79775f7c3 100644 --- a/apps/webserver/http-strings.c +++ b/apps/webserver/http-strings.c @@ -44,11 +44,11 @@ const char http_referer[9] = /* "Referer:" */ {0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x72, 0x3a, }; const char http_header_200[85] = -/* "HTTP/1.0 200 OK\r\nServer: Contiki/2.6 http://www.contiki-os.org/\r\nConnection: close\r\n" */ -{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x36, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2d, 0x6f, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, }; +/* "HTTP/1.0 200 OK\r\nServer: Contiki/2.7 http://www.contiki-os.org/\r\nConnection: close\r\n" */ +{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x37, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2d, 0x6f, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, }; const char http_header_404[92] = -/* "HTTP/1.0 404 Not found\r\nServer: Contiki/2.6 http://www.contiki-os.org/\r\nConnection: close\r\n" */ -{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x34, 0x30, 0x34, 0x20, 0x4e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x36, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2d, 0x6f, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, }; +/* "HTTP/1.0 404 Not found\r\nServer: Contiki/2.7 http://www.contiki-os.org/\r\nConnection: close\r\n" */ +{0x48, 0x54, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x30, 0x20, 0x34, 0x30, 0x34, 0x20, 0x4e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0xd, 0xa, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3a, 0x20, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2f, 0x32, 0x2e, 0x37, 0x20, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6b, 0x69, 0x2d, 0x6f, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0xd, 0xa, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0xd, 0xa, }; const char http_content_type_plain[29] = /* "Content-type: text/plain\r\n\r\n" */ {0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x20, 0x74, 0x65, 0x78, 0x74, 0x2f, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0xd, 0xa, 0xd, 0xa, }; diff --git a/core/contiki-version.h b/core/contiki-version.h index ee296482199..f3f9473beae 100644 --- a/core/contiki-version.h +++ b/core/contiki-version.h @@ -35,7 +35,7 @@ #define __CONTIKI_VERSION__ #ifndef CONTIKI_VERSION_STRING -#define CONTIKI_VERSION_STRING "Contiki 2.6" +#define CONTIKI_VERSION_STRING "Contiki 2.7" #endif /* CONTIKI_VERSION_STRING */ #endif /* __CONTIKI_VERSION__ */ diff --git a/doc/Doxyfile b/doc/Doxyfile index 975c7bd3d87..eef3e673d74 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -26,7 +26,7 @@ DOXYFILE_ENCODING = UTF-8 # identify the project. Note that if you do not use Doxywizard you need # to put quotes around the project name if it contains spaces. -PROJECT_NAME = "Contiki 2.6" +PROJECT_NAME = "Contiki 2.7" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/tools/release-tools/README.md b/tools/release-tools/README.md index 29d2fe51986..95c658a274e 100644 --- a/tools/release-tools/README.md +++ b/tools/release-tools/README.md @@ -4,9 +4,9 @@ Release tools The tools/release-tools directory contains files for building and testing Contiki releases. To compile a release of Contiki, run - make RELEASE=2.6 + make RELEASE=2.7 -for Contiki 2.6. It is also possible to compile a release of a specific git tag +for Contiki 2.7. It is also possible to compile a release of a specific git tag or other non-numbered version, such as the current git HEAD, like this: make TAG=HEAD