Changeset 683


Ignore:
Timestamp:
08/04/10 22:39:09 (18 months ago)
Author:
octorian
Message:

Consolidation of touchscreen code into the main platform libraries/builds

Location:
trunk/LogicMail
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/LogicMail/build.xml

    r569 r683  
    3232    <sequential> 
    3333      <mkdir dir="${dist.dir}/@{platform}"/> 
    34       <copy file="res/icons/logicmail.png" todir="${dist.dir}/@{platform}"/> 
    3534      <rapc output="${module.name}" 
    3635            srcdir="src" 
    … …  
    4342             type="cldc" 
    4443             midletclass="org.logicprobe.LogicMail.LogicMail" 
    45              icon="logicmail.png" 
     44             icon="../../res/icons/logicmail.png" 
    4645             arguments="-build:${module.build}"> 
    4746          <entry arguments="-build:${module.build} autostartup" 
    … …  
    6564        </src> 
    6665      </rapc> 
    67       <delete file="${dist.dir}/@{platform}/logicmail.png"/> 
    6866    </sequential> 
    6967  </macrodef> 
    … …  
    8987        <include name="LogicMail_BB47/res/**/*.png" /> 
    9088      </fileset> 
    91       <fileset id="bb470t_fileset" dir=".."> 
    92         <include name="LogicMail_BB46/src/**/*.java" /> 
    93         <include name="LogicMail_BB46/res/**/*.png" /> 
    94         <include name="LogicMail_BB47/src/**/*.java" /> 
    95         <include name="LogicMail_BB47/res/**/*.png" /> 
    96         <include name="LogicMail_BB47T/src/**/*.java" /> 
    97         <include name="LogicMail_BB47T/res/**/*.png" /> 
    98       </fileset> 
    9989      <build-platform jdehome="${jde470.home}" platform="BB470" defines="BLACKBERRY_4_7_0" platformfileset="bb470_fileset"/> 
    100       <build-platform jdehome="${jde470.home}" platform="BB470T" defines="BLACKBERRY_4_7_0" platformfileset="bb470t_fileset"/> 
    10190    </then></if> 
    10291    <if><isset property="jde500.home"/><then> 
    … …  
    10998        <include name="LogicMail_BB50/res/**/*.png" /> 
    11099      </fileset> 
    111       <fileset id="bb500t_fileset" dir=".."> 
    112         <include name="LogicMail_BB46/src/**/*.java" /> 
    113         <include name="LogicMail_BB46/res/**/*.png" /> 
    114         <include name="LogicMail_BB47/src/**/*.java" /> 
    115         <include name="LogicMail_BB47/res/**/*.png" /> 
    116         <include name="LogicMail_BB47T/src/**/*.java" /> 
    117         <include name="LogicMail_BB47T/res/**/*.png" /> 
    118         <include name="LogicMail_BB50/src/**/*.java" /> 
    119         <include name="LogicMail_BB50/res/**/*.png" /> 
    120         <include name="LogicMail_BB50T/src/**/*.java" /> 
    121         <include name="LogicMail_BB50T/res/**/*.png" /> 
    122       </fileset> 
    123100      <build-platform jdehome="${jde500.home}" platform="BB500" defines="BLACKBERRY_5_0_0" platformfileset="bb500_fileset"/> 
    124       <build-platform jdehome="${jde500.home}" platform="BB500T" defines="BLACKBERRY_5_0_0" platformfileset="bb500t_fileset"/> 
    125101    </then></if> 
    126102  </target> 
    … …  
    145121               forceclose="true" 
    146122               codfile="${dist.dir}/BB470/${module.name}.cod"/> 
    147       <sigtool jdehome="${jde470.home}" 
    148                password="${sigtool.password}" 
    149                forceclose="true" 
    150                codfile="${dist.dir}/BB470T/${module.name}.cod"/> 
    151123    </then></if> 
    152124    <if><isset property="jde500.home"/><then> 
    … …  
    155127               forceclose="true" 
    156128               codfile="${dist.dir}/BB500/${module.name}.cod"/> 
    157       <sigtool jdehome="${jde500.home}" 
    158                password="${sigtool.password}" 
    159                forceclose="true" 
    160                codfile="${dist.dir}/BB500T/${module.name}.cod"/> 
    161129    </then></if> 
    162130  </target> 
    … …  
    204172          <fileset dir="${dist.dir}/BB460" includes="*.cod" /> 
    205173        </codset> 
    206         <codset dir="BB470" greaterthanequal="4.7.0" lessthan="5.0.0" keyboardType="Qwerty|Reduced"> 
     174        <codset dir="BB470" greaterthanequal="4.7.0" lessthan="5.0.0"> 
    207175          <fileset dir="${dist.dir}/BB470" includes="*.cod" /> 
    208176        </codset> 
    209         <codset dir="BB470T" greaterthanequal="4.7.0" lessthan="5.0.0" keyboardType="Virtual"> 
    210           <fileset dir="${dist.dir}/BB470T" includes="*.cod" /> 
    211         </codset> 
    212         <codset dir="BB500" greaterthanequal="5.0.0" keyboardType="Qwerty|Reduced"> 
     177        <codset dir="BB500" greaterthanequal="5.0.0"> 
    213178          <fileset dir="${dist.dir}/BB500" includes="*.cod" /> 
    214         </codset> 
    215         <codset dir="BB500T" greaterthanequal="5.0.0" keyboardType="Virtual"> 
    216           <fileset dir="${dist.dir}/BB500T" includes="*.cod" /> 
    217179        </codset> 
    218180      </application> 
    … …  
    264226      <insert if="jde470.home" path="/application"> 
    265227         <![CDATA[ 
    266            <jad blackberryVersion="[4.7.0,5.0.0)" KeyboardType="Qwerty|Reduced" file="BB470/${module.name}.jad"/> 
    267            <jad blackberryVersion="[4.7.0,5.0.0)" KeyboardType="Virtual" file="BB470T/${module.name}.jad"/> 
     228           <jad blackberryVersion="[4.7.0,5.0.0)" file="BB470/${module.name}.jad"/> 
    268229         ]]> 
    269230      </insert> 
    270231      <insert if="jde500.home" path="/application"> 
    271232         <![CDATA[ 
    272            <jad blackberryVersion="[5.0.0,)" KeyboardType="Qwerty|Reduced" file="BB500/${module.name}.jad"/> 
    273            <jad blackberryVersion="[5.0.0,)" KeyboardType="Virtual" file="BB500T/${module.name}.jad"/> 
     233           <jad blackberryVersion="[5.0.0,)" file="BB500/${module.name}.jad"/> 
    274234         ]]> 
    275235      </insert> 
    … …  
    283243    <if><isset property="jde470.home"/><then> 
    284244      <copy-ota-files src="${dist.dir}/BB470" dest="${dist.ota.dir}/${module.version}/BB470"/> 
    285       <copy-ota-files src="${dist.dir}/BB470T" dest="${dist.ota.dir}/${module.version}/BB470T"/> 
    286245    </then></if> 
    287246    <if><isset property="jde500.home"/><then> 
    288247      <copy-ota-files src="${dist.dir}/BB500" dest="${dist.ota.dir}/${module.version}/BB500"/> 
    289       <copy-ota-files src="${dist.dir}/BB500T" dest="${dist.ota.dir}/${module.version}/BB500T"/> 
    290248    </then></if> 
    291249  </target> 

  • trunk/LogicMail/project.properties

    r556 r683  
    66module.description=LogicMail for BlackBerry 
    77module.vendor=Derek Konigsberg 
    8 module.copyright=Copyright (c) 2009, Derek Konigsberg 
     8module.copyright=Copyright (c) 2010, Derek Konigsberg 
    99module.version=1.9.1 
    1010module.build=0 
    … …  
    1212# Set the paths to the JDEs to build with 
    1313# 
    14 jde421.home=C:/Program Files/Research In Motion/BlackBerry JDE 4.2.1 
    15 jde460.home=C:/Program Files/Research In Motion/BlackBerry JDE 4.6.0 
    16 jde470.home=C:/Program Files/Research In Motion/BlackBerry JDE 4.7.0 
    17 jde500.home=C:/Program Files/Research In Motion/BlackBerry JDE 5.0.0 
     14jde421.home=C:/Users/octo/eclipse35/plugins/net.rim.ejde.componentpack4.2.1_4.2.1.19/components 
     15jde460.home=C:/Users/octo/eclipse35/plugins/net.rim.ejde.componentpack4.6.0_4.6.0.23/components 
     16jde470.home=C:/Users/octo/eclipse35/plugins/net.rim.ejde.componentpack4.7.0_4.7.0.57/components 
     17jde500.home=C:/Users/octo/eclipse35/plugins/net.rim.ejde.componentpack5.0.0_5.0.0.25/components 
    1818 
    1919# 
Note: See TracChangeset for help on using the changeset viewer.