Changeset 13793

Timestamp:

2007-01-25T13:53:18+13:00 (17 years ago)

Author:

kjdon

Message:

a few fixes

File:

• trunk/gsdl3/dist-resources/dist-build.xml (modified) (4 diffs)

trunk/gsdl3/dist-resources/dist-build.xml

@@ -85 +85 @@
 
     <!-- make the extra directories needed for a release -->
-    <mkdir dir="${basedir}/Linux/bin"/>
     <mkdir dir="${basedir}/Linux/lib/jni"/>
-    <mkdir dir="${basedir}/Darwin/bin"/>
     <mkdir dir="${basedir}/Darwin/lib/jni"/>
     <mkdir dir="${basedir}/Windows/lib/jni"/>
-    <mkdir dir="${basedir}/Windows/bin"/>
     <mkdir dir="${gs2build.home}/Unix/bin/linux"/>
     <mkdir dir="${gs2build.home}/Unix/bin/darwin"/>
@@ -102 +99 @@
     <!-- compile the java stuff -->
     <antcall target="compile-web"/>
-    <antcall target="configure-packages"/>
-    <antcall target="compile-packages-javaonly"/>
+    <antcall target="configure-packages-and-indexers"/>
+    <antcall target="compile-packages-and-indexers-javaonly"/>
     <antcall target="distclean-packages"/>
     <antcall target="compile-core"/>
@@ -148 +145 @@
       <fileset dir="${gs2build.home}/lib" defaultexcludes="no"/>
     </move>
-    <copy file="${gs2build.home}/lib/win32.mak" tofile="${gs2build.home}/source/lib/win32.mak"/>
     <move todir="${gs2build.home}/source/packages" failonerror="false">
       <fileset dir="${gs2build.home}/packages" defaultexcludes="no"/>
@@ -215 +211 @@
   </target>   
 
-  <target name="compile-packages-javaonly" depends="init">
+  <target name="configure-packages-and-indexers" depends="init">
+    <exec executable="${indexers.home}/configure"
+      dir="${indexers.home}">
+      <arg value="--prefix=${basedir}"/>
+      <arg value="--libdir=${lib.jni}"/>
+    </exec>          
+    <exec executable="${javagdbm.home}/configure"
+      dir="${javagdbm.home}">
+      <arg value="--prefix=${basedir}"/>
+      <arg value="--libdir=${lib.jni}"/>
+    </exec>    
+
+  </target>
+  <target name="compile-packages-and-indexers-javaonly" depends="init">
     <echo>Compiling Indexers</echo>
     <exec executable="make" os="${os.unix}"