git clone of logicmail with some fixes/features added
Stepping up minimum supported OS to 4.5 (build and project files)
git-svn-id: https://logicmail.svn.sourceforge.net/svnroot/logicmail/trunk@749 5c734088-3d25-0410-9155-b3c3832efda5
+36
-38
+1
-1
J2MEUnit/.classpath
+1
-1
J2MEUnit/.classpath
···
2
2
<classpath>
3
3
<classpathentry kind="src" path="src"/>
4
4
<classpathentry kind="src" path="res"/>
5
-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/net.rim.ejde.BlackBerryVMInstallType/BlackBerry JRE 4.2.1"/>
5
+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/net.rim.ejde.BlackBerryVMInstallType/BlackBerry JRE 4.5.0"/>
6
6
<classpathentry kind="output" path="bin"/>
7
7
</classpath>
+1
-1
LogicMail/.classpath
+1
-1
LogicMail/.classpath
···
2
2
<classpath>
3
3
<classpathentry kind="src" path="src"/>
4
4
<classpathentry kind="src" path="res"/>
5
-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/net.rim.ejde.BlackBerryVMInstallType/BlackBerry JRE 4.2.1"/>
5
+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/net.rim.ejde.BlackBerryVMInstallType/BlackBerry JRE 4.5.0"/>
6
6
<classpathentry kind="src" path=".locale_interfaces"/>
7
7
<classpathentry kind="output" path="bin"/>
8
8
</classpath>
+14
-14
LogicMail/build.xml
+14
-14
LogicMail/build.xml
···
70
70
71
71
<!-- Build the application -->
72
72
<target name="build">
73
-
<if><isset property="jde421.home"/><then>
74
-
<fileset id="bb421_fileset" dir="src" />
75
-
<build-platform jdehome="${jde421.home}" platform="BB421" defines="BLACKBERRY_4_2_1" platformfileset="bb421_fileset"/>
73
+
<if><isset property="jde450.home"/><then>
74
+
<fileset id="bb450_fileset" dir="src" />
75
+
<build-platform jdehome="${jde450.home}" platform="BB450" defines="BLACKBERRY_4_5_0" platformfileset="bb450_fileset"/>
76
76
</then></if>
77
77
<if><isset property="jde460.home"/><then>
78
78
<fileset id="bb460_fileset" dir="..">
···
118
118
119
119
<!-- Sign the application -->
120
120
<target name="sign" depends="build" if="sigtool.password">
121
-
<if><isset property="jde421.home"/><then>
122
-
<sigtool jdehome="${jde421.home}"
121
+
<if><isset property="jde450.home"/><then>
122
+
<sigtool jdehome="${jde450.home}"
123
123
password="${sigtool.password}"
124
124
forceclose="true"
125
-
codfile="${dist.dir}/BB421/${module.name}.cod"/>
125
+
codfile="${dist.dir}/BB450/${module.name}.cod"/>
126
126
</then></if>
127
127
<if><isset property="jde460.home"/><then>
128
128
<sigtool jdehome="${jde460.home}"
···
164
164
<include name="**/*.java"/>
165
165
</fileset>
166
166
<classpath>
167
-
<pathelement path="${jde421.home}/lib/net_rim_api.jar"/>
168
-
<pathelement path="${dist.dir}/BB421/${module.name}.jar"/>
167
+
<pathelement path="${jde450.home}/lib/net_rim_api.jar"/>
168
+
<pathelement path="${dist.dir}/BB450/${module.name}.jar"/>
169
169
</classpath>
170
170
</javadoc>
171
171
</target>
···
186
186
they will need to be manually edited if executing this task without
187
187
all supported JDE versions defined.
188
188
-->
189
-
<codset dir="BB421" greaterthanequal="4.2.1" lessthan="4.7.0">
190
-
<fileset dir="${dist.dir}/BB421" includes="*.cod" />
189
+
<codset dir="BB450" greaterthanequal="4.5.0" lessthan="4.6.0">
190
+
<fileset dir="${dist.dir}/BB450" includes="*.cod" />
191
191
</codset>
192
192
<codset dir="BB460" greaterthanequal="4.6.0" lessthan="4.7.0">
193
193
<fileset dir="${dist.dir}/BB460" includes="*.cod" />
···
237
237
]]>
238
238
</insert>
239
239
240
-
<insert if="jde421.home" path="/application">
240
+
<insert if="jde450.home" path="/application">
241
241
<![CDATA[
242
-
<jad blackberryVersion="[4.2.1,4.7.0)" file="BB421/${module.name}.jad"/>
242
+
<jad blackberryVersion="[4.5.0,4.6.0)" file="BB450/${module.name}.jad"/>
243
243
]]>
244
244
</insert>
245
245
<insert if="jde460.home" path="/application">
···
263
263
]]>
264
264
</insert>
265
265
</xmltask>
266
-
<if><isset property="jde421.home"/><then>
267
-
<copy-ota-files src="${dist.dir}/BB421" dest="${dist.ota.dir}/${module.version}/BB421"/>
266
+
<if><isset property="jde450.home"/><then>
267
+
<copy-ota-files src="${dist.dir}/BB450" dest="${dist.ota.dir}/${module.version}/BB450"/>
268
268
</then></if>
269
269
<if><isset property="jde460.home"/><then>
270
270
<copy-ota-files src="${dist.dir}/BB460" dest="${dist.ota.dir}/${module.version}/BB460"/>
+1
-1
LogicMail/project.properties
+1
-1
LogicMail/project.properties
···
11
11
#
12
12
# Set the paths to the JDEs to build with
13
13
#
14
-
jde421.home=C:/Users/octo/eclipse35/plugins/net.rim.ejde.componentpack4.2.1_4.2.1.19/components
14
+
jde450.home=C:/Users/octo/eclipse35/plugins/net.rim.ejde.componentpack4.5.0_4.5.0.28/components
15
15
jde460.home=C:/Users/octo/eclipse35/plugins/net.rim.ejde.componentpack4.6.0_4.6.0.23/components
16
16
jde470.home=C:/Users/octo/eclipse35/plugins/net.rim.ejde.componentpack4.7.0_4.7.0.57/components
17
17
jde500.home=C:/Users/octo/eclipse35/plugins/net.rim.ejde.componentpack5.0.0_5.0.0.25/components
+1
-1
LogicMailStartup/.classpath
+1
-1
LogicMailStartup/.classpath
···
2
2
<classpath>
3
3
<classpathentry kind="src" path="src"/>
4
4
<classpathentry kind="src" path="res"/>
5
-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/net.rim.ejde.BlackBerryVMInstallType/BlackBerry JRE 4.2.1"/>
5
+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/net.rim.ejde.BlackBerryVMInstallType/BlackBerry JRE 4.5.0"/>
6
6
<classpathentry combineaccessrules="false" kind="src" path="/LogicMail"/>
7
7
<classpathentry kind="output" path="bin"/>
8
8
</classpath>
+1
-1
LogicMailTests/.classpath
+1
-1
LogicMailTests/.classpath
···
2
2
<classpath>
3
3
<classpathentry kind="src" path="src"/>
4
4
<classpathentry kind="src" path="res"/>
5
-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/net.rim.ejde.BlackBerryVMInstallType/BlackBerry JRE 4.2.1"/>
5
+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/net.rim.ejde.BlackBerryVMInstallType/BlackBerry JRE 4.5.0"/>
6
6
<classpathentry combineaccessrules="false" kind="src" path="/J2MEUnit"/>
7
7
<classpathentry combineaccessrules="false" kind="src" path="/LogicMail"/>
8
8
<classpathentry kind="output" path="bin"/>
+17
-19
LogicMailTests/build.xml
+17
-19
LogicMailTests/build.xml
···
7
7
<property name="src.dir" location="src"/>
8
8
<property name="dist.dir" location="dist"/>
9
9
<property name="app.src.dir" location="../LogicMail/src"/>
10
+
<property name="res.src.dir" location="../LogicMail/res"/>
10
11
<property name="j2meunit.src.dir" location="../J2MEUnit/src"/>
11
12
<property file="../LogicMail/project.properties"/>
12
13
13
14
<!-- Task definitions -->
14
-
<taskdef name="rapc" classname="ca.slashdev.bb.RapcTask">
15
-
<classpath>
16
-
<pathelement location="../lib/bb-ant-tools.jar"/>
17
-
</classpath>
18
-
</taskdef>
15
+
<typedef resource="bb-ant-defs.xml" classpath="../lib/bb-ant-tools.jar" />
19
16
20
17
<!-- Build the application tests -->
21
18
<target name="build">
···
25
22
<rapc output="${module.name}Tests"
26
23
srcdir="${src.dir}"
27
24
destdir="${dist.dir}"
28
-
jdehome="${jde.home}">
25
+
jdehome="${jde450.home}">
29
26
<jdp title="${module.title}Tests"
30
27
vendor="${module.vendor}"
31
28
version="${module.version}"
32
29
type="cldc"
33
30
midletclass="org.logicprobe.LogicMail.LogicMailTests"/>
34
31
<src>
35
-
<fileset dir="${j2meunit.src.dir}">
36
-
<include name="**/*.java"/>
37
-
</fileset>
32
+
<fileset dir="${j2meunit.src.dir}">
33
+
<include name="**/*.java"/>
34
+
</fileset>
38
35
<fileset dir="${src.dir}">
39
-
<include name="**/*.java"/>
40
-
</fileset>
41
-
<fileset dir="${app.src.dir}">
42
-
<include name="**/*.java"/>
43
-
<include name="**/*.rrc"/>
44
-
<include name="**/*.rrh"/>
45
-
<exclude name="**/*BB40.java"/>
46
-
<exclude name="org/logicprobe/LogicMail/LogicMail.java"/>
47
-
</fileset>
48
-
</src>
36
+
<include name="**/*.java"/>
37
+
</fileset>
38
+
<fileset dir="${app.src.dir}">
39
+
<include name="**/*.java"/>
40
+
<exclude name="org/logicprobe/LogicMail/LogicMail.java"/>
41
+
</fileset>
42
+
<fileset dir="${res.src.dir}">
43
+
<include name="**/*.rrc"/>
44
+
<include name="**/*.rrh"/>
45
+
</fileset>
46
+
</src>
49
47
</rapc>
50
48
</target>
51
49