Eclipse Public License - v 1.0 +
+ +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER +THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, +REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE +OF THIS AGREEMENT.
+ +1. DEFINITIONS
+ +"Contribution" means:
+ +a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
i) +changes to the Program, and
+ +ii) +additions to the Program;
+ +where +such changes and/or additions to the Program originate from and are distributed +by that particular Contributor. A Contribution 'originates' from a Contributor +if it was added to the Program by such Contributor itself or anyone acting on +such Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in conjunction +with the Program under their own license agreement, and (ii) are not derivative +works of the Program.
+ +"Contributor" means any person or +entity that distributes the Program.
+ +"Licensed Patents " mean patent +claims licensable by a Contributor which are necessarily infringed by the use +or sale of its Contribution alone or when combined with the Program.
+ +"Program" means the Contributions +distributed in accordance with this Agreement.
+ +"Recipient" means anyone who +receives the Program under this Agreement, including all Contributors.
+ +2. GRANT OF RIGHTS
+ +a) +Subject to the terms of this Agreement, each Contributor hereby grants Recipient +a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly +display, publicly perform, distribute and sublicense the Contribution of such +Contributor, if any, and such derivative works, in source code and object code +form.
+ +b) +Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free +patent license under Licensed Patents to make, use, sell, offer to sell, import +and otherwise transfer the Contribution of such Contributor, if any, in source +code and object code form. This patent license shall apply to the combination +of the Contribution and the Program if, at the time the Contribution is added +by the Contributor, such addition of the Contribution causes such combination +to be covered by the Licensed Patents. The patent license shall not apply to +any other combinations which include the Contribution. No hardware per se is +licensed hereunder.
+ +c) +Recipient understands that although each Contributor grants the licenses to its +Contributions set forth herein, no assurances are provided by any Contributor +that the Program does not infringe the patent or other intellectual property +rights of any other entity. Each Contributor disclaims any liability to Recipient +for claims brought by any other entity based on infringement of intellectual +property rights or otherwise. As a condition to exercising the rights and +licenses granted hereunder, each Recipient hereby assumes sole responsibility +to secure any other intellectual property rights needed, if any. For example, +if a third party patent license is required to allow Recipient to distribute +the Program, it is Recipient's responsibility to acquire that license before +distributing the Program.
+ +d) +Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement.
+ +3. REQUIREMENTS
+ +A Contributor may choose to distribute the +Program in object code form under its own license agreement, provided that: +
+ +a) +it complies with the terms and conditions of this Agreement; and
+ +b) +its license agreement:
+ +i) +effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose;
+ +ii) +effectively excludes on behalf of all Contributors all liability for damages, +including direct, indirect, special, incidental and consequential damages, such +as lost profits;
+ +iii) +states that any provisions which differ from this Agreement are offered by that +Contributor alone and not by any other party; and
+ +iv) +states that source code for the Program is available from such Contributor, and +informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange.
+ +When the Program is made available in source +code form:
+ +a) +it must be made available under this Agreement; and
+ +b) a +copy of this Agreement must be included with each copy of the Program.
+ +Contributors may not remove or alter any +copyright notices contained within the Program.
+ +Each Contributor must identify itself as the +originator of its Contribution, if any, in a manner that reasonably allows +subsequent Recipients to identify the originator of the Contribution.
+ +4. COMMERCIAL DISTRIBUTION
+ +Commercial distributors of software may +accept certain responsibilities with respect to end users, business partners +and the like. While this license is intended to facilitate the commercial use +of the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes the +Program in a commercial product offering, such Contributor ("Commercial +Contributor") hereby agrees to defend and indemnify every other +Contributor ("Indemnified Contributor") against any losses, damages and +costs (collectively "Losses") arising from claims, lawsuits and other +legal actions brought by a third party against the Indemnified Contributor to +the extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may participate +in any such claim at its own expense.
+ +For example, a Contributor might include the +Program in a commercial product offering, Product X. That Contributor is then a +Commercial Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance claims and +warranties are such Commercial Contributor's responsibility alone. Under this +section, the Commercial Contributor would have to defend claims against the +other Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages.
+ +5. NO WARRANTY
+ +EXCEPT AS EXPRESSLY SET FORTH IN THIS +AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, +WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, +MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and distributing the +Program and assumes all risks associated with its exercise of rights under this +Agreement , including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs or +equipment, and unavailability or interruption of operations.
+ +6. DISCLAIMER OF LIABILITY
+ +EXCEPT AS EXPRESSLY SET FORTH IN THIS +AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF +THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES.
+ +7. GENERAL
+ +If any provision of this Agreement is invalid +or unenforceable under applicable law, it shall not affect the validity or +enforceability of the remainder of the terms of this Agreement, and without +further action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable.
+ +If Recipient institutes patent litigation +against any entity (including a cross-claim or counterclaim in a lawsuit) +alleging that the Program itself (excluding combinations of the Program with +other software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the date +such litigation is filed.
+ +All Recipient's rights under this Agreement +shall terminate if it fails to comply with any of the material terms or +conditions of this Agreement and does not cure such failure in a reasonable +period of time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive.
+ +Everyone is permitted to copy and distribute +copies of this Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The Agreement +Steward reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement Steward has +the right to modify this Agreement. The Eclipse Foundation is the initial +Agreement Steward. The Eclipse Foundation may assign the responsibility to +serve as the Agreement Steward to a suitable separate entity. Each new version +of the Agreement will be given a distinguishing version number. The Program +(including Contributions) may always be distributed subject to the version of +the Agreement under which it was received. In addition, after a new version of +the Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly stated +in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to +the intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved.
+ +This Agreement is governed by the laws of the +State of New York and the intellectual property laws of the United States of +America. No party to this Agreement will bring a legal action under this +Agreement more than one year after the cause of action arose. Each party waives +its rights to a jury trial in any resulting litigation.
+ +
March 17, 2005
+ +THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.
+ +Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. + For purposes of the EPL, "Program" will mean the Content.
+ +Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS + modules ("Modules") and made available as downloadable archives ("Downloads").
+ +The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:
+ +Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.
+ +THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+ +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.
+ +Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.
+ +Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both. + + diff --git a/p2/org.eclipse.cdt.p2.generator/about.html b/p2/org.eclipse.cdt.p2.generator/about.html new file mode 100644 index 00000000000..d7c511887d6 --- /dev/null +++ b/p2/org.eclipse.cdt.p2.generator/about.html @@ -0,0 +1,24 @@ + + +June 22, 2007
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + \ No newline at end of file diff --git a/p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/MinGWGenerator.java b/p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/MinGWGenerator.java index 5a4c72fe949..9ec0173a0b6 100644 --- a/p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/MinGWGenerator.java +++ b/p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/MinGWGenerator.java @@ -12,7 +12,6 @@ package org.eclipse.cdt.p2.generator; import java.io.File; -import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -27,6 +26,8 @@ import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifact import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey; import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.internal.provisional.p2.metadata.IUpdateDescriptor; +import org.eclipse.equinox.internal.provisional.p2.metadata.License; import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory; import org.eclipse.equinox.internal.provisional.p2.metadata.ProvidedCapability; import org.eclipse.equinox.internal.provisional.p2.metadata.RequiredCapability; @@ -67,13 +68,17 @@ public class MinGWGenerator implements IApplication { metaRepo = metaRepoMgr.createRepository(repoLocation, REPO_NAME, IMetadataRepositoryManager.TYPE_SIMPLE_REPOSITORY, null); artiRepo = artiRepoMgr.createRepository(repoLocation, REPO_NAME, IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, null); + License publicDomainLic = MetadataFactory.createLicense(null, publicDomain); + License gplLic = MetadataFactory.createLicense(gplURL, gpl); + License lgplLic = MetadataFactory.createLicense(lgplURL, lgpl); + Version wascanaVersion = new Version("1.0.0"); String mingwSubdir = "mingw"; // MinGW Runtime String runtimeId = "wascana.mingw.mingwrt"; Version runtimeVersion = new Version("4.15.1"); - InstallableUnitDescription runtimeIUDesc = createIUDesc(runtimeId, runtimeVersion, "MinGW Runtime"); + InstallableUnitDescription runtimeIUDesc = createIUDesc(runtimeId, runtimeVersion, "MinGW Runtime Library", publicDomainLic); IInstallableUnit runtimeIU = createIU(runtimeIUDesc, runtimeId, runtimeVersion, "http://downloads.sourceforge.net/mingw/mingwrt-3.15.1-mingw32.tar.gz", mingwSubdir, @@ -81,17 +86,17 @@ public class MinGWGenerator implements IApplication { // w32api String w32apiId = "wascana.mingw.w32api"; - Version w32apiVersion = new Version("3.12"); - InstallableUnitDescription w32apiIUDesc = createIUDesc(w32apiId, w32apiVersion, "MinGW Windows SDK"); + Version w32apiVersion = new Version("3.13"); + InstallableUnitDescription w32apiIUDesc = createIUDesc(w32apiId, w32apiVersion, "MinGW Windows Library", publicDomainLic); IInstallableUnit w32apiIU = createIU(w32apiIUDesc, w32apiId, w32apiVersion, - "http://downloads.sourceforge.net/mingw/w32api-3.12-mingw32-dev.tar.gz", + "http://downloads.sourceforge.net/mingw/w32api-3.13-mingw32-dev.tar.gz", mingwSubdir, InstallArtifactRepository.GZIP_COMPRESSON); // binutils String binutilsId = "wascana.mingw.binutils"; Version binutilsVersion = new Version("2.18.50.20080109-2"); - InstallableUnitDescription binutilsIUDesc = createIUDesc(binutilsId, binutilsVersion, "MinGW binutils"); + InstallableUnitDescription binutilsIUDesc = createIUDesc(binutilsId, binutilsVersion, "MinGW binutils", gplLic); IInstallableUnit binutilsIU = createIU(binutilsIUDesc, binutilsId, binutilsVersion, "http://downloads.sourceforge.net/mingw/binutils-2.18.50-20080109-2.tar.gz", mingwSubdir, @@ -100,7 +105,7 @@ public class MinGWGenerator implements IApplication { // gcc-4 core String gcc4coreId = "wascana.mingw.gcc4.core"; Version gcc4Version = new Version("4.3.2.tdm-1"); - InstallableUnitDescription gcc4coreIUDesc = createIUDesc(gcc4coreId, gcc4Version, "MinGW gcc-4 core"); + InstallableUnitDescription gcc4coreIUDesc = createIUDesc(gcc4coreId, gcc4Version, "MinGW gcc-4 core", gplLic); RequiredCapability[] gcc4coreReqs = new RequiredCapability[] { MetadataFactory.createRequiredCapability( IInstallableUnit.NAMESPACE_IU_ID, @@ -120,7 +125,8 @@ public class MinGWGenerator implements IApplication { // gcc-4 g++ String gcc4gppId = "wascana.mingw.gcc4.g++"; - InstallableUnitDescription gcc4gppIUDesc = createIUDesc(gcc4gppId, gcc4Version, "MinGW gcc-4 g++"); + InstallableUnitDescription gcc4gppIUDesc = createIUDesc(gcc4gppId, gcc4Version, "MinGW gcc-4 g++", gplLic); + gcc4gppIUDesc.setLicense(gplLic); RequiredCapability[] gcc4gppReqs = new RequiredCapability[] { MetadataFactory.createRequiredCapability( IInstallableUnit.NAMESPACE_IU_ID, @@ -134,15 +140,24 @@ public class MinGWGenerator implements IApplication { // gdb String gdbId = "wascana.mingw.gdb"; - Version gdbVersion = new Version("6.8.0.3"); - InstallableUnitDescription gdbIUDesc = createIUDesc(gdbId, gdbVersion, "MinGW gdb"); + Version gdbVersion = new Version("6.8.0.4"); + InstallableUnitDescription gdbIUDesc = createIUDesc(gdbId, gdbVersion, "MinGW gdb", gplLic); IInstallableUnit gdbIU = createIU(gdbIUDesc, gdbId, gdbVersion, "http://downloads.sourceforge.net/mingw/gdb-6.8-mingw-3.tar.bz2", mingwSubdir, InstallArtifactRepository.BZIP2_COMPRESSION); + // msys + String msysId = "wascana.msys.core"; + Version msysVersion = new Version("1.0.11.20080826"); + InstallableUnitDescription msysIUDesc = createIUDesc(msysId, msysVersion, "MSYS Build System", gplLic); + IInstallableUnit msysIU = createIU(msysIUDesc, msysId, msysVersion, + "http://downloads.sourceforge.net/mingw/msysCORE-1.0.11-20080826.tar.gz", + "msys", + InstallArtifactRepository.GZIP_COMPRESSON); + // MinGW toolchain category - InstallableUnitDescription mingwToolchainDesc = createIUDesc("wascana.mingw", wascanaVersion, "MinGW Toolchain"); + InstallableUnitDescription mingwToolchainDesc = createIUDesc("wascana.mingw", wascanaVersion, "MinGW Toolchain", null);; mingwToolchainDesc.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.TRUE.toString()); RequiredCapability[] mingwToolchainReqs = new RequiredCapability[] { MetadataFactory.createRequiredCapability( @@ -163,10 +178,33 @@ public class MinGWGenerator implements IApplication { MetadataFactory.createRequiredCapability( IInstallableUnit.NAMESPACE_IU_ID, gdbIU.getId(), new VersionRange(null), null, false, false), + MetadataFactory.createRequiredCapability( + IInstallableUnit.NAMESPACE_IU_ID, + msysIU.getId(), new VersionRange(null), null, false, false), }; mingwToolchainDesc.setRequiredCapabilities(mingwToolchainReqs); IInstallableUnit mingwToolchainIU = MetadataFactory.createInstallableUnit(mingwToolchainDesc); + // SDL + String sdlId = "wascana.sdl"; + Version sdlVersion = new Version("1.2.13"); + InstallableUnitDescription sdlIUDesc = createIUDesc(sdlId, sdlVersion, "SDL (Simple Directmedia Layer) Library", lgplLic); + IInstallableUnit sdlIU = createIU(sdlIUDesc, sdlId, sdlVersion, + "http://www.libsdl.org/release/SDL-devel-1.2.13-mingw32.tar.gz", + mingwSubdir, + InstallArtifactRepository.GZIP_COMPRESSON); + + // Libraries toolchain category + InstallableUnitDescription libsIUDesc = createIUDesc("wascana.libs", wascanaVersion, "Libraries", null);; + libsIUDesc.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.TRUE.toString()); + RequiredCapability[] libsReqs = new RequiredCapability[] { + MetadataFactory.createRequiredCapability( + IInstallableUnit.NAMESPACE_IU_ID, + sdlIU.getId(), new VersionRange(null), null, false, false), + }; + libsIUDesc.setRequiredCapabilities(libsReqs); + IInstallableUnit libsIU = MetadataFactory.createInstallableUnit(libsIUDesc); + metaRepo.addInstallableUnits(new IInstallableUnit[] { runtimeIU, w32apiIU, @@ -174,7 +212,11 @@ public class MinGWGenerator implements IApplication { gcc4coreIU, gcc4gppIU, gdbIU, + msysIU, mingwToolchainIU, + +// sdlIU, +// libsIU }); System.out.println("done"); @@ -186,15 +228,17 @@ public class MinGWGenerator implements IApplication { public void stop() { } - private InstallableUnitDescription createIUDesc(String id, Version version, String name) throws ProvisionException { + private InstallableUnitDescription createIUDesc(String id, Version version, String name, License license) throws ProvisionException { InstallableUnitDescription iuDesc = new MetadataFactory.InstallableUnitDescription(); iuDesc.setId(id); iuDesc.setVersion(version); + iuDesc.setLicense(license); iuDesc.setSingleton(true); iuDesc.setProperty(IInstallableUnit.PROP_NAME, name); iuDesc.setCapabilities(new ProvidedCapability[] { MetadataFactory.createProvidedCapability(IInstallableUnit.NAMESPACE_IU_ID, id, version) }); + iuDesc.setUpdateDescriptor(MetadataFactory.createUpdateDescriptor(id, new VersionRange(null), IUpdateDescriptor.NORMAL, "")); return iuDesc; } @@ -214,4 +258,15 @@ public class MinGWGenerator implements IApplication { return MetadataFactory.createInstallableUnit(iuDesc); } + public static final String publicDomain = "This package is placed in the Public Domain." + + " No warranty is given; refer to the header files within the package."; + + public static final String gplURL = "http://www.gnu.org/copyleft/gpl.html"; + + public static final String gpl = "GNU GENERAL PUBLIC LICENSE\n" + gplURL; + + public static final String lgplURL = "http://www.gnu.org/copyleft/lesser.html"; + + public static final String lgpl = "GNU LESSER GENERAL PUBLIC LICENSE\n" + lgplURL; + } diff --git a/p2/org.eclipse.cdt.p2/META-INF/MANIFEST.MF b/p2/org.eclipse.cdt.p2/META-INF/MANIFEST.MF index 6b9a8f9448a..aef0dd5102c 100644 --- a/p2/org.eclipse.cdt.p2/META-INF/MANIFEST.MF +++ b/p2/org.eclipse.cdt.p2/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CDT P2 customizations for SDKs Bundle-SymbolicName: org.eclipse.cdt.p2;singleton:=true -Bundle-Version: 5.0.0 +Bundle-Version: 5.0.0.qualifier Bundle-Activator: org.eclipse.cdt.p2.Activator -Bundle-Vendor: eclipse.org +Bundle-Vendor: Eclipse.org Require-Bundle: org.eclipse.core.runtime, org.eclipse.equinox.p2.artifact.repository;bundle-version="1.0.2", org.eclipse.equinox.p2.core;bundle-version="1.0.0", diff --git a/p2/org.eclipse.cdt.p2/about.html b/p2/org.eclipse.cdt.p2/about.html new file mode 100644 index 00000000000..d7c511887d6 --- /dev/null +++ b/p2/org.eclipse.cdt.p2/about.html @@ -0,0 +1,24 @@ + + +June 22, 2007
+The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.
+ +If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.
+ + \ No newline at end of file diff --git a/p2/org.eclipse.cdt.p2/about.ini b/p2/org.eclipse.cdt.p2/about.ini new file mode 100644 index 00000000000..b3cd8d70ba9 --- /dev/null +++ b/p2/org.eclipse.cdt.p2/about.ini @@ -0,0 +1,24 @@ +# about.ini +# contains information about a feature +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# "%key" are externalized strings defined in about.properties +# This file does not need to be translated. + +# Property "aboutText" contains blurb for "About" dialog (translated) +aboutText=%blurb + +# Property "windowImage" contains path to window icon (16x16) +# needed for primary features only + +# Property "featureImage" contains path to feature image (32x32) +featureImage=eclipse32.gif + +# Property "aboutImage" contains path to product image (500x330 or 115x164) +# needed for primary features only + +# Property "appName" contains name of the application (translated) +# needed for primary features only + +# Property "welcomePerspective" contains the id of the perspective in which the +# welcome page is to be opened. +# optional diff --git a/p2/org.eclipse.cdt.p2/about.mappings b/p2/org.eclipse.cdt.p2/about.mappings new file mode 100644 index 00000000000..0824105e69d --- /dev/null +++ b/p2/org.eclipse.cdt.p2/about.mappings @@ -0,0 +1,9 @@ +# about.mappings +# contains fill-ins for about.properties +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file does not need to be translated. + +# The following should contain the build version. +# e.g. "0=20020612" +# This value will be added automaticaly via the build scripts +0=@build@ \ No newline at end of file diff --git a/p2/org.eclipse.cdt.p2/build.properties b/p2/org.eclipse.cdt.p2/build.properties index e9863e281ea..6b7cd92b987 100644 --- a/p2/org.eclipse.cdt.p2/build.properties +++ b/p2/org.eclipse.cdt.p2/build.properties @@ -2,4 +2,9 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.xml + plugin.xml,\ + about.html,\ + about.ini,\ + about.mappings,\ + eclipse32.gif,\ + plugin.properties diff --git a/p2/org.eclipse.cdt.p2/eclipse32.gif b/p2/org.eclipse.cdt.p2/eclipse32.gif new file mode 100644 index 00000000000..e6ad7ccd75b Binary files /dev/null and b/p2/org.eclipse.cdt.p2/eclipse32.gif differ diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepository.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepository.java index 1aade3cc226..fe5f16fdc5f 100644 --- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepository.java +++ b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepository.java @@ -62,8 +62,9 @@ public class InstallArtifactRepository extends AbstractArtifactRepository { private static final String DESCRIPTION = "Wind River Metadata Repository"; //$NON-NLS-1$ private static final String PROVIDER = "Wind River"; //$NON-NLS-1$ - - private Map