Changeset 556


Ignore:
Timestamp:
11/22/09 17:50:19 (2 years ago)
Author:
octorian
Message:

Preliminary update to ANT build files

Location:
trunk/LogicMail
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/LogicMail/build.xml

    r493 r556  
    55<project name="LogicMail" default="build" basedir="."> 
    66  <!-- Properties --> 
    7   <property name="src.dir" location="src"/> 
    87  <property name="dist.dir" location="dist"/> 
    98  <property name="dist.ota.dir" location="distota"/> 
    … …  
    1110  <property name="docs.dir" location="docs"/> 
    1211  <property name="startup.src.dir" location="../LogicMailStartup/src"/> 
    13   <property name="bb470.src.dir" location="../LogicMail_BB47/src"/> 
    1412  <property file="project.properties"/> 
    1513   
    … …  
    3432    <sequential> 
    3533      <mkdir dir="${dist.dir}/@{platform}"/> 
    36       <copy file="${src.dir}/icons/logicmail.png" todir="${dist.dir}/@{platform}"/> 
     34      <copy file="res/icons/logicmail.png" todir="${dist.dir}/@{platform}"/> 
    3735      <rapc output="${module.name}" 
    38             srcdir="${src.dir}" 
     36            srcdir="src" 
    3937            destdir="${dist.dir}/@{platform}" 
    4038            jdehome="@{jdehome}" 
    … …  
    5351        </jdp> 
    5452        <src> 
    55           <fileset dir="${src.dir}"> 
     53          <fileset dir="src"> 
    5654            <include name="**/*.java"/> 
     55          </fileset> 
     56          <fileset dir="res"> 
    5757            <include name="**/*.rrc"/> 
    5858            <include name="**/*.rrh"/> 
    … …  
    6666      </rapc> 
    6767      <delete file="${dist.dir}/@{platform}/logicmail.png"/> 
    68       <sleep milliseconds="${task.sleep}"/> 
    6968    </sequential> 
    7069  </macrodef> 
    … …  
    7372  <target name="build"> 
    7473    <if><isset property="jde421.home"/><then> 
    75       <fileset id="bb421_fileset" dir="${src.dir}" /> 
     74      <fileset id="bb421_fileset" dir="src" /> 
    7675      <build-platform jdehome="${jde421.home}" platform="BB421" defines="BLACKBERRY_4_2_1" platformfileset="bb421_fileset"/> 
    7776    </then></if> 
     77    <if><isset property="jde460.home"/><then> 
     78      <fileset id="bb460_fileset" dir=".."> 
     79        <include name="LogicMail_BB46/src/**/*.java" /> 
     80        <include name="LogicMail_BB46/res/**/*.png" /> 
     81      </fileset> 
     82      <build-platform jdehome="${jde460.home}" platform="BB460" defines="BLACKBERRY_4_6_0" platformfileset="bb460_fileset"/> 
     83    </then></if> 
    7884    <if><isset property="jde470.home"/><then> 
    79       <fileset id="bb470_fileset" dir="${bb470.src.dir}"> 
    80         <include name="**/*.java"/> 
    81         <include name="**/*.png"/> 
     85      <fileset id="bb470_fileset" dir=".."> 
     86        <include name="LogicMail_BB46/src/**/*.java" /> 
     87        <include name="LogicMail_BB46/res/**/*.png" /> 
     88        <include name="LogicMail_BB47/src/**/*.java" /> 
     89        <include name="LogicMail_BB47/res/**/*.png" /> 
     90      </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" /> 
    8298      </fileset> 
    8399      <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"/> 
     101    </then></if> 
     102    <if><isset property="jde500.home"/><then> 
     103      <fileset id="bb500_fileset" dir=".."> 
     104        <include name="LogicMail_BB46/src/**/*.java" /> 
     105        <include name="LogicMail_BB46/res/**/*.png" /> 
     106        <include name="LogicMail_BB47/src/**/*.java" /> 
     107        <include name="LogicMail_BB47/res/**/*.png" /> 
     108        <include name="LogicMail_BB50/src/**/*.java" /> 
     109        <include name="LogicMail_BB50/res/**/*.png" /> 
     110      </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> 
     123      <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"/> 
    84125    </then></if> 
    85126  </target> 
    … …  
    92133               forceclose="true" 
    93134               codfile="${dist.dir}/BB421/${module.name}.cod"/> 
    94       <sleep milliseconds="${task.sleep}"/> 
     135    </then></if> 
     136    <if><isset property="jde460.home"/><then> 
     137      <sigtool jdehome="${jde460.home}" 
     138               password="${sigtool.password}" 
     139               forceclose="true" 
     140               codfile="${dist.dir}/BB460/${module.name}.cod"/> 
    95141    </then></if> 
    96142    <if><isset property="jde470.home"/><then> 
    … …  
    99145               forceclose="true" 
    100146               codfile="${dist.dir}/BB470/${module.name}.cod"/> 
    101       <sleep milliseconds="${task.sleep}"/> 
     147      <sigtool jdehome="${jde470.home}" 
     148               password="${sigtool.password}" 
     149               forceclose="true" 
     150               codfile="${dist.dir}/BB470T/${module.name}.cod"/> 
     151    </then></if> 
     152    <if><isset property="jde500.home"/><then> 
     153      <sigtool jdehome="${jde500.home}" 
     154               password="${sigtool.password}" 
     155               forceclose="true" 
     156               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"/> 
    102161    </then></if> 
    103162  </target> 
    … …  
    110169             use="true" 
    111170             windowtitle="${module.description}"> 
    112       <fileset dir="${src.dir}"> 
     171      <fileset dir="src"> 
    113172        <include name="**/*.java"/> 
    114173      </fileset> 
    … …  
    142201          <fileset dir="${dist.dir}/BB421" includes="*.cod" /> 
    143202        </codset> 
    144         <codset dir="BB470" greaterthanequal="4.7.0"> 
     203        <codset dir="BB460" greaterthanequal="4.6.0" lessthan="4.7.0"> 
     204          <fileset dir="${dist.dir}/BB460" includes="*.cod" /> 
     205        </codset> 
     206        <codset dir="BB470" greaterthanequal="4.7.0" lessthan="5.0.0"> 
    145207          <fileset dir="${dist.dir}/BB470" includes="*.cod" /> 
    146208        </codset> 
     209        <!-- Uncomment when bb-ant-tools supports more attributes 
     210        <codset dir="BB470T" greaterthanequal="4.7.0" lessthan="5.0.0" series="9500"> 
     211          <fileset dir="${dist.dir}/BB470T" includes="*.cod" /> 
     212        </codset> 
     213        --> 
     214        <codset dir="BB500" greaterthanequal="5.0.0"> 
     215          <fileset dir="${dist.dir}/BB500" includes="*.cod" /> 
     216        </codset> 
     217        <!-- Uncomment when bb-ant-tools supports more attributes 
     218        <codset dir="BB500T" greaterthanequal="5.0.0" series="9500"> 
     219          <fileset dir="${dist.dir}/BB500T" includes="*.cod" /> 
     220        </codset> 
     221        --> 
    147222      </application> 
    148223        </alx> 
    … …  
    150225      <fileset dir=".." includes="README.txt, LICENSE.txt, ChangeLog.txt"/> 
    151226    </copy> 
    152     <sleep milliseconds="${task.sleep}"/> 
    153227  </target> 
    154228   
    … …  
    164238      <replaceregexp file="@{dest}/${module.name}.jad" match="MIDlet-Jar-URL(.*)\n" replace="" /> 
    165239      <replaceregexp file="@{dest}/${module.name}.jad" match="MIDlet-Jar-Size(.*)\n" replace="" /> 
    166       <sleep milliseconds="${task.sleep}"/> 
    167240    </sequential> 
    168241  </macrodef> 
    … …  
    191264      </insert> 
    192265    </xmltask> 
    193         <sleep milliseconds="${task.sleep}"/> 
    194266    <if><isset property="jde421.home"/><then> 
    195267      <copy-ota-files src="${dist.dir}/BB421" dest="${dist.ota.dir}/${module.version}/BB421"/> 

  • trunk/LogicMail/project.properties

    r489 r556  
    77module.vendor=Derek Konigsberg 
    88module.copyright=Copyright (c) 2009, Derek Konigsberg 
    9 module.version=1.9.0 
     9module.version=1.9.1 
    1010module.build=0 
    1111# 
    … …  
    1313# 
    1414jde421.home=C:/Program Files/Research In Motion/BlackBerry JDE 4.2.1 
     15jde460.home=C:/Program Files/Research In Motion/BlackBerry JDE 4.6.0 
    1516jde470.home=C:/Program Files/Research In Motion/BlackBerry JDE 4.7.0 
    16  
    17 # 
    18 # Time to sleep, in milliseconds, between build tasks 
    19 # 
    20 task.sleep=0 
     17jde500.home=C:/Program Files/Research In Motion/BlackBerry JDE 5.0.0 
    2118 
    2219# 
Note: See TracChangeset for help on using the changeset viewer.