- Separate out libraries by their purpose, so Netbeans doesn't have so much junk on the main classpath. - Bundle a version of Ivy instead of downloading it. - Have Ivy remove old versions of libraries instead of just adding new ones. - Write the classpaths themselves to private.properties instead of an indirect private.classpath property which shows up weirdly in Netbeans. Change-Id: I33b5fe34cc08d48d1b0e35ee93f21fa62bf8cfdb Reviewed-on: http://gerrit.dmdirc.com/2705 Reviewed-by: Greg Holmes <greg@dmdirc.com> Automatic-Compile: DMDirc Build Managertags/0.8rc1
|
|
||
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
|
|
|
35 |
|
|
36 |
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
|
|
||
5 |
|
5 |
|
6 |
|
6 |
|
7 |
|
7 |
|
8 |
|
|
|
|
8 |
|
|
9 |
|
9 |
|
10 |
|
10 |
|
11 |
|
11 |
|
12 |
|
12 |
|
13 |
|
13 |
|
14 |
|
|
|
|
14 |
|
|
15 |
|
15 |
|
16 |
|
16 |
|
17 |
|
17 |
|
|
|
||
2 |
|
2 |
|
3 |
|
3 |
|
4 |
|
4 |
|
5 |
|
|
|
6 |
|
5 |
|
7 |
|
6 |
|
8 |
|
7 |
|
9 |
|
8 |
|
10 |
|
|
|
|
9 |
|
|
11 |
|
10 |
|
12 |
|
11 |
|
13 |
|
12 |
|
14 |
|
13 |
|
15 |
|
14 |
|
16 |
|
15 |
|
17 |
|
|
|
18 |
|
|
|
19 |
|
|
|
20 |
|
|
|
21 |
|
|
|
22 |
|
|
|
23 |
|
|
|
24 |
|
|
|
25 |
|
|
|
26 |
|
|
|
27 |
|
|
|
28 |
|
|
|
|
16 |
|
|
29 |
|
17 |
|
30 |
|
18 |
|
31 |
|
|
|
|
19 |
|
|
32 |
|
20 |
|
33 |
|
21 |
|
34 |
|
22 |
|
|
|
||
|
1 |
|
|
|
2 |
|
|
|
3 |
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
|
17 |
|
|
|
18 |
|
|
|
19 |
|
|
|
20 |
|
|
|
||
1 |
|
1 |
|
2 |
|
2 |
|
3 |
|
3 |
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
4 |
|
10 |
|
5 |
|
11 |
|
6 |
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
16 |
|
|
|
17 |
|
|
|
|
7 |
|
|
|
8 |
|
|
18 |
|
9 |
|
19 |
|
10 |
|
20 |
|
11 |
|
|
|
||
7 |
|
7 |
|
8 |
|
8 |
|
9 |
|
9 |
|
10 |
|
|
|
11 |
|
|
|
12 |
|
|
|
13 |
|
|
|
14 |
|
|
|
15 |
|
|
|
|
10 |
|
|
|
11 |
|
|
16 |
|
12 |
|
17 |
|
13 |
|
18 |
|
14 |
|
|
|
||
22 |
|
18 |
|
23 |
|
19 |
|
24 |
|
20 |
|
25 |
|
|
|
|
21 |
|
|
|
22 |
|
|
|
23 |
|
|
|
24 |
|
|
|
25 |
|
|
|
26 |
|
|
26 |
|
27 |
|
27 |
|
|
|
|
28 |
|
|
28 |
|
29 |
|
29 |
|
30 |
|
30 |
|
31 |
|
31 |
|
32 |
|
32 |
|
|
|
33 |
|
|
|
|
33 |
|
|
|
34 |
|
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
|
|
37 |
|
|
|
|
37 |
|
|
|
38 |
|
|
|
39 |
|
|
|
40 |
|
|
|
41 |
|
|
|
42 |
|
|
38 |
|
43 |
|
39 |
|
|
|
|
44 |
|
|
40 |
|
45 |
|
41 |
|
46 |
|
42 |
|
|
|
43 |
|
|
|
|
47 |
|
|
|
48 |
|
|
|
49 |
|
|
|
50 |
|
|
|
51 |
|
|
|
52 |
|
|
|
53 |
|
|
|
54 |
|
|
|
55 |
|
|
44 |
|
56 |
|
45 |
|
57 |
|
46 |
|
58 |
|
|
|
||
13 |
|
13 |
|
14 |
|
14 |
|
15 |
|
15 |
|
16 |
|
|
|
17 |
|
|
|
18 |
|
|
|
19 |
|
|
|
|
16 |
|
|
20 |
|
17 |
|
21 |
|
18 |
|
22 |
|
19 |
|
23 |
|
|
|
24 |
|
|
|
25 |
|
|
|
26 |
|
|
|
|
20 |
|
|
27 |
|
21 |
|
28 |
|
22 |
|
29 |
|
23 |
|
30 |
|
|
|
31 |
|
|
|
32 |
|
|
|
33 |
|
|
|
|
24 |
|
|
34 |
|
25 |
|
35 |
|
26 |
|
36 |
|
27 |
|
37 |
|
|
|
38 |
|
|
|
39 |
|
|
|
40 |
|
|
|
|
28 |
|
|
41 |
|
29 |
|
42 |
|
30 |
|
43 |
|
31 |
|
|
|
||
3 |
|
3 |
|
4 |
|
4 |
|
5 |
|
5 |
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
|
|
|
11 |
|
|
|
|
6 |
|
|
|
7 |
|
|
|
8 |
|
|
12 |
|
9 |
|
13 |
|
10 |
|
14 |
|
11 |
|
15 |
|
12 |
|
16 |
|
13 |
|
17 |
|
|
|
|
14 |
|
|
18 |
|
15 |
|
19 |
|
16 |
|
20 |
|
17 |
|
|
|
||
11 |
|
11 |
|
12 |
|
12 |
|
13 |
|
13 |
|
14 |
|
|
|
|
14 |
|
|
15 |
|
15 |
|
16 |
|
16 |
|
17 |
|
17 |
|
|
|
||
4 |
|
4 |
|
5 |
|
5 |
|
6 |
|
6 |
|
|
7 |
|
|
7 |
|
8 |
|
8 |
|
9 |
|
9 |
|
10 |
|
|
|
||
19 |
|
20 |
|
20 |
|
21 |
|
21 |
|
22 |
|
22 |
|
|
|
|
23 |
|
|
23 |
|
24 |
|
24 |
|
25 |
|
25 |
|
26 |
|
|
|
||
33 |
|
34 |
|
34 |
|
35 |
|
35 |
|
36 |
|
36 |
|
|
|
|
37 |
|
|
37 |
|
38 |
|
38 |
|
39 |
|
39 |
|
40 |
|
|
|
||
49 |
|
50 |
|
50 |
|
51 |
|
51 |
|
52 |
|
52 |
|
|
|
|
53 |
|
|
53 |
|
54 |
|
54 |
|
55 |
|
55 |
|
56 |
|
56 |
|
57 |
|
57 |
|
58 |
|
58 |
|
|
|
59 |
|
|
|
|
59 |
|
|
|
60 |
|
|
60 |
|
61 |
|
61 |
|
62 |
|
62 |
|
63 |
|
|
|
||
1 |
|
1 |
|
2 |
|
2 |
|
3 |
|
3 |
|
4 |
|
|
|
|
4 |
|
|
|
5 |
|
|
5 |
|
6 |
|
6 |
|
7 |
|
|
|
||
3 |
|
3 |
|
4 |
|
4 |
|
5 |
|
5 |
|
6 |
|
|
|
|
6 |
|
|
7 |
|
7 |
|
8 |
|
|
|
|
8 |
|
|
9 |
|
9 |
|
10 |
|
10 |
|
11 |
|
11 |
|
|
|
||
14 |
|
14 |
|
15 |
|
15 |
|
16 |
|
16 |
|
17 |
|
|
|
|
17 |
|
|
18 |
|
18 |
|
19 |
|
19 |
|
20 |
|
|
|
|
20 |
|
|
21 |
|
21 |
|
22 |
|
|
|
23 |
|
|
|
|
22 |
|
|
|
23 |
|
|
24 |
|
24 |
|
25 |
|
|
|
26 |
|
25 |
|
27 |
|
26 |
|
28 |
|
27 |
|
29 |
|
|
|
30 |
|
|
|
|
28 |
|
|
|
29 |
|
|
|
30 |
|
|
|
31 |
|
|
31 |
|
32 |
|
32 |
|
33 |
|
33 |
|
34 |
|
|
|
||
80 |
|
80 |
|
81 |
|
81 |
|
82 |
|
82 |
|
83 |
|
|
|
84 |
|
|
|
85 |
|
|
|
86 |
|
|
|
87 |
|
|
|
88 |
|
|
|
89 |
|
83 |
|
90 |
|
84 |
|
91 |
|
85 |
|