This represents everything that is needed to hold your LabVIEW projects under version control with GIT. With this you can configure GIT to use LabVIEW's diff and merge tools to play with your projects.
To view the actual code, switch to the branch that matches to your operating system. Currently only Windows is supported, but porting this to Linux or Mac should be fairly easy. Please contact me if you plan to do so.
Assume you have a master branch with a few commits and a feature branch with new changes. You currently have master checked out.
To diff those branches, you can use
git diff feature
which will bring up LVCompare.exe with the correct attributes and show you the differences between master and feature.
To merge those branches, you can use
git merge feature
which will bring up LVMerge.exe. This will show you 4 different versions:
- Base, which is the common ancestor of
featureandmaster, - Theirs which is the vi in
feature, - Yours, which is the vi in
master, - and finally the merged vi.
Just edit the merged vi if necessary, save it and press close, and GIT will automagically create a nice merge commit.
When calling
git merge feature master
GIT will not call LVMerge.exe at first, but will try to do an internal merge which will fail. You will then have to use
git mergetool -t labview
to call LVMerge.exe and do the merge.
To download, install, and configure LabViewGitEnv for every user on your system, open a GIT Bash shell and issue the following commands
mkdir -p /c/repos/other && cd /c/repos/other
git clone -b windows git://github.com/joerg/LabViewGitEnv.git
cd LabViewGitEnv
bin/LVBootstrap.sh --system
, where /c/repos/other is where you place your forked GitHub projects.
LabViewGitEnv can automatically detect your version of LabVIEW if you have VIKit installed.
If you followed this section, you can skip the installation and configuration sections. However, if you use GIT Gui, there are few more settings to configure, and you can find them in the sections below.
There are (or should be) four branches. The one you are seeing here (master) should be fairly empty, the other ones represent everything that is needed for Linux, Mac and Windows.
In order to run this you will need LabVIEW, GIT, and bash, which comes with msysgit for Windows users and should be preinstalled on any *nix system.
You can install this system wide or per user. If you have administrative rights, I suggest installing it system wide.
Open GIT Bash as Administrator and issue the following commands
mkdir -p /usr/local
git clone -b windows git://github.com/joerg/LabViewGitEnv.git /usr/local/
cd /usr/local && git checkout -b local
If you are planning to use GIT Gui, open cmd.exe as Administrator and issue the following command
setx Path "%Path%;GIT_INSTALL_PATH\local\bin /M"
, where GIT_INSTALL_PATH mostly is something like C:\Programme Files\Git.
Open GIT Bash and issue the following commands
git clone -b windows git://github.com/joerg/LabViewGitEnv.git /tmp/LabViewGitEnv
find /tmp/LabViewGitEnv -maxdepth 1 -mindepth 1 -exec cp -r {} ~ \;
cd ~ && git checkout -b local
If you are planning to use GIT Gui, open cmd.exe and issue the following command
setx Path "%Path%;C:\Users\USER_NAME\bin"
, where USER_NAME is your windows user name.
Work on this is not done yet, but I suppose it should be pretty simple to do so. If you are using LabVIEW on Linux or Mac and want to use it with GIT, then please contact me and we can surely figure this out pretty fast.
To configure GIT to use LabViewGitEnv, just open Git Bash on Windows or any Shell on Linux and Mac and issue the following
LVInit.sh OPTION
where OPTION can be one of the following
--system
Cofigures GIT system wide. You need administrative rights to do that, so on Windows you need to have Git Bash opened as Administrator and on Linux and Mac you have to be root or use sudo. This is recommended since GIT will be configured to only use LabViewGitEnv for LabVIEW file types.
--global
Configures user specific settings.
--local
Configures the Repository you are currently in. Beware: This does not get propagated through a push/pull.
LabViewGitEnv can automatically detect your version of LabVIEW to use for diffs and merges if you have VIKit installed.
If not, you may also need to edit your LabVIEW path. To do so, edit your LVConfig.sh in either /usr/local/etc or ~/etc and adapt the LabViewBin and LabViewShared variables. LabViewBin represents the LabVIEW binary you want to use, LabViewShared represents the folder where to find LabVIEW Compare and LabVIEW Merge.
If you can't find those two, you may use the following commands to search through your system (replace the "c" with whatever drive letter your LabVIEW is installed on)
find /c -type f -name LabVIEW.exe -print 2> /dev/null
find /c -type d -name "LabVIEW Compare" -print 2> /dev/null
The first one will search for your LabViewBin, the second one will search for your LabViewShared (be sure to only use the part of the path till the Shared folder without the trailing slash).
Full support is currently only given for GIT Gui. If you have set your Path variable according to the installation instructions, almost everything will work out of the box.
To Diff LabVIEW files you have to open gitk and configure one more option. On Windows, open GIT Gui and view some project tree to open gitk. In gitk select Edit -> Options and choose the installed LVGitKExternalDiffWrapper.
Open a GIT Bash, go to the folder you installed it to ( /usr/local for system wide installs, ~ for per user installs, or /c/repos/other/LabViewGitEnv for Quick Start installs), and issue the following commands:
git stash save "local changes"
git checkout windows
git pull
git checkout local
git rebase windows local
git stash pop
Finally, one more command is needed in case some changes happened for git-config. However, you should always run this to make sure everything is configured correctly:
bin/LVBootstrap.sh --system
LVInit.sh (--system|--global|--local)
Copyright (c) 2011 Jörg Herzinger, see LICENSE for details.
- Joe Friedrichsen, 2014