Changeset 1953

Show
Ignore:
Timestamp:
11/07/08 16:19:05
Author:
douglm
Message:

Move some build stuff into its own repository.

Change build files ot use same properties throughout

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r1952 r1953  
    162162             excludes="*" /> 
    163163    <!-- default to empty --> 
    164     <fileset id="base.resource.files" refid="empty.fileset" /> 
     164    <fileset id="buildjar.resource.files" refid="empty.fileset" /> 
     165    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" /> 
    165166 
    166167    <!-- ==================== Subcomponent Compilation Classpath ==================== --> 
    …… 
    204205 
    205206  <!-- ================================================================= 
    206        "build" and "clean" targets for the project - does not build 
    207        subsidiary projects like rpiutil and access 
     207       "build" and "clean" targets for the project 
    208208       ================================================================= --> 
    209209 
    …… 
    213213                                build.freebusy,build.bwtools,build.webapps, 
    214214                                build.testsuite,build.deployutil" 
    215           description="builds the project"/> 
     215          description="builds the project"> 
     216    <copy toDir="${dist.home}" > 
     217      <fileset dir="${org.bedework.project.bwtools}/dist" includes="*.jar" /> 
     218    </copy> 
     219  </target> 
    216220 
    217221  <target name="clean" depends="init,clean.rpiutil,clean.access,clean.davutil, 

  • trunk/build/quickstart/linux/install

    r1951 r1953  
    2222  $JAVA_HOME/bin/java -jar $DS_HOME/bin/apacheds-tools.jar graceful --install-path $DS_HOME --configuration 
    2323} 
     24 
     25echo "========================================================" 
     26echo "This script will create a set of configurations in your " 
     27echo "home directory ($HOME) for you to customize" 
     28echo "In addition we create an initial set of users and groups" 
     29echo "which allow an initial system to run" 
     30echo "" 
     31echo "Further changes can then be made to the running quickstart" 
     32echo "using the tools provided" 
     33echo "" 
     34echo "The following information will be requested:" 
     35echo "  One or more administrative group names" 
     36echo "  One or more administrative users" 
     37echo "  One or more non-administrative users" 
     38echo "" 
     39echo "The ldap directory will be initialised with this information" 
     40echo "then you will provide the account which will be made superuser" 
     41echo "which must be one of those supplied above." 
     42echo "========================================================" 
    2443 
    2544if [ -d "$HOME/bwbuild" ] ; then 
    …… 
    5978  cd $DS_HOME && ./apacheds.sh & 
    6079 
     80  echo "Pausing while the server starts" 
     81 
    6182  sleep 10 
     83 
     84  echo "Getting directory information and creating entries" 
    6285 
    6386  DIRTOOL_HOME=$BEDEWORK_HOME/projects/bwtools 
    6487  DIRTOOL_CP=$libcache/commons-codec-1.3.jar:$libcache/log4j-1.2.8.jar 
    65   DIRTOOL_CP=$DIRTOOL_CP:$DIRTOOL_HOME/dist/bw-tools-3.5.jar 
     88  DIRTOOL_CP=$DIRTOOL_CP:$BEDEWORK_HOME/dist/bw-tools-3.5.jar 
    6689 
    6790  $JAVA_HOME/bin/java -classpath $DIRTOOL_CP org.bedework.tools.directory.DirTool -initSystem 
    6891 
     92  echo "Enter superuser account" 
     93  superuser= 
     94  until [ "$superuser" != "" ] ; do 
     95    read superuser 
     96  done 
     97 
     98  echo "create data" 

  • trunk/config/build.xml

    r953 r1953  
    7676    <!-- ==================== Sources and classes ====================== --> 
    7777 
    78     <fileset id="base.java.sources" dir="${source.home}" > 
     78    <fileset id="buildjar.java.sources" dir="${source.home}" > 
    7979      <include name="org/bedework/webconfig/**/*.java"/> 
    8080    </fileset> 
    …… 
    108108    <!-- ==================== Sources and classes ====================== --> 
    109109 
    110     <fileset id="base.java.sources" dir="${source.home}" > 
     110    <fileset id="buildjar.java.sources" dir="${source.home}" > 
    111111      <!-- 
    112112      <include name="edu/rpi/cct/uwcal/config/**/*.java"/> 

  • trunk/deployutil/build.xml

    r957 r1953  
    1919    <!-- ==================== Sources and classes ====================== --> 
    2020 
    21     <fileset id="base.java.sources" dir="${source.home}" > 
     21    <fileset id="buildjar.java.sources" dir="${source.home}" > 
    2222      <include name="org/bedework/*/*.java"/> 
    2323    </fileset>