gradle: merge indexOBR and indexR5 tasks into index task

Signed-off-by: Ferry Huberts <[email protected]>
bndtools · Apr 25, 2014 · d5b520b · d5b520b
1 parent 5bb87c1
commit d5b520b
Show file tree

Hide file tree

Showing 7 changed files with 216 additions and 329 deletions.
diff --git a/cnf/gradle/doc/BUILDING-GRADLE.md b/cnf/gradle/doc/BUILDING-GRADLE.md
@@ -494,9 +494,15 @@ This is in addition to the ```clean``` task that is defined by the Java plugin.
 
 ## All Projects
 
-### Index Tasks
+### index
+
+This task can create one or more of the following:
+* an uncompressed OBR index
+* an uncompressed R5 index
+* a compressed OBR index
+* a compressed R5 index
 
-#### Index Tasks Configuration
+These indexes are generated from/for one or more configured directories.
 
 Which directories are indexed is controlled by
 the ```gradleBuild_indexDirectories``` property. Its **syntax** is:
@@ -524,10 +530,9 @@ above):
 syntax,syntax,...
 ```
 
-#### indexOBR
-
-This task creates an uncompressed OBR index and/or a compressed OBR index of
-one or more configured directories.
+This task is automatically disabled when no index directories have been defined
+or when no OBR indexes **and** no R5 indexes are configured to be created
+(either uncompressed or compressed).
 
 OBR index generation is controlled by the properties
 
@@ -537,16 +542,6 @@ OBR index generation is controlled by the properties
 * &nbsp;```gradleBuild_indexOBRCompressed``` if set to ```true``` then a
   compressed OBR index is generated.
 
-This task is automatically disabled when no index directories have been defined
-or when no OBR indexes are configured to be created (either uncompressed or
-compressed).
-
-#### indexR5
-
-This task creates an uncompressed R5 index and/or a compressed R5 index of
-one or more configured directories, and is completely equivalent to
-the ```indexOBR``` task.
-
 R5 index generation is controlled by the properties
 
 * &nbsp;```gradleBuild_indexR5Uncompressed```: if set to ```true``` then an
@@ -555,18 +550,6 @@ R5 index generation is controlled by the properties
 * &nbsp;```gradleBuild_indexR5Compressed``` if set to ```true``` then a
   compressed R5 index is generated.
 
-This task is automatically disabled when no index directories have been defined
-or when no R5 indexes are configured to be created (either uncompressed or
-compressed).
-
-### index
-
-This task simply runs the ```indexOBR``` and ```indexR5``` tasks.
-
-This task is automatically disabled when no index directories have been defined
-or when no OBR indexes **and** no R5 indexes are configured to be created
-(either uncompressed or compressed).
-
 ### cleanNeeded
 
 This task will invoke the ```clean``` task on all projects on which the

diff --git a/cnf/gradle/doc/bnd.dot b/cnf/gradle/doc/bnd.dot
@@ -165,8 +165,6 @@ digraph GradleSetup {
     subgraph cluster21 {
       label="";
       style=invis;
-      indexOBR             [shape=box, style=filled, fillcolor=cyan     , label="indexOBR"            ]
-      indexR5              [shape=box, style=filled, fillcolor=cyan     , label="indexR5"             ]
       index                [shape=box, style=filled, fillcolor=cyan     , label="index"               ]
     }
 
@@ -179,9 +177,6 @@ digraph GradleSetup {
       distcleanNeeded      [shape=box, style=filled, fillcolor=cyan     , label="distcleanNeeded"     ]
     }
 
-    indexOBR               -> index
-    indexR5                -> index
-
     clean                  -> cleanNeeded        [color=blue  ]
     cleanNeeded            -> cleanNeeded        [color=red   ]
     clean                  -> distclean          [color=blue  ]
@@ -197,15 +192,10 @@ digraph GradleSetup {
       fillcolor=lightgrey;
       color=black;
 
-      distIndexOBR           [shape=box, style=filled, fillcolor=cyan, label="indexOBR"]
-      distIndexR5            [shape=box, style=filled, fillcolor=cyan, label="indexR5"]
       distIndex              [shape=box, style=filled, fillcolor=cyan, label="index"]
       distDist               [shape=box, style=filled, fillcolor=cyan, label="dist"]
 
-      release                -> distIndexOBR     [color=red   ]
-      release                -> distIndexR5      [color=red   ]
-      distIndexOBR           -> distIndex
-      distIndexR5            -> distIndex
+      release                -> distIndex        [color=red   ]
       distIndex              -> distDist
     }
 }