Merge pull request #60 from WojciechRynczuk/v3_release

V3.0.2 release
WojciechRynczuk · Dec 18, 2018 · eb5fcd1 · eb5fcd1
2 parents 3aa7f0d + bf25f9c
commit eb5fcd1
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 44 deletions.
diff --git a/sources/common/doc/examples/example.vcd b/sources/common/doc/examples/example.vcd
@@ -1,6 +1,6 @@
-$date Tue Aug 28 21:45:21 2018
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 us
 $end
@@ -24,6 +24,7 @@ $scope module FRDM $end
 		$var wire 7 FRDM.Sensors.Slider Slider $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx FRDM.Buttons.SW1
 bx FRDM.Buttons.SW3

diff --git a/sources/common/doc/examples/merge_t1_t1.vcd b/sources/common/doc/examples/merge_t1_t1.vcd
@@ -1,6 +1,6 @@
-$date Tue Aug 28 21:47:21 2018
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 us
 $end
@@ -63,6 +63,7 @@ $scope module System2 $end
 		$upscope $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx System1.Disco.Buttons.Center
 bx System1.Disco.Buttons.Down

diff --git a/sources/common/doc/examples/merge_t1_t2.vcd b/sources/common/doc/examples/merge_t1_t2.vcd
@@ -1,6 +1,6 @@
-$date Tue Aug 28 21:46:07 2018
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 us
 $end
@@ -63,6 +63,7 @@ $scope module System2 $end
 		$upscope $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx System1.Disco.Buttons.Center
 bx System1.Disco.Buttons.Down

diff --git a/sources/common/doc/manual.odt b/sources/common/doc/manual.odt
diff --git a/sources/common/doc/manual.pdf b/sources/common/doc/manual.pdf
diff --git a/sources/common/inc/Version.h b/sources/common/inc/Version.h
@@ -5,7 +5,7 @@
 /// @par Full Description
 /// Version information header.
 ///
-/// @par Copyright (c) 2017 vcdMaker team
+/// @par Copyright (c) 2018 vcdMaker team
 ///
 /// Permission is hereby granted, free of charge, to any person obtaining a
 /// copy of this software and associated documentation files (the "Software"),
@@ -32,7 +32,7 @@
 /// @{
 #define D_VERSION_MAJOR 3
 #define D_VERSION_MINOR 0
-#define D_VERSION_PATCH 1
+#define D_VERSION_PATCH 2
 #define D_RELEASE_NAME  "Nestor"
 /// @}
 

