Changeset 17008

Timestamp:

2008-08-26T14:18:10+12:00 (16 years ago)

Author:

ak19

Message:

Now it unpacks demo collections gs2mgppdemo and gs2mgdemo again. Also extracts the index.zip of gberg into the index folder.

File:

• greenstone3/trunk/build.xml (modified) (4 diffs)

greenstone3/trunk/build.xml

@@ -502 +502 @@
     <property name="import.zip" value="import.zip"/>
     <property name="metadata.zip" value="metadata.zip"/>
-    <property name="index.zip" value="index/index.zip"/>
+    <property name="index.zip" value="index.zip"/>
 
     <echo message="installing collections..."/>
@@ -527 +527 @@
   </target>
 
-  <target name="gs2mgdemo-install" if="gs2mgdemo.present"  depends="gs2mgdemo-prepare">
+  <target name="gs2mgdemo-install" if="gs2mgdemo.present" depends="gs2mgdemo-prepare">
     <echo> installing gs2mgdemo</echo>
     <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${import.zip}" />
     <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${metadata.zip}" />
-    <unzip dest="${gs2mgdemo.dir}/index" src="${gs2mgdemo.dir}/${index.zip}" />
+    <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${index.zip}" />
     <!--Don't delete the zips, else doing an svn update will get them all over again.-->
     <!--<delete><fileset refid="gs2mgdemofiles"/></delete>-->
@@ -558 +558 @@
     <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${import.zip}" />
     <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${metadata.zip}" />
-    <unzip dest="${gs2mgppdemo.dir}/index" src="${gs2mgppdemo.dir}/${index.zip}" />
+    <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${index.zip}" />
     <!--<delete><fileset refid="gs2mgppdemofiles"/></delete>-->
     <echo>collection gs2mgppdemo installed</echo>
@@ -566 +566 @@
     <property name="gberg.dir" value="${collect.dir}/gberg"/>
     <fileset id="gbergfiles" dir="${gberg.dir}">
-      <include name="${index.zip}"/>
+      <include name="index/${index.zip}"/>
     </fileset>
-    <available file="${gberg.dir}/${index.zip}" property="gberg.present"/>
+    <available file="${gberg.dir}/index/${index.zip}" property="gberg.present"/>
   </target>