Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

simplify webapprt build by processing WebappShellComponents.manifest …

…from the webapprt/ Makefile
  • Loading branch information...
commit 7d14b361b43ea38c51e907a6a83e24fd9b793bc7 1 parent 00ad5b0
Myk Melez authored March 14, 2012
4  webapprt/Makefile.in
@@ -59,6 +59,10 @@ DIRS += mac
59 59
 endif # mac
60 60
 endif # windows
61 61
 
  62
+EXTRA_PP_COMPONENTS = \
  63
+  WebappShellComponents.manifest \
  64
+  $(NULL)
  65
+
62 66
 include $(topsrcdir)/config/rules.mk
63 67
 
64 68
 libs:: prefs.js
0  webapprt/components/WebappShellComponents.manifest → webapprt/WebappShellComponents.manifest
File renamed without changes
56  webapprt/components/Makefile.in
... ...
@@ -1,56 +0,0 @@
1  
-# ***** BEGIN LICENSE BLOCK *****
2  
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
3  
-#
4  
-# The contents of this file are subject to the Mozilla Public License Version
5  
-# 1.1 (the "License"); you may not use this file except in compliance with
6  
-# the License. You may obtain a copy of the License at
7  
-# http://www.mozilla.org/MPL/
8  
-#
9  
-# Software distributed under the License is distributed on an "AS IS" basis,
10  
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
11  
-# for the specific language governing rights and limitations under the
12  
-# License.
13  
-#
14  
-# The Original Code is the Mozilla Browser code.
15  
-#
16  
-# The Initial Developer of the Original Code is
17  
-# Netscape Communications Corporation.
18  
-# Portions created by the Initial Developer are Copyright (C) 2002
19  
-# the Initial Developer. All Rights Reserved.
20  
-#
21  
-# Contributor(s):
22  
-#  Brian Ryner <bryner@brianryner.com>
23  
-#
24  
-# Alternatively, the contents of this file may be used under the terms of
25  
-# either the GNU General Public License Version 2 or later (the "GPL"), or
26  
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27  
-# in which case the provisions of the GPL or the LGPL are applicable instead
28  
-# of those above. If you wish to allow use of your version of this file only
29  
-# under the terms of either the GPL or the LGPL, and not to allow others to
30  
-# use your version of this file under the terms of the MPL, indicate your
31  
-# decision by deleting the provisions above and replace them with the notice
32  
-# and other provisions required by the GPL or the LGPL. If you do not delete
33  
-# the provisions above, a recipient may use your version of this file under
34  
-# the terms of any one of the MPL, the GPL or the LGPL.
35  
-#
36  
-# ***** END LICENSE BLOCK *****
37  
-
38  
-DEPTH     = ../..
39  
-topsrcdir = @top_srcdir@
40  
-srcdir    = @srcdir@
41  
-VPATH     = @srcdir@
42  
-
43  
-include $(DEPTH)/config/autoconf.mk
44  
-
45  
-EXTRA_PP_COMPONENTS = \
46  
-  WebappShellComponents.manifest \
47  
-  $(NULL)
48  
-
49  
-# XXX Uncomment this once we get tests.
50  
-#TEST_DIRS += test
51  
-
52  
-ifdef MOZILLA_OFFICIAL
53  
-DEFINES += -DOFFICIAL_BUILD=1
54  
-endif
55  
-
56  
-include $(topsrcdir)/config/rules.mk
51  webapprt/components/test/Makefile.in
... ...
@@ -1,51 +0,0 @@
1  
-# ***** BEGIN LICENSE BLOCK *****
2  
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
3  
-#
4  
-# The contents of this file are subject to the Mozilla Public License Version
5  
-# 1.1 (the "License"); you may not use this file except in compliance with
6  
-# the License. You may obtain a copy of the License at
7  
-# http://www.mozilla.org/MPL/
8  
-#
9  
-# Software distributed under the License is distributed on an "AS IS" basis,
10  
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
11  
-# for the specific language governing rights and limitations under the
12  
-# License.
13  
-#
14  
-# The Original Code is mozilla.org code.
15  
-#
16  
-# The Initial Developer of the Original Code is
17  
-# the Mozilla Foundation.
18  
-# Portions created by the Initial Developer are Copyright (C) 2010
19  
-# the Initial Developer. All Rights Reserved.
20  
-#
21  
-# Contributor(s):
22  
-#   Robert Strong <robert.bugzilla@gmail.com> (Original Author)
23  
-#
24  
-# Alternatively, the contents of this file may be used under the terms of
25  
-# either of the GNU General Public License Version 2 or later (the "GPL"),
26  
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27  
-# in which case the provisions of the GPL or the LGPL are applicable instead
28  
-# of those above. If you wish to allow use of your version of this file only
29  
-# under the terms of either the GPL or the LGPL, and not to allow others to
30  
-# use your version of this file under the terms of the MPL, indicate your
31  
-# decision by deleting the provisions above and replace them with the notice
32  
-# and other provisions required by the GPL or the LGPL. If you do not delete
33  
-# the provisions above, a recipient may use your version of this file under
34  
-# the terms of any one of the MPL, the GPL or the LGPL.
35  
-#
36  
-# ***** END LICENSE BLOCK *****
37  
-
38  
-DEPTH     = ../../..
39  
-topsrcdir = @top_srcdir@
40  
-srcdir    = @srcdir@
41  
-VPATH     = @srcdir@
42  
-relativesrcdir  = webapprt/components/test
43  
-
44  
-include $(DEPTH)/config/autoconf.mk
45  
-include $(topsrcdir)/config/rules.mk
46  
-
47  
-_WEBAPPRT_TEST_FILES = \
48  
-  $(NULL)
49  
-
50  
-libs:: $(_WEBAPPRT_TEST_FILES)
51  
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)

0 notes on commit 7d14b36

Please sign in to comment.
Something went wrong with that request. Please try again.