From 11f21666607d5bbca69dd4bb3d54b0ea48691b9b Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 19 May 2015 10:47:29 -0700 Subject: [PATCH] Bug 1164717 - Flatten storage/public/ directory. r=mak --HG-- rename : storage/public/StatementCache.h => storage/StatementCache.h rename : storage/public/mozIStorageAggregateFunction.idl => storage/mozIStorageAggregateFunction.idl rename : storage/public/mozIStorageAsyncConnection.idl => storage/mozIStorageAsyncConnection.idl rename : storage/public/mozIStorageAsyncStatement.idl => storage/mozIStorageAsyncStatement.idl rename : storage/public/mozIStorageBaseStatement.idl => storage/mozIStorageBaseStatement.idl rename : storage/public/mozIStorageBindingParams.idl => storage/mozIStorageBindingParams.idl rename : storage/public/mozIStorageBindingParamsArray.idl => storage/mozIStorageBindingParamsArray.idl rename : storage/public/mozIStorageCompletionCallback.idl => storage/mozIStorageCompletionCallback.idl rename : storage/public/mozIStorageConnection.idl => storage/mozIStorageConnection.idl rename : storage/public/mozIStorageError.idl => storage/mozIStorageError.idl rename : storage/public/mozIStorageFunction.idl => storage/mozIStorageFunction.idl rename : storage/public/mozIStoragePendingStatement.idl => storage/mozIStoragePendingStatement.idl rename : storage/public/mozIStorageProgressHandler.idl => storage/mozIStorageProgressHandler.idl rename : storage/public/mozIStorageResultSet.idl => storage/mozIStorageResultSet.idl rename : storage/public/mozIStorageRow.idl => storage/mozIStorageRow.idl rename : storage/public/mozIStorageService.idl => storage/mozIStorageService.idl rename : storage/public/mozIStorageStatement.idl => storage/mozIStorageStatement.idl rename : storage/public/mozIStorageStatementCallback.idl => storage/mozIStorageStatementCallback.idl rename : storage/public/mozIStorageStatementParams.idl => storage/mozIStorageStatementParams.idl rename : storage/public/mozIStorageStatementRow.idl => storage/mozIStorageStatementRow.idl rename : storage/public/mozIStorageVacuumParticipant.idl => storage/mozIStorageVacuumParticipant.idl rename : storage/public/mozIStorageValueArray.idl => storage/mozIStorageValueArray.idl rename : storage/public/mozStorageHelper.h => storage/mozStorageHelper.h rename : storage/public/storage.h => storage/storage.h --- storage/{public => }/StatementCache.h | 0 storage/moz.build | 42 ++++++++++++++++- .../mozIStorageAggregateFunction.idl | 0 .../mozIStorageAsyncConnection.idl | 0 .../mozIStorageAsyncStatement.idl | 0 .../{public => }/mozIStorageBaseStatement.idl | 0 .../{public => }/mozIStorageBindingParams.idl | 0 .../mozIStorageBindingParamsArray.idl | 0 .../mozIStorageCompletionCallback.idl | 0 .../{public => }/mozIStorageConnection.idl | 0 storage/{public => }/mozIStorageError.idl | 0 storage/{public => }/mozIStorageFunction.idl | 0 .../mozIStoragePendingStatement.idl | 0 .../mozIStorageProgressHandler.idl | 0 storage/{public => }/mozIStorageResultSet.idl | 0 storage/{public => }/mozIStorageRow.idl | 0 storage/{public => }/mozIStorageService.idl | 0 storage/{public => }/mozIStorageStatement.idl | 0 .../mozIStorageStatementCallback.idl | 0 .../mozIStorageStatementParams.idl | 0 .../{public => }/mozIStorageStatementRow.idl | 0 .../mozIStorageVacuumParticipant.idl | 0 .../{public => }/mozIStorageValueArray.idl | 0 storage/{public => }/mozStorageHelper.h | 0 storage/public/moz.build | 47 ------------------- storage/{public => }/storage.h | 0 26 files changed, 41 insertions(+), 48 deletions(-) rename storage/{public => }/StatementCache.h (100%) rename storage/{public => }/mozIStorageAggregateFunction.idl (100%) rename storage/{public => }/mozIStorageAsyncConnection.idl (100%) rename storage/{public => }/mozIStorageAsyncStatement.idl (100%) rename storage/{public => }/mozIStorageBaseStatement.idl (100%) rename storage/{public => }/mozIStorageBindingParams.idl (100%) rename storage/{public => }/mozIStorageBindingParamsArray.idl (100%) rename storage/{public => }/mozIStorageCompletionCallback.idl (100%) rename storage/{public => }/mozIStorageConnection.idl (100%) rename storage/{public => }/mozIStorageError.idl (100%) rename storage/{public => }/mozIStorageFunction.idl (100%) rename storage/{public => }/mozIStoragePendingStatement.idl (100%) rename storage/{public => }/mozIStorageProgressHandler.idl (100%) rename storage/{public => }/mozIStorageResultSet.idl (100%) rename storage/{public => }/mozIStorageRow.idl (100%) rename storage/{public => }/mozIStorageService.idl (100%) rename storage/{public => }/mozIStorageStatement.idl (100%) rename storage/{public => }/mozIStorageStatementCallback.idl (100%) rename storage/{public => }/mozIStorageStatementParams.idl (100%) rename storage/{public => }/mozIStorageStatementRow.idl (100%) rename storage/{public => }/mozIStorageVacuumParticipant.idl (100%) rename storage/{public => }/mozIStorageValueArray.idl (100%) rename storage/{public => }/mozStorageHelper.h (100%) delete mode 100644 storage/public/moz.build rename storage/{public => }/storage.h (100%) diff --git a/storage/public/StatementCache.h b/storage/StatementCache.h similarity index 100% rename from storage/public/StatementCache.h rename to storage/StatementCache.h diff --git a/storage/moz.build b/storage/moz.build index ae72cc11bc76..127dc76066bc 100644 --- a/storage/moz.build +++ b/storage/moz.build @@ -4,7 +4,47 @@ # 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! diff --git a/storage/public/mozIStorageAggregateFunction.idl b/storage/mozIStorageAggregateFunction.idl similarity index 100% rename from storage/public/mozIStorageAggregateFunction.idl rename to storage/mozIStorageAggregateFunction.idl diff --git a/storage/public/mozIStorageAsyncConnection.idl b/storage/mozIStorageAsyncConnection.idl similarity index 100% rename from storage/public/mozIStorageAsyncConnection.idl rename to storage/mozIStorageAsyncConnection.idl diff --git a/storage/public/mozIStorageAsyncStatement.idl b/storage/mozIStorageAsyncStatement.idl similarity index 100% rename from storage/public/mozIStorageAsyncStatement.idl rename to storage/mozIStorageAsyncStatement.idl diff --git a/storage/public/mozIStorageBaseStatement.idl b/storage/mozIStorageBaseStatement.idl similarity index 100% rename from storage/public/mozIStorageBaseStatement.idl rename to storage/mozIStorageBaseStatement.idl diff --git a/storage/public/mozIStorageBindingParams.idl b/storage/mozIStorageBindingParams.idl similarity index 100% rename from storage/public/mozIStorageBindingParams.idl rename to storage/mozIStorageBindingParams.idl diff --git a/storage/public/mozIStorageBindingParamsArray.idl b/storage/mozIStorageBindingParamsArray.idl similarity index 100% rename from storage/public/mozIStorageBindingParamsArray.idl rename to storage/mozIStorageBindingParamsArray.idl diff --git a/storage/public/mozIStorageCompletionCallback.idl b/storage/mozIStorageCompletionCallback.idl similarity index 100% rename from storage/public/mozIStorageCompletionCallback.idl rename to storage/mozIStorageCompletionCallback.idl diff --git a/storage/public/mozIStorageConnection.idl b/storage/mozIStorageConnection.idl similarity index 100% rename from storage/public/mozIStorageConnection.idl rename to storage/mozIStorageConnection.idl diff --git a/storage/public/mozIStorageError.idl b/storage/mozIStorageError.idl similarity index 100% rename from storage/public/mozIStorageError.idl rename to storage/mozIStorageError.idl diff --git a/storage/public/mozIStorageFunction.idl b/storage/mozIStorageFunction.idl similarity index 100% rename from storage/public/mozIStorageFunction.idl rename to storage/mozIStorageFunction.idl diff --git a/storage/public/mozIStoragePendingStatement.idl b/storage/mozIStoragePendingStatement.idl similarity index 100% rename from storage/public/mozIStoragePendingStatement.idl rename to storage/mozIStoragePendingStatement.idl diff --git a/storage/public/mozIStorageProgressHandler.idl b/storage/mozIStorageProgressHandler.idl similarity index 100% rename from storage/public/mozIStorageProgressHandler.idl rename to storage/mozIStorageProgressHandler.idl diff --git a/storage/public/mozIStorageResultSet.idl b/storage/mozIStorageResultSet.idl similarity index 100% rename from storage/public/mozIStorageResultSet.idl rename to storage/mozIStorageResultSet.idl diff --git a/storage/public/mozIStorageRow.idl b/storage/mozIStorageRow.idl similarity index 100% rename from storage/public/mozIStorageRow.idl rename to storage/mozIStorageRow.idl diff --git a/storage/public/mozIStorageService.idl b/storage/mozIStorageService.idl similarity index 100% rename from storage/public/mozIStorageService.idl rename to storage/mozIStorageService.idl diff --git a/storage/public/mozIStorageStatement.idl b/storage/mozIStorageStatement.idl similarity index 100% rename from storage/public/mozIStorageStatement.idl rename to storage/mozIStorageStatement.idl diff --git a/storage/public/mozIStorageStatementCallback.idl b/storage/mozIStorageStatementCallback.idl similarity index 100% rename from storage/public/mozIStorageStatementCallback.idl rename to storage/mozIStorageStatementCallback.idl diff --git a/storage/public/mozIStorageStatementParams.idl b/storage/mozIStorageStatementParams.idl similarity index 100% rename from storage/public/mozIStorageStatementParams.idl rename to storage/mozIStorageStatementParams.idl diff --git a/storage/public/mozIStorageStatementRow.idl b/storage/mozIStorageStatementRow.idl similarity index 100% rename from storage/public/mozIStorageStatementRow.idl rename to storage/mozIStorageStatementRow.idl diff --git a/storage/public/mozIStorageVacuumParticipant.idl b/storage/mozIStorageVacuumParticipant.idl similarity index 100% rename from storage/public/mozIStorageVacuumParticipant.idl rename to storage/mozIStorageVacuumParticipant.idl diff --git a/storage/public/mozIStorageValueArray.idl b/storage/mozIStorageValueArray.idl similarity index 100% rename from storage/public/mozIStorageValueArray.idl rename to storage/mozIStorageValueArray.idl diff --git a/storage/public/mozStorageHelper.h b/storage/mozStorageHelper.h similarity index 100% rename from storage/public/mozStorageHelper.h rename to storage/mozStorageHelper.h diff --git a/storage/public/moz.build b/storage/public/moz.build deleted file mode 100644 index f99dc162618b..000000000000 --- 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! - diff --git a/storage/public/storage.h b/storage/storage.h similarity index 100% rename from storage/public/storage.h rename to storage/storage.h