--- a/.hgtags Fri Jan 30 14:55:05 2015 +0900
+++ b/.hgtags Thu Jan 29 09:29:39 2015 +0900
@@ -35,3 +35,4 @@
0000000000000000000000000000000000000000 dce-1.4
0000000000000000000000000000000000000000 dce-1.4
9f04862aa72f9f1fb8f56b49a1d6d34c84607f7a dce-1.4
+c6df754a23d120b3e908b2c6fde318a18328b1ad dce-1.5
--- a/RELEASE_NOTES Fri Jan 30 14:55:05 2015 +0900
+++ b/RELEASE_NOTES Thu Jan 29 09:29:39 2015 +0900
@@ -5,18 +5,34 @@
Please refer the page http://www.nsnam.org/projects/direct-code-execution/ for detailed instructions
-Release dce-dev
+Release dce-1.5
===============
-This release is not yet available.
Availability
------------
-
+In order to use DCE, please use bake tool to install DCE.
+The followings are the basic steps to use DCE.
+
+ % bake.py configure -e dce-ns3-1.5
+ or
+ % bake.py configure -e dce-linux-1.5
+ % bake.py download
+ % bake.py build
+
+For more information, please refer the document.
+
Tested platforms
-------------------
+- Ubuntu 10.04 64bit
+- Ubuntu 12.04 32bit/64bit
+- Ubuntu 13.04 64bit
+- Ubuntu 14.04 64bit (new)
+- Fedora 18 32bit
+- CentOS 6.2 64bit
New user-visible features
-------------------------
+(none)
Bugs fixed
----------
--- a/doc/doxygen.conf Fri Jan 30 14:55:05 2015 +0900
+++ b/doc/doxygen.conf Thu Jan 29 09:29:39 2015 +0900
@@ -32,7 +32,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = "1.4"
+PROJECT_NUMBER = "1.5"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
--- a/doc/ns3_html_theme/static/ns3_version.js Fri Jan 30 14:55:05 2015 +0900
+++ b/doc/ns3_html_theme/static/ns3_version.js Thu Jan 29 09:29:39 2015 +0900
@@ -1,7 +1,7 @@
// ns3_version.js: automatically generated
// public urls
var ns3_host = "/";
-var ns3_version = "Release <a href=\"http://www.nsnam.org/overview/projects/direct-code-execution/dce-1.4\">dce-1.4</a>";
-var ns3_release = "docs/dce/release/1.4/";
+var ns3_version = "Release <a href=\"http://www.nsnam.org/overview/projects/direct-code-execution/dce-1.5\">dce-1.5</a>";
+var ns3_release = "docs/dce/release/1.5/";
var ns3_local = "";
var ns3_doxy = "doxygen/";
--- a/doc/source/conf.py Fri Jan 30 14:55:05 2015 +0900
+++ b/doc/source/conf.py Thu Jan 29 09:29:39 2015 +0900
@@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
-version = '1.4'
+version = '1.5'
# The full version, including alpha/beta/rc tags.
-release = '1.4'
+release = '1.5'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
--- a/ns3waf/__init__.py Fri Jan 30 14:55:05 2015 +0900
+++ b/ns3waf/__init__.py Thu Jan 29 09:29:39 2015 +0900
@@ -145,7 +145,7 @@
env['WL_SONAME_SUPPORTED'] = True
-ns3_versions = ['3-dev', '3.21', '3.20', '3.19', '3.18', '3.17']
+ns3_versions = ['3-dev', '3.22', '3.21', '3.20', '3.19', '3.18', '3.17']
def _check_dependencies(conf, required, mandatory):
found = []
match_pkg = None
--- a/wscript Fri Jan 30 14:55:05 2015 +0900
+++ b/wscript Thu Jan 29 09:29:39 2015 +0900
@@ -503,6 +503,7 @@
# Add directories under myscripts dir
def add_myscripts(bld):
+ # submodule parse should be the first
for dir in os.listdir('myscripts'):
if dir.startswith('.') or dir == 'CVS':
continue