Base import of Tycho code (warning: huge commit)

7 files changed, 24 insertions, 59 deletions

diff --git a/xulrunner/examples/simple/Makefile.in b/xulrunner/examples/simple/Makefile.in
index 3e6086323..f31c0daee 100644
--- a/xulrunner/examples/simple/Makefile.in
+++ b/xulrunner/examples/simple/Makefile.in
@@ -3,16 +3,6 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPI_NAME	= simple
-
-PREF_JS_EXPORTS	= $(srcdir)/simple-prefs.js
 DIST_FILES	= application.ini
 
 ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
diff --git a/xulrunner/examples/simple/components/public/Makefile.in b/xulrunner/examples/simple/components/public/Makefile.in
deleted file mode 100644
index 6562abbce..000000000
--- a/xulrunner/examples/simple/components/public/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPI_NAME	= simple
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xulrunner/examples/simple/components/public/moz.build b/xulrunner/examples/simple/components/public/moz.build
index d9309dd16..3a611f85a 100644
--- a/xulrunner/examples/simple/components/public/moz.build
+++ b/xulrunner/examples/simple/components/public/moz.build
@@ -8,5 +8,6 @@ XPIDL_SOURCES += [
     'nsISimpleTest.idl',
 ]
 
-MODULE = 'simple'
+XPIDL_MODULE = 'simple'
 
+XPI_NAME = 'simple'
diff --git a/xulrunner/examples/simple/components/src/Makefile.in b/xulrunner/examples/simple/components/src/Makefile.in
deleted file mode 100644
index 365007ccb..000000000
--- a/xulrunner/examples/simple/components/src/Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPI_NAME	= simple
-SHORT_LIBNAME = simpltst
-IS_COMPONENT	= 1
-
-EXTRA_DSO_LDOPTS = \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-
-EXTRA_COMPONENTS = SimpleTest.js SimpleTest.manifest
-
-include $(topsrcdir)/config/rules.mk
diff --git a/xulrunner/examples/simple/components/src/SimpleTest.cpp b/xulrunner/examples/simple/components/src/SimpleTest.cpp
index 380921759..06249abdd 100644
--- a/xulrunner/examples/simple/components/src/SimpleTest.cpp
+++ b/xulrunner/examples/simple/components/src/SimpleTest.cpp
@@ -9,12 +9,13 @@
 
 class SimpleTest : public nsISimpleTest
 {
+  ~SimpleTest() {}
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISIMPLETEST
 };
 
-NS_IMPL_ISUPPORTS1(SimpleTest, nsISimpleTest)
+NS_IMPL_ISUPPORTS(SimpleTest, nsISimpleTest)
 
 NS_IMETHODIMP
 SimpleTest::Add(int32_t a, int32_t b, int32_t *r)
@@ -35,13 +36,13 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(SimpleTest)
 NS_DEFINE_NAMED_CID(SIMPLETEST_CID);
 
 static const mozilla::Module::CIDEntry kSimpleCIDs[] = {
-  { &kSIMPLETEST_CID, false, NULL, SimpleTestConstructor },
-  { NULL }
+  { &kSIMPLETEST_CID, false, nullptr, SimpleTestConstructor },
+  { nullptr }
 };
 
 static const mozilla::Module::ContractIDEntry kSimpleContracts[] = {
   { "@test.mozilla.org/simple-test;1?impl=c++", &kSIMPLETEST_CID },
-  { NULL }
+  { nullptr }
 };
 
 static const mozilla::Module kSimpleModule = {
diff --git a/xulrunner/examples/simple/components/src/moz.build b/xulrunner/examples/simple/components/src/moz.build
index 949fa2794..56e2882b6 100644
--- a/xulrunner/examples/simple/components/src/moz.build
+++ b/xulrunner/examples/simple/components/src/moz.build
@@ -4,11 +4,17 @@
 # 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/.
 
-MODULE = 'simple'
-
-CPP_SOURCES += [
+SOURCES += [
     'SimpleTest.cpp',
 ]
 
-LIBRARY_NAME = 'simpletest'
+XPCOMBinaryComponent('simpletest')
+
+EXTRA_COMPONENTS += [
+    'SimpleTest.js',
+    'SimpleTest.manifest',
+]
+
+XPI_NAME = 'simple'
 
+FAIL_ON_WARNINGS = True
diff --git a/xulrunner/examples/simple/moz.build b/xulrunner/examples/simple/moz.build
index 4e7b6721e..444532379 100644
--- a/xulrunner/examples/simple/moz.build
+++ b/xulrunner/examples/simple/moz.build
@@ -6,5 +6,11 @@
 
 DIRS += ['components']
 
-MODULE = 'simple'
+XPI_NAME = 'simple'
+
+JAR_MANIFESTS += ['jar.mn']
+
+JS_PREFERENCE_FILES += [
+    'simple-prefs.js',
+]