git clone of logicmail with some fixes/features added
Changes to support using the newer version (v1.3) of the BlackBerry Java Plug-in for Eclipse
git-svn-id: https://logicmail.svn.sourceforge.net/svnroot/logicmail/trunk@874 5c734088-3d25-0410-9155-b3c3832efda5
+150
-9
+4
-2
J2MEUnit/BlackBerry_App_Descriptor.xml
+4
-2
J2MEUnit/BlackBerry_App_Descriptor.xml
···
1
+
<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
2
+
1
3
<Properties ModelVersion="1.1.2">
2
4
<General Title="J2MEUnit" Version="1.1.1" Vendor="Brunno Silva, et al." Description="J2ME Unit Testing Toolkit"/>
3
-
<Application Type="Library" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="false" IsAutostartup="false"/>
5
+
<Application Type="Library" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="true" IsAutostartup="false"/>
4
6
<Resources hasTitleResource="false" TitleResourceBundleName="" TitleResourceBundleRelativePath="" TitleResourceBundleClassName="" TitleResourceBundleKey="" DescriptionId="">
5
7
<Icons/>
6
8
</Resources>
7
9
<Compile OutputCompilerMessages="false" ConvertImages="false" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
8
10
<PreprocessorDefines/>
9
11
</Compile>
10
-
<Packaging OutputFileName="J2MEUnit" OutputFolder="deliverables" PreBuildStep="" PostBuildStep="" CleanStep="" GenerateALXFile="false">
12
+
<Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="J2MEUnit" OutputFolder="deliverables" GenerateALXFile="false">
11
13
<AlxFiles/>
12
14
</Packaging>
13
15
<HiddenProperties>
+3
-1
LogicMail/BlackBerry_App_Descriptor.xml
+3
-1
LogicMail/BlackBerry_App_Descriptor.xml
···
1
+
<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
2
+
1
3
<Properties ModelVersion="1.1.2">
2
4
<General Title="LogicMail" Version="2.1.0" Vendor="Derek Konigsberg" Description="LogicMail for BlackBerry"/>
3
5
<Application Type="Library" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="true" IsAutostartup="false"/>
···
7
9
<Compile OutputCompilerMessages="false" ConvertImages="false" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
8
10
<PreprocessorDefines/>
9
11
</Compile>
10
-
<Packaging OutputFileName="LogicMail" OutputFolder="deliverables" PreBuildStep="" PostBuildStep="" CleanStep="" GenerateALXFile="false">
12
+
<Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="LogicMail" OutputFolder="deliverables" GenerateALXFile="false">
11
13
<AlxFiles/>
12
14
</Packaging>
13
15
<HiddenProperties>
+3
-1
LogicMailStartup/BlackBerry_App_Descriptor.xml
+3
-1
LogicMailStartup/BlackBerry_App_Descriptor.xml
···
1
+
<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
2
+
1
3
<Properties ModelVersion="1.1.2">
2
4
<General Title="LogicMail" Version="2.1.0" Vendor="Derek Konigsberg" Description="LogicMail for BlackBerry"/>
3
5
<Application Type="BlackBerry Application" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="false" IsAutostartup="false"/>
···
10
12
<Compile OutputCompilerMessages="false" ConvertImages="false" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
11
13
<PreprocessorDefines/>
12
14
</Compile>
13
-
<Packaging OutputFileName="LogicMailStartup" OutputFolder="deliverables" PreBuildStep="" PostBuildStep="" CleanStep="" GenerateALXFile="false">
15
+
<Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="LogicMailStartup" OutputFolder="deliverables" GenerateALXFile="false">
14
16
<AlxFiles/>
15
17
</Packaging>
16
18
<HiddenProperties>
+3
-1
LogicMailTests/BlackBerry_App_Descriptor.xml
+3
-1
LogicMailTests/BlackBerry_App_Descriptor.xml
···
1
+
<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
2
+
1
3
<Properties ModelVersion="1.1.2">
2
4
<General Title="LogicMail Tests" Version="2.1.0" Vendor="Derek Konigsberg" Description="LogicMail Unit Tests"/>
3
5
<Application Type="BlackBerry Application" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="false" IsAutostartup="false"/>
···
9
11
<Compile OutputCompilerMessages="false" ConvertImages="false" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
10
12
<PreprocessorDefines/>
11
13
</Compile>
12
-
<Packaging OutputFileName="LogicMailTests" OutputFolder="deliverables" PreBuildStep="" PostBuildStep="" CleanStep="" GenerateALXFile="false">
14
+
<Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="LogicMailTests" OutputFolder="deliverables" GenerateALXFile="false">
13
15
<AlxFiles/>
14
16
</Packaging>
15
17
<HiddenProperties>
+3
-1
LogicMail_BB46/BlackBerry_App_Descriptor.xml
+3
-1
LogicMail_BB46/BlackBerry_App_Descriptor.xml
···
1
+
<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
2
+
1
3
<Properties ModelVersion="1.1.2">
2
4
<General Title="" Version="2.1.0" Vendor="Derek Konigsberg" Description="LogicMail BB 4.6 Platform Library"/>
3
5
<Application Type="Library" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="true" IsAutostartup="false"/>
···
7
9
<Compile OutputCompilerMessages="false" ConvertImages="false" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
8
10
<PreprocessorDefines/>
9
11
</Compile>
10
-
<Packaging OutputFileName="LogicMail_BB46" OutputFolder="deliverables" PreBuildStep="" PostBuildStep="" CleanStep="" GenerateALXFile="false">
12
+
<Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="LogicMail_BB46" OutputFolder="deliverables" GenerateALXFile="false">
11
13
<AlxFiles/>
12
14
</Packaging>
13
15
<HiddenProperties>
+3
-1
LogicMail_BB47/BlackBerry_App_Descriptor.xml
+3
-1
LogicMail_BB47/BlackBerry_App_Descriptor.xml
···
1
+
<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
2
+
1
3
<Properties ModelVersion="1.1.2">
2
4
<General Title="" Version="2.1.0" Vendor="Derek Konigsberg" Description="LogicMail BB 4.7 Platform Library"/>
3
5
<Application Type="Library" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="true" IsAutostartup="false"/>
···
7
9
<Compile OutputCompilerMessages="false" ConvertImages="false" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
8
10
<PreprocessorDefines/>
9
11
</Compile>
10
-
<Packaging OutputFileName="LogicMail_BB47" OutputFolder="deliverables" PreBuildStep="" PostBuildStep="" CleanStep="" GenerateALXFile="false">
12
+
<Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="LogicMail_BB47" OutputFolder="deliverables" GenerateALXFile="false">
11
13
<AlxFiles/>
12
14
</Packaging>
13
15
<HiddenProperties>
+3
-1
LogicMail_BB50/BlackBerry_App_Descriptor.xml
+3
-1
LogicMail_BB50/BlackBerry_App_Descriptor.xml
···
1
+
<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
2
+
1
3
<Properties ModelVersion="1.1.2">
2
4
<General Title="" Version="2.1.0" Vendor="Derek Konigsberg" Description="LogicMail BB 5.0 Platform Library"/>
3
5
<Application Type="Library" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="true" IsAutostartup="false"/>
···
7
9
<Compile OutputCompilerMessages="false" ConvertImages="false" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
8
10
<PreprocessorDefines/>
9
11
</Compile>
10
-
<Packaging OutputFileName="LogicMail_BB50" OutputFolder="deliverables" PreBuildStep="" PostBuildStep="" CleanStep="" GenerateALXFile="false">
12
+
<Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="LogicMail_BB50" OutputFolder="deliverables" GenerateALXFile="false">
11
13
<AlxFiles/>
12
14
</Packaging>
13
15
<HiddenProperties>
+3
-1
LogicMail_BB60/BlackBerry_App_Descriptor.xml
+3
-1
LogicMail_BB60/BlackBerry_App_Descriptor.xml
···
1
+
<!-- This file has been generated by the BlackBerry Plugin for Eclipse v3.6.1. -->
2
+
1
3
<Properties ModelVersion="1.1.2">
2
4
<General Title="" Version="2.1.0" Vendor="Derek Konigsberg" Description="LogicMail BB 6.0 Platform Library"/>
3
5
<Application Type="Library" MainMIDletName="" MainArgs="" HomeScreenPosition="0" StartupTier="7" IsSystemModule="true" IsAutostartup="false"/>
···
7
9
<Compile OutputCompilerMessages="false" ConvertImages="false" CreateWarningForNoExportedRoutine="true" CompressResources="false" AliasList="">
8
10
<PreprocessorDefines/>
9
11
</Compile>
10
-
<Packaging OutputFileName="LogicMail_BB60" OutputFolder="deliverables" PreBuildStep="" PostBuildStep="" CleanStep="" GenerateALXFile="true">
12
+
<Packaging PreBuildStep="" PostBuildStep="" CleanStep="" OutputFileName="LogicMail_BB60" OutputFolder="deliverables" GenerateALXFile="true">
11
13
<AlxFiles/>
12
14
</Packaging>
13
15
<HiddenProperties>
+102
lib/eclipse/Compiler.java
+102
lib/eclipse/Compiler.java
···
1
+
package net.rim.tools.compiler;
2
+
3
+
import java.io.*;
4
+
5
+
public class Compiler {
6
+
private static final String IMPORT_PREFIX = "-import=";
7
+
private static final String EXEPATH_PREFIX = "-exepath=";
8
+
private static final String COMPONENT_PACK_PREFIX = "net.rim.ejde.componentpack";
9
+
private static final String RIM_JAR = "net_rim_api.jar";
10
+
private static final String RAPC_ORIG_JAR = "rapc-orig.jar";
11
+
12
+
public static void main(String[] args) throws Exception {
13
+
String[] updatedArgs = new String[args.length];
14
+
String exePath = null;
15
+
String componentPack = null;
16
+
17
+
for(int i=0; i<args.length; i++) {
18
+
if(args[i].startsWith(EXEPATH_PREFIX)) {
19
+
exePath = args[i].substring(EXEPATH_PREFIX.length()) + "\\";
20
+
21
+
int p = exePath.indexOf(COMPONENT_PACK_PREFIX);
22
+
if(p == -1) { break; }
23
+
int q = exePath.indexOf('\\', p);
24
+
if(q == -1) { break; }
25
+
componentPack = exePath.substring(p, q);
26
+
27
+
break;
28
+
}
29
+
}
30
+
31
+
if(exePath == null || componentPack == null) {
32
+
System.err.println("Unable to parse execution path!");
33
+
System.exit(1);
34
+
}
35
+
36
+
for(int i=0; i<args.length; i++) {
37
+
if(args[i].startsWith(IMPORT_PREFIX)) {
38
+
updatedArgs[i] = fixImports(componentPack, args[i]);
39
+
}
40
+
else {
41
+
updatedArgs[i] = args[i];
42
+
}
43
+
}
44
+
45
+
int result = runRapc(exePath, updatedArgs);
46
+
System.exit(result);
47
+
}
48
+
49
+
private static String fixImports(String componentPack, String line) {
50
+
String[] imports = line.substring(IMPORT_PREFIX.length()).split(";");
51
+
StringBuilder buf = new StringBuilder();
52
+
buf.append(IMPORT_PREFIX);
53
+
54
+
for(int i=0; i<imports.length; i++) {
55
+
// Only include an API JAR from this module's component pack
56
+
if(imports[i].endsWith(RIM_JAR)) {
57
+
if(imports[i].indexOf(componentPack) != -1) {
58
+
buf.append(imports[i]);
59
+
buf.append(';');
60
+
}
61
+
}
62
+
else {
63
+
buf.append(imports[i]);
64
+
buf.append(';');
65
+
}
66
+
}
67
+
68
+
String newLine = buf.toString();
69
+
return newLine.substring(0, newLine.length() - 1);
70
+
}
71
+
72
+
private static int runRapc(String exePath, String[] args) throws IOException {
73
+
StringBuilder buf = new StringBuilder();
74
+
buf.append("java -jar ");
75
+
buf.append(exePath);
76
+
buf.append(RAPC_ORIG_JAR);
77
+
for(int i=0; i<args.length; i++) {
78
+
buf.append(' ').append(args[i]);
79
+
}
80
+
Process p = Runtime.getRuntime().exec(buf.toString());
81
+
82
+
String s = null;
83
+
BufferedReader stdInput = new BufferedReader(new InputStreamReader(p.getInputStream()));
84
+
BufferedReader stdError = new BufferedReader(new InputStreamReader(p.getErrorStream()));
85
+
86
+
while ((s = stdInput.readLine()) != null) {
87
+
System.out.println(s);
88
+
}
89
+
90
+
while ((s = stdError.readLine()) != null) {
91
+
System.err.println(s);
92
+
}
93
+
94
+
int result;
95
+
try {
96
+
result = p.waitFor();
97
+
} catch (Exception e) {
98
+
result = 1;
99
+
}
100
+
return result;
101
+
}
102
+
}
+23
lib/eclipse/README-eclipse.txt
+23
lib/eclipse/README-eclipse.txt
···
1
+
Unlike the automated build environment, which is Ant-based, the normal
2
+
development environment for LogicMail is the BlackBerry Java Plug-in for
3
+
Eclipse (on Windows). Unfortunately, there is a bug in the latest version
4
+
(1.3.0.201102031007-19) of this plugin which prevents it from successfully
5
+
building the LogicMail code.
6
+
7
+
This bug has been reported to RIM numerous times, and is officially documented
8
+
in this ticket:
9
+
https://www.blackberry.com/jira/browse/TOOL-250
10
+
11
+
Since a fix is not expected any time soon, I've created a workaround for the
12
+
issue. This workaround is implemented as a wrapper for the RIM "rapc.jar"
13
+
utility, that filters eroneous entries out of its command-line arguments.
14
+
15
+
To install this workaround, perform the following steps in each component-pack
16
+
plugin directory:
17
+
- Go to the component-pack's bin directory
18
+
(e.g. "C:\eclipse\plugins\net.rim.ejde.componentpack4.6.0_4.6.0.23\components\bin")
19
+
- Rename the file "rapc.jar" to "rapc-orig.jar"
20
+
- Copy the alternate version of "rapc.jar" from this directory to that location
21
+
22
+
P.S. The source code inside my RAPC wrapper is also provided, in the file
23
+
called "Compiler.java".
lib/eclipse/rapc.jar
lib/eclipse/rapc.jar
This is a binary file and will not be displayed.