Backed out changeset 132909245ca8 (bug 1096494) for causing merge conflicts to m-c

browser/installer/Makefile.in

@@ -120,13 +120,6 @@ BINPATH = bin
 endif
 DEFINES += -DBINPATH=$(BINPATH)
 
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-RESPATH = $(_APPNAME)/Contents/Resources
-else
-RESPATH = $(BINPATH)
-endif
-DEFINES += -DRESPATH=$(RESPATH)
-
 AB = $(firstword $(subst -, ,$(AB_CD)))
 DEFINES += -DAB=$(AB)
 

toolkit/mozapps/installer/packager.mk

@@ -39,7 +39,7 @@ ifndef _APPNAME
 _APPNAME = $(MOZ_MACBUNDLE_NAME)
 endif
 ifndef _BINPATH
-_BINPATH = /$(_APPNAME)/Contents/MacOS
+_BINPATH = /$(_APPNAME)/Contents/Resources
 endif # _BINPATH
 ifdef UNIVERSAL_BINARY
 STAGEPATH = universal/

toolkit/mozapps/installer/packager.py

@@ -32,7 +32,6 @@ import os
 from StringIO import StringIO
 import subprocess
 import platform
-import mozinfo
 
 # List of libraries to shlibsign.
 SIGN_LIBS = [
@@ -295,11 +294,11 @@ def main():
     elif 'MOZ_OMNIJAR' in defines:
         del defines['MOZ_OMNIJAR']
 
-    respath = ''
-    if 'RESPATH' in defines:
-        respath = SimpleManifestSink.normalize_path(defines['RESPATH'])
-    while respath.startswith('/'):
-        respath = respath[1:]
+    binpath = ''
+    if 'BINPATH' in defines:
+        binpath = SimpleManifestSink.normalize_path(defines['BINPATH'])
+    while binpath.startswith('/'):
+        binpath = binpath[1:]
 
     if args.unify:
         def is_native(path):
@@ -350,19 +349,18 @@ def main():
             removals_in.name = args.removals
             removals = RemovedFiles(copier)
             preprocess(removals_in, removals, defines)
-            copier.add(mozpack.path.join(respath, 'removed-files'), removals)
+            copier.add(mozpack.path.join(binpath, 'removed-files'), removals)
 
     # shlibsign libraries
     if launcher.can_launch():
-        if not mozinfo.isMac:
-            for lib in SIGN_LIBS:
-                libbase = mozpack.path.join(respath, '%s%s') \
-                    % (buildconfig.substs['DLL_PREFIX'], lib)
-                libname = '%s%s' % (libbase, buildconfig.substs['DLL_SUFFIX'])
-                if copier.contains(libname):
-                    copier.add(libbase + '.chk',
-                               LibSignFile(os.path.join(args.destination,
-                                                        libname)))
+        for lib in SIGN_LIBS:
+            libbase = mozpack.path.join(binpath, '%s%s') \
+                % (buildconfig.substs['DLL_PREFIX'], lib)
+            libname = '%s%s' % (libbase, buildconfig.substs['DLL_SUFFIX'])
+            if copier.contains(libname):
+                copier.add(libbase + '.chk',
+                           LibSignFile(os.path.join(args.destination,
+                                                    libname)))
 
     # Setup preloading
     if args.jarlog and os.path.exists(args.jarlog):
@@ -395,7 +393,7 @@ def main():
 
     copier.copy(args.destination)
     generate_precomplete(os.path.normpath(os.path.join(args.destination,
-                                                       respath)))
+                                                       binpath)))
 
 
 if __name__ == '__main__':