Bug 664907 - Use MOZ_CHROME_FILE_FORMAT=symlink for omnijar builds, r=ted,Mitch
authorMichael Wu <mwu@mozilla.com>
Mon, 25 Jul 2011 21:57:37 -0700
changeset 73323 95eda84ea6babca4d7d43e65db1bc803252431d8
parent 73322 dd550792ca90e22ebf0ae463af9426bfcae07b22
child 73324 7a21ce9c4482b70b59b81f89641f3d586ca0e7a0
push id20846
push usermak77@bonardo.net
push dateTue, 26 Jul 2011 09:50:30 +0000
treeherdermozilla-central@982a5835fba1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, Mitch
bugs664907
milestone8.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 664907 - Use MOZ_CHROME_FILE_FORMAT=symlink for omnijar builds, r=ted,Mitch Turns on symlink on non-windows. It is questionable whether symlink works correctly on windows.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -7908,17 +7908,21 @@ dnl Omnijar packaging is compatible with
 dnl In unpackaged builds, omnijar looks for files as if
 dnl things were flat packaged. After packaging, all files
 dnl are loaded from a single jar. MOZ_CHROME_FILE_FORMAT
 dnl is set to flat since putting files into jars is only
 dnl done during packaging with omnijar.
 if test "$MOZ_CHROME_FILE_FORMAT" = "omni"; then
     MOZ_OMNIJAR=1
     AC_DEFINE(MOZ_OMNIJAR)
-    MOZ_CHROME_FILE_FORMAT=flat
+    if test "$OS_ARCH" = "WINNT"; then
+        MOZ_CHROME_FILE_FORMAT=flat
+    else
+        MOZ_CHROME_FILE_FORMAT=symlink
+    fi
 elif test "$MOZ_CHROME_FILE_FORMAT" = "jar"; then
     AC_DEFINE(MOZ_CHROME_FILE_FORMAT_JAR)
 fi
 
 AC_SUBST(MOZ_OMNIJAR)
 
 dnl ========================================================
 dnl = Define default location for MOZILLA_FIVE_HOME