1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
|
--- assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml.orig 2008-03-11 00:23:57.000000000 +0900
+++ assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml 2008-03-11 01:00:02.000000000 +0900
@@ -11,6 +11,9 @@
<property name="eclipse.features" value="${eclipse.base}/features"/>
<property name="archiveFullPath" value="${basedir}/${buildLabel}/${archiveName}"/>
<property name="tarargs" value=""/>
+ <condition property="jdk16">
+ <isset property="JavaSE-1.6"/>
+ </condition>
<!-- Beginning of the jarUp task -->
<target name="jarUp" description="Create a jar from the given location.">
<available property="${source}/${elementName}_exists" file="${source}/${elementName}"/>
@@ -50,9 +53,6 @@
<ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui.templates" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
@@ -128,9 +128,6 @@
<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.app" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
@@ -143,15 +140,15 @@
<ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
<ant antfile="build.xml" dir="plugins/org.eclipse.ui.intro.universal" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
<ant antfile="build.xml" dir="plugins/org.eclipse.jsch.core" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
@@ -188,9 +185,6 @@
<ant antfile="build.xml" dir="plugins/org.eclipse.compare" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
<ant antfile="build.xml" dir="plugins/org.eclipse.jsch.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
@@ -474,10 +468,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
<param name="elementName" value="org.eclipse.help_3.3.2.v20071126_33x"/>
</antcall>
<antcall target="jarUp">
@@ -590,10 +580,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
<param name="elementName" value="org.eclipse.jdt.junit.runtime_3.3.0.v20070606-0010"/>
</antcall>
<antcall target="jarUp">
@@ -892,6 +878,9 @@
<param name="source" value="${eclipse.plugins}"/>
<param name="elementName" value="org.eclipse.team.core_3.3.1.r33x_20080128"/>
</antcall>
+
+ <antcall target="main.jdk16" inheritAll="true" />
+
<eclipse.brand root="${eclipse.base}/freebsd.gtk.amd64/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" />
<exec executable="cp" dir="${basedir}">
<arg line="-r '${assemblyTempDir}/${collectingFolder}/freebsd.gtk.amd64/${collectingFolder}' '${assemblyTempDir}'"/>
@@ -909,6 +898,31 @@
</exec>
<delete dir="${assemblyTempDir}"/>
</target>
+
+ <target name="main.jdk16" if="jdk16">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}" />
+ </ant>
+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}" />
+ </ant>
+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}" />
+ </ant>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}" />
+ <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100" />
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}" />
+ <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100" />
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}" />
+ <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x" />
+ </antcall>
+ </target>
+
<target name="gzipResults" unless="runPackager">
<move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/>
<gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/>
|
