M build.properties.sample

M dist/build.xml
M dom/build.xml
M webclient/build.xml
M dist/netbeans/build.xml
M dist/netbeans/webclient.properties
M dom/jni/Makefile.in
M dom/src/Makefile.in
M webclient/src_moz/Makefile.in
M webclient/src_moz/EmbedWindow.cpp
M webclient/src_moz/EmbedWindow.h

- Fix for Mac OS X


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

mozilla/java/dist/netbeans/build.xml

@@ -87,6 +87,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>
@@ -160,9 +166,10 @@
         <property file="webclient.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">
@@ -213,7 +220,7 @@ ${so.prefix}xul.${so.extension}.
                   value="${basedir}/../2_0_alpha_8.html" />
         
         <java classname="org.mozilla.webclient.test.TestBrowser" fork="true">
-            <jvmarg value="-DNSPR_LOG_MODULES=webclient:4,webclientstub:4,pluglets:4"/>
+            <jvmarg value="-DNSPR_LOG_MODULES=javadom:4,webclient:4,webclientstub:4,pluglets:4"/>
             <jvmarg value="-DNSPR_LOG_FILE=${basedir}${FILE_PATH_SEP}${build.dir}${FILE_PATH_SEP}webclient.log"/>
             <jvmarg value="-Dbuild.test.results.dir=${basedir}${FILE_PATH_SEP}${build.test.results.dir}" />
             <jvmarg value="-DBROWSER_BIN_DIR=${browser.bin.dir}"/>