Bug 897573 - Get rid of the make rules from toolkit/components/osfile/Makefile.in; r=glandium
authorMs2ger <ms2ger@gmail.com>
Fri, 02 Aug 2013 09:03:47 +0200
changeset 140950 5423e04326c2d9d826b0dc6247a3840d4e0e5805
parent 140949 225a4dbdeb1fb12a93e79b13009d558aba9bad8d
child 140951 3ac5fdcbb36685ab5eff3ad3a30c210f38740c09
push id25044
push userMs2ger@gmail.com
push dateFri, 02 Aug 2013 07:10:23 +0000
treeherdermozilla-central@76a944fa6b25 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs897573
milestone25.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 897573 - Get rid of the make rules from toolkit/components/osfile/Makefile.in; r=glandium
toolkit/components/osfile/Makefile.in
toolkit/components/osfile/_PromiseWorker.jsm
toolkit/components/osfile/modules/_PromiseWorker.jsm
toolkit/components/osfile/modules/moz.build
toolkit/components/osfile/modules/osfile_async_front.jsm
toolkit/components/osfile/modules/osfile_async_worker.js
toolkit/components/osfile/modules/osfile_shared_allthreads.jsm
toolkit/components/osfile/modules/osfile_shared_front.jsm
toolkit/components/osfile/modules/osfile_unix_allthreads.jsm
toolkit/components/osfile/modules/osfile_unix_back.jsm
toolkit/components/osfile/modules/osfile_unix_front.jsm
toolkit/components/osfile/modules/osfile_win_allthreads.jsm
toolkit/components/osfile/modules/osfile_win_back.jsm
toolkit/components/osfile/modules/osfile_win_front.jsm
toolkit/components/osfile/modules/ospath_unix_back.jsm
toolkit/components/osfile/modules/ospath_win_back.jsm
toolkit/components/osfile/moz.build
toolkit/components/osfile/osfile_async_front.jsm
toolkit/components/osfile/osfile_async_worker.js
toolkit/components/osfile/osfile_shared_allthreads.jsm
toolkit/components/osfile/osfile_shared_front.jsm
toolkit/components/osfile/osfile_unix_allthreads.jsm
toolkit/components/osfile/osfile_unix_back.jsm
toolkit/components/osfile/osfile_unix_front.jsm
toolkit/components/osfile/osfile_win_allthreads.jsm
toolkit/components/osfile/osfile_win_back.jsm
toolkit/components/osfile/osfile_win_front.jsm
toolkit/components/osfile/ospath_unix_back.jsm
toolkit/components/osfile/ospath_win_back.jsm
--- a/toolkit/components/osfile/Makefile.in
+++ b/toolkit/components/osfile/Makefile.in
@@ -7,23 +7,8 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY  = 1
 
 include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(NSINSTALL) $(srcdir)/osfile_shared_allthreads.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/osfile_unix_allthreads.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/osfile_unix_back.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/ospath_unix_back.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/osfile_unix_front.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/osfile_win_allthreads.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/ospath_win_back.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/osfile_win_back.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/osfile_win_front.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/osfile_async_front.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/osfile_async_worker.js $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/osfile_shared_front.jsm $(FINAL_TARGET)/modules/osfile
-	$(NSINSTALL) $(srcdir)/_PromiseWorker.jsm $(FINAL_TARGET)/modules/osfile
rename from toolkit/components/osfile/_PromiseWorker.jsm
rename to toolkit/components/osfile/modules/_PromiseWorker.jsm
new file mode 100644
--- /dev/null
+++ b/toolkit/components/osfile/modules/moz.build
@@ -0,0 +1,23 @@
+# -*- 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/.
+
+JS_MODULES_PATH = 'modules/osfile'
+
+EXTRA_JS_MODULES += [
+    '_PromiseWorker.jsm',
+    'osfile_async_front.jsm',
+    'osfile_async_worker.js',
+    'osfile_shared_allthreads.jsm',
+    'osfile_shared_front.jsm',
+    'osfile_unix_allthreads.jsm',
+    'osfile_unix_back.jsm',
+    'osfile_unix_front.jsm',
+    'osfile_win_allthreads.jsm',
+    'osfile_win_back.jsm',
+    'osfile_win_front.jsm',
+    'ospath_unix_back.jsm',
+    'ospath_win_back.jsm',
+]
rename from toolkit/components/osfile/osfile_async_front.jsm
rename to toolkit/components/osfile/modules/osfile_async_front.jsm
rename from toolkit/components/osfile/osfile_async_worker.js
rename to toolkit/components/osfile/modules/osfile_async_worker.js
rename from toolkit/components/osfile/osfile_shared_allthreads.jsm
rename to toolkit/components/osfile/modules/osfile_shared_allthreads.jsm
rename from toolkit/components/osfile/osfile_shared_front.jsm
rename to toolkit/components/osfile/modules/osfile_shared_front.jsm
rename from toolkit/components/osfile/osfile_unix_allthreads.jsm
rename to toolkit/components/osfile/modules/osfile_unix_allthreads.jsm
rename from toolkit/components/osfile/osfile_unix_back.jsm
rename to toolkit/components/osfile/modules/osfile_unix_back.jsm
rename from toolkit/components/osfile/osfile_unix_front.jsm
rename to toolkit/components/osfile/modules/osfile_unix_front.jsm
rename from toolkit/components/osfile/osfile_win_allthreads.jsm
rename to toolkit/components/osfile/modules/osfile_win_allthreads.jsm
rename from toolkit/components/osfile/osfile_win_back.jsm
rename to toolkit/components/osfile/modules/osfile_win_back.jsm
rename from toolkit/components/osfile/osfile_win_front.jsm
rename to toolkit/components/osfile/modules/osfile_win_front.jsm
rename from toolkit/components/osfile/ospath_unix_back.jsm
rename to toolkit/components/osfile/modules/ospath_unix_back.jsm
rename from toolkit/components/osfile/ospath_win_back.jsm
rename to toolkit/components/osfile/modules/ospath_win_back.jsm
--- a/toolkit/components/osfile/moz.build
+++ b/toolkit/components/osfile/moz.build
@@ -1,14 +1,18 @@
 # -*- 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 += [
+    'modules',
+]
+
 TEST_DIRS += ['tests']
 
 MODULE = 'osfile'
 
 LIBRARY_NAME = 'osfile_s'
 
 EXTRA_PP_JS_MODULES += [
     'osfile.jsm',