Line attributes in lego1 & lego2

ROOT
41

FYI, the input file used to generate system.rootrc is:

$ROOTSYS/config/rootrc.in
42

The patch in now applied.
Thanks

43

[quote]The patch in now applied.[/quote] Thx Olivier.

[quote]FYI, the input file used to generate system.rootrc is:$ROOTSYS/config/rootrc.in[/quote]So that’s why $ROOTSYS/etc/system.rootrc was not under version control… :wink:
Thanks.

Z

44

Hi again,

Among the 5 files provided above, 3 are still different between v5-99 (master branch) & v5-34-00-patches

  • rootrc.in (see patch below for v5-99)
  • TPainter3dAlgorithms.cxx (mainly white spaces)
  • THistPainter.cxx (doc, “minor” changes & white spaces)
    For the two latter almost none of the changes seems related to ROOT6.
    So it may be worth keeping these files as close as possible.

Cheers,
Z
rootrc.in.5-99.diff (1.74 KB)
TPainter3dAlgorithms.cxx.5-99vs5-34-00-patches.diff (1.1 KB)
THistPainter.cxx.5-99vs5-34-00-patches.diff (9.94 KB)

45

so the patch on rootrc.in is for ROOT 6 ?
and the 2 others for 5.34 ?

right ?

46

can you send proper diff ?
The one you sent do not work:

imaccouet:src couet$ patch TPainter3dAlgorithms.cxx < ~/Downloads/TPainter3dAlgorithms.cxx.5-99vs5-34-00-patches.diff
patching file TPainter3dAlgorithms.cxx
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] n
Skipping patch.
9 out of 9 hunks ignored -- saving rejects to file TPainter3dAlgorithms.cxx.rej
47

[quote]so the patch on rootrc.in is for ROOT 6 ?[/quote]Yes

[quote]and the 2 others for 5.34 ?[/quote]Nope, these are just the current differences between 5.34 and 5.99 i.e. all the changes you recently commited to the master branch omitting the 5.34 branch.
The question is: can these changes be backported to 5.34?
If you can insure me there are no ROOT6 features (e.g. R__SUNCCBUG in TPainter3dAlgorithms.cxx) and no extra dependence with whatever in your recent changes (please check the diff files provided above), I can provide the corresponding patch.

Cheers,
Z

48

the diffs show only C++ diff which should fine in both versions (even that SUNCC thing).
I agree with you that it would be better to have the same code in both versions.

49

So here’s the patch for the branch 5.34.00-patches.
This amounts to overwrite 5.34.00-patches files by 5.99-patches files.
Test macros

50

All in place. Thanks.