Bug 1164717 - Flatten storage/public/ directory. r=mak
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Tue, 19 May 2015 10:47:29 -0700
changeset 244696 ad01543457e739b4eee7a245e16734a3ecfd10ad
parent 244695 5795f6ace55704d15ff8711562418f53b468c73d
child 244697 dd79977a3286d947aff8e270245d05c05e676964
push id13044
push usercbook@mozilla.com
push dateWed, 20 May 2015 14:10:38 +0000
treeherderfx-team@32382625e449 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1164717
milestone41.0a1
Bug 1164717 - Flatten storage/public/ directory. r=mak
storage/StatementCache.h
storage/moz.build
storage/mozIStorageAggregateFunction.idl
storage/mozIStorageAsyncConnection.idl
storage/mozIStorageAsyncStatement.idl
storage/mozIStorageBaseStatement.idl
storage/mozIStorageBindingParams.idl
storage/mozIStorageBindingParamsArray.idl
storage/mozIStorageCompletionCallback.idl
storage/mozIStorageConnection.idl
storage/mozIStorageError.idl
storage/mozIStorageFunction.idl
storage/mozIStoragePendingStatement.idl
storage/mozIStorageProgressHandler.idl
storage/mozIStorageResultSet.idl
storage/mozIStorageRow.idl
storage/mozIStorageService.idl
storage/mozIStorageStatement.idl
storage/mozIStorageStatementCallback.idl
storage/mozIStorageStatementParams.idl
storage/mozIStorageStatementRow.idl
storage/mozIStorageVacuumParticipant.idl
storage/mozIStorageValueArray.idl
storage/mozStorageHelper.h
storage/public/StatementCache.h
storage/public/moz.build
storage/public/mozIStorageAggregateFunction.idl
storage/public/mozIStorageAsyncConnection.idl
storage/public/mozIStorageAsyncStatement.idl
storage/public/mozIStorageBaseStatement.idl
storage/public/mozIStorageBindingParams.idl
storage/public/mozIStorageBindingParamsArray.idl
storage/public/mozIStorageCompletionCallback.idl
storage/public/mozIStorageConnection.idl
storage/public/mozIStorageError.idl
storage/public/mozIStorageFunction.idl
storage/public/mozIStoragePendingStatement.idl
storage/public/mozIStorageProgressHandler.idl
storage/public/mozIStorageResultSet.idl
storage/public/mozIStorageRow.idl
storage/public/mozIStorageService.idl
storage/public/mozIStorageStatement.idl
storage/public/mozIStorageStatementCallback.idl
storage/public/mozIStorageStatementParams.idl
storage/public/mozIStorageStatementRow.idl
storage/public/mozIStorageVacuumParticipant.idl
storage/public/mozIStorageValueArray.idl
storage/public/mozStorageHelper.h
storage/public/storage.h
storage/storage.h
rename from storage/public/StatementCache.h
rename to storage/StatementCache.h
--- a/storage/moz.build
+++ b/storage/moz.build
@@ -1,10 +1,50 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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', 'build']
+DIRS += ['src', 'build']
 
 TEST_DIRS += ['test']
 
