diff options
19 files changed, 43 insertions, 19 deletions
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties index cf47252a2de..6774b8113f6 100644 --- a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties +++ b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.properties @@ -42,7 +42,7 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -111,6 +111,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml index f0670349e9f..643055903ab 100644 --- a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml +++ b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml @@ -4,7 +4,9 @@ label="%featureName" version="1.0.0.qualifier" provider-name="%providerName" - plugin="org.eclipse.cdt.build.crossgcc"> + plugin="org.eclipse.cdt.build.crossgcc" + license-feature="org.eclipse.cdt.license" + license-feature-version="1.0.0.qualifier"> <description> %description diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/license.html b/cross/org.eclipse.cdt.build.crossgcc-feature/license.html index c184ca36a99..f19c483b9c8 100644 --- a/cross/org.eclipse.cdt.build.crossgcc-feature/license.html +++ b/cross/org.eclipse.cdt.build.crossgcc-feature/license.html @@ -8,7 +8,7 @@ <body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> +<p>February 1, 2011</p> <h3>Usage Of Content</h3> @@ -58,6 +58,7 @@ that directory.</p> OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> + <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.properties b/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.properties index 879525615bc..d1e0149af57 100644 --- a/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.properties +++ b/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/feature.properties @@ -42,7 +42,7 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -111,6 +111,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/license.html b/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/license.html index c184ca36a99..f19c483b9c8 100644 --- a/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/license.html +++ b/cross/org.eclipse.cdt.build.crossgcc-feature/sourceTemplateFeature/license.html @@ -8,7 +8,7 @@ <body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> +<p>February 1, 2011</p> <h3>Usage Of Content</h3> @@ -58,6 +58,7 @@ that directory.</p> OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> + <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.properties b/cross/org.eclipse.cdt.launch.remote-feature/feature.properties index e68003213bf..209e8cfeab1 100644 --- a/cross/org.eclipse.cdt.launch.remote-feature/feature.properties +++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.properties @@ -42,7 +42,7 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -111,6 +111,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml index 2f54b2e2064..e350efe78e4 100644 --- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml +++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml @@ -3,7 +3,9 @@ id="org.eclipse.cdt.launch.remote" label="%featureName" version="6.0.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + license-feature="org.eclipse.cdt.license" + license-feature-version="1.0.0.qualifier"> <description> %description diff --git a/cross/org.eclipse.cdt.launch.remote-feature/license.html b/cross/org.eclipse.cdt.launch.remote-feature/license.html index c184ca36a99..f19c483b9c8 100644 --- a/cross/org.eclipse.cdt.launch.remote-feature/license.html +++ b/cross/org.eclipse.cdt.launch.remote-feature/license.html @@ -8,7 +8,7 @@ <body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> +<p>February 1, 2011</p> <h3>Usage Of Content</h3> @@ -58,6 +58,7 @@ that directory.</p> OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> + <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> diff --git a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties index 2158e95c7ab..1571c78c2ff 100644 --- a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties +++ b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/feature.properties @@ -41,7 +41,7 @@ http://www.eclipse.org/legal/epl-v10.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -110,6 +110,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ diff --git a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/license.html b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/license.html index c184ca36a99..f19c483b9c8 100644 --- a/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/license.html +++ b/cross/org.eclipse.cdt.launch.remote-feature/sourceTemplateFeature/license.html @@ -8,7 +8,7 @@ <body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> +<p>February 1, 2011</p> <h3>Usage Of Content</h3> @@ -58,6 +58,7 @@ that directory.</p> OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> + <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.properties b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.properties index 1f381b6c3f1..58aa18be665 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.properties +++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.properties @@ -43,7 +43,7 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -112,6 +112,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml index bdd58f8551f..ee3fed7fba8 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml +++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml @@ -4,7 +4,9 @@ label="%featureName" version="7.0.0.qualifier" provider-name="%providerName" - image="eclipse_update_120.jpg"> + image="eclipse_update_120.jpg" + license-feature="org.eclipse.cdt.license" + license-feature-version="1.0.0.qualifier"> <description> %description diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/license.html b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/license.html index c184ca36a99..f19c483b9c8 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/license.html +++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/license.html @@ -8,7 +8,7 @@ <body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> +<p>February 1, 2011</p> <h3>Usage Of Content</h3> @@ -58,6 +58,7 @@ that directory.</p> OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> + <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> diff --git a/upc/org.eclipse.cdt.bupc-feature/feature.properties b/upc/org.eclipse.cdt.bupc-feature/feature.properties index d4dbeea5bbb..5743aad4fb9 100644 --- a/upc/org.eclipse.cdt.bupc-feature/feature.properties +++ b/upc/org.eclipse.cdt.bupc-feature/feature.properties @@ -42,7 +42,7 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -111,6 +111,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ diff --git a/upc/org.eclipse.cdt.bupc-feature/feature.xml b/upc/org.eclipse.cdt.bupc-feature/feature.xml index 46059ab3eb4..07c2c17270c 100644 --- a/upc/org.eclipse.cdt.bupc-feature/feature.xml +++ b/upc/org.eclipse.cdt.bupc-feature/feature.xml @@ -4,7 +4,9 @@ label="%featureName" version="1.0.3.qualifier" provider-name="%providerName" - plugin="org.eclipse.cdt.managedbuilder.bupc.ui"> + plugin="org.eclipse.cdt.managedbuilder.bupc.ui" + license-feature="org.eclipse.cdt.license" + license-feature-version="1.0.0.qualifier"> <description> %description diff --git a/upc/org.eclipse.cdt.bupc-feature/license.html b/upc/org.eclipse.cdt.bupc-feature/license.html index c184ca36a99..f19c483b9c8 100644 --- a/upc/org.eclipse.cdt.bupc-feature/license.html +++ b/upc/org.eclipse.cdt.bupc-feature/license.html @@ -8,7 +8,7 @@ <body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> +<p>February 1, 2011</p> <h3>Usage Of Content</h3> @@ -58,6 +58,7 @@ that directory.</p> OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> + <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> diff --git a/windows/org.eclipse.cdt.msw-feature/feature.properties b/windows/org.eclipse.cdt.msw-feature/feature.properties index 1883fc55bbf..88c697ce8c2 100644 --- a/windows/org.eclipse.cdt.msw-feature/feature.properties +++ b/windows/org.eclipse.cdt.msw-feature/feature.properties @@ -43,7 +43,7 @@ licenseURL=license.html # should be plain text version of license agreement pointed to be "licenseURL" license=\ Eclipse Foundation Software User Agreement\n\ -April 14, 2010\n\ +February 1, 2011\n\ \n\ Usage Of Content\n\ \n\ @@ -112,6 +112,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\ TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\ \n\ + - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\ diff --git a/windows/org.eclipse.cdt.msw-feature/feature.xml b/windows/org.eclipse.cdt.msw-feature/feature.xml index 2c613f7920b..46a446dee07 100644 --- a/windows/org.eclipse.cdt.msw-feature/feature.xml +++ b/windows/org.eclipse.cdt.msw-feature/feature.xml @@ -3,7 +3,9 @@ id="org.eclipse.cdt.msw" label="CDT Visual C++ Support" version="1.0.0.qualifier" - provider-name="Eclipse CDT"> + provider-name="Eclipse CDT" + license-feature="org.eclipse.cdt.license" + license-feature-version="1.0.0.qualifier"> <description> %description diff --git a/windows/org.eclipse.cdt.msw-feature/license.html b/windows/org.eclipse.cdt.msw-feature/license.html index c184ca36a99..f19c483b9c8 100644 --- a/windows/org.eclipse.cdt.msw-feature/license.html +++ b/windows/org.eclipse.cdt.msw-feature/license.html @@ -8,7 +8,7 @@ <body lang="EN-US"> <h2>Eclipse Foundation Software User Agreement</h2> -<p>April 14, 2010</p> +<p>February 1, 2011</p> <h3>Usage Of Content</h3> @@ -58,6 +58,7 @@ that directory.</p> OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p> <ul> + <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li> <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li> <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li> <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li> |