Improvements of the CRLF handling:
When a file is checked out on a drive shared with Linux or MacOS,
those OS have different default line endings.
Windows uses CRLF, and Linux/Mac use LF.
To be able to checkout files under Linux/Mac and to get the same
result, mark all known file types with eol=CRLF
"The 4024 release apparently shipped with the 4023.119
internal build for engineering"
It seems as if the *.Tc* files ue a different version numbering than
the *.tsproj files.
Adapt twincat_version_manager.py to handle different versions
for different file types (technically file names) and
check that the *.tsproj file have version "3.1.4023.119"
Change the CRLF strategie:
All (nearly all) files have LF in the repo, and CRLF in the working tree.
When we started, all files had been commited "as is".
Now it is more and more disturbing that Git shows "^M" in git diff
when a line was added or chenged.
To avoid this, store all files in the repo with LF.
To normalzie existing repos for a crate, run:
Step 1)
(unless you have done that already)
git remote add tc_generic_structure https://bitbucket.org/europeanspallationsource/tc_generic_structure.git
Step 2)
git fetch tc_generic_structure
Step 3)
(master below may be integration)
git merge tc_generic_structure/master -X renormalize
Trial-licenses should not be part of any Git - they
experire and soon and cause a lot of merge-conflicts.
Remove solution/TrialLicense.tclrs and
ignore it in .gitignore (keep .gitignore sorted)
Fix the whitespaces using check_fix_white_space.py
modified: solution/tc_project_app/GVLs/GVL_APP.TcGVL
modified: solution/tc_project_app/POUs/MAIN.TcPOU
Make it possible to check for whitespace-damage:
- a file uses TAB instead of space
- a file has trailing whitespace e.g.
"text on this line \n" instead of "text on this line\n"
Both make reviews unnecessary hard and may lead to merge conflicts,
which could be easily avoided.
In the next commit this script will be added to the continous integration.
Some FB in the Etercat Termianls folder were not the latest version
They were replaced by the latest version according to the developer Viktor Heirich# Please enter the commit message for your changes. Lines starting
Torsten Bögershausen