Bug 1047877 - Flatten modules/libpref/{public,src}/ directories. r=bs…

…medberg
Brli · Aug 8, 2014 · 1c52359 · 1c52359
1 parent 79d830a
commit 1c52359
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 48 deletions.
diff --git a/modules/libpref/src/Makefile.in → modules/libpref/Makefile.in b/modules/libpref/src/Makefile.in → modules/libpref/Makefile.in
diff --git a/modules/libpref/src/Preferences.cpp → modules/libpref/Preferences.cpp b/modules/libpref/src/Preferences.cpp → modules/libpref/Preferences.cpp
diff --git a/modules/libpref/public/Preferences.h → modules/libpref/Preferences.h b/modules/libpref/public/Preferences.h → modules/libpref/Preferences.h
diff --git a/modules/libpref/src/init/all.js → modules/libpref/init/all.js b/modules/libpref/src/init/all.js → modules/libpref/init/all.js
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
@@ -4,6 +4,40 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
 TEST_DIRS += ['test']
 
+XPIDL_SOURCES += [
+    'nsIPrefBranch.idl',
+    'nsIPrefBranch2.idl',
+    'nsIPrefBranchInternal.idl',
+    'nsIPrefLocalizedString.idl',
+    'nsIPrefService.idl',
+    'nsIRelativeFilePref.idl',
+]
+
+XPIDL_MODULE = 'pref'
+
+EXPORTS.mozilla += [
+    'Preferences.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsPrefBranch.cpp',
+    'nsPrefsFactory.cpp',
+    'Preferences.cpp',
+    'prefread.cpp',
+]
+
+# prefapi.cpp cannot be built in unified mode because it uses plarena.h
+SOURCES += [
+    'prefapi.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+
+DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
+DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
diff --git a/modules/libpref/public/nsIPrefBranch.idl → modules/libpref/nsIPrefBranch.idl b/modules/libpref/public/nsIPrefBranch.idl → modules/libpref/nsIPrefBranch.idl
diff --git a/modules/libpref/public/nsIPrefBranch2.idl → modules/libpref/nsIPrefBranch2.idl b/modules/libpref/public/nsIPrefBranch2.idl → modules/libpref/nsIPrefBranch2.idl
diff --git a/.../libpref/public/nsIPrefBranchInternal.idl → modules/libpref/nsIPrefBranchInternal.idl b/.../libpref/public/nsIPrefBranchInternal.idl → modules/libpref/nsIPrefBranchInternal.idl
diff --git a/...libpref/public/nsIPrefLocalizedString.idl → modules/libpref/nsIPrefLocalizedString.idl b/...libpref/public/nsIPrefLocalizedString.idl → modules/libpref/nsIPrefLocalizedString.idl
diff --git a/modules/libpref/public/nsIPrefService.idl → modules/libpref/nsIPrefService.idl b/modules/libpref/public/nsIPrefService.idl → modules/libpref/nsIPrefService.idl
diff --git a/...es/libpref/public/nsIRelativeFilePref.idl → modules/libpref/nsIRelativeFilePref.idl b/...es/libpref/public/nsIRelativeFilePref.idl → modules/libpref/nsIRelativeFilePref.idl
diff --git a/modules/libpref/src/nsPrefBranch.cpp → modules/libpref/nsPrefBranch.cpp b/modules/libpref/src/nsPrefBranch.cpp → modules/libpref/nsPrefBranch.cpp
diff --git a/modules/libpref/src/nsPrefBranch.h → modules/libpref/nsPrefBranch.h b/modules/libpref/src/nsPrefBranch.h → modules/libpref/nsPrefBranch.h
diff --git a/modules/libpref/src/nsPrefsFactory.cpp → modules/libpref/nsPrefsFactory.cpp b/modules/libpref/src/nsPrefsFactory.cpp → modules/libpref/nsPrefsFactory.cpp
diff --git a/modules/libpref/src/prefapi.cpp → modules/libpref/prefapi.cpp b/modules/libpref/src/prefapi.cpp → modules/libpref/prefapi.cpp
diff --git a/modules/libpref/src/prefapi.h → modules/libpref/prefapi.h b/modules/libpref/src/prefapi.h → modules/libpref/prefapi.h
diff --git a/modules/libpref/src/prefapi_private_data.h → modules/libpref/prefapi_private_data.h b/modules/libpref/src/prefapi_private_data.h → modules/libpref/prefapi_private_data.h
diff --git a/modules/libpref/src/prefread.cpp → modules/libpref/prefread.cpp b/modules/libpref/src/prefread.cpp → modules/libpref/prefread.cpp
diff --git a/modules/libpref/src/prefread.h → modules/libpref/prefread.h b/modules/libpref/src/prefread.h → modules/libpref/prefread.h
diff --git a/modules/libpref/public/moz.build b/modules/libpref/public/moz.build
diff --git a/modules/libpref/src/moz.build b/modules/libpref/src/moz.build