Changeset 2053

Show
Ignore:
Timestamp:
02/10/09 16:51:32
Author:
douglm
Message:

Allow carddav to be built from the bw script

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/loadDeployConfig.xml

    r1938 r2053  
    1818      <property file="${org.bedework.user.build.properties}" /> 
    1919 
     20      <!-- These should already be defined in the above file 
    2021      <property name="org.bedework.config.properties" 
    2122                location="${org.bedework.config.base}/configs/democal.properties" /> 
    2223      <property name="org.bedework.config.options" 
    2324                location="${org.bedework.config.base}/configs/democal.options.xml" /> 
     25                --> 
    2426 
    2527      <echo message="==========================================================" /> 
    …… 
    3133 
    3234      <xmlproperty file="${org.bedework.config.options}"/> 
     35 
     36      <!-- Load the CardDAV options --> 
     37      <xmlproperty file="${org.bedework.carddav.options}"/> 
    3338 
    3439      <if> 

  • trunk/build/quickstart/linux/bw

    r2024 r2053  
    3030  echo "     -bwchome     Specify path to configurations" 
    3131  echo "     -bwc         Specify configuration name" 
    32   echo "     -offline     Build without atempting to retrieve library jars" 
     32  echo "     -offline     Build without attempting to retrieve library jars" 
     33  echo "     -carddav     Target is for the CardDAV build, otherwise it's a calendar build" 
    3334  echo "     target       Ant target to execute" 
    3435  echo "" 
    …… 
    5960saveddir=`pwd` 
    6061 
     62trap 'cd $saveddir' 0 
     63trap "exit 2" 1 2 3 15 
     64 
    6165export QUICKSTART_HOME=$saveddir 
    6266 
    …… 
    6872offline= 
    6973quickstart= 
     74carddav= 
    7075 
    7176if [ "$1" = "" ] ; then 
    …… 
    8691    -quickstart) 
    8792      quickstart="yes" 
     93      shift 
     94      ;; 
     95    -carddav) 
     96      carddav="yes" 
    8897      shift 
    8998      ;; 
    …… 
    140149CLASSPATH=$CLASSPATH:$QUICKSTART_HOME/bedework/applib/log4j-1.2.8.jar 
    141150 
     151 
     152if [ "$carddav" != "" ] ; then 
     153  cd $QUICKSTART_HOME/bedework-carddav 
     154fi 
     155 
    142156$JAVA_HOME/bin/java -classpath $CLASSPATH $ant_xmllogfile $offline -Dant.home=$ANT org.apache.tools.ant.launch.Launcher $BWCONFIG $ant_listener $ant_logger $* 

  • trunk/config/bwbuild/default/build.properties

    r1944 r2053  
    2121org.bedework.config.properties=${env.BEDEWORK_CONFIG}/cal.properties 
    2222org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml 
     23org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml 
    2324 
    2425# Enable/disable replacement of log4j config during deployment 

  • trunk/deployment/appjars.xml

    r2052 r2053  
    311311 
    312312      <getJar lib="${org.bedework.app.lib}" 
    313               name="xalan" version="2.6.0" /> 
     313              name="xalan" version="2.7.1" /> 
    314314      <getJar lib="${org.bedework.app.lib}" 
    315315              name="hsqldb" version="1.7.3.3" />