Bug=85492

author=ashuk

Files modified:
java/build/install_dom_win32.js
java/build/install_pluglets_win32.js
java/build/install_blackconnect_win32.js
java/build/install_webclient_win32.js
java/build/install_blackwood_win32.js

This fix modifies the install.js files for the Blackwood XPIs
to ensure that XPI's copies the appropriate files in the
components dir upon installation.

Thanks to Girish for helping with the changes related to
the new XPInstall API.

java/build/install_blackconnect_win32.js

@@ -51,19 +51,15 @@ logComment("Starting Install Process");
    var fComponents     = getFolder("Components");
    var fJavadev        = getFolder("Program","javadev");
    src = getFolder(fJavadev, "lib/bcorb.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/bcjavastubs.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/javaloader.dll");
-   err = copy(src, fComponents);
-   src = getFolder(fJavadev, "lib/javaSample.dll");
-   err = copy(src, fComponents);
-   src = getFolder(fJavadev, "lib/bcTest.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/bcxpcomstubs.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "regxpcom.exe");
-   err = copy(src, fProgram);
+   err = File.copy(src, fProgram);
 
    // check return value
    if(err == SUCCESS)

java/build/install_blackwood_win32.js

@@ -51,23 +51,19 @@
    var fComponents     = getFolder("Components");
    var fJavadev        = getFolder("Program","javadev");
    src = getFolder(fJavadev, "lib/javadom.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/pluglet.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/bcorb.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/bcjavastubs.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/javaloader.dll");
-   err = copy(src, fComponents);
-   src = getFolder(fJavadev, "lib/javaSample.dll");
-   err = copy(src, fComponents);
-   src = getFolder(fJavadev, "lib/bcTest.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/bcxpcomstubs.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "regxpcom.exe");
-   err = copy(src, fProgram);
+   err = File.copy(src, fProgram);
 
    // check return value
    if(err == SUCCESS)

java/build/install_dom_win32.js

@@ -51,7 +51,7 @@ logComment("Starting Install Process");
    var fComponents     = getFolder("Components");
    var fJavadev        = getFolder("Program","javadev");
    src = getFolder(fJavadev, "lib/javadom.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
 
    // check return value
    if(err == SUCCESS)

java/build/install_pluglets_win32.js

@@ -51,9 +51,9 @@ logComment("Starting Install Process");
    var fComponents     = getFolder("Components");
    var fJavadev        = getFolder("Program","javadev");
    src = getFolder(fJavadev, "lib/javadom.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/pluglet.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
 
    // check return value
    if(err == SUCCESS)

java/build/install_webclient_win32.js

@@ -51,21 +51,17 @@ logComment("Starting Install Process");
    var fComponents     = getFolder("Components");
    var fJavadev        = getFolder("Program","javadev");
    src = getFolder(fJavadev, "lib/javadom.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/bcorb.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/bcjavastubs.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/javaloader.dll");
-   err = copy(src, fComponents);
-   src = getFolder(fJavadev, "lib/javaSample.dll");
-   err = copy(src, fComponents);
-   src = getFolder(fJavadev, "lib/bcTest.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "lib/bcxpcomstubs.dll");
-   err = copy(src, fComponents);
+   err = File.copy(src, fComponents);
    src = getFolder(fJavadev, "regxpcom.exe");
-   err = copy(src, fProgram);
+   err = File.copy(src, fProgram);
 
    // check return value
    if(err == SUCCESS)