Port of bug 1047584 for SeaMonkey

Comment on attachment 8496719 [details] [diff] [review] patch Works fine for me, thanks!

Comment on attachment 8496719 [details] [diff] [review] patch >+#ifdef XP_MACOSX >+@APPNAME@/Contents/MacOS/@DLL_PREFIX@softokn3@DLL_SUFFIX@ >+#else > @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ >+#endif Is there no @VARIBLE@ we can use or define to avoid having to #ifdef every time? (The value of the variable would be @APPNAME@/Contents/MacOS on MacOS and @BINPATH@ everywhere else.)

No, bug 1047584 didn't implement @VARIABLE@'s though I have mentioned that I think it should and I'd be in favor of this being added.

Comment on attachment 8496719 [details] [diff] [review] patch OK, I guess #ifdef will have to do for now.

Heads up that Mac V2 signing also landed on Aurora today. We are still discussing whether it will be uplifted to esr31 since from what I know we won't be able to whitelist for the entire esr31 lifecycle but we are leaning towards not uplifting at this time.

Comment on attachment 8496719 [details] [diff] [review] patch (In reply to Robert Strong [:rstrong] (use needinfo to contact me) from comment #6) > Heads up that Mac V2 signing also landed on Aurora today. We are still > discussing whether it will be uplifted to esr31 since from what I know we > won't be able to whitelist for the entire esr31 lifecycle but we are leaning > towards not uplifting at this time. [Approval Request Comment] Regression caused by (bug #): 1047584 User impact if declined: ? Testing completed (on m-c, etc.): Yes Risk to taking this patch (and alternatives if risky): ? String changes made by this patch: None

> +#elif XP_MACOSX > +@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@-bin > +@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@ stefanh: do we generate seamonkey-bin on OSX? I think we stopped doing that on Linux.

Pushed to comm-central http://hg.mozilla.org/comm-central/rev/316848ae2904

Pushed to comm-beta: http://hg.mozilla.org/releases/comm-beta/rev/e567470af025

(In reply to Philip Chee from comment #8) > > +#elif XP_MACOSX > > +@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@-bin > > +@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@ > stefanh: do we generate seamonkey-bin on OSX? I think we stopped doing that > on Linux. Yes, we do.

i.e. this error: python /builds/slave/test/tools/buildfarm/utils/printbuildrev.py ./SeaMonkeyDebug.app/Contents/MacOS in dir /builds/slave/test/build (timeout 1200 secs) watching logfiles {} argv: ['python', '/builds/slave/test/tools/buildfarm/utils/printbuildrev.py', './SeaMonkeyDebug.app/Contents/MacOS'] environment: Apple_PubSub_Socket_Render=/tmp/launch-igMgqT/Render CVS_RSH=ssh DISPLAY=/tmp/launch-D1NTiV/org.x:0 HOME=/Users/seabld LOGNAME=seabld PATH=/tools/buildbot/bin:/tools/python/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin PWD=/builds/slave/test/build PYTHONPATH=/tools/buildbot/lib/python2.7/site-packages SHELL=/bin/bash SSH_AUTH_SOCK=/tmp/launch-EQ9Czj/Listeners TMPDIR=/var/folders/bm/kc_3cyjj2v15yn2741pj8s6r0000gn/T/ USER=seabld VERSIONER_PYTHON_PREFER_32_BIT=no VERSIONER_PYTHON_VERSION=2.7 __CF_USER_TEXT_ENCODING=0x1F5:0:0 using PTY: False Traceback (most recent call last): File "/builds/slave/test/tools/buildfarm/utils/printbuildrev.py", line 14, in <module> buildid = appini.get('App', 'BuildID') File "/tools/python27/lib/python2.7/ConfigParser.py", line 607, in get raise NoSectionError(section) ConfigParser.NoSectionError: No section: 'App' program finished with exit code 1 elapsedTime=0.036184

(In reply to Edmund Wong (:ewong) from comment #12) > i.e. this error: > > python /builds/slave/test/tools/buildfarm/utils/printbuildrev.py > ./SeaMonkeyDebug.app/Contents/MacOS > in dir /builds/slave/test/build (timeout 1200 secs) > watching logfiles {} > argv: ['python', > '/builds/slave/test/tools/buildfarm/utils/printbuildrev.py', > './SeaMonkeyDebug.app/Contents/MacOS'] > environment: > Apple_PubSub_Socket_Render=/tmp/launch-igMgqT/Render > CVS_RSH=ssh > DISPLAY=/tmp/launch-D1NTiV/org.x:0 > HOME=/Users/seabld > LOGNAME=seabld > > PATH=/tools/buildbot/bin:/tools/python/bin:/opt/local/bin:/usr/bin:/bin:/usr/ > sbin:/sbin:/usr/local/bin:/usr/X11/bin > PWD=/builds/slave/test/build > PYTHONPATH=/tools/buildbot/lib/python2.7/site-packages > SHELL=/bin/bash > SSH_AUTH_SOCK=/tmp/launch-EQ9Czj/Listeners > TMPDIR=/var/folders/bm/kc_3cyjj2v15yn2741pj8s6r0000gn/T/ > USER=seabld > VERSIONER_PYTHON_PREFER_32_BIT=no > VERSIONER_PYTHON_VERSION=2.7 > __CF_USER_TEXT_ENCODING=0x1F5:0:0 > using PTY: False > Traceback (most recent call last): > File "/builds/slave/test/tools/buildfarm/utils/printbuildrev.py", line 14, > in <module> > buildid = appini.get('App', 'BuildID') > File "/tools/python27/lib/python2.7/ConfigParser.py", line 607, in get > raise NoSectionError(section) > ConfigParser.NoSectionError: No section: 'App' > program finished with exit code 1 > elapsedTime=0.036184 Sorry. Posted this to the wrong bug. :(

(In reply to Philip Chee from comment #8) > > +#elif XP_MACOSX > > +@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@-bin > > +@APPNAME@/Contents/MacOS/@MOZ_APP_NAME@ > stefanh: do we generate seamonkey-bin on OSX? I think we stopped doing that > on Linux. Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Firefox/36.0 SeaMonkey/2.33a1 ID:20141112003001 c-c:8247ad339166 m-c:688f821edcd4 In this Linux build, there are both a "seamonkey" and a "seamonkey-bin" in the appdir. The seamonkey-bin file is only 8 bytes longer than the seamonkey one so I guess they are almost identical binaries. There is also a "run-mozilla.sh" script but I don't know if it's still actually used.