Diff LabVIEW: Difference between revisions
mNo edit summary |
Expanded to include LVCompare settings based on LabVIEW vs Windows OS bitness. |
||
| Line 1: | Line 1: | ||
In order to use a [[Source Code Control Tools|SCC tool]] with [[LabVIEW|LabVIEW]] files directly from the Windows Explorer, [http://www.altap.cz Altap Salamander] or similar file browser, it's possible to use LVCompare.exe deliverd by [[NI|NI]] in the <LabVIEW>\Shared folder.<br> For [[TortoiseSVN client to Subversion|TortoiseSVN]] the following settings can be used: | In order to use a [[Source Code Control Tools|SCC tool]] with [[LabVIEW|LabVIEW]] files directly from the Windows Explorer, [http://www.altap.cz Altap Salamander] or similar file browser, it's possible to use LVCompare.exe deliverd by [[NI|NI]] in the <LabVIEW>\Shared folder.<br> For [[TortoiseSVN client to Subversion|TortoiseSVN]] the following settings can be used for both LabVIEW VIs (Extension: .vi) or Controls (Extension: .ctl): | ||
(TortoiseSVN -> Settings -> Diff Viewer -> Advanced) < | |||
(TortoiseSVN -> Settings -> Diff Viewer -> Advanced -> Add...) | |||
If running 32-bit LabVIEW under 64-bit Windows: | |||
<pre>Filename/Extension: .vi | |||
Program: "C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" -nobdcosm -nobdpos %mine %base</pre> | |||
If running 32-bit LabVIEW under 32-bit Windows or 64-bit LabVIEW under 64-bit Windows: | |||
<pre>Filename/Extension: .vi | <pre>Filename/Extension: .vi | ||
Program: "C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" -nobdcosm -nobdpos %mine %base</pre> | Program: "C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" -nobdcosm -nobdpos %mine %base</pre> | ||
[[Category:SCC]] | [[Category:SCC]] | ||
Latest revision as of 10:46, 12 March 2019
In order to use a SCC tool with LabVIEW files directly from the Windows Explorer, Altap Salamander or similar file browser, it's possible to use LVCompare.exe deliverd by NI in the <LabVIEW>\Shared folder.
For TortoiseSVN the following settings can be used for both LabVIEW VIs (Extension: .vi) or Controls (Extension: .ctl):
(TortoiseSVN -> Settings -> Diff Viewer -> Advanced -> Add...)
If running 32-bit LabVIEW under 64-bit Windows:
Filename/Extension: .vi Program: "C:\Program Files (x86)\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" -nobdcosm -nobdpos %mine %base
If running 32-bit LabVIEW under 32-bit Windows or 64-bit LabVIEW under 64-bit Windows:
Filename/Extension: .vi Program: "C:\Program Files\National Instruments\Shared\LabVIEW Compare\LVCompare.exe" -nobdcosm -nobdpos %mine %base