BUSMASTER v1.9.0 Commits

Ercem5 · Sep 6, 2013 · 5af3cae · 5af3cae
1 parent 73bfeb4
commit 5af3cae
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 73 deletions.
diff --git a/Documents/1 Development Environment/topics/nsis.dita b/Documents/1 Development Environment/topics/nsis.dita
@@ -1,35 +1,37 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd" []>
-<topic id="nsis" xml:lang="en-us">
-  <title>NullSoft Scritable Install System - Installation Tool</title>
-  <prolog>
-    <author>Ratnadip Choudhury</author>
-    <copyright>
-      <copyryear year="2011"/>
-      <copyrholder>ROBERT BOSCH ENGINEERING AND BUSINESS SOLUTIONS LIMITED</copyrholder>
-    </copyright>
-  </prolog>
-  <body>
-    <section>
-      <title>Description</title>
-      <p>NullSoft Scriptable Install System (NSIS) is the <xref href="http://en.wikipedia.org/wiki/List_of_installation_software" scope="external">software installation framework</xref> used. It is a script-driven Windows installation system. The following links may be accessed for details:</p>
-    </section>
-    <section>
-      <title>Download</title>
-      <p>The NSIS installer is available for download at <xref href="http://nsis.sourceforge.net/" scope="external"/>. The latest version is 2.46, dated December 06, 2009.</p>
-    </section>
-    <section>
-      <title>Installation</title>
-      <p>Just run the <filepath>nsis-2.46-setup.exe</filepath>. The standard installation folder is <filepath>%ProgramFiles%\NSIS</filepath>.</p>
-    </section>
-    <section>
-      <title>Configuration</title>
-      <p>There is no specific configuration necessary.</p>
-    </section>
-    <section>
-      <title>Usage</title>
-      <p>The BUSMASTER install script is located under <filepath>Installation Setup\BUSMASTER Install Script.nsi</filepath>.</p>
-      <p>The setup is depicted in the diagram below which shows how the installer build generation process is initiated by User and how the script accesses the artifacts from various locations under the <filepath>Sources</filepath> and <filepath>Documents\4 Help</filepath> folder. Prior to building the script, the artifacts needs to be generated by building the BUSMASTER application in Visual studio environment (VC++) and DITA-OT.<image href="../images/installation.png" placement="break"/></p>
-    </section>
-  </body>
-</topic>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd" []>
+<topic id="nsis" xml:lang="en-us">
+  <title>NullSoft Scritable Install System - Installation Tool</title>
+  <prolog>
+    <author>Ratnadip Choudhury</author>
+    <copyright>
+      <copyryear year="2011"/>
+      <copyrholder>ROBERT BOSCH ENGINEERING AND BUSINESS SOLUTIONS LIMITED</copyrholder>
+    </copyright>
+  </prolog>
+  <body>
+    <section>
+      <title>Description</title>
+      <p>NullSoft Scriptable Install System (NSIS) is the <xref href="http://en.wikipedia.org/wiki/List_of_installation_software" scope="external">software installation framework</xref> used. It is a script-driven Windows installation system. The following links may be accessed for details:</p>
+    </section>
+    <section>
+      <title>Download</title>
+      <p>The NSIS installer is available for download at <xref href="http://nsis.sourceforge.net/" scope="external"/>. The latest version is 2.46, dated December 06, 2009.</p>
+    </section>
+    <section>
+      <title>Installation</title>
+      <p>Just run the <filepath>nsis-2.46-setup.exe</filepath>. The standard installation folder is <filepath>%ProgramFiles%\NSIS</filepath>.</p>
+    </section>
+    <section>
+      <title>Configuration</title>
+      <p>There is no specific configuration necessary.</p>
+    </section>
+    <section>
+      <title>Usage</title>
+      <p>The BUSMASTER install script is located under <filepath>Installation Setup\BUSMASTER Install Script.nsi</filepath>.</p>
+      <p>The setup is depicted in the diagram below which shows how the installer build generation process is initiated by User and how the script accesses the artifacts from various locations under the <filepath>Sources</filepath> and <filepath>Documents\4 Help</filepath> folder. Prior to building the script, the artifacts needs to be generated by building the BUSMASTER application in Visual studio environment (VC++) and DITA-OT.<image href="../images/installation.png" placement="break"/></p>
+      <title>Dependency</title>
+      <p>Install script expects Visual Studio 2012 Redistributable package to be available under the folder Tools\VC++ 2012 Redistributable\vcredist_x86.exe</p>
+    </section>
+  </body>
+</topic>
diff --git a/Documents/4 Help/topics/what_is_new.dita b/Documents/4 Help/topics/what_is_new.dita
@@ -1,18 +1,26 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd" []>
-<topic id="what_is_new" xml:lang="en-us">
-  <title>What is new?</title>
-  <prolog>
-    <author>Ratnadip Choudhury</author>
-    <copyright>
-      <copyryear year="2011"/>
-      <copyrholder>ROBERT BOSCH ENGINEERING AND BUSINESS SOLUTIONS LIMITED</copyrholder>
-    </copyright>
-    <metadata>
-      <keywords>
-        <indexterm>What is new?</indexterm>
-      </keywords>
-    </metadata>
-  </prolog>
-  <body/>
-</topic>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd" []>
+<topic id="what_is_new" xml:lang="en-us">
+  <title>What is new?</title>
+  <prolog>
+    <author>Ratnadip Choudhury</author>
+    <copyright>
+      <copyryear year="2011"/>
+      <copyrholder>ROBERT BOSCH ENGINEERING AND BUSINESS SOLUTIONS LIMITED</copyrholder>
+    </copyright>
+    <metadata>
+      <keywords>
+        <indexterm>What is new?</indexterm>
+      </keywords>
+    </metadata>
+  </prolog>
+  <body>
+    <p>Support to following hardware interfaces are added:</p>
+    <ul>
+      <li>NSI interface</li>
+      <li>i-View Interface</li>
+      <li>Development Environment IDE is migrated to Visual Studio 2012</li>
+      <li>Visual Studio Redistributable Package is expected by the installer script. Please refer development environment for more information</li>
+    </ul>
+  </body>
+</topic>
diff --git a/Documents/4 Help_New/images/MessageWindow.bmp b/Documents/4 Help_New/images/MessageWindow.bmp
diff --git a/Documents/4 Help_New/topics/what_is_new.dita b/Documents/4 Help_New/topics/what_is_new.dita
@@ -1,18 +1,26 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd" []>
-<topic id="what_is_new" xml:lang="en-us">
-  <title>What is new?</title>
-  <prolog>
-    <author>Ratnadip Choudhury</author>
-    <copyright>
-      <copyryear year="2011"/>
-      <copyrholder>ROBERT BOSCH ENGINEERING AND BUSINESS SOLUTIONS LIMITED</copyrholder>
-    </copyright>
-    <metadata>
-      <keywords>
-        <indexterm>What is new?</indexterm>
-      </keywords>
-    </metadata>
-  </prolog>
-  <body/>
-</topic>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd" []>
+<topic id="what_is_new" xml:lang="en-us">
+  <title>What is new?</title>
+  <prolog>
+    <author>Ratnadip Choudhury</author>
+    <copyright>
+      <copyryear year="2011"/>
+      <copyrholder>ROBERT BOSCH ENGINEERING AND BUSINESS SOLUTIONS LIMITED</copyrholder>
+    </copyright>
+    <metadata>
+      <keywords>
+        <indexterm>What is new?</indexterm>
+      </keywords>
+    </metadata>
+  </prolog>
+  <body>
+    <p>Support to following hardware interfaces are added:</p>
+    <ul>
+      <li>NSI interface</li>
+      <li>i-View Interface</li>
+      <li>Development Environment IDE is migrated to Visual Studio 2012</li>
+      <li>Visual Studio Redistributable Package is expected by the installer script. Please refer development environment for more information</li>
+    </ul>
+  </body>
+</topic>
diff --git a/Sources/Format Converter/J1939DBC2DBFConverter/J1939DBC2DBFConverter.cpp b/Sources/Format Converter/J1939DBC2DBFConverter/J1939DBC2DBFConverter.cpp
@@ -92,7 +92,7 @@ CJ1939DBC2DBFConverter::CJ1939DBC2DBFConverter(void)
     m_hDLLModule = NULL;
     m_pouDBC2DBFConverter = NULL;
 }
-HRESULT CJ1939DBC2DBFConverter::GetHelpText(string& pchHelpText)
+HRESULT CJ1939DBC2DBFConverter::GetHelpText(CString pchHelpText)
 {
     pchHelpText = _("Converts the CANoe J1939 Database(.dbc) file to BUSMASTER J1939 Database(.dbf) file");
     return S_OK;

diff --git a/Sources/Format Converter/J1939DBC2DBFConverter/J1939DBC2DBFConverter.h b/Sources/Format Converter/J1939DBC2DBFConverter/J1939DBC2DBFConverter.h
@@ -16,7 +16,7 @@ class CJ1939DBC2DBFConverter : public CBaseConverter
     virtual HRESULT GetConverterName(string& strConverterName);
     virtual HRESULT GetErrorStatus(HRESULT hResult, string& omstrStatus);
     virtual HRESULT GetLastConversionStatus(HRESULT& hResult, string& omstrStatus);
-    virtual HRESULT GetHelpText(string& pchHelpText);
+    virtual HRESULT GetHelpText(CString pchHelpText);
     virtual BOOL bHaveOwnWindow();
     virtual HRESULT GettextBusmaster();
     virtual HRESULT GetPropertyPage(CPropertyPage*& pPage)