Changeset 19131

Show
Ignore:
Timestamp:
20.04.2009 15:46:09 (10 years ago)
Author:
oranfry
Message:

changes to the names and locations of things

Location:
release-kits/derk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/derk/ant-scripts/build.xml

    r19039 r19131  
    4242        <if><bool><not><available file="dec"/></not></bool> 
    4343            <svn> 
    44                 <export srcurl="${svn.root}/documented-example-collections/${branch.path}" destPath="dec"/> 
     44                <export srcurl="${svn.root}/collections/documented-examples/${branch.path}" destPath="documented-examples"/> 
    4545            </svn> 
    4646        </if> 
     
    5555        </if> 
    5656 
    57         <exec dir="gs2build" executable="/bin/bash" failonerror="true"><arg value="./configure"/></exec> 
    58         <exec dir="gs2build/common-src" executable="make" failonerror="true"/> 
    59         <exec dir="gs2build/common-src" executable="make" failonerror="true"><arg value="install"/></exec> 
    60         <exec dir="gs2build" executable="/bin/bash" failonerror="true"><arg value="./configure"/></exec> 
    61         <exec dir="gs2build" executable="make" failonerror="true"/> 
    62         <exec dir="gs2build" executable="make" failonerror="true"><arg value="install"/></exec> 
    63  
     57        <if> 
     58            <bool><not><available file="gs2build/Makefile"/></not></bool> 
     59            <exec dir="gs2build" executable="/bin/bash" failonerror="true"><arg value="./configure"/></exec> 
     60            <exec dir="gs2build/common-src" executable="make" failonerror="true"/> 
     61            <exec dir="gs2build/common-src" executable="make" failonerror="true"><arg value="install"/></exec> 
     62            <exec dir="gs2build" executable="/bin/bash" failonerror="true"><arg value="./configure"/></exec> 
     63            <exec dir="gs2build" executable="make" failonerror="true"/> 
     64            <exec dir="gs2build" executable="make" failonerror="true"><arg value="install"/></exec> 
     65        </if> 
    6466    </target> 
    6567 
     
    7072    <target name="create-archives"> 
    7173        <mkdir dir="products"/> 
    72         <zip destfile="products/Greenstone-${version}-documented-examples.zip" basedir="${basedir}" includes="dec/**/*"/> 
     74        <zip destfile="products/Greenstone-documented-examples-${version}.zip" basedir="${basedir}" includes="documented-examples/**/*"/> 
    7375        <exec executable="tar"> 
    74             <arg line="-czf products/Greenstone-${version}-documented-examples.tar.gz dec"/> 
     76            <arg line="-czf products/Greenstone-documented-examples-${version}.tar.gz documented-examples"/> 
    7577        </exec> 
    7678    </target> 
  • release-kits/derk/resources/build.sh

    r19033 r19131  
    33source setup.bash 
    44 
    5 if [ ! -e "collect/dec" ]; then 
     5if [ ! -e "collect/documented-examples" ]; then 
    66    cd collect 
    7     ln -s ../../dec 
     7    ln -s ../../documented-examples 
    88    cd $opwd 
    99fi 
     
    1111cd collect 
    1212 
    13 for coll in dec/*; do 
     13for coll in documented-examples/*; do 
    1414    cd $opwd 
    1515 
    1616    if [ -d "collect/$coll/etc" ]; then 
    17         echo 
    18         echo "Building collection $coll " 
    19         echo 
     17        if [ ! -e "collect/$coll/index" ]; then 
     18            echo 
     19            echo "Building collection $coll " 
     20            echo 
    2021 
    21         import.pl --removeold $coll && \ 
    22         buildcol.pl --removeold $coll && \ 
    23         rm -rf collect/$coll/index collect/$coll/archives && \ 
    24         mv collect/$coll/building collect/$coll/index || exit 1 
     22            import.pl --removeold $coll && \ 
     23            buildcol.pl --removeold $coll && \ 
     24            rm -rf collect/$coll/index collect/$coll/archives && \ 
     25            mv collect/$coll/building collect/$coll/index || exit 1 
     26        else 
     27            echo skipping $coll 
     28        fi 
    2529    fi 
    2630done