M dist/build.xml

M dist/webclient-dist.xml

- first crack at making this work with a mozilla 1.7 suite install

java/dist/build.xml

@@ -43,11 +43,7 @@
   <property name="source.home" value="${basedir}/.." />
   <property name="moz.dist" value="${myenv.MOZ_SRC}/mozilla/dist" />
 
-  <target name="prepare">
-  
-    <mkdir dir="${dist.home}" />
-    <mkdir dir="${dist.home}/components" />
-
+  <target name="props">
     <condition property="so.prefix" value="">
       <and>
         <os family="windows" />
@@ -72,6 +68,24 @@
       </and>
     </condition>
 
+    <condition property="platform" value="win32">
+      <and>
+        <os family="windows" />
+      </and>
+    </condition>
+
+    <condition property="platform" value="linux">
+      <and>
+        <os family="unix" />
+      </and>
+    </condition>
+  </target>
+
+  <target name="prepare" depends="props">
+  
+    <mkdir dir="${dist.home}" />
+    <mkdir dir="${dist.home}/components" />
+
   </target>
 
   <target name="dist" depends="prepare,compile.test">
@@ -104,9 +118,10 @@
 
     <copy tofile="${dist.home}/build.xml" file="webclient-dist.xml" />
 
-    <zip destfile="${name}_${version}.zip" basedir="${dist.home}" />
-    <copy todir="${dist.home}" file="${name}_${version}.zip" />
-    <delete file="${name}_${version}.zip" />
+    <zip destfile="${name}_${version}_${platform}.zip" 
+         basedir="${dist.home}" />
+    <copy todir="${dist.home}" file="${name}_${version}_${platform}.zip" />
+    <delete file="${name}_${version}_${platform}.zip" />
 
   </target>
 
@@ -123,21 +138,21 @@
 
   <target name="test.dist" depends="prepare,clean.dev.build">
 
-    <unzip dest="${moz.dist}/bin" src="${dist.home}/${name}_${version}.zip" />
+    <unzip dest="${moz.install.dir}" src="${dist.home}/${name}_${version}_${platform}.zip" />
 
-    <ant inheritAll="false" dir="${moz.dist}/bin"/>
+    <ant inheritAll="false" dir="${moz.install.dir}"/>
 
     <antcall target="clean.test.dist" />
 
   </target>
 
-  <target name="clean.test.dist">
+  <target name="clean.test.dist" depends="props">
 
-    <delete file="${moz.dist}/bin/build.xml" />
-    <delete file="${moz.dist}/bin/components/${so.prefix}javadom.${so.extension}" />
-    <delete file="${moz.dist}/bin/${so.prefix}javadomjni.${so.extension}" />
-    <delete file="${moz.dist}/bin/${so.prefix}${name}.${so.extension}" />
-    <delete file="${moz.dist}/bin/${name}.jar" />
+    <delete file="${moz.install.dir}/build.xml" />
+    <delete file="${moz.install.dir}/components/${so.prefix}javadom.${so.extension}" />
+    <delete file="${moz.install.dir}/${so.prefix}javadomjni.${so.extension}" />
+    <delete file="${moz.install.dir}/${so.prefix}${name}.${so.extension}" />
+    <delete file="${moz.install.dir}/${name}.jar" />
 
   </target>
 

java/dist/webclient-dist.xml

@@ -2,9 +2,7 @@
 
   <property environment="myenv" />
 
-
-  <target name="main">
-
+  <target name="props">
     <condition property="PATH_SEP" value=";">
       <and>
         <os family="windows" />
@@ -17,14 +15,58 @@
       </and>
     </condition>
 
-    <java classname="org.mozilla.webclient.test.TestBrowser"
+    <condition property="gre.dir" 
+               value="${myenv.HOMEDRIVE}\PROGRA~1\COMMON~1\mozilla.org\GRE\1.7_2004061609">
+      <and>
+        <os family="windows" />
+      </and>
+    </condition>
+
+    <condition property="gre.dir" value=":">
+      <and>
+        <os family="unix" />
+      </and>
+    </condition>
+
+    <condition property="java.libpath" 
+               value="${basedir}${PATH_SEP}${basedir}\components${PATH_SEP}${gre.dir}${PATH_SEP}${gre.dir}\components">
+      <and>
+        <os family="windows" />
+      </and>
+    </condition>
+
+    <condition property="java.libpath" 
+               value="${basedir}${PATH_SEP}${basedir}/components${PATH_SEP}${gre.dir}${PATH_SEP}${gre.dir}/components">
+      <and>
+        <os family="unix" />
+      </and>
+    </condition>
+
+
+  </target>
+
+
+  <target name="test" depends="props">
+
+  <echo message="ANT_HOME = ${myenv.ANT_HOME}"/>
+  <echo message="HOMEDRIVE = ${myenv.HOMEDRIVE}"/>
+  <echo message="gre.dir = ${gre.dir}"/>
+  <echo message="java.libpath = ${java.libpath}"/>
+
+  </target>
+
+  <target name="main" depends="props">
+
+    <java newenvironment="true"
+          classname="org.mozilla.webclient.test.TestBrowser"
           classpath="${basedir}/webclient.jar" fork="true">
-        <jvmarg value="-Djava.library.path=${basedir}${PATH_SEP}${basedir}/components"/>
-        <jvmarg value="-DNSPR_LOG_MODULES=${myenv.NSPR_LOG_MODULES}"/>
-        <jvmarg value="-DNSPR_LOG_FILE=${myenv.NSPR_LOG_FILE}"/>
-        <jvmarg value="-DBROWSER_BIN_DIR=${basedir}"/>
+        <jvmarg value="-Djava.library.path=${java.libpath}"/>
+        <jvmarg value="-DNSPR_LOG_MODULES=webclient:4,webclientstub:4"/>
+        <jvmarg value="-DNSPR_LOG_FILE=webclient.log"/>
+        <jvmarg value="-DBROWSER_BIN_DIR=${gre.dir}"/>
     </java>
 
   </target>
 
+
 </project>