Merge branch 'intel-version-2.3.2'

* intel-version-2.3.2: NEWS: mention Cmake build system Update version headers, NEWS and ChangeLogs
accellera-official · Feb 23, 2017 · 3740901 · 3740901
2 parents 3dfc0d6 + 49b93a4
commit 3740901
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 19 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,14 @@
 See also docs/tlm/ChangeLog.
 
+2017-02-23  Philipp A. Hartmann <[email protected]>
+
+	* SystemC 2.3.2 (public review) released.
+
+2016-11-03  Philipp A. Hartmann <[email protected]>
+
+	* SystemC 2.3.1a released.
+	* Update to Apache License, Version 2.0, no functional changes.
+
 2014-04-17  Philipp A. Hartmann <[email protected]>
 
 	* Combined SystemC 2.3.1 / TLM 2.0.3 officially released.

diff --git a/NEWS b/NEWS
@@ -1,9 +1,19 @@
+* SystemC 2.3.2_pub_rev_20170223
+  Public-review release of SystemC 2.3.2
+  - Includes TLM 2.0.4_pub_rev_20170223
+  - Initial support for C++11/14.
+  - Windows DLL support.
+  - Cmake build system (experimental)
+  - Bug fixes, code cleanup.
+  - Some minor new features.
+
 * SystemC 2.3.1a
   Relicensed under Apache License, Version 2.0.
   No functional changes.
 
 * SystemC 2.3.1
   Release of SystemC 2.3.1
+  - Includes TLM-2.0.3
   - Bug fixes.
   - Code cleanup.
   - Some experimental new features.

diff --git a/docs/tlm/ChangeLog b/docs/tlm/ChangeLog
@@ -1,11 +1,12 @@
-2013-12-15 TLM 2.0.3          Included as part of SystemC 2.3.1
-2012-05-11 TLM 2.0.2          Included as part of SystemC 2.3.0
-2009-07-15 TLM 2.0.1          public release rc2, svn rev 801
-2009-07-10 TLM 2.0.1 rc1      TLMWG only, svn rev 791
-2009-04-06 TLM 2.0.1 alpha 2  TLMWG only
-2009-01-30 TLM 2.0.1 alpha 1  TLMWG only
-2008-06-09 TLM 2.0.0          public release
-2008-05-15 TLM 2.0            OSCI-only
-2007-11-29 TLM 2.0 Draft 2    public review
-2007-11-09 TLM 2.0 Draft 2    OSCI-only
-2006-11-29 TLM 2.0 Draft 1    public review
+2017-02-21 TLM 2.0.4_pub_rev_20170223 Included as part of SystemC 2.3.2_pub_rev_20170223
+2013-12-15 TLM 2.0.3                  Included as part of SystemC 2.3.1
+2012-05-11 TLM 2.0.2                  Included as part of SystemC 2.3.0
+2009-07-15 TLM 2.0.1                  public release rc2, svn rev 801
+2009-07-10 TLM 2.0.1 rc1              TLMWG only, svn rev 791
+2009-04-06 TLM 2.0.1 alpha 2          TLMWG only
+2009-01-30 TLM 2.0.1 alpha 1          TLMWG only
+2008-06-09 TLM 2.0.0                  public release
+2008-05-15 TLM 2.0                    OSCI-only
+2007-11-29 TLM 2.0 Draft 2            public review
+2007-11-09 TLM 2.0 Draft 2            OSCI-only
+2006-11-29 TLM 2.0 Draft 1            public review
diff --git a/src/sysc/kernel/sc_ver.h b/src/sysc/kernel/sc_ver.h
@@ -56,7 +56,7 @@ extern SC_API const std::string  sc_copyright_string;
 
 #define SYSTEMC_2_3_2
 
-#define SYSTEMC_VERSION       20170209
+#define SYSTEMC_VERSION       20170223
 #define SC_VERSION_ORIGINATOR "Accellera"
 #define SC_VERSION_MAJOR      2
 #define SC_VERSION_MINOR      3
@@ -67,15 +67,15 @@ extern SC_API const std::string  sc_copyright_string;
 #define IEEE_1666_SYSTEMC     201101L
 
 #define SC_COPYRIGHT                               \
-  "Copyright (c) 1996-2014 by all Contributors,\n" \
+  "Copyright (c) 1996-2017 by all Contributors,\n" \
   "ALL RIGHTS RESERVED\n"
 
 
 #define SC_VERSION_RELEASE_DATE \
   SC_STRINGIFY_HELPER_( SYSTEMC_VERSION )
 
 #if ( SC_IS_PRERELEASE == 1 )
-#  define SC_VERSION_PRERELEASE "lwg"
+#  define SC_VERSION_PRERELEASE "pub_rev"
 #  define SC_VERSION \
     SC_STRINGIFY_HELPER_( SC_VERSION_MAJOR.SC_VERSION_MINOR.SC_VERSION_PATCH ) \
     "_" SC_VERSION_PRERELEASE "_" SC_VERSION_RELEASE_DATE \

diff --git a/src/tlm_core/tlm_2/tlm_version.h b/src/tlm_core/tlm_2/tlm_version.h
@@ -65,21 +65,21 @@ namespace tlm
 
 #define TLM_VERSION_MAJOR                   2           ///< version major level ( numeric )
 #define TLM_VERSION_MINOR                   0           ///< version minor level ( numeric )
-#define TLM_VERSION_PATCH                   3           ///< version patch level ( numeric )
+#define TLM_VERSION_PATCH                   4           ///< version patch level ( numeric )
 #define TLM_VERSION_ORIGINATOR              "Accellera" ///< TLM creator string
 #define TLM_VERSION_SEPARATOR               "."         ///< version string separator
 
-#define TLM_IS_PRERELEASE                   0           ///< pre-release flag ( 1 / 0 )
+#define TLM_IS_PRERELEASE                   1           ///< pre-release flag ( 1 / 0 )
 
 #if TLM_IS_PRERELEASE
 #    define TLM_VERSION_PRERELEASE          "pub_rev"   ///< pre-release version string
 #else
 #    define TLM_VERSION_PRERELEASE          ""          ///< pre-release version string
 #endif
 
-#define TLM_VERSION_RELEASE_YEAR            "2013"      ///< release year  ( YYYY )
-#define TLM_VERSION_RELEASE_MONTH           "12"        ///< release month ( MM )
-#define TLM_VERSION_RELEASE_DAY             "15"        ///< release day   ( DD )
+#define TLM_VERSION_RELEASE_YEAR            "2017"      ///< release year  ( YYYY )
+#define TLM_VERSION_RELEASE_MONTH           "02"        ///< release month ( MM )
+#define TLM_VERSION_RELEASE_DAY             "23"        ///< release day   ( DD )
 
 #define TLM_COPYRIGHT \
   "Copyright (c) 1996-" TLM_VERSION_RELEASE_YEAR " by all Contributors\n" \