Changeset 2655

Show
Ignore:
Timestamp:
01/12/10 16:18:49
Author:
douglm
Message:

Attempt at a building program.

Small comment change to tomcat build.

Update of svncopy script

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.properties

    r2625 r2655  
    1010 
    1111# Name of generated jar files 
     12org.bedework.build.jar.name=bw-build 
    1213org.bedework.deployutil.jar.name=bw-deployutil 
    1314 

  • trunk/build.xml

    r2625 r2655  
    181181              location="${org.bedework.project.bedework}/deployment" /> 
    182182 
     183    <property name="org.bedework.build.jar" 
     184              location="${bin.home}/${org.bedework.build.jar.name}-${project.version}.jar" /> 
     185 
    183186    <property name="org.bedework.deployutil.jar" 
    184187              location="${bin.home}/${org.bedework.deployutil.jar.name}-${project.version}.jar" /> 
    …… 
    197200       ================================================================= --> 
    198201 
    199   <target name="build" depends="init.build,build.rpiutil, 
     202  <target name="build" depends="init.build,build.rpiutil,build.build, 
    200203                                build.access,build.davutil, 
    201204                                build.webdav,build.caldav, 
    …… 
    666669       Targets to build sub-components of this project. 
    667670       ================================================================= --> 
     671 
     672  <target name="build.build" depends="init" 
     673          description="builds the java build configuration component"> 
     674    <ant antfile="${org.bedework.project.bedework}/build/build.xml" inheritrefs="true" 
     675           target="build" > 
     676      <property name="build.jar.file" location="${org.bedework.build.jar}" /> 
     677    </ant> 
     678  </target> 
    668679 
    669680  <target name="build.deployutil" depends="init" 

  • trunk/build/platforms/tomcat5War.xml

    r1939 r2655  
    33<!-- =================================================================== 
    44     This file is imported by buildwar.xml and adds a target 
    5         doPortal 
     5        doPlatform 
    66     which will be invoked by the buildwar targets. 
    77     =================================================================== --> 

  • trunk/util/svncopy.sh

    r2252 r2655  
    11#!/bin/bash 
    22 
    3 # Copy the current trunk to a new location and adjust the externals property 
     3# Copy the current trunk to a new location and adjust the bedework externals property 
    44 
    55usage() { 
    …… 
    7070 
    7171# ------------------------------------------------------------------ 
    72 # copyproject - copy a single project 
     72# copyproject - copy a single project. At the same time build up an 
     73#               externals property file 
    7374# 
    7475# par 1 - project name 
    …… 
    8283  then 
    8384    echo "build/$1 $SVNREPOSITORY/$1/$2" >> $SCTEMPFILE 
     85  elif [ "${1}" = "bwtzsvr" ] 
     86  then 
     87#      Not linked 
     88    echo "" 
    8489  elif [ "${1}" = "carddav" ] 
    8590  then 
     91#      Not linked 
     92    echo "" 
     93  elif [ "${1}" = "clientapp" ] 
     94  then 
     95#      Not linked 
     96    echo "" 
     97  elif [ "${1}" = "naming" ] 
     98  then 
     99#      Not linked 
    86100    echo "" 
    87101  elif [ "${1}" != "bedework" ] 
    …… 
    119133PROJECTS="$PROJECTS calendarapi" 
    120134PROJECTS="$PROJECTS carddav" 
     135PROJECTS="$PROJECTS clientapp" 
    121136PROJECTS="$PROJECTS contrib" 
    122137PROJECTS="$PROJECTS davutil" 
    123138PROJECTS="$PROJECTS dumprestore" 
     139PROJECTS="$PROJECTS naming" 
    124140PROJECTS="$PROJECTS rpiutil" 
    125141PROJECTS="$PROJECTS testsuite"