Browse Source

Merge pull request #56 from csmith/circle

Add support for building javadoc.
pull/58/head
Greg Holmes 9 years ago
parent
commit
848a8fbe13
2 changed files with 12 additions and 5 deletions
  1. 7
    5
      circle.yml
  2. 5
    0
      javadoc.gradle

+ 7
- 5
circle.yml View File

12
     - git fetch --tags
12
     - git fetch --tags
13
     - git submodule update --init --remote
13
     - git submodule update --init --remote
14
 
14
 
15
-dependencies:
16
-  override:
17
-    - ./gradlew --stacktrace --parallel client:dependencies plugins:dependencies
18
-
19
 test:
15
 test:
20
   override:
16
   override:
21
-    - ./gradlew --stacktrace --parallel jar test client:fatjar
17
+    - >
18
+      if [ -n "${BUILD_JAVADOC}" ]; then
19
+        ./gradlew --stacktrace packageJavadoc;
20
+      else
21
+        ./gradlew --stacktrace --parallel jar test client:fatjar;
22
+      fi
22
 
23
 
23
 general:
24
 general:
24
   artifacts:
25
   artifacts:
25
     - plugins/dist-versioned
26
     - plugins/dist-versioned
26
     - client/build/libs
27
     - client/build/libs
28
+    - build/libs/dmdirc-javadoc.jar
27
 
29
 

+ 5
- 0
javadoc.gradle View File

6
         classpath = files(allprojects.collect { it.sourceSets.main.compileClasspath })
6
         classpath = files(allprojects.collect { it.sourceSets.main.compileClasspath })
7
         destinationDir = file("${buildDir}/docs/javadoc")
7
         destinationDir = file("${buildDir}/docs/javadoc")
8
     }
8
     }
9
+
10
+    task packageJavadoc(type: Jar, dependsOn: 'javadoc') {
11
+        from project.aggregateJavadoc.destinationDir
12
+        classifier = 'javadoc'
13
+    }
9
 }
14
 }
10
 
15
 

Loading…
Cancel
Save