diff --git a/sources/common/src/VCDTracer.cpp b/sources/common/src/VCDTracer.cpp
@@ -81,6 +81,7 @@ void TRACER::VCDTracer::GenerateSignalStructure()
 
 void TRACER::VCDTracer::GenerateSignalDefaults()
 {
+    DumpLine("$enddefinitions $end");
     DumpLine("$dumpvars");
     for (const auto &signal : m_rSignalDb.GetSignalFootprint())
     {

diff --git a/sources/vcdMaker/test/functional/test_001.vcd b/sources/vcdMaker/test/functional/test_001.vcd
@@ -1,6 +1,6 @@
-$date December 8, 2014 14:15:00
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 us
 $end
@@ -16,6 +16,7 @@ $scope module Top $end
 		$var wire 64 Top.Counter.Low Low $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bxxxxxxxx A.Val
 bxxxxxxxx B.Val

diff --git a/sources/vcdMaker/test/functional/test_002.vcd b/sources/vcdMaker/test/functional/test_002.vcd
@@ -1,6 +1,6 @@
-$date December 8, 2014 14:15:00
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 us
 $end
@@ -24,6 +24,7 @@ $scope module FRDM $end
 		$var wire 7 FRDM.Sensors.Slider Slider $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx FRDM.Buttons.SW1
 bx FRDM.Buttons.SW3

diff --git a/sources/vcdMaker/test/functional/test_003.vcd b/sources/vcdMaker/test/functional/test_003.vcd
@@ -1,6 +1,6 @@
-$date December 8, 2014 14:15:00
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 us
 $end
@@ -22,6 +22,7 @@ $scope module Top $end
 		$var wire 64 Top.Cnt.Low Low $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bxxxxxxxx A.Val
 bxxxxxxxx B.Val

diff --git a/sources/vcdMerge/test/functional/test0_ms.vcd b/sources/vcdMerge/test/functional/test0_ms.vcd
@@ -1,6 +1,6 @@
-$date December 8, 2014 14:15:00
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 ms
 $end
@@ -63,6 +63,7 @@ $scope module System2 $end
 		$upscope $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx System1.Disco.Buttons.Center
 bx System1.Disco.Buttons.Down

diff --git a/sources/vcdMerge/test/functional/test0_ns.vcd b/sources/vcdMerge/test/functional/test0_ns.vcd
@@ -1,6 +1,6 @@
-$date December 8, 2014 14:15:00
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 ns
 $end
@@ -63,6 +63,7 @@ $scope module System2 $end
 		$upscope $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx System1.Disco.Buttons.Center
 bx System1.Disco.Buttons.Down

diff --git a/sources/vcdMerge/test/functional/test0_us.vcd b/sources/vcdMerge/test/functional/test0_us.vcd
@@ -1,6 +1,6 @@
-$date December 8, 2014 14:15:00
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 us
 $end
@@ -63,6 +63,7 @@ $scope module System2 $end
 		$upscope $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx System1.Disco.Buttons.Center
 bx System1.Disco.Buttons.Down

diff --git a/sources/vcdMerge/test/functional/test1_ms.vcd b/sources/vcdMerge/test/functional/test1_ms.vcd
@@ -1,6 +1,6 @@
-$date December 8, 2014 14:15:00
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 ms
 $end
@@ -63,6 +63,7 @@ $scope module System2 $end
 		$upscope $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx System1.Disco.Buttons.Center
 bx System1.Disco.Buttons.Down

diff --git a/sources/vcdMerge/test/functional/test1_ns.vcd b/sources/vcdMerge/test/functional/test1_ns.vcd
@@ -1,6 +1,6 @@
-$date December 8, 2014 14:15:00
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 ns
 $end
@@ -63,6 +63,7 @@ $scope module System2 $end
 		$upscope $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx System1.Disco.Buttons.Center
 bx System1.Disco.Buttons.Down

diff --git a/sources/vcdMerge/test/functional/test1_us.vcd b/sources/vcdMerge/test/functional/test1_us.vcd
@@ -1,6 +1,6 @@
-$date December 8, 2014 14:15:00
+$date Tue Dec 18 17:57:25 2018
 $end
-$version VCD Tracer "Nestor" Release v.3.0.1
+$version VCD Tracer "Nestor" Release v.3.0.2
 $end
 $timescale 1 us
 $end
@@ -63,6 +63,7 @@ $scope module System2 $end
 		$upscope $end
 	$upscope $end
 $upscope $end
+$enddefinitions $end
 $dumpvars
 bx System1.Disco.Buttons.Center
 bx System1.Disco.Buttons.Down

diff --git a/windows/Bootstrapper/Bundle.wxs b/windows/Bootstrapper/Bundle.wxs
@@ -5,7 +5,7 @@
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
      xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
   <!-- Can be added to bundle to change the installation icon: IconSourceFile="..\Installer\resources\vcdMaker128.ico"-->
-	<Bundle Name="vcdMaker $(var.ProductVersionInfo)" Version="3.0.1.0" Manufacturer="vcdMaker team" UpgradeCode="aa694554-90fe-4f5b-b432-1373894aa8da">
+	<Bundle Name="vcdMaker $(var.ProductVersionInfo)" Version="3.0.2.0" Manufacturer="vcdMaker team" UpgradeCode="aa694554-90fe-4f5b-b432-1373894aa8da">
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
       <Payload SourceFile="resources\bootstrapper_logo.png"/>
       <bal:WixStandardBootstrapperApplication

diff --git a/windows/Installer/Product.wxs b/windows/Installer/Product.wxs
@@ -3,7 +3,7 @@
 <?define UpgradeCode="3A563016-E31D-4D93-A36B-105420BA6E57"?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Name='vcdMaker $(var.ProductVersionInfo)' Id='3A142969-4CD6-48F2-AB64-D44F690E7193' UpgradeCode='$(var.UpgradeCode)'
+  <Product Name='vcdMaker $(var.ProductVersionInfo)' Id='D6123246-8A68-41DB-84BE-F4F690AEC966' UpgradeCode='$(var.UpgradeCode)'
     Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='vcdMaker team'>
 
     <Package Id='*' Keywords='vcdMaker Installer'
@@ -17,7 +17,7 @@
     <Upgrade Id='$(var.UpgradeCode)'>
     <UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND'
         Minimum='1.0.0' IncludeMinimum='yes'
-        Maximum='3.0.1' IncludeMaximum='no' />
+        Maximum='3.0.2' IncludeMaximum='no' />
     </Upgrade>
 
     <Media Id='1' Cabinet='Install.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
@@ -28,25 +28,25 @@
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='INSTALLDIR' Name='vcdMaker'>
 
-          <Component Id='vcdMakerExecutable' Guid='15247FDC-7EA8-4931-B96A-DD3B3926B74E'>
+          <Component Id='vcdMakerExecutable' Guid='80B54EC5-B55B-4046-BD32-7B7E2466A3D0'>
             <Environment Id='UpdatePath' Name='PATH' Action='set' Permanent='no' System='no' Part='last' Value='[INSTALLDIR]' />
             <File Id='vcdMakerEXE' Name='$(var.vcdMaker.TargetFileName)' DiskId='1' Source='$(var.vcdMaker.TargetPath)' KeyPath='yes'>
             </File>
           </Component>
 
-          <Component Id='vcdMergeExecutable' Guid='2E82E953-9A3F-4AC0-A4C0-9F352C0ACDF1'>
+          <Component Id='vcdMergeExecutable' Guid='722D9BF2-8D84-4FD7-807A-A77C852B712B'>
             <File Id='vcdMergeEXE' Name='$(var.vcdMerge.TargetFileName)' DiskId='1' Source='$(var.vcdMerge.TargetPath)' KeyPath='yes'>
             </File>
           </Component>
 
-          <Component Id='vcdMakerManual' Guid='11B39AA4-49B4-4D18-AE33-3D278BC8BE84'>
+          <Component Id='vcdMakerManual' Guid='CBBA9EBF-0FF3-4A3E-ABE5-04D7689C4456'>
             <File Id="ManualPdf" Name="Manual.pdf" Source="$(var.SolutionDir)..\..\sources\common\doc\manual.pdf" KeyPath='yes'>
               <Shortcut Id="vcdMakerManualLnk" Directory="ProgramMenuDir" Name="vcdMaker $(var.ProductVersionInfo) Manual" WorkingDirectory='INSTALLDIR' IconIndex="0" Advertise="yes" />
             </File>
           </Component>
 
           <Directory Id='SampleDir' Name='samples'>
-            <Component Id='SampleFiles' Guid='59F4E01F-5FE3-48B3-97A2-8E7808E6EED7'>
+            <Component Id='SampleFiles' Guid='DB87BE16-F437-4FB2-9A6A-07A0CDFB54EE'>
               <File Id="SampleTtx" Name="example.txt" Source="$(var.SolutionDir)..\..\sources\common\doc\examples\example.txt" KeyPath='yes'></File>
               <File Id="SampleUsr" Name="example_user.txt" Source="$(var.SolutionDir)..\..\sources\common\doc\examples\example_user.txt"></File>
               <File Id="SampleVcd" Name="example.vcd" Source="$(var.SolutionDir)..\..\sources\common\doc\examples\example.vcd"></File>
@@ -68,7 +68,7 @@
 
       <Directory Id="ProgramMenuFolder" Name="Programs">
         <Directory Id="ProgramMenuDir" Name="vcdMaker $(var.ProductVersionInfo)">
-          <Component Id="ProgramMenuDir" Guid="59CBFDEC-3666-4313-9DF6-D6B97768FFD5">
+          <Component Id="ProgramMenuDir" Guid="8A677339-2E3E-483C-B102-224988E9FDA8">
             <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
             <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Type='string' Value='' KeyPath='yes' />
           </Component>

diff --git a/windows/Installer/guid_list.txt b/windows/Installer/guid_list.txt
@@ -1,34 +1,37 @@
 vcdMaker:
 {3A563016-E31D-4D93-A36B-105420BA6E57} vcdMaker UpgradeCode
 
-vcdMaker 1.0:
+vcdMaker 1.0.1:
 {0E0B8006-8388-4DC6-B2A2-1EA0E6A954B7} vcdMaker ProductId
 {CF176F63-6DA4-45A6-837B-CD1AFF3F5C12} vcdMakerExecutable Component
 {82B593FF-F018-4D28-87F3-A253FE5D4F7D} vcdMakerManual Component
 {C87B5829-C991-4527-9D16-3507C907395F} SampleFiles Component
 {FE343CAE-C7B4-47DF-B133-FAAC5F90F2DF} ProgramMenuDir Component
 
-vcdMaker 2.0:
+vcdMaker 2.0.1:
 {E11FE905-A80F-4764-B77C-AC7EADDF98CE} vcdMaker ProductId
 {5A12ED7E-8977-44D3-BB79-70B7130718F2} vcdMakerExecutable Component
 {F3A2D8F6-2FE0-4CE9-9A67-C41BBF3F5824} vcdMakerManual Component
 {00CB08B4-C7F5-4CCD-AF3F-854F68138B68} SampleFiles Component
 {8CE0301F-EEC9-4696-B0E8-74F9C1942495} ProgramMenuDir Component
 {4D660398-6AB3-4B41-BD90-D77581B91A89} vcdMergeExecutable Component
 
-vcdMaker 3.0:
+vcdMaker 3.0.1:
 {3A142969-4CD6-48F2-AB64-D44F690E7193} vcdMaker ProductId
 {15247FDC-7EA8-4931-B96A-DD3B3926B74E} vcdMakerExecutable Component
 {11B39AA4-49B4-4D18-AE33-3D278BC8BE84} vcdMakerManual Component
 {59F4E01F-5FE3-48B3-97A2-8E7808E6EED7} SampleFiles Component
 {59CBFDEC-3666-4313-9DF6-D6B97768FFD5} ProgramMenuDir Component
 {2E82E953-9A3F-4AC0-A4C0-9F352C0ACDF1} vcdMergeExecutable Component
-{D6123246-8A68-41DB-84BE-F4F690AEC966}
-{80B54EC5-B55B-4046-BD32-7B7E2466A3D0}
-{CBBA9EBF-0FF3-4A3E-ABE5-04D7689C4456}
-{DB87BE16-F437-4FB2-9A6A-07A0CDFB54EE}
-{8A677339-2E3E-483C-B102-224988E9FDA8}
-{722D9BF2-8D84-4FD7-807A-A77C852B712B}
+
+vcdMaker 3.0.2:
+{D6123246-8A68-41DB-84BE-F4F690AEC966} vcdMaker ProductId
+{80B54EC5-B55B-4046-BD32-7B7E2466A3D0} vcdMakerExecutable Component
+{CBBA9EBF-0FF3-4A3E-ABE5-04D7689C4456} vcdMakerManual Component
+{DB87BE16-F437-4FB2-9A6A-07A0CDFB54EE} SampleFiles Component
+{8A677339-2E3E-483C-B102-224988E9FDA8} ProgramMenuDir Component
+{722D9BF2-8D84-4FD7-807A-A77C852B712B} vcdMergeExecutable Component
+
 {0A77D082-22B4-42BB-BD23-754C463C30F4}
 {B29D4B89-2580-4A69-BD4D-33941FD9446D}
 {7A6FB76B-45F8-4E4C-9381-399D128E6983}

diff --git a/windows/Installer/version.wxi b/windows/Installer/version.wxi
@@ -1,4 +1,4 @@
 <Include>
-  <?define ProductVersion="3.0.1" ?>
+  <?define ProductVersion="3.0.2" ?>
   <?define ProductVersionInfo="3.0" ?>
 </Include>