M dist/build.xml

M dist/netbeans/build.xml

- support for building a mac os x universal binary distribution

M dist/mcp-test/src/test/java/cardemo/CarDemoTest.java

- re-enable cardemo test.  The right way to disable this is to
  do it in the build file.

M dist/mcp-test/src/test/java/jsf_jmaki/JsfjMakiTest.java

- use getAnchors() to get the right link.

M dist/netbeans/nbproject/project.properties

- add junit to classpath

dist/build.xml dist/mcp-test/src/test/java/cardemo/CarDemoTest.java dist/mcp-test/src/test/java/jsf_jmaki/JsfjMakiTest.java dist/netbeans/build.xml dist/netbeans/nbproject/project.properties


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

mozilla/java/dist/netbeans/build.xml

@@ -106,9 +106,9 @@
             </and>
         </condition>
 
-        <condition property="platform" value="mac">
+        <condition property="platform" value="macosx">
             <and>
-                <os family="mac" />
+                <os name="Mac OS X" />
             </and>
         </condition>
         
@@ -135,7 +135,7 @@
         <condition property="build.mac.classes">
             <and>
                 <isset property="platform" />
-                <equals arg1="${platform}" arg2="mac" />
+                <equals arg1="${platform}" arg2="macosx" />
             </and>
         </condition>
         
@@ -173,7 +173,7 @@
         </condition>
         
         <uptodate property="do.copy.binaries">
-            <srcfiles dir="${basedir}/../bin" includes="**/*.*" />
+            <srcfiles dir="${basedir}/../bin/${platform}/bin" includes="**/*.*" />
             <mapper type="identity" to="${browser.bin.dir}/**/*.*" />
         </uptodate>
         
@@ -203,7 +203,7 @@ ${so.prefix}xul.${so.extension}.
     
     <target name="copy.binaries" if="do.copy.binaries">
         <copy todir="${browser.bin.dir}">
-            <fileset dir="${basedir}/../bin" />
+            <fileset dir="${basedir}/../bin/${platform}/bin" />
         </copy>
     </target>