Bug 974217 - Remove the non-standalone part of dirserviceprovider; r=glandium
authorEhsan Akhgari <ehsan@mozilla.com>
Wed, 19 Feb 2014 13:14:11 -0500
changeset 169897 f5d15ac47466a88132cf652bf4016663b1271e17
parent 169896 bb77326af1337a4eb7377fd894162e459f4c49a1
child 169898 31e4260825dc2f2c955435d16f3f737ba3a84091
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersglandium
bugs974217
milestone30.0a1
Bug 974217 - Remove the non-standalone part of dirserviceprovider; r=glandium
embedding/tests/winEmbed/Makefile.in
profile/dirserviceprovider/moz.build
profile/dirserviceprovider/src/Makefile.in
profile/dirserviceprovider/src/moz.build
profile/dirserviceprovider/src/objs.mozbuild
profile/dirserviceprovider/standalone/Makefile.in
profile/dirserviceprovider/standalone/moz.build
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@@ -23,17 +23,17 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 #
 # Contributor(s):
 #
 # ***** END LICENSE BLOCK *****
 
 LIBS = \
-	$(DEPTH)/profile/dirserviceprovider/standalone/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
+	$(DEPTH)/profile/dirserviceprovider/src/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
 	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 	$(NULL)
 
 STL_FLAGS=
 
 OS_LIBS		+= $(call EXPAND_LIBNAME,ole32 comdlg32 shell32 version)
 
 include $(topsrcdir)/config/rules.mk
--- a/profile/dirserviceprovider/moz.build
+++ b/profile/dirserviceprovider/moz.build
@@ -1,8 +1,8 @@
 # -*- 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', 'standalone']
+DIRS += ['public', 'src']
 
rename from profile/dirserviceprovider/standalone/Makefile.in
rename to profile/dirserviceprovider/src/Makefile.in
--- a/profile/dirserviceprovider/src/moz.build
+++ b/profile/dirserviceprovider/src/moz.build
@@ -1,16 +1,15 @@
 # -*- 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/.
 
-include('objs.mozbuild')
-
-UNIFIED_SOURCES += modules_profiledirservice_src_csrcs
+UNIFIED_SOURCES += ['nsProfileDirServiceProvider.cpp']
+if CONFIG['MOZ_PROFILELOCKING']:
+    UNIFIED_SOURCES += ['nsProfileLock.cpp']
 
-LIBRARY_NAME = 'profdirserviceprovider_s'
+LIBRARY_NAME = 'profdirserviceprovidersa_s'
 
-# we don't want the shared lib
 FORCE_STATIC_LIB = True
 
-DEFINES['MOZILLA_INTERNAL_API'] = True
+DEFINES['XPCOM_GLUE'] = 1
deleted file mode 100644
--- a/profile/dirserviceprovider/src/objs.mozbuild
+++ /dev/null
@@ -1,19 +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/.
-
-modules_profiledirservice_src_lcsrcs = [
-    'nsProfileDirServiceProvider.cpp',
-]
-
-if CONFIG['MOZ_PROFILELOCKING']:
-    modules_profiledirservice_src_lcsrcs += [
-        'nsProfileLock.cpp',
-    ]
-
-modules_profiledirservice_src_csrcs = [ 
-    '%s/profile/dirserviceprovider/src/%s' % (TOPSRCDIR, s) \
-        for s in sorted(modules_profiledirservice_src_lcsrcs)
-]
deleted file mode 100644
--- a/profile/dirserviceprovider/standalone/moz.build
+++ /dev/null
@@ -1,20 +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/.
-
-include('../src/objs.mozbuild')
-
-UNIFIED_SOURCES += modules_profiledirservice_src_csrcs
-
-LIBRARY_NAME = 'profdirserviceprovidersa_s'
-
-FORCE_STATIC_LIB = True
-
-DEFINES['XPCOM_GLUE'] = 1
-
-LOCAL_INCLUDES += [
-    '../src',
-]
-