[gentoo-commits] gentoo-x86 commit in app-doc/root-docs/files: root-docs-6.00.01-makehtml.patch root-docs-6.00.01-fillpatterns.patch

[Andrew Savchenko (bircoph)]

bircoph     15/03/02 08:25:14

  Added:                root-docs-6.00.01-makehtml.patch
                        root-docs-6.00.01-fillpatterns.patch
  Log:
  version bump (sci-physics/root will be committed shortly)
  
  Signed-off-by: Andrew Savchenko <bircoph@g.o>
  (Portage version: 2.2.17/cvs/Linux i686, signed Manifest commit with key 565953B95372756C)

Revision  Changes    Path
1.1                  app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch?rev=1.1&content-type=text/plain

Index: root-docs-6.00.01-makehtml.patch
===================================================================
diff --git a/Makefile b/Makefile
index 600e8db..afad025 100644
--- a/Makefile
+++ b/Makefile
@@ -1072,16 +1072,7 @@ $(ROOTPCH): $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
 
 ifeq ($(BUILDX11),yes)
 ifeq ($(BUILDASIMAGE),yes)
-html: rootexecs postbin changelog releasenotes
-ifneq ($(USECONFIG),FALSE)
-	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
-	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
-	  echo 'ERROR: root.exe has not been installed by this build.'; \
-	  echo '       Run "make install" before running "make html".'; \
-	  exit 1; \
-	fi
-endif
-	@$(MAKELOGHTML)
+html: compiledata releasenotes
 	@$(MAKEHTML)
 else
 html:
diff --git a/build/unix/makehtml.sh b/build/unix/makehtml.sh
index a94e790..8b4589d 100755
--- a/build/unix/makehtml.sh
+++ b/build/unix/makehtml.sh
@@ -1,16 +1,16 @@
 #! /bin/sh
 
 dir=`pwd`
-ROOT=$dir/bin/root
+ROOT=root
 cd tutorials
 # we need tutorials/hsimple.root
 if [ ! -f hsimple.root ]; then
-   $ROOT -n -l -b -q hsimple.C
+   $ROOT -n -l -b -q hsimple.C && exit 1
 fi
 cd tree
 # we need tutorials/tree/cernstaff.root
 if [ ! -f cernstaff.root ]; then
-   $ROOT -n -l -b -q cernbuild.C
+   $ROOT -n -l -b -q cernbuild.C || exit 1
 fi
 cd $dir
 
@@ -20,7 +20,7 @@ echo ""
 
 # To generate the full documentation, we do need to
 # use the graphics engine, so do not use '-b'.
-$ROOT -n -l <<makedoc
+$ROOT -n -l <<makedoc || exit 1
     THtml h;
     h.LoadAllLibs();
     h.MakeAll();



1.1                  app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch?rev=1.1&content-type=text/plain

Index: root-docs-6.00.01-fillpatterns.patch
===================================================================
diff --git a/core/base/doc/macros/fillpatterns.C b/core/base/doc/macros/fillpatterns.C
index b0a5132..fca81c8 100644
--- a/core/base/doc/macros/fillpatterns.C
+++ b/core/base/doc/macros/fillpatterns.C
@@ -20,11 +20,11 @@ TCanvas * fillpatterns()
 
    // Fixed patterns.
    for (i=1; i<=5; i++) {
-      box(j++, 0.01, y-bh, 0.19, y);
-      box(j++, 0.21, y-bh, 0.39, y);
-      box(j++, 0.41, y-bh, 0.59, y);
-      box(j++, 0.61, y-bh, 0.79, y);
-      box(j++, 0.81, y-bh, 0.99, y);
+      box(j, 0.01, y-bh, 0.19, y); j++;
+      box(j, 0.21, y-bh, 0.39, y); j++;
+      box(j, 0.41, y-bh, 0.59, y); j++;
+      box(j, 0.61, y-bh, 0.79, y); j++;
+      box(j, 0.81, y-bh, 0.99, y); j++;
       y = y-bh-db;
    }
 
@@ -55,7 +55,7 @@ TCanvas * fillpatterns()
    return Pat;
 }
 
-box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t  y2)
+void box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t  y2)
 {
    // Draw an box using the fill pattern "pat" with the "pat" value
    // written on top.