소스 검색

Use gradle wrapper.

I haven't tested with windows stuff... :)

Change-Id: I7741b2a581b102eb8d8edc5ef95fa33447a6aa84
Reviewed-on: http://gerrit.dmdirc.com/3896
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
changes/96/3896/3
Chris Smith 9 년 전
부모
커밋
d66a4d7747
1개의 변경된 파일36개의 추가작업 그리고 4개의 파일을 삭제
  1. 36
    4
      build.xml

+ 36
- 4
build.xml 파일 보기

@@ -8,7 +8,15 @@
8 8
     <target name="init-dependencies"/>
9 9
 
10 10
     <target name="compile">
11
-        <exec executable="gradle" dir="." failonerror="true">
11
+        <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
12
+            <arg value="-PdmdircOutput=${dmdircOutput}"/>
13
+            <arg value="--parallel"/>
14
+            <arg value="compileJava"/>
15
+        </exec>
16
+
17
+        <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
18
+            <arg value="/c"/>
19
+            <arg value="gradlew.bat"/>
12 20
             <arg value="-PdmdircOutput=${dmdircOutput}"/>
13 21
             <arg value="--parallel"/>
14 22
             <arg value="compileJava"/>
@@ -16,7 +24,15 @@
16 24
     </target>
17 25
 
18 26
     <target name="jar">
19
-        <exec executable="gradle" dir="." failonerror="true">
27
+        <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
28
+            <arg value="-PdmdircOutput=${dmdircOutput}"/>
29
+            <arg value="--parallel"/>
30
+            <arg value="jar"/>
31
+        </exec>
32
+
33
+        <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
34
+            <arg value="/c"/>
35
+            <arg value="gradlew.bat"/>
20 36
             <arg value="-PdmdircOutput=${dmdircOutput}"/>
21 37
             <arg value="--parallel"/>
22 38
             <arg value="jar"/>
@@ -31,7 +47,15 @@
31 47
     </target>
32 48
 
33 49
     <target name="clean">
34
-        <exec executable="gradle" dir="." failonerror="true">
50
+        <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
51
+            <arg value="-PdmdircOutput=${dmdircOutput}"/>
52
+            <arg value="--parallel"/>
53
+            <arg value="clean"/>
54
+        </exec>
55
+
56
+        <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
57
+            <arg value="/c"/>
58
+            <arg value="gradlew.bat"/>
35 59
             <arg value="-PdmdircOutput=${dmdircOutput}"/>
36 60
             <arg value="--parallel"/>
37 61
             <arg value="clean"/>
@@ -41,7 +65,15 @@
41 65
     <target name="with.clover"/>
42 66
 
43 67
     <target name="compile-for-tests" depends="compile">
44
-        <exec executable="gradle" dir="." failonerror="true">
68
+        <exec executable="gradlew" dir="." failonerror="true" resolveexecutable="true" osfamily="unix">
69
+            <arg value="-PdmdircOutput=${dmdircOutput}"/>
70
+            <arg value="--parallel"/>
71
+            <arg value="compileTestJava"/>
72
+        </exec>
73
+
74
+        <exec executable="cmd" dir="." failonerror="true" osfamily="windows">
75
+            <arg value="/c"/>
76
+            <arg value="gradlew.bat"/>
45 77
             <arg value="-PdmdircOutput=${dmdircOutput}"/>
46 78
             <arg value="--parallel"/>
47 79
             <arg value="compileTestJava"/>

Loading…
취소
저장