+XPIDL_SOURCES += [
+    'mozIStorageAggregateFunction.idl',
+    'mozIStorageAsyncConnection.idl',
+    'mozIStorageAsyncStatement.idl',
+    'mozIStorageBaseStatement.idl',
+    'mozIStorageBindingParams.idl',
+    'mozIStorageBindingParamsArray.idl',
+    'mozIStorageCompletionCallback.idl',
+    'mozIStorageConnection.idl',
+    'mozIStorageError.idl',
+    'mozIStorageFunction.idl',
+    'mozIStoragePendingStatement.idl',
+    'mozIStorageProgressHandler.idl',
+    'mozIStorageResultSet.idl',
+    'mozIStorageRow.idl',
+    'mozIStorageService.idl',
+    'mozIStorageStatement.idl',
+    'mozIStorageStatementCallback.idl',
+    'mozIStorageStatementParams.idl',
+    'mozIStorageStatementRow.idl',
+    'mozIStorageVacuumParticipant.idl',
+    'mozIStorageValueArray.idl',
+]
+
+XPIDL_MODULE = 'storage'
+
+EXPORTS += [
+    'mozStorageHelper.h',
+]
+
+EXPORTS.mozilla += [
+    'storage.h',
+]
+
+# NOTE When adding something to this list, you probably need to add it to the
+#      storage.h file too.
+EXPORTS.mozilla.storage += [
+    'StatementCache.h',
+]
+# SEE ABOVE NOTE!
rename from storage/public/mozIStorageAggregateFunction.idl
rename to storage/mozIStorageAggregateFunction.idl
rename from storage/public/mozIStorageAsyncConnection.idl
rename to storage/mozIStorageAsyncConnection.idl
rename from storage/public/mozIStorageAsyncStatement.idl
rename to storage/mozIStorageAsyncStatement.idl
rename from storage/public/mozIStorageBaseStatement.idl
rename to storage/mozIStorageBaseStatement.idl
rename from storage/public/mozIStorageBindingParams.idl
rename to storage/mozIStorageBindingParams.idl
rename from storage/public/mozIStorageBindingParamsArray.idl
rename to storage/mozIStorageBindingParamsArray.idl
rename from storage/public/mozIStorageCompletionCallback.idl
rename to storage/mozIStorageCompletionCallback.idl
rename from storage/public/mozIStorageConnection.idl
rename to storage/mozIStorageConnection.idl
rename from storage/public/mozIStorageError.idl
rename to storage/mozIStorageError.idl
rename from storage/public/mozIStorageFunction.idl
rename to storage/mozIStorageFunction.idl
rename from storage/public/mozIStoragePendingStatement.idl
rename to storage/mozIStoragePendingStatement.idl
rename from storage/public/mozIStorageProgressHandler.idl
rename to storage/mozIStorageProgressHandler.idl
rename from storage/public/mozIStorageResultSet.idl
rename to storage/mozIStorageResultSet.idl
rename from storage/public/mozIStorageRow.idl
rename to storage/mozIStorageRow.idl
rename from storage/public/mozIStorageService.idl
rename to storage/mozIStorageService.idl
rename from storage/public/mozIStorageStatement.idl
rename to storage/mozIStorageStatement.idl
rename from storage/public/mozIStorageStatementCallback.idl
rename to storage/mozIStorageStatementCallback.idl
rename from storage/public/mozIStorageStatementParams.idl
rename to storage/mozIStorageStatementParams.idl
rename from storage/public/mozIStorageStatementRow.idl
rename to storage/mozIStorageStatementRow.idl
rename from storage/public/mozIStorageVacuumParticipant.idl
rename to storage/mozIStorageVacuumParticipant.idl
rename from storage/public/mozIStorageValueArray.idl
rename to storage/mozIStorageValueArray.idl
rename from storage/public/mozStorageHelper.h
rename to storage/mozStorageHelper.h
deleted file mode 100644
--- a/storage/public/moz.build
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-XPIDL_SOURCES += [
-    'mozIStorageAggregateFunction.idl',
-    'mozIStorageAsyncConnection.idl',
-    'mozIStorageAsyncStatement.idl',
-    'mozIStorageBaseStatement.idl',
-    'mozIStorageBindingParams.idl',
-    'mozIStorageBindingParamsArray.idl',
-    'mozIStorageCompletionCallback.idl',
-    'mozIStorageConnection.idl',
-    'mozIStorageError.idl',
-    'mozIStorageFunction.idl',
-    'mozIStoragePendingStatement.idl',
-    'mozIStorageProgressHandler.idl',
-    'mozIStorageResultSet.idl',
-    'mozIStorageRow.idl',
-    'mozIStorageService.idl',
-    'mozIStorageStatement.idl',
-    'mozIStorageStatementCallback.idl',
-    'mozIStorageStatementParams.idl',
-    'mozIStorageStatementRow.idl',
-    'mozIStorageVacuumParticipant.idl',
-    'mozIStorageValueArray.idl',
-]
-
-XPIDL_MODULE = 'storage'
-
-EXPORTS += [
-    'mozStorageHelper.h',
-]
-
-EXPORTS.mozilla += [
-    'storage.h',
-]
-
-# NOTE When adding something to this list, you probably need to add it to the
-#      storage.h file too.
-EXPORTS.mozilla.storage += [
-    'StatementCache.h',
-]
-# SEE ABOVE NOTE!
-
rename from storage/public/storage.h
rename to storage/storage.h