PageRenderTime 60ms CodeModel.GetById 35ms RepoModel.GetById 1ms app.codeStats 0ms

/sci-physics/root/files/root-5.34-htmldoc.patch

https://bitbucket.org/burcin/lmnd-prefix-wip
Patch | 58 lines | 54 code | 4 blank | 0 comment | 0 complexity | a1b7fef36054060fefe09c7c93104798 MD5 | raw file
Possible License(s): LGPL-2.0, GPL-3.0, Apache-2.0, BSD-3-Clause, AGPL-1.0, GPL-2.0, MIT, MPL-2.0-no-copyleft-exception, LGPL-2.1, LGPL-3.0, AGPL-3.0, Unlicense, CC0-1.0 
    

  1. --- root/Makefile.orig	2012-05-30 00:50:46.000000000 +0400
    2. 

  2. +++ root/Makefile	2012-05-30 00:51:05.839679686 +0400
    3. 

  3. @@ -1088,16 +1088,7 @@
    4. 

  4.  releasenotes:
    5. 

  5.  	@$(MAKERELNOTES)
    6. 

  6.  
    7. 

  7. -html: $(ROOTEXE) changelog releasenotes
    8. 

  8. -ifneq ($(USECONFIG),FALSE)
    9. 

  9. -	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
    10. 

  10. -	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
    11. 

  11. -	  echo 'ERROR: root.exe has not been installed by this build.'; \
    12. 

  12. -	  echo '       Run "make install" before running "make html".'; \
    13. 

  13. -	  exit 1; \
    14. 

  14. -	fi
    15. 

  15. -endif
    16. 

  16. -	@$(MAKELOGHTML)
    17. 

  17. +html: $(ROOTEXE) releasenotes
    18. 

  18.  	@$(MAKEHTML)
    19. 

  19.  
    20. 

  20.  # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
    21. 

  21. --- root/build/unix/makehtml.sh.orig	2012-05-23 23:25:45.000000000 +0400
    22. 

  22. +++ root/build/unix/makehtml.sh	2012-05-24 13:04:43.919062126 +0400
    23. 

  23. @@ -6,12 +6,12 @@
    24. 

  24.  cd tutorials
    25. 

  25.  # we need tutorials/hsimple.root
    26. 

  26.  if [ ! -f hsimple.root ]; then
    27. 

  27. -   $ROOT -l -b -q hsimple.C
    28. 

  28. +   ../$ROOT -l -b -q hsimple.C && exit 1
    29. 

  29.  fi
    30. 

  30.  cd tree
    31. 

  31.  # we need tutorials/tree/cernstaff.root
    32. 

  32.  if [ ! -f cernstaff.root ]; then
    33. 

  33. -   $ROOT -l -b -q cernbuild.C
    34. 

  34. +   ../../$ROOT -l -b -q cernbuild.C || exit 1
    35. 

  35.  fi
    36. 

  36.  cd $dir
    37. 

  37.  
    38. 

  38. @@ -19,7 +19,7 @@
    39. 

  39.  echo "Generating doc in directory htmldoc/..."
    40. 

  40.  echo ""
    41. 

  41.  
    42. 

  42. -$ROOT -l <<makedoc
    43. 

  43. +$ROOT -l <<makedoc || exit 1
    44. 

  44.      THtml h;
    45. 

  45.      h.LoadAllLibs();
    46. 

  46.      h.MakeAll();
    47. 

  47. --- root/html/src/THtml.cxx.orig	2012-05-25 16:18:10.000000000 +0400
    48. 

  48. +++ root/html/src/THtml.cxx	2012-05-29 19:22:40.810563296 +0400
    49. 

  49. @@ -1913,6 +1913,9 @@
    50. 

  50.  void THtml::CreateStyleSheet() const {
    51. 

  51.     // Write the default ROOT style sheet.
    52. 

  52.     CopyFileFromEtcDir("ROOT.css");
    53. 

  53. +   CopyFileFromEtcDir("info.png");
    54. 

  54. +   CopyFileFromEtcDir("root-banner.png");
    55. 

  55. +   CopyFileFromEtcDir("rootdrawing-logo.png");
    56. 

  56.     CopyFileFromEtcDir("shadowAlpha.png");
    57. 

  57.     CopyFileFromEtcDir("shadow.gif");
    58. 

  58.  }
    59. 

  59.