non-ide files for rc2

git-svn-id: svn://10.0.0.236/trunk@233216 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/dist/non-ide/build.properties.sample

@@ -1,9 +1,11 @@
-bin.artifacts.pattern=${so.prefix}webclient.${so.extension},${so.prefix}javadomjni.${so.extension},components/${so.prefix}javadom.${so.extension}
+bin.artifacts.pattern=${so.prefix}webclient.${so.extension},${so.prefix}webclient.jnilib,${so.prefix}javadomjni.${so.extension},${so.prefix}javadomjni.jnilib,components/${so.prefix}javadom.${so.extension}
+nspr.log.modules=sync:javadom:4,webclient:4,webclientstub:4,pluglets:4
+nspr.log.filename=webclient.log
 #debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=y
 
 # Begin Editable Properties
 
-junit.jar=C:\\PROGRA~1\\netbeans-5.5\\ide7\\ant\\lib\\junit-3.8.1.jar 
+junit.jar=/Users/edburns/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar
 
 #Make this point to the bin directory of your XULRUNNER installation
-browser.bin.dir=C:\\Projects\\chaff\\webclient-alpha-5\\xulrunner
+browser.bin.dir=/Users/edburns/Projects/chaff/XUL.framework/Versions/1.8.1.3

mozilla/java/dist/non-ide/build.xml

@@ -66,6 +66,12 @@
                 <os family="windows" />
             </and>
         </condition>
+        
+        <condition property="so.extension" value="dylib">
+            <and>
+                <os name="Mac OS X" />
+            </and>
+        </condition>
 
         <condition property="so.extension" value="so">
             <and>
@@ -79,15 +85,15 @@
             </and>
         </condition>
 
-        <condition property="platform" value="unix">
+        <condition property="platform" value="macosx">
             <and>
-                <os family="unix" />
+                <os name="Mac OS X" />
             </and>
         </condition>
         
-        <condition property="platform" value="mac">
+        <condition property="platform" value="unix">
             <and>
-                <os family="mac" />
+                <os family="unix" />
             </and>
         </condition>
         
@@ -108,7 +114,7 @@
         <condition property="build.mac.classes">
             <and>
                 <isset property="platform" />
-                <equals arg1="${platform}" arg2="mac" />
+                <equals arg1="${platform}" arg2="macosx" />
             </and>
         </condition>
         
@@ -135,13 +141,13 @@
                 <os family="unix" />
             </and>
         </condition>
-
         <property file="build.properties" />
 
         <condition property="preconditions.met">
-            <and>
+            <or>
                 <available file="${browser.bin.dir}/${so.prefix}xul.${so.extension}" />
-            </and>
+                <available file="${browser.bin.dir}/${so.prefix}xpcom.${so.extension}" />
+            </or>
         </condition>
 
         <uptodate property="do.copy.binaries">

mozilla/java/dist/non-ide/project.properties

@@ -18,10 +18,10 @@ dist.jar=${dist.dir}/webclient.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 file.reference.main-java=../test/manual/src/main/java
 file.reference.main-java-1=../test/automated/src/main/java
-file.reference.webclient-2_0_a5.jar=../lib/webclient-2_0_a5.jar
+file.reference.webclient-2_0_a9.jar=../lib/webclient-2_0_a9.jar
 jar.compress=false
 javac.classpath=\
-    ${file.reference.webclient-2_0_a5.jar}
+    ${file.reference.webclient-2_0_a9.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false