| blob | d16446af6f9538b62a722a6e4fd86bba462e3d2c |
1 --- build.xml.orig 2009-12-26 09:11:39.211850481 +0100
2 +++ build.xml 2009-12-26 09:12:52.782683274 +0100
3 @@ -33,65 +33,65 @@
4 <exclude name="**/icon?*.png"/>
5 </patternset>
7 - <!-- detect current platform -->
8 - <condition property="platform" value="linux">
9 - <os name="Linux" arch="i386"/>
10 - </condition>
11 - <condition property="platform" value="linux64">
12 - <or>
13 - <os name="Linux" arch="amd64"/>
14 - <os name="Linux" arch="ia64"/>
15 - <os name="Linux" arch="x86_64"/>
16 - </or>
17 - </condition>
18 - <condition property="platform" value="mac">
19 - <os family="mac"/>
20 - </condition>
21 - <condition property="platform" value="win32">
22 - <os family="windows"/>
23 - </condition>
24 - <condition property="platform" value="unknown">
25 - <not>
26 - <isset property="platform"/>
27 - </not>
28 - </condition>
29 -
30 - <target name="all" depends="clean,compile,compile-tests,test,package,clean_end"/>
31 - <target name="linux" depends="clean,compile-linux,package-linux,clean_end"/>
32 - <target name="linux64" depends="clean,compile-linux64,package-linux64,clean_end"/>
33 - <target name="mac" depends="clean,compile-mac,package-mac,clean_end"/>
34 - <target name="win32" depends="clean,compile-win32,package-win32,clean_end"/>
35 - <target name="current">
36 - <antcall target="${platform}"/>
37 - </target>
38 -
39 - <!-- this is run by cruise control continous integration -->
40 - <target name="cruise" depends="clean,compile,compile-tests,package,clean_end"/>
41 -
42 + <!-- detect current platform -->
43 + <condition property="platform" value="linux">
44 + <os name="Linux" arch="i386"/>
45 + </condition>
46 + <condition property="platform" value="linux64">
47 + <or>
48 + <os name="Linux" arch="amd64"/>
49 + <os name="Linux" arch="ia64"/>
50 + <os name="Linux" arch="x86_64"/>
51 + </or>
52 + </condition>
53 + <condition property="platform" value="mac">
54 + <os family="mac"/>
55 + </condition>
56 + <condition property="platform" value="win32">
57 + <os family="windows"/>
58 + </condition>
59 + <condition property="platform" value="unknown">
60 + <not>
61 + <isset property="platform"/>
62 + </not>
63 + </condition>
64 +
65 + <target name="all" depends="clean,compile,compile-tests,test,package,clean_end"/>
66 + <target name="linux" depends="clean,compile-linux,package-linux,clean_end"/>
67 + <target name="linux64" depends="clean,compile-linux64,package-linux64,clean_end"/>
68 + <target name="mac" depends="clean,compile-mac,package-mac,clean_end"/>
69 + <target name="win32" depends="clean,compile-win32,package-win32,clean_end"/>
70 + <target name="current">
71 + <antcall target="${platform}"/>
72 + </target>
73 +
74 + <!-- this is run by cruise control continous integration -->
75 + <target name="cruise" depends="clean,compile,compile-tests,package,clean_end"/>
76 +
77 <target name="info">
78 - <echo message="This script will build ${name} ${version}"/>
79 + <echo message="This script will build ${name} ${version}"/>
80 <echo message="Targets (some may work only on Linux):"/>
81 <echo message=" all - runs tests and builds binaries for all OSs"/>
82 - <echo message=" linux - builds only Linux 32-bit binary"/>
83 + <echo message=" linux - builds only Linux 32-bit binary"/>
84 <echo message=" linux64 - builds only Linux 64-bit binary"/>
85 <echo message=" mac - builds only Mac binary"/>
86 - <echo message=" win32 - builds only Windows binary"/>
87 + <echo message=" win32 - builds only Windows binary"/>
88 <echo message=" current = ${platform}"/>
89 </target>
90 -
91 - <target name="clean">
92 +
93 + <target name="clean">
94 <delete dir="${dist}"/>
95 - <antcall target="clean_end"/>
96 + <antcall target="clean_end"/>
97 </target>
98 -
99 - <target name="clean_end">
100 - <delete dir="${bin}"/>
101 - <delete dir="${testbin}"/>
102 - <delete dir="${bin}.linux"/>
103 - <delete dir="${bin}.linux64"/>
104 - <delete dir="${bin}.win32"/>
105 - <delete dir="${bin}.mac"/>
106 - <delete dir="${testresults}"/>
107 +
108 + <target name="clean_end">
109 + <delete dir="${bin}"/>
110 + <delete dir="${testbin}"/>
111 + <delete dir="${bin}.linux"/>
112 + <delete dir="${bin}.linux64"/>
113 + <delete dir="${bin}.win32"/>
114 + <delete dir="${bin}.mac"/>
115 + <delete dir="${testresults}"/>
116 </target>
118 <macrodef name="compile">
119 @@ -167,18 +167,18 @@
120 <classpath>
121 <path location="${testbin}"/>
122 <fileset dir="${swt}" includes="swt-${platform}.jar"/>
123 - <fileset dir="${ext}/junit" includes="*.jar"/>
124 + <fileset dir="${ext}/junit" includes="*.jar"/>
125 <fileset dir="${ext}/easymock" includes="*.jar"/>
126 - <fileset dir="${ext}/picocontainer" includes="*.jar"/>
127 + <fileset dir="${ext}/picocontainer" includes="*.jar"/>
128 <path refid="emma.lib"/>
129 </classpath>
130 <formatter type="xml"/>
131 <batchtest todir="${testresults}">
132 <fileset dir="${testbin}" includes="**/*Test.class"/>
133 </batchtest>
134 - </junit>
135 - <!--
136 - report: no valid input data files have been specified
137 + </junit>
138 + <!--
139 + report: no valid input data files have been specified
140 <emma>
141 <report sourcepath="${src}" encoding="UTF-8">
142 <fileset dir="${basedir}" includes="coverage.ec"/>
143 @@ -213,11 +213,11 @@
144 <macrodef name="package-for">
145 <attribute name="platform"/>
146 <attribute name="librocksaw"/>
147 - <sequential>
148 + <sequential>
149 <mkdir dir="${dist}"/>
150 <unzip src="${ext}/picocontainer/picocontainer-1.0.jar" dest="${bin}.@{platform}"/>
151 <unzip src="${swt}/swt-@{platform}.jar" dest="${bin}.@{platform}"/>
152 - <copy file="${ext}/rocksaw/lib/@{librocksaw}" todir="${bin}.@{platform}"/>
153 + <copy file="${ext}/rocksaw/lib/@{librocksaw}" todir="${bin}.@{platform}"/>
154 <copy file="${ext}/winping/lib/winping.dll" todir="${bin}.win32"/>
155 <delete includeemptydirs="true" failonerror="false">
156 <fileset dir="${bin}.@{platform}/images" includes="**/*.svg"/>
157 @@ -284,14 +284,14 @@
158 <include name="Color*"/>
159 <include name="Link*"/>
160 <include name="Tracker*"/>
161 - <include name="Date*"/>
162 + <include name="Date*"/>
163 <include name="Tray*"/>
164 <include name="Tree*"/>
165 <include name="DateTime*"/>
166 <include name="Sash*"/>
167 </fileset>
168 <fileset dir="${bin}.@{platform}/org/eclipse/swt/awt"/>
169 - </delete>
170 + </delete>
171 <jar destfile="${dist}/${ant.project.name}-@{platform}-orig.jar" >
172 <manifest>
173 <attribute name="Main-Class" value="${main.class}"/>
174 @@ -342,49 +342,50 @@
175 -keep class * {
176 % *Proc(int, int, int);
177 }
178 - </proguard>
179 -
180 + </proguard>
181 +
182 <delete file="${dist}/${ant.project.name}-@{platform}-orig.jar"/>
183 </sequential>
184 </macrodef>
186 <target name="package-linux" depends="svn-info">
187 - <package-for platform="linux" librocksaw="librocksaw.so"/>
188 -
189 - <!-- now create deb package for Ubuntu and such -->
190 + <package-for platform="linux" librocksaw="librocksaw.so"/>
191 +
192 + <!-- now create deb package for Ubuntu and such
193 <antcall target="package-linux-deb-rpm"/>
194 - </target>
195 -
196 - <target name="package-linux64" depends="svn-info">
197 - <package-for platform="linux64" librocksaw="librocksaw.so"/>
198 - </target>
199 -
200 - <target name="package-linux-deb-rpm" if="isRunningOnLinux">
201 - <mkdir dir="${dist}/deb"/>
202 - <copy todir="${dist}/deb">
203 - <fileset dir="${ext}/deb-bundle"/>
204 - </copy>
205 -
206 - <copy file="${dist}/${ant.project.name}-linux-${version}.jar" todir="${dist}/deb/usr/lib/ipscan"/>
207 - <copy file="resources/images/icon.png" tofile="${dist}/deb/usr/share/pixmaps/ipscan.png"/>
208 -
209 - <replace file="${dist}/deb/DEBIAN/control">
210 - <replacefilter token="VERSION" value="${version}"/>
211 - </replace>
212 -
213 - <exec executable="chmod" dir="${dist}">
214 - <arg line="a+x deb/usr/bin/ipscan deb/usr/lib/ipscan/${ant.project.name}-linux-${version}.jar"/>
215 - </exec>
216 - <echo message="Trying to build .deb package using dpkg..."/>
217 - <exec executable="dpkg" dir="${dist}">
218 - <arg line="-b deb ${ant.project.name}_${version}_i386.deb"/>
219 - </exec>
220 - <echo message="Trying to build .rpm package using alien..."/>
221 - <exec executable="alien" dir="${dist}">
222 - <arg line="--to-rpm ${ant.project.name}_${version}_i386.deb"/>
223 - </exec>
224 -
225 - <delete dir="${dist}/deb"/>
226 + -->
227 + </target>
228 +
229 + <target name="package-linux64" depends="svn-info">
230 + <package-for platform="linux64" librocksaw="librocksaw.so"/>
231 + </target>
232 +
233 + <target name="package-linux-deb-rpm" if="isRunningOnLinux">
234 + <mkdir dir="${dist}/deb"/>
235 + <copy todir="${dist}/deb">
236 + <fileset dir="${ext}/deb-bundle"/>
237 + </copy>
238 +
239 + <copy file="${dist}/${ant.project.name}-linux-${version}.jar" todir="${dist}/deb/usr/lib/ipscan"/>
240 + <copy file="resources/images/icon.png" tofile="${dist}/deb/usr/share/pixmaps/ipscan.png"/>
241 +
242 + <replace file="${dist}/deb/DEBIAN/control">
243 + <replacefilter token="VERSION" value="${version}"/>
244 + </replace>
245 +
246 + <exec executable="chmod" dir="${dist}">
247 + <arg line="a+x deb/usr/bin/ipscan deb/usr/lib/ipscan/${ant.project.name}-linux-${version}.jar"/>
248 + </exec>
249 + <echo message="Trying to build .deb package using dpkg..."/>
250 + <exec executable="dpkg" dir="${dist}">
251 + <arg line="-b deb ${ant.project.name}_${version}_i386.deb"/>
252 + </exec>
253 + <echo message="Trying to build .rpm package using alien..."/>
254 + <exec executable="alien" dir="${dist}">
255 + <arg line="--to-rpm ${ant.project.name}_${version}_i386.deb"/>
256 + </exec>
257 +
258 + <delete dir="${dist}/deb"/>
259 </target>
261 <target name="package-win32" depends="svn-info">