Issue #65 - Remove AppConstants from toolkit/mozapps/update

toolkit/mozapps/update/moz.build

@@ -18,11 +18,12 @@ XPIDL_SOURCES += [
 TEST_DIRS += ['tests']
 
 EXTRA_COMPONENTS += [
-    'nsUpdateService.js',
     'nsUpdateService.manifest',
     'nsUpdateServiceStub.js',
 ]
 
+EXTRA_PP_COMPONENTS += ['nsUpdateService.js']
+
 JAR_MANIFESTS += ['jar.mn']
 
 with Files('**'):

toolkit/mozapps/update/nsUpdateService.js

@@ -12,7 +12,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
 Cu.import("resource://gre/modules/FileUtils.jsm", this);
 Cu.import("resource://gre/modules/Services.jsm", this);
 Cu.import("resource://gre/modules/ctypes.jsm", this);
-Cu.import("resource://gre/modules/AppConstants.jsm", this);
 Cu.importGlobalProperties(["XMLHttpRequest"]);
 
 const UPDATESERVICE_CID = Components.ID("{B3C290A6-3943-4B89-8BBE-C01EB7B3B311}");
@@ -219,10 +218,7 @@ function closeHandle(handle) {
  * @return The Win32 handle to the mutex.
  */
 function createMutex(aName, aAllowExisting = true) {
-  if (AppConstants.platform != "win") {
+#ifdef XP_WIN
-    throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-  }
-
   const INITIAL_OWN = 1;
   const ERROR_ALREADY_EXISTS = 0xB7;
   let lib = ctypes.open("kernel32.dll");
@@ -246,6 +242,9 @@ function createMutex(aName, aAllowExisting = true) {
   }
 
   return handle;
+#else
+  throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+#endif
 }
 
 /**
@@ -257,10 +256,7 @@ function createMutex(aName, aAllowExisting = true) {
  * @return Global mutex path
  */
 function getPerInstallationMutexName(aGlobal = true) {
-  if (AppConstants.platform != "win") {
+#ifdef XP_WIN
-    throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-  }
-
   let hasher = Cc["@mozilla.org/security/hash;1"].
                createInstance(Ci.nsICryptoHash);
   hasher.init(hasher.SHA1);
@@ -274,6 +270,9 @@ function getPerInstallationMutexName(aGlobal = true) {
 
   hasher.update(data, data.length);
   return (aGlobal ? "Global\\" : "") + "MozillaUpdateMutex-" + hasher.finish(true);
+#else
+  throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+#endif
 }
 
 /**
@@ -285,13 +284,14 @@ function getPerInstallationMutexName(aGlobal = true) {
  * @return true if this instance holds the update mutex
  */
 function hasUpdateMutex() {
-  if (AppConstants.platform != "win") {
+#ifdef XP_WIN
-    return true;
-  }
   if (!gUpdateMutexHandle) {
     gUpdateMutexHandle = createMutex(getPerInstallationMutexName(true), false);
   }
   return !!gUpdateMutexHandle;
+#else
+  return true;
+#endif
 }
 
 /**
@@ -322,10 +322,7 @@ function areDirectoryEntriesWriteable(aDir) {
  * @return true if elevation is required, false otherwise
  */
 function getElevationRequired() {
-  if (AppConstants.platform != "macosx") {
+#ifdef XP_MACOSX
-    return false;
-  }
-
   try {
     // Recursively check that the application bundle (and its descendants) can
     // be written to.
@@ -344,6 +341,7 @@ function getElevationRequired() {
   }
   LOG("getElevationRequired - able to write to application bundle, elevation " +
       "not required");
+#endif
   return false;
 }
 
@@ -355,12 +353,13 @@ function getElevationRequired() {
  * @return true if an update can be applied, false otherwise
  */
 function getCanApplyUpdates() {
-  if (AppConstants.platform != "macosx") {
+#ifndef XP_MACOSX
   try {
     let updateTestFile = getUpdateFile([FILE_UPDATE_TEST]);
     LOG("getCanApplyUpdates - testing write access " + updateTestFile.path);
     testWriteAccess(updateTestFile, false);
-      if (AppConstants.platform == "win") {
+
+#ifdef XP_WIN
     // Example windowsVersion:  Windows XP == 5.1
     let windowsVersion = Services.sysinfo.getProperty("version");
     LOG("getCanApplyUpdates - windowsVersion = " + windowsVersion);
@@ -427,13 +426,13 @@ function getCanApplyUpdates() {
       appDirTestFile.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
       appDirTestFile.remove(false);
     }
-      }
+#endif // XP_WIN
   } catch (e) {
     LOG("getCanApplyUpdates - unable to apply updates. Exception: " + e);
     // No write privileges to install directory
     return false;
   }
-  } 
+#endif // !XP_MACOSX
 
   LOG("getCanApplyUpdates - able to apply updates");
   return true;
@@ -454,16 +453,18 @@ XPCOMUtils.defineLazyGetter(this, "gCanStageUpdatesSession", function aus_gCSUS(
 
   try {
     let updateTestFile;
-    if (AppConstants.platform == "macosx") {
+#ifdef XP_MACOSX
     updateTestFile = getUpdateFile([FILE_UPDATE_TEST]);
-    } else {
+#else
     updateTestFile = getInstallDirRoot();
     updateTestFile.append(FILE_UPDATE_TEST);
-    }
+#endif
+
     LOG("gCanStageUpdatesSession - testing write access " +
         updateTestFile.path);
     testWriteAccess(updateTestFile, true);
-    if (AppConstants.platform != "macosx") {
+
+#ifndef XP_MACOSX
     // On all platforms except Mac, we need to test the parent directory as
     // well, as we need to be able to move files in that directory during the
     // replacing step.
@@ -474,7 +475,7 @@ XPCOMUtils.defineLazyGetter(this, "gCanStageUpdatesSession", function aus_gCSUS(
     updateTestFile.createUnique(Ci.nsILocalFile.DIRECTORY_TYPE,
                                 FileUtils.PERMS_DIRECTORY);
     updateTestFile.remove(false);
-    }
+#endif // !XP_MACOSX
   } catch (e) {
     LOG("gCanStageUpdatesSession - unable to stage updates. Exception: " +
         e);
@@ -593,10 +594,10 @@ function getAppBaseDir() {
  */
 function getInstallDirRoot() {
   let dir = getAppBaseDir();
-  if (AppConstants.platform == "macosx") {
+#ifdef XP_MACOSX
   // On Mac, we store the Updated.app directory inside the bundle directory.
   dir = dir.parent.parent;
-  }
+#endif
   return dir;
 }
 
@@ -879,7 +880,8 @@ function handleUpdateFailure(update, errorCode) {
     let cancelations = Services.prefs.getIntPref(PREF_APP_UPDATE_CANCELATIONS, 0);
     cancelations++;
     Services.prefs.setIntPref(PREF_APP_UPDATE_CANCELATIONS, cancelations);
-    if (AppConstants.platform == "macosx") {
+
+#ifdef XP_MACOSX
     let osxCancelations = Services.prefs.getIntPref(PREF_APP_UPDATE_CANCELATIONS_OSX, 0);
     osxCancelations++;
     Services.prefs.setIntPref(PREF_APP_UPDATE_CANCELATIONS_OSX,
@@ -901,9 +903,10 @@ function handleUpdateFailure(update, errorCode) {
     let prompter = Cc["@mozilla.org/updates/update-prompt;1"].
                createInstance(Ci.nsIUpdatePrompt);
     prompter.showUpdateError(update);
-    } else {
+#else
     writeStatusFile(getUpdatesDir(), update.state = STATE_PENDING);
-    }
+#endif
+
     return true;
   }
 
@@ -1483,12 +1486,15 @@ UpdateService.prototype = {
         Services.obs.removeObserver(this, topic);
         Services.prefs.removeObserver(PREF_APP_UPDATE_LOG, this);
 
-        if (AppConstants.platform == "win" && gUpdateMutexHandle) {
+#ifdef XP_WIN
+        if (gUpdateMutexHandle) {
           // If we hold the update mutex, let it go!
           // The OS would clean this up sometime after shutdown,
           // but that would have no guarantee on timing.
           closeHandle(gUpdateMutexHandle);
         }
+#endif
+
         if (this._retryTimer) {
           this._retryTimer.cancel();
         }
@@ -1845,7 +1851,8 @@ UpdateService.prototype = {
     });
 
     let update = minorUpdate || majorUpdate;
-    if (AppConstants.platform == "macosx" && update) {
+#ifdef XP_MACOSX
+    if (update) {
       if (getElevationRequired()) {
         let installAttemptVersion = Services.prefs.getCharPref(
                                             PREF_APP_UPDATE_ELEVATE_VERSION,
@@ -1895,6 +1902,7 @@ UpdateService.prototype = {
         }
       }
     }
+#endif
 
     return update;
   },
@@ -2890,11 +2898,11 @@ Downloader.prototype = {
 
     LOG("Downloader:_verifyDownload downloaded size == expected size.");
 
+#ifdef MOZ_VERIFY_MAR_SIGNATURE
     // The hash check is not necessary when mar signatures are used to verify
     // the downloaded mar file.
-    if (AppConstants.MOZ_VERIFY_MAR_SIGNATURE) {
     return true;
-    }
+#endif
 
     let fileStream = Cc["@mozilla.org/network/file-input-stream;1"].
                      createInstance(Ci.nsIFileInputStream);