Changeset 524

Timestamp:

11/02/09 20:43:40 (2 years ago)

Author:

octorian

Message:

Added build hooks for manual selection of included locales, and set locale list to only releasable ones.

Location:

branches/LogicMail-1.1/LogicMail

Files:

• build.xml (modified) (3 diffs)
• project.properties (modified) (1 diff)
• src/org/logicprobe/LogicMail/AppInfo.java (modified) (4 diffs)
• src/org/logicprobe/LogicMail/LogicMail.java (modified) (1 diff)
• src/org/logicprobe/LogicMail/ui/GlobalConfigScreen.java (modified) (2 diffs)

branches/LogicMail-1.1/LogicMail/build.xml

@@ -28 +28 @@
         <!-- Build the application -->
         <target name="build">
+                <!-- Prepare the resource file list -->
+                <propertyregex property="rrc.files"
+                        input="${module.locales}"
+                        regexp="([^,]+)"
+                        global="true"
+                        replace="LogicMail_\1.rrc"
+                />
+
+                <!-- Create the fileset of sources and images -->
+                <fileset dir="${src.dir}" id="sources">
+                        <include name="**/*.java" />
+                        <exclude name="**/bb40/*.java" />
+                        <exclude name="**/*BB40.java" />
+                        <include name="**/*.png" />
+                </fileset>
+                <!-- Create the fileset of translations -->
+                <fileset dir="${src.dir}/org/logicprobe/LogicMail"
+                        includes="LogicMail.rrc,LogicMail.rrh,${rrc.files}"
+                        id="translations"/>
+                
+                <!-- Prepare the arguments -->
+                <if><isset property="module.build"/>
+                        <then><property name="argument.build" value="-build:${module.build}"/></then>
+                        <else><property name="argument.build" value=""/></else>
+                </if>
+                <if><istrue value="${module.release}"/>
+                        <then><property name="argument.release" value="-release"/></then>
+                        <else><property name="argument.release" value=""/></else>
+                </if>
+                
                 <mkdir dir="${dist.dir}" />
                 <copy file="${src.dir}/icons/logicmail.png" todir="${dist.dir}" />
                 <rapc output="${module.name}"
-                          srcdir="${src.dir}"
                           destdir="${dist.dir}"
                           jdehome="${jde.home}">
@@ -40 +69 @@
                                  midletclass="org.logicprobe.LogicMail.LogicMail"
                                  icon="logicmail.png"
-                                 arguments="-build:${module.build}">
+                                 arguments="${argument.build} ${argument.release}">
                         </jdp>
                         <src>
-                                <fileset dir="${src.dir}">
-                                        <include name="**/*.java" />
-                                        <include name="**/*.rrc" />
-                                        <include name="**/*.rrh" />
-                                        <exclude name="**/bb40" />
-                                        <exclude name="**/*BB40.java" />
-                                        <include name="**/*.png" />
-                                </fileset>
+                                <fileset refid="sources" />
+                                <fileset refid="translations" />
                                 <fileset dir="${startup.src.dir}">
                                         <include name="**/*.java" />
@@ -112 +135 @@
                 <replaceregexp file="${dist.ota.dir}/LogicMail.jad" match="MIDlet-Jar-Size(.*)\n" replace="" />
                 <unzip src="${dist.dir}/${module.name}.cod" dest="${dist.ota.dir}" />
-    </target>
+        </target>
 
         <!-- Prepare the distribution -->

branches/LogicMail-1.1/LogicMail/project.properties

@@ -8 +8 @@
 module.copyright=Copyright (c) 2009, Derek Konigsberg
 module.version=1.1.0
+#
+# Build number, typically set for automated builds
+#
 module.build=0
+#
+# Locales to include in addition to the default
+#
+module.locales=es,zh,zh_CN
+#
+# Set to "yes" for release builds.  This disables any application features
+# intended only for testing, such as manual locale selection.
+#
+module.release=no
 #
 # Set the path to the JDE to build with

branches/LogicMail-1.1/LogicMail/src/org/logicprobe/LogicMail/AppInfo.java

@@ -43 +43 @@
     public final static long GUID = 0x6bc611e33074e780L;
     
+    private static String PARAM_BUILD = "-build:";
+    private static String PARAM_RELEASE = "-release";
+    
     private static String appName;
     private static String appVersion;
+    private static boolean release;
+    
     /**
      * Initializes the application information from the descriptor and the
@@ -51 +56 @@
      */
     public static synchronized void initialize(String args[]) {
-        String build = null;
+        String buildParam = null;
         for(int i=0; i<args.length; i++) {
-                if(args[i].indexOf("-build:") != -1) {
-                        int p = args[i].indexOf("-build:");
+                if(args[i].indexOf(PARAM_BUILD) != -1) {
+                    int p_len = PARAM_BUILD.length();
+                        int p = args[i].indexOf(PARAM_BUILD);
                         int q = args[i].indexOf(' ');
                         if(q == -1) {
-                                build = args[i].substring(p + 7);
+                                buildParam = args[i].substring(p + p_len);
                         }
                         else {
-                                build = args[i].substring(p + 7, q);
+                                buildParam = args[i].substring(p + p_len, q);
                         }
                 }
+                else if(args[i].indexOf(PARAM_RELEASE) != -1) {
+                    release = true;
+            }
         }
         
@@ -72 +81 @@
         StringBuffer buf = new StringBuffer();
         buf.append(appDesc.getVersion());
-        if(build != null) {
+        if(buildParam != null) {
                 buf.append(" (");
-                buf.append(build);
+                buf.append(buildParam);
                 buf.append(')');
         }
         appVersion = buf.toString();
     }
+    
     public static String getName() {
         return appName;
@@ -86 +96 @@
         return appVersion;
     }
+    
+    public static boolean isRelease() {
+        return release;
+    }
 }

branches/LogicMail-1.1/LogicMail/src/org/logicprobe/LogicMail/LogicMail.java

@@ -60 +60 @@
         MailSettings.getInstance().loadSettings();
 
-        // Set the language, if configured
-        String languageCode =
-            MailSettings.getInstance().getGlobalConfig().getLanguageCode();
-        if(languageCode != null && languageCode.length() > 0) {
-            try {
-                Locale.setDefault(Locale.get(languageCode));
-            } catch (Exception e) { }
+        if(!AppInfo.isRelease()) {
+            // Set the language, if configured
+            String languageCode =
+                MailSettings.getInstance().getGlobalConfig().getLanguageCode();
+            if(languageCode != null && languageCode.length() > 0) {
+                try {
+                    Locale.setDefault(Locale.get(languageCode));
+                } catch (Exception e) { }
+            }
         }
         

branches/LogicMail-1.1/LogicMail/src/org/logicprobe/LogicMail/ui/GlobalConfigScreen.java

@@ -42 +42 @@
 import net.rim.device.api.ui.text.TextFilter;
 
+import org.logicprobe.LogicMail.AppInfo;
 import org.logicprobe.LogicMail.LogicMailResource;
 import org.logicprobe.LogicMail.conf.GlobalConfig;
@@ -124 +125 @@
                 resources.getString(LogicMailResource.CONFIG_GLOBAL_LANGUAGE),
                 languageChoices, languageIndex);
-        add(fldLanguage);
+        if(!AppInfo.isRelease()) {
+            add(fldLanguage);
+        }
 
         fldUnicodeNormalization = new CheckboxField(resources.getString(