Changeset 19131 for release-kits

Timestamp:

2009-04-20T15:46:09+12:00 (15 years ago)

Author:

oranfry

Message:

changes to the names and locations of things

Location:

release-kits/derk

Files:

• ant-scripts/build.xml (modified) (3 diffs)
• resources/build.sh (modified) (2 diffs)

release-kits/derk/ant-scripts/build.xml

@@ -42 +42 @@
         <if><bool><not><available file="dec"/></not></bool>
             <svn>
-                <export srcurl="${svn.root}/documented-example-collections/${branch.path}" destPath="dec"/>
+                <export srcurl="${svn.root}/collections/documented-examples/${branch.path}" destPath="documented-examples"/>
             </svn>
         </if>
@@ -55 +55 @@
         </if>
 
-        <exec dir="gs2build" executable="/bin/bash" failonerror="true"><arg value="./configure"/></exec>
-        <exec dir="gs2build/common-src" executable="make" failonerror="true"/>
-        <exec dir="gs2build/common-src" executable="make" failonerror="true"><arg value="install"/></exec>
-        <exec dir="gs2build" executable="/bin/bash" failonerror="true"><arg value="./configure"/></exec>
-        <exec dir="gs2build" executable="make" failonerror="true"/>
-        <exec dir="gs2build" executable="make" failonerror="true"><arg value="install"/></exec>
-
+        <if>
+            <bool><not><available file="gs2build/Makefile"/></not></bool>
+            <exec dir="gs2build" executable="/bin/bash" failonerror="true"><arg value="./configure"/></exec>
+            <exec dir="gs2build/common-src" executable="make" failonerror="true"/>
+            <exec dir="gs2build/common-src" executable="make" failonerror="true"><arg value="install"/></exec>
+            <exec dir="gs2build" executable="/bin/bash" failonerror="true"><arg value="./configure"/></exec>
+            <exec dir="gs2build" executable="make" failonerror="true"/>
+            <exec dir="gs2build" executable="make" failonerror="true"><arg value="install"/></exec>
+        </if>
     </target>
 
@@ -70 +72 @@
     <target name="create-archives">
         <mkdir dir="products"/>
-        <zip destfile="products/Greenstone-${version}-documented-examples.zip" basedir="${basedir}" includes="dec/**/*"/>
+        <zip destfile="products/Greenstone-documented-examples-${version}.zip" basedir="${basedir}" includes="documented-examples/**/*"/>
         <exec executable="tar">
-            <arg line="-czf products/Greenstone-${version}-documented-examples.tar.gz dec"/>
+            <arg line="-czf products/Greenstone-documented-examples-${version}.tar.gz documented-examples"/>
         </exec>
     </target>

release-kits/derk/resources/build.sh

@@ -3 +3 @@
 source setup.bash
 
-if [ ! -e "collect/dec" ]; then
+if [ ! -e "collect/documented-examples" ]; then
     cd collect
-    ln -s ../../dec
+    ln -s ../../documented-examples
     cd $opwd
 fi
@@ -11 +11 @@
 cd collect
 
-for coll in dec/*; do
+for coll in documented-examples/*; do
     cd $opwd
 
     if [ -d "collect/$coll/etc" ]; then
-        echo
-        echo "Building collection $coll "
-        echo
+        if [ ! -e "collect/$coll/index" ]; then
+            echo
+            echo "Building collection $coll "
+            echo
 
-        import.pl --removeold $coll && \
-        buildcol.pl --removeold $coll && \
-        rm -rf collect/$coll/index collect/$coll/archives && \
-        mv collect/$coll/building collect/$coll/index || exit 1
+            import.pl --removeold $coll && \
+            buildcol.pl --removeold $coll && \
+            rm -rf collect/$coll/index collect/$coll/archives && \
+            mv collect/$coll/building collect/$coll/index || exit 1
+        else
+            echo skipping $coll
+        fi
     fi
 done