Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcvs2svn2009-02-03 14:26:16 -0500
committercvs2svn2009-02-03 14:26:16 -0500
commitc2a8cfe1a98b2244fb370c38a5d0988867c3f3e2 (patch)
treed9f285c82f81c513089496604b28bbb54ca9eac4
parent018af1b16ca786189bd9f097924684898544b9df (diff)
downloadorg.eclipse.cdt-c2a8cfe1a98b2244fb370c38a5d0988867c3f3e2.tar.gz
org.eclipse.cdt-c2a8cfe1a98b2244fb370c38a5d0988867c3f3e2.tar.xz
org.eclipse.cdt-c2a8cfe1a98b2244fb370c38a5d0988867c3f3e2.zip
This commit was manufactured by cvs2svn to create tag 'v200902031437'.v200902031437
Sprout from master 2009-02-03 19:26:15 UTC Mike Kucera <mkucera@ca.ibm.com> 'GNU extensions: Optional positive expression in conditional expression (bug 212905). Case ranges (bug 211882). Compound statement expressions (bug 226274).' Delete: p2/org.eclipse.cdt.p2-feature/.project p2/org.eclipse.cdt.p2-feature/build.properties p2/org.eclipse.cdt.p2-feature/eclipse_update_120.jpg p2/org.eclipse.cdt.p2-feature/epl-v10.html p2/org.eclipse.cdt.p2-feature/feature.properties p2/org.eclipse.cdt.p2-feature/feature.xml p2/org.eclipse.cdt.p2-feature/license.html p2/org.eclipse.cdt.p2.generator/.classpath p2/org.eclipse.cdt.p2.generator/.project p2/org.eclipse.cdt.p2.generator/.settings/org.eclipse.jdt.core.prefs p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF p2/org.eclipse.cdt.p2.generator/about.html p2/org.eclipse.cdt.p2.generator/build.properties p2/org.eclipse.cdt.p2.generator/plugin.xml p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/Activator.java p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/MinGWGenerator.java p2/org.eclipse.cdt.p2/.classpath p2/org.eclipse.cdt.p2/.project p2/org.eclipse.cdt.p2/.settings/org.eclipse.jdt.core.prefs p2/org.eclipse.cdt.p2/META-INF/MANIFEST.MF p2/org.eclipse.cdt.p2/about.html p2/org.eclipse.cdt.p2/about.ini p2/org.eclipse.cdt.p2/about.mappings p2/org.eclipse.cdt.p2/build.properties p2/org.eclipse.cdt.p2/eclipse32.gif p2/org.eclipse.cdt.p2/plugin.properties p2/org.eclipse.cdt.p2/plugin.xml p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/Activator.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListReader.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListWriter.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepository.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryFactory.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryIO.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstalledFile.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/Messages.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/TarExtractor.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/ZipExtractor.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/messages.properties p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/CollectAction.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/SDKTouchpoint.java p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/UninstallAction.java windows/org.eclipse.cdt.msw.build/.classpath windows/org.eclipse.cdt.msw.build/.cvsignore windows/org.eclipse.cdt.msw.build/.project windows/org.eclipse.cdt.msw.build/.settings/org.eclipse.jdt.core.prefs windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF windows/org.eclipse.cdt.msw.build/build.properties windows/org.eclipse.cdt.msw.build/plugin.properties windows/org.eclipse.cdt.msw.build/plugin.xml windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java
-rw-r--r--p2/org.eclipse.cdt.p2-feature/.project17
-rw-r--r--p2/org.eclipse.cdt.p2-feature/build.properties5
-rw-r--r--p2/org.eclipse.cdt.p2-feature/eclipse_update_120.jpgbin21695 -> 0 bytes
-rw-r--r--p2/org.eclipse.cdt.p2-feature/epl-v10.html328
-rw-r--r--p2/org.eclipse.cdt.p2-feature/feature.properties140
-rw-r--r--p2/org.eclipse.cdt.p2-feature/feature.xml28
-rw-r--r--p2/org.eclipse.cdt.p2-feature/license.html79
-rw-r--r--p2/org.eclipse.cdt.p2.generator/.classpath11
-rw-r--r--p2/org.eclipse.cdt.p2.generator/.project28
-rw-r--r--p2/org.eclipse.cdt.p2.generator/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF16
-rw-r--r--p2/org.eclipse.cdt.p2.generator/about.html24
-rw-r--r--p2/org.eclipse.cdt.p2.generator/build.properties5
-rw-r--r--p2/org.eclipse.cdt.p2.generator/plugin.xml18
-rw-r--r--p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/Activator.java76
-rw-r--r--p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/MinGWGenerator.java294
-rw-r--r--p2/org.eclipse.cdt.p2/.classpath12
-rw-r--r--p2/org.eclipse.cdt.p2/.project28
-rw-r--r--p2/org.eclipse.cdt.p2/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--p2/org.eclipse.cdt.p2/META-INF/MANIFEST.MF18
-rw-r--r--p2/org.eclipse.cdt.p2/about.html24
-rw-r--r--p2/org.eclipse.cdt.p2/about.ini24
-rw-r--r--p2/org.eclipse.cdt.p2/about.mappings9
-rw-r--r--p2/org.eclipse.cdt.p2/build.properties10
-rw-r--r--p2/org.eclipse.cdt.p2/eclipse32.gifbin1706 -> 0 bytes
-rw-r--r--p2/org.eclipse.cdt.p2/plugin.properties12
-rw-r--r--p2/org.eclipse.cdt.p2/plugin.xml24
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/Activator.java84
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListReader.java40
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListWriter.java24
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepository.java313
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryFactory.java69
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryIO.java479
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstalledFile.java66
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/Messages.java37
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/TarExtractor.java84
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/ZipExtractor.java78
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/messages.properties15
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/CollectAction.java70
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/SDKTouchpoint.java43
-rw-r--r--p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/UninstallAction.java52
-rw-r--r--windows/org.eclipse.cdt.msw.build/.classpath7
-rw-r--r--windows/org.eclipse.cdt.msw.build/.cvsignore1
-rw-r--r--windows/org.eclipse.cdt.msw.build/.project28
-rw-r--r--windows/org.eclipse.cdt.msw.build/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF13
-rw-r--r--windows/org.eclipse.cdt.msw.build/build.properties6
-rw-r--r--windows/org.eclipse.cdt.msw.build/plugin.properties9
-rw-r--r--windows/org.eclipse.cdt.msw.build/plugin.xml658
-rw-r--r--windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java50
-rw-r--r--windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java57
-rw-r--r--windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java160
-rw-r--r--windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java41
53 files changed, 0 insertions, 3745 deletions
diff --git a/p2/org.eclipse.cdt.p2-feature/.project b/p2/org.eclipse.cdt.p2-feature/.project
deleted file mode 100644
index 9a49fa6fcf..0000000000
--- a/p2/org.eclipse.cdt.p2-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.p2-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/p2/org.eclipse.cdt.p2-feature/build.properties b/p2/org.eclipse.cdt.p2-feature/build.properties
deleted file mode 100644
index 98ab6638ed..0000000000
--- a/p2/org.eclipse.cdt.p2-feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- feature.properties,\
- license.html
diff --git a/p2/org.eclipse.cdt.p2-feature/eclipse_update_120.jpg b/p2/org.eclipse.cdt.p2-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad6..0000000000
--- a/p2/org.eclipse.cdt.p2-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/p2/org.eclipse.cdt.p2-feature/epl-v10.html b/p2/org.eclipse.cdt.p2-feature/epl-v10.html
deleted file mode 100644
index ed4b196655..0000000000
--- a/p2/org.eclipse.cdt.p2-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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 (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) 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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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. </span></p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p><span style='font-size:10.0pt'>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.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/p2/org.eclipse.cdt.p2-feature/feature.properties b/p2/org.eclipse.cdt.p2-feature/feature.properties
deleted file mode 100644
index 0a713c48b9..0000000000
--- a/p2/org.eclipse.cdt.p2-feature/feature.properties
+++ /dev/null
@@ -1,140 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Wind River Systems
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Wind River Systems - initial implementation
-###############################################################################
-# features.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse CDT p2 Toolchain Installer
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse CDT Update Site
-
-# "description" property - description of the feature
-description=Eclipse p2-based installer for toolchains and libraries.
-
-# copyright
-copyright=\
-Copyright (c) 2008 Wind River Systems and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-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\
- - 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\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/p2/org.eclipse.cdt.p2-feature/feature.xml b/p2/org.eclipse.cdt.p2-feature/feature.xml
deleted file mode 100644
index 936c588c6a..0000000000
--- a/p2/org.eclipse.cdt.p2-feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.cdt.p2"
- label="%featureName"
- version="5.0.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.cdt.p2">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.eclipse.cdt.p2"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/p2/org.eclipse.cdt.p2-feature/license.html b/p2/org.eclipse.cdt.p2-feature/license.html
deleted file mode 100644
index c6af966b61..0000000000
--- a/p2/org.eclipse.cdt.p2-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY &quot;CONTENT&quot;). 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.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>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
- (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
- modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; 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.</p>
-
-<p>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):</p>
-
-<ul>
- <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>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>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.</p>
-
-<h3>Cryptography</h3>
-
-<p>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.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/p2/org.eclipse.cdt.p2.generator/.classpath b/p2/org.eclipse.cdt.p2.generator/.classpath
deleted file mode 100644
index 67889f3aad..0000000000
--- a/p2/org.eclipse.cdt.p2.generator/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/internal/provisional/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/p2/org.eclipse.cdt.p2.generator/.project b/p2/org.eclipse.cdt.p2.generator/.project
deleted file mode 100644
index fc1c628df0..0000000000
--- a/p2/org.eclipse.cdt.p2.generator/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.p2.generator</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/p2/org.eclipse.cdt.p2.generator/.settings/org.eclipse.jdt.core.prefs b/p2/org.eclipse.cdt.p2.generator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f313740144..0000000000
--- a/p2/org.eclipse.cdt.p2.generator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Dec 01 20:43:28 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF b/p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF
deleted file mode 100644
index 3bd1a1bd33..0000000000
--- a/p2/org.eclipse.cdt.p2.generator/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Generator Plug-in
-Bundle-SymbolicName: org.eclipse.cdt.p2.generator;singleton:=true
-Bundle-Version: 5.0.0.qualifier
-Bundle-Activator: org.eclipse.cdt.p2.generator.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.cdt.p2;bundle-version="5.0.0",
- org.eclipse.equinox.p2.artifact.repository;bundle-version="1.0.2",
- org.eclipse.equinox.p2.core;bundle-version="1.0.0",
- org.eclipse.equinox.p2.metadata;bundle-version="1.0.0",
- org.eclipse.equinox.p2.engine;bundle-version="1.0.1",
- org.eclipse.equinox.p2.metadata.repository;bundle-version="1.0.0",
- org.eclipse.equinox.p2.metadata.generator;bundle-version="1.0.1"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/p2/org.eclipse.cdt.p2.generator/about.html b/p2/org.eclipse.cdt.p2.generator/about.html
deleted file mode 100644
index d7c511887d..0000000000
--- a/p2/org.eclipse.cdt.p2.generator/about.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 22, 2007</p>
-<h3>License</h3>
-
-<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>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 <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
diff --git a/p2/org.eclipse.cdt.p2.generator/build.properties b/p2/org.eclipse.cdt.p2.generator/build.properties
deleted file mode 100644
index e9863e281e..0000000000
--- a/p2/org.eclipse.cdt.p2.generator/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml
diff --git a/p2/org.eclipse.cdt.p2.generator/plugin.xml b/p2/org.eclipse.cdt.p2.generator/plugin.xml
deleted file mode 100644
index 73a72853ed..0000000000
--- a/p2/org.eclipse.cdt.p2.generator/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- id="mingwGenerator"
- name="MinGW Generator"
- point="org.eclipse.core.runtime.applications">
- <application
- cardinality="singleton-global"
- thread="main"
- visible="true">
- <run
- class="org.eclipse.cdt.p2.generator.MinGWGenerator">
- </run>
- </application>
- </extension>
-
-</plugin>
diff --git a/p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/Activator.java b/p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/Activator.java
deleted file mode 100644
index eabd95beb7..0000000000
--- a/p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/Activator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.cdt.p2.generator;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.cdt.p2.generator";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- @SuppressWarnings("unchecked")
- public <T> T getService(Class<T> clazz) {
- BundleContext context = plugin.getBundle().getBundleContext();
- ServiceReference ref = context.getServiceReference(clazz.getName());
- return (ref != null) ? (T)context.getService(ref) : null;
- }
-
- public Bundle getBundle(String symbolicName) {
- PackageAdmin packageAdmin = getService(PackageAdmin.class);
- if (packageAdmin == null)
- return null;
- Bundle[] bundles = packageAdmin.getBundles(symbolicName, null);
- if (bundles == null)
- return null;
- //Return the first bundle that is not installed or uninstalled
- for (int i = 0; i < bundles.length; i++) {
- if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
- return bundles[i];
- }
- }
- return null;
- }
-
-}
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
deleted file mode 100644
index b0e1848a60..0000000000
--- a/p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/MinGWGenerator.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.generator;
-
-import java.io.File;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.p2.internal.repo.artifact.InstallArtifactRepository;
-import org.eclipse.cdt.p2.internal.touchpoint.SDKTouchpoint;
-import org.eclipse.equinox.app.IApplication;
-import org.eclipse.equinox.app.IApplicationContext;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
-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;
-import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
-import org.eclipse.equinox.internal.provisional.p2.metadata.generator.MetadataGeneratorHelper;
-import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepository;
-import org.eclipse.equinox.internal.provisional.p2.metadata.repository.IMetadataRepositoryManager;
-import org.eclipse.osgi.service.resolver.VersionRange;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
-
-/**
- * @author DSchaefe
- *
- */
-public class MinGWGenerator implements IApplication {
-
- private static final String REPO_NAME = "Wascana";
-
- IMetadataRepository metaRepo;
- IArtifactRepository artiRepo;
-
- @Override
- public Object start(IApplicationContext context) throws Exception {
- context.applicationRunning();
-
- Activator.getDefault().getBundle("org.eclipse.equinox.p2.exemplarysetup").start(Bundle.START_TRANSIENT); //$NON-NLS-1$
-
- File repoDir = new File("C:\\Wascana\\repo");
- new File(repoDir, "artifacts.xml").delete();
- new File(repoDir, "content.xml").delete();
-
- URL repoLocation = new File("C:\\Wascana\\repo").toURI().toURL();
-
- IMetadataRepositoryManager metaRepoMgr = Activator.getDefault().getService(IMetadataRepositoryManager.class);
- IArtifactRepositoryManager artiRepoMgr = Activator.getDefault().getService(IArtifactRepositoryManager.class);
-
- 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);
- License zlibLic = MetadataFactory.createLicense(zlibLicURL, zlibLicText);
- License wxLic = MetadataFactory.createLicense(wxLicURL, wxLicText);
-
- 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, "Wascana MinGW Runtime Library", publicDomainLic);
- IInstallableUnit runtimeIU = createIU(runtimeIUDesc, runtimeId, runtimeVersion,
- "http://downloads.sourceforge.net/mingw/mingwrt-3.15.1-mingw32.tar.gz",
- mingwSubdir,
- InstallArtifactRepository.GZIP_COMPRESSION);
-
- // w32api
- String w32apiId = "wascana.mingw.w32api";
- Version w32apiVersion = new Version("3.13");
- InstallableUnitDescription w32apiIUDesc = createIUDesc(w32apiId, w32apiVersion, "Wascana MinGW Windows Library", publicDomainLic);
- IInstallableUnit w32apiIU = createIU(w32apiIUDesc, w32apiId, w32apiVersion,
- "http://downloads.sourceforge.net/mingw/w32api-3.13-mingw32-dev.tar.gz",
- mingwSubdir,
- InstallArtifactRepository.GZIP_COMPRESSION);
-
- // binutils
- String binutilsId = "wascana.mingw.binutils";
- Version binutilsVersion = new Version("2.19");
- InstallableUnitDescription binutilsIUDesc = createIUDesc(binutilsId, binutilsVersion, "Wascana MinGW binutils", gplLic);
- IInstallableUnit binutilsIU = createIU(binutilsIUDesc, binutilsId, binutilsVersion,
- "http://downloads.sourceforge.net/mingw/binutils-2.19-mingw32-bin.tar.gz",
- mingwSubdir,
- InstallArtifactRepository.GZIP_COMPRESSION);
-
- // gcc-4 core
- String gcc4coreId = "wascana.mingw.gcc4.core";
- Version gcc4Version = new Version("4.3.2.tdm-1");
- InstallableUnitDescription gcc4coreIUDesc = createIUDesc(gcc4coreId, gcc4Version, "Wascana MinGW gcc-4 core", gplLic);
- RequiredCapability[] gcc4coreReqs = new RequiredCapability[] {
- MetadataFactory.createRequiredCapability(
- IInstallableUnit.NAMESPACE_IU_ID,
- runtimeIU.getId(), new VersionRange(null), null, false, false),
- MetadataFactory.createRequiredCapability(
- IInstallableUnit.NAMESPACE_IU_ID,
- w32apiIU.getId(), new VersionRange(null), null, false, false),
- MetadataFactory.createRequiredCapability(
- IInstallableUnit.NAMESPACE_IU_ID,
- binutilsIU.getId(), new VersionRange(null), null, false, false),
- };
- gcc4coreIUDesc.setRequiredCapabilities(gcc4coreReqs);
- IInstallableUnit gcc4coreIU = createIU(gcc4coreIUDesc, gcc4coreId, gcc4Version,
- "http://downloads.sourceforge.net/tdm-gcc/gcc-4.3.2-tdm-1-core.tar.gz",
- mingwSubdir,
- InstallArtifactRepository.GZIP_COMPRESSION);
-
- // gcc-4 g++
- String gcc4gppId = "wascana.mingw.gcc4.g++";
- InstallableUnitDescription gcc4gppIUDesc = createIUDesc(gcc4gppId, gcc4Version, "Wascana MinGW gcc-4 g++", gplLic);
- gcc4gppIUDesc.setLicense(gplLic);
- RequiredCapability[] gcc4gppReqs = new RequiredCapability[] {
- MetadataFactory.createRequiredCapability(
- IInstallableUnit.NAMESPACE_IU_ID,
- gcc4coreIU.getId(), new VersionRange(gcc4Version, true, gcc4Version, true), null, false, false),
- };
- gcc4gppIUDesc.setRequiredCapabilities(gcc4gppReqs);
- IInstallableUnit gcc4gppIU = createIU(gcc4gppIUDesc, gcc4gppId, gcc4Version,
- "http://downloads.sourceforge.net/tdm-gcc/gcc-4.3.2-tdm-1-g++.tar.gz",
- mingwSubdir,
- InstallArtifactRepository.GZIP_COMPRESSION);
-
- // gdb
- String gdbId = "wascana.mingw.gdb";
- Version gdbVersion = new Version("6.8.0.4");
- InstallableUnitDescription gdbIUDesc = createIUDesc(gdbId, gdbVersion, "Wascana 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, "Wascana 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_COMPRESSION);
-
- // MinGW toolchain category
- InstallableUnitDescription mingwToolchainDesc = createIUDesc("wascana.mingw", wascanaVersion, "MinGW Toolchain", null);;
- mingwToolchainDesc.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.TRUE.toString());
- RequiredCapability[] mingwToolchainReqs = new RequiredCapability[] {
- createRequiredCap(runtimeId),
- createRequiredCap(w32apiId),
- createRequiredCap(binutilsId),
- createRequiredCap(gcc4coreId),
- createRequiredCap(gcc4gppId),
- createRequiredCap(gdbId),
- createRequiredCap(msysId),
- };
- mingwToolchainDesc.setRequiredCapabilities(mingwToolchainReqs);
- IInstallableUnit mingwToolchainIU = MetadataFactory.createInstallableUnit(mingwToolchainDesc);
-
- // zlib
- String zlibId = "wascana.zlib";
- Version zlibVersion = new Version("1.2.3");
- InstallableUnitDescription zlibIUDesc = createIUDesc(zlibId, zlibVersion, "Wascana zlib Library", zlibLic);
- IInstallableUnit zlibIU = createIU(zlibIUDesc, zlibId, zlibVersion,
- "http://downloads.sourceforge.net/wascana/zlib-mingw-1.2.3.zip",
- mingwSubdir,
- InstallArtifactRepository.ZIP_COMPRESSION);
-
- // SDL
- String sdlId = "wascana.sdl";
- Version sdlVersion = new Version("1.2.13");
- InstallableUnitDescription sdlIUDesc = createIUDesc(sdlId, sdlVersion, "Wascana SDL (Simple Directmedia Layer) Library", lgplLic);
- IInstallableUnit sdlIU = createIU(sdlIUDesc, sdlId, sdlVersion,
- "http://downloads.sourceforge.net/wascana/SDL-mingw-1.2.13.zip",
- mingwSubdir,
- InstallArtifactRepository.ZIP_COMPRESSION);
-
- // wxWidgets
- String wxId = "wascana.wxWidgets";
- Version wxVersion = new Version("2.8.9");
- InstallableUnitDescription wxDesc = createIUDesc(wxId, wxVersion, "Wascana wxWidgets Library", wxLic);
- IInstallableUnit wxIU = createIU(wxDesc, wxId, wxVersion,
- "http://downloads.sourceforge.net/wascana/wxMSW-mingw-2.8.9.zip",
- mingwSubdir,
- InstallArtifactRepository.ZIP_COMPRESSION);
-
- // Libraries toolchain category
- InstallableUnitDescription libsIUDesc = createIUDesc("wascana.libs", wascanaVersion, "Libraries", null);;
- libsIUDesc.setProperty(IInstallableUnit.PROP_TYPE_CATEGORY, Boolean.TRUE.toString());
- RequiredCapability[] libsReqs = new RequiredCapability[] {
- createRequiredCap(zlibId),
- createRequiredCap(sdlId),
- createRequiredCap(wxId),
- };
- libsIUDesc.setRequiredCapabilities(libsReqs);
- IInstallableUnit libsIU = MetadataFactory.createInstallableUnit(libsIUDesc);
-
- metaRepo.addInstallableUnits(new IInstallableUnit[] {
- runtimeIU,
- w32apiIU,
- binutilsIU,
- gcc4coreIU,
- gcc4gppIU,
- gdbIU,
- msysIU,
- mingwToolchainIU,
-
- wxIU,
- zlibIU,
- sdlIU,
- libsIU
- });
-
- System.out.println("done");
-
- return EXIT_OK;
- }
-
- @Override
- public void stop() {
- }
-
- 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;
- }
-
- private IInstallableUnit createIU(InstallableUnitDescription iuDesc, String id, Version version, String location, String subdir, String compression) throws ProvisionException {
- iuDesc.setProperty(IInstallableUnit.PROP_TYPE_GROUP, Boolean.TRUE.toString());
- iuDesc.setTouchpointType(SDKTouchpoint.TOUCHPOINT_TYPE);
- Map<String, String> tpdata = new HashMap<String, String>();
- tpdata.put("uninstall", "uninstall()");
- iuDesc.addTouchpointData(MetadataFactory.createTouchpointData(tpdata));
- IArtifactKey artiKey = MetadataGeneratorHelper.createLauncherArtifactKey(id, version);
- ArtifactDescriptor artiDesc = new ArtifactDescriptor(artiKey);
- artiDesc.setProperty(InstallArtifactRepository.SUB_DIR, subdir);
- artiDesc.setProperty(InstallArtifactRepository.COMPRESSION, compression);
- artiDesc.setRepositoryProperty("artifact.reference", location);
- artiRepo.addDescriptor(artiDesc);
- iuDesc.setArtifacts(new IArtifactKey[] { artiKey });
- return MetadataFactory.createInstallableUnit(iuDesc);
- }
-
- private RequiredCapability createRequiredCap(String id) {
- return MetadataFactory.createRequiredCapability(
- IInstallableUnit.NAMESPACE_IU_ID,
- id, new VersionRange(null), null, false, false);
- }
-
- 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;
-
- public static final String zlibLicURL = "http://www.zlib.net/zlib_license.html";
-
- public static final String zlibLicText = "http://www.zlib.net/zlib_license.html";
-
- public static final String wxLicURL = "http://www.wxwidgets.org/about/newlicen.htm";
-
- public static final String wxLicText = "wxWindows license\n" + wxLicURL;
-
-}
diff --git a/p2/org.eclipse.cdt.p2/.classpath b/p2/org.eclipse.cdt.p2/.classpath
deleted file mode 100644
index c8ff43b072..0000000000
--- a/p2/org.eclipse.cdt.p2/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/internal/provisional/**"/>
- <accessrule kind="accessible" pattern="**/internal/p2/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/p2/org.eclipse.cdt.p2/.project b/p2/org.eclipse.cdt.p2/.project
deleted file mode 100644
index 8808e4bb73..0000000000
--- a/p2/org.eclipse.cdt.p2/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.p2</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/p2/org.eclipse.cdt.p2/.settings/org.eclipse.jdt.core.prefs b/p2/org.eclipse.cdt.p2/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index aca6ee8c3d..0000000000
--- a/p2/org.eclipse.cdt.p2/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Sun Nov 30 21:26:19 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/p2/org.eclipse.cdt.p2/META-INF/MANIFEST.MF b/p2/org.eclipse.cdt.p2/META-INF/MANIFEST.MF
deleted file mode 100644
index aef0dd5102..0000000000
--- a/p2/org.eclipse.cdt.p2/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-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.qualifier
-Bundle-Activator: org.eclipse.cdt.p2.Activator
-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",
- org.eclipse.equinox.p2.metadata;bundle-version="1.0.0",
- org.eclipse.equinox.p2.engine;bundle-version="1.0.1",
- org.apache.ant;bundle-version="1.7.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.cdt.p2,
- org.eclipse.cdt.p2.internal.repo.artifact;x-friends:="org.eclipse.cdt.p2.generator",
- org.eclipse.cdt.p2.internal.touchpoint;x-friends:="org.eclipse.cdt.p2.generator"
diff --git a/p2/org.eclipse.cdt.p2/about.html b/p2/org.eclipse.cdt.p2/about.html
deleted file mode 100644
index d7c511887d..0000000000
--- a/p2/org.eclipse.cdt.p2/about.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 22, 2007</p>
-<h3>License</h3>
-
-<p>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 <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>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 <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html> \ No newline at end of file
diff --git a/p2/org.eclipse.cdt.p2/about.ini b/p2/org.eclipse.cdt.p2/about.ini
deleted file mode 100644
index b3cd8d70ba..0000000000
--- a/p2/org.eclipse.cdt.p2/about.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
deleted file mode 100644
index 0824105e69..0000000000
--- a/p2/org.eclipse.cdt.p2/about.mappings
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
deleted file mode 100644
index 6b7cd92b98..0000000000
--- a/p2/org.eclipse.cdt.p2/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- 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
deleted file mode 100644
index e6ad7ccd75..0000000000
--- a/p2/org.eclipse.cdt.p2/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/p2/org.eclipse.cdt.p2/plugin.properties b/p2/org.eclipse.cdt.p2/plugin.properties
deleted file mode 100644
index 007115c082..0000000000
--- a/p2/org.eclipse.cdt.p2/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Wind River Systems and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Doug Schaefer (Wind River) - initial API and implementation
-###############################################################################
-
-installArtifactRepository=Install Artifact Repository
diff --git a/p2/org.eclipse.cdt.p2/plugin.xml b/p2/org.eclipse.cdt.p2/plugin.xml
deleted file mode 100644
index cfbad8fef5..0000000000
--- a/p2/org.eclipse.cdt.p2/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- id="org.eclipse.cdt.p2.internal.repo.artifact.InstallArtifactRepository"
- name="%installArtifactRepository"
- point="org.eclipse.equinox.p2.artifact.repository.artifactRepositories">
- <factory
- class="org.eclipse.cdt.p2.internal.repo.artifact.InstallArtifactRepositoryFactory">
- </factory>
- <filter
- suffix="installArtifact.xml">
- </filter>
- </extension>
- <extension
- point="org.eclipse.equinox.p2.engine.touchpoints">
- <touchpoint
- class="org.eclipse.cdt.p2.internal.touchpoint.SDKTouchpoint"
- type="org.eclipse.cdt.p2.internal.touchpoint.SDKTouchpoint"
- version="1">
- </touchpoint>
- </extension>
-
-</plugin>
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/Activator.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/Activator.java
deleted file mode 100644
index 7b80dae759..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/Activator.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.cdt.p2;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.cdt.p2";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- static public BundleContext getContext() {
- return plugin.getBundle().getBundleContext();
- }
-
- /**
- * Return a service from our context.
- *
- * @param name name of the service
- * @return the service
- */
- @SuppressWarnings("unchecked")
- public <T> T getService(Class<T> clazz) {
- BundleContext context = getBundle().getBundleContext();
- ServiceReference ref = context.getServiceReference(clazz.getName());
- return (ref != null) ? (T)context.getService(ref) : null;
- }
-
- /**
- * Spit out the log.
- *
- * @param status
- */
- public void log(int severity, String message, Throwable exception) {
- Platform.getLog(plugin.getBundle()).log(new Status(severity, PLUGIN_ID, message, exception));
- }
-
- public void log(IStatus status) {
- Platform.getLog(plugin.getBundle()).log(status);
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListReader.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListReader.java
deleted file mode 100644
index 914b42db82..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListReader.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.repo.artifact;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-/**
- * @author DSchaefe
- *
- */
-public class FileListReader {
-
- private final BufferedReader in;
-
- public FileListReader(File fileListfile) throws IOException {
- in = new BufferedReader(new FileReader(fileListfile));
- }
-
- public InstalledFile getNext() throws IOException {
- String line = in.readLine();
- return line != null ? new InstalledFile(line) : null;
- }
-
- public void close() throws IOException {
- in.close();
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListWriter.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListWriter.java
deleted file mode 100644
index 5c8144f142..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/FileListWriter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.cdt.p2.internal.repo.artifact;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-public class FileListWriter {
-
- private final BufferedWriter out;
-
- public FileListWriter(File fileListFile) throws IOException {
- out = new BufferedWriter(new FileWriter(fileListFile));
- }
-
- public void addFile(InstalledFile file) throws IOException {
- file.write(out);
- }
-
- public void close() throws IOException {
- out.close();
- }
-
-}
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
deleted file mode 100644
index 9202a2299e..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepository.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.repo.artifact;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.cdt.p2.Activator;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepositoryManager;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRequest;
-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.p2.core.location.AgentLocation;
-import org.eclipse.equinox.internal.provisional.p2.core.repository.IRepository;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
-import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.AbstractArtifactRepository;
-
-/**
- * @author DSchaefe
- *
- */
-public class InstallArtifactRepository extends AbstractArtifactRepository {
-
- // Install directory property
- public static final String INSTALL_DIR = "installDir"; //$NON-NLS-1$
- public static final String SUB_DIR = "subdir"; //$NON-NLS-1$
- public static final String FILENAME = "installArtifact.xml"; //$NON-NLS-1$
-
- public static final String COMPRESSION = "compression";
- public static final String GZIP_COMPRESSION = "tar.gz";
- public static final String BZIP2_COMPRESSION = "tar.bz2";
- public static final String ZIP_COMPRESSION = "zip";
-
- private static final String VERSION = "2.0.0"; //$NON-NLS-1$
- private static final String DESCRIPTION = "Wind River Metadata Repository"; //$NON-NLS-1$
- private static final String PROVIDER = "Wind River"; //$NON-NLS-1$
-
- // Map from artifact id to artifact descriptor. We only allow one version of each artifact
- // to be installed at a time.
- private Map<String, IArtifactDescriptor> artifacts = new HashMap<String, IArtifactDescriptor>();
-
- public InstallArtifactRepository(URL aLocation, String aName, Map aProperties) {
- super(aName, InstallArtifactRepository.class.getName(), VERSION, aLocation, DESCRIPTION, PROVIDER, aProperties);
- save();
- }
-
- /**
- * Constructor for reading in from file.
- *
- * @param _name
- * @param _type
- * @param _version
- * @param _description
- * @param _provider
- * @param _artifacts
- * @param mappingRules
- * @param _properties
- */
- InstallArtifactRepository(String _name, String _type, String _version, URL _location, String _description, String _provider, Set<ArtifactDescriptor> _artifacts, Map _properties) {
- super(_name, _type, _version, _location, _description, _provider, _properties);
- for (IArtifactDescriptor descriptor : _artifacts)
- artifacts.put(descriptor.getArtifactKey().getId(), descriptor);
- }
-
- public static URL getActualLocation(URL base) {
- final String name = FILENAME;
- String spec = base.toExternalForm();
- if (spec.endsWith(name))
- return base;
- if (spec.endsWith("/")) //$NON-NLS-1$
- spec += name;
- else
- spec += "/" + name; //$NON-NLS-1$
- try {
- return new URL(spec);
- } catch (MalformedURLException e) {
- return null;
- }
- }
-
- public static IArtifactRepository getRepository(IProfile profile) throws ProvisionException {
- AgentLocation location = Activator.getDefault().getService(AgentLocation.class);
- String profileId = profile.getProfileId();
- profileId = profileId.replaceAll("[:/\\\\]", "_"); //$NON-NLS-1$ //$NON-NLS-2$
- try {
- URL url = location.getDataArea(Activator.PLUGIN_ID);
- url = new URL(url.toExternalForm() + "installDirRepo/" + profileId + "/" + FILENAME); //$NON-NLS-1$ //$NON-NLS-2$
- IArtifactRepositoryManager repoMgr = Activator.getDefault().getService(IArtifactRepositoryManager.class);
- try {
- return repoMgr.loadRepository(url, null);
- } catch (ProvisionException e) {
- Map<String, String> properties = new HashMap<String, String>();
- properties.put(INSTALL_DIR, profile.getLocalProperty(IProfile.PROP_INSTALL_FOLDER));
- return repoMgr.createRepository(url, profile.getProfileId(), InstallArtifactRepository.class.getName(), properties);
- }
- } catch (MalformedURLException e) {
- Activator.getDefault().log(IStatus.ERROR, "Creating install repo URI", e); //$NON-NLS-1$
- return null;
- }
- }
-
- @Override
- public boolean isModifiable() {
- // We're always modifiable
- // TODO - unless we're a shared install...
- return true;
- }
-
- @Override
- public boolean contains(IArtifactDescriptor descriptor) {
- return contains(descriptor.getArtifactKey());
- }
-
- @Override
- public synchronized boolean contains(IArtifactKey key) {
- IArtifactDescriptor desc = artifacts.get(key.getId());
- if (desc == null)
- return false;
- return desc.getArtifactKey().equals(key);
- }
-
- @Override
- public IStatus getArtifact(IArtifactDescriptor descriptor, OutputStream destination, IProgressMonitor monitor) {
- // copying from this repository is not supported, yet...
- throw new UnsupportedOperationException();
- }
-
- @Override
- public synchronized IArtifactDescriptor[] getArtifactDescriptors(IArtifactKey key) {
- // we only have one artifact descriptor per key
- IArtifactDescriptor desc = artifacts.get(key);
- if (desc != null)
- return new IArtifactDescriptor[] { desc };
- return new IArtifactDescriptor[0];
- }
-
- @Override
- public synchronized IArtifactKey[] getArtifactKeys() {
- Collection<IArtifactDescriptor> descs = artifacts.values();
- IArtifactKey[] keys = new IArtifactKey[descs.size()];
- int i = 0;
- for (IArtifactDescriptor desc : descs)
- keys[i++] = desc.getArtifactKey();
- return keys;
- }
-
- @Override
- public IStatus getArtifacts(IArtifactRequest[] requests, IProgressMonitor monitor) {
- // TODO Auto-generated method stub
- return Status.OK_STATUS;
- }
-
- @Override
- public synchronized void addDescriptor(IArtifactDescriptor descriptor) {
- super.addDescriptor(descriptor);
- artifacts.put(descriptor.getArtifactKey().getId(), descriptor);
- save();
- }
-
- @Override
- public synchronized void addDescriptors(IArtifactDescriptor[] descriptors) {
- super.addDescriptors(descriptors);
- for (IArtifactDescriptor descriptor : descriptors)
- artifacts.put(descriptor.getArtifactKey().getId(), descriptor);
- save();
- }
-
- synchronized Collection<IArtifactDescriptor> getDescriptors() {
- return artifacts.values();
- }
-
- private File getFileListFile(String artifact) throws IOException {
- File file;
- try {
- file = new File(URLUtil.toURI(location));
- } catch (URISyntaxException e) {
- throw new IOException(e);
- }
- if (file.getName().equals(FILENAME))
- file = file.getParentFile();
- return new File(file, artifact + ".txt"); //$NON-NLS-1$
- }
-
- @Override
- public OutputStream getOutputStream(IArtifactDescriptor descriptor) throws ProvisionException {
- // Do the modifiable check in the superclass
- super.getOutputStream(descriptor);
-
- // Add the descriptor to the list and save it
- IArtifactDescriptor oldDesc = artifacts.get(descriptor.getArtifactKey().getId());
- if (oldDesc != null)
- removeDescriptor(oldDesc);
- addDescriptor(descriptor);
-
- // Start the extractor
- try {
- String installDirName = (String)getProperties().get(INSTALL_DIR);
- if (installDirName == null)
- throw new ProvisionException("Install directory not set"); //$NON-NLS-1$
- File installDir = new File(installDirName);
- String subDir = (String)descriptor.getProperties().get(SUB_DIR);
- if (subDir != null)
- installDir = new File(installDir, subDir);
- PipedOutputStream out = new PipedOutputStream();
- PipedInputStream in = new PipedInputStream(out);
- String compression = descriptor.getProperty(COMPRESSION);
- if (ZIP_COMPRESSION.equals(compression)) {
- ZipExtractor extractor = new ZipExtractor(in, installDir,
- new FileListWriter(getFileListFile(descriptor.getArtifactKey().getId())));
- extractor.start();
- } else {
- TarExtractor extractor = new TarExtractor(in, installDir,
- new FileListWriter(getFileListFile(descriptor.getArtifactKey().getId())),
- compression);
- extractor.start();
- }
- return out;
- } catch (IOException e) {
- // TODO How could that happen
- throw new ProvisionException(e.getLocalizedMessage());
- }
- }
-
- private void deleteFiles(String artifact) {
- File fileListFile = null;
- try {
- fileListFile = getFileListFile(artifact);
- FileListReader reader = new FileListReader(fileListFile);
- InstalledFile file;
- while ((file = reader.getNext()) != null) {
- file.uninstall();
- }
- reader.close();
- } catch (IOException e) {
- Activator.getDefault().log(IStatus.WARNING, "deleting file", e); //$NON-NLS-1$
- } finally {
- if (fileListFile != null)
- fileListFile.delete();
- }
- }
-
- @Override
- public synchronized void removeAll() {
- super.removeAll();
- for (String artifact : artifacts.keySet())
- deleteFiles(artifact);
- artifacts.clear();
- save();
- }
-
- @Override
- public void removeDescriptor(IArtifactDescriptor descriptor) {
- removeDescriptor(descriptor.getArtifactKey());
- }
-
- @Override
- public synchronized void removeDescriptor(IArtifactKey key) {
- super.removeDescriptor(key);
- deleteFiles(key.getId());
- artifacts.remove(key);
- save();
- }
-
- private void save() {
- try {
- OutputStream os = null;
- try {
- URL actualLocation = getActualLocation(location);
- File artifactsFile = new File(actualLocation.getPath());
- artifactsFile.getParentFile().mkdirs();
- os = new FileOutputStream(artifactsFile);
- super.setProperty(IRepository.PROP_TIMESTAMP, Long.toString(System.currentTimeMillis()));
- new InstallArtifactRepositoryIO().write(this, os);
- } catch (IOException e) {
- // TODO proper exception handling
- e.printStackTrace();
- } finally {
- if (os != null)
- os.close();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryFactory.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryFactory.java
deleted file mode 100644
index 55e236acd7..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.repo.artifact;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Map;
-
-import org.eclipse.cdt.p2.Activator;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.spi.p2.artifact.repository.IArtifactRepositoryFactory;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author DSchaefe
- *
- */
-public class InstallArtifactRepositoryFactory implements IArtifactRepositoryFactory {
-
- public IArtifactRepository create(URL location, String name, String type, Map properties) throws ProvisionException {
- return new InstallArtifactRepository(location, name, properties);
- }
-
- public IArtifactRepository load(URL location, IProgressMonitor monitor) throws ProvisionException {
- File localFile = null;
- boolean local = false;
- try {
- localFile = new File(InstallArtifactRepository.getActualLocation(location).getPath());
- InputStream descriptorStream = null;
- try {
- descriptorStream = new BufferedInputStream(new FileInputStream(localFile));
- InstallArtifactRepositoryIO io = new InstallArtifactRepositoryIO();
- return io.read(localFile.toURI().toURL(), descriptorStream);
- } finally {
- if (descriptorStream != null)
- descriptorStream.close();
- }
- } catch (FileNotFoundException e) {
- String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ProvisionException.REPOSITORY_NOT_FOUND, msg, e));
- } catch (IOException e) {
- String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ProvisionException.REPOSITORY_FAILED_READ, msg, e));
- } finally {
- // TODO why is this here?
- if (!local && localFile != null && !localFile.delete())
- localFile.deleteOnExit();
- }
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryIO.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryIO.java
deleted file mode 100644
index 5e33581a2b..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstallArtifactRepositoryIO.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.repo.artifact;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.cdt.p2.Activator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
-import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
-import org.eclipse.equinox.internal.p2.persistence.XMLParser;
-import org.eclipse.equinox.internal.p2.persistence.XMLWriter;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.ArtifactDescriptor;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactDescriptor;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing.ProcessingStepDescriptor;
-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
-import org.eclipse.osgi.service.resolver.VersionRange;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * @author DSchaefe
- *
- */
-public class InstallArtifactRepositoryIO {
-
- /**
- * Writes the given artifact repository to the stream.
- * This method performs buffering, and closes the stream when finished.
- */
- public void write(InstallArtifactRepository repository, OutputStream output) {
- OutputStream bufferedOutput = null;
- try {
- try {
- bufferedOutput = new BufferedOutputStream(output);
- Writer repositoryWriter = new Writer(bufferedOutput);
- repositoryWriter.write(repository);
- } finally {
- if (bufferedOutput != null) {
- bufferedOutput.close();
- }
- }
- } catch (IOException ioe) {
- // TODO shouldn't this throw a core exception?
- ioe.printStackTrace();
- }
- }
-
- /**
- * Reads the artifact repository from the given stream,
- * and returns the contained array of abstract artifact repositories.
- *
- * This method performs buffering, and closes the stream when finished.
- */
- public IArtifactRepository read(URL location, InputStream input) throws ProvisionException {
- BufferedInputStream bufferedInput = null;
- try {
- try {
- bufferedInput = new BufferedInputStream(input);
- Parser repositoryParser = new Parser(Activator.getContext(), Activator.PLUGIN_ID, location);
- repositoryParser.parse(input);
- IStatus result = repositoryParser.getStatus();
- switch (result.getSeverity()) {
- case IStatus.CANCEL :
- throw new OperationCanceledException();
- case IStatus.ERROR :
- throw new ProvisionException(result);
- case IStatus.WARNING :
- case IStatus.INFO :
- Activator.getDefault().log(result);
- }
- return repositoryParser.getRepository();
- } finally {
- if (bufferedInput != null)
- bufferedInput.close();
- }
- } catch (IOException ioe) {
- String msg = NLS.bind(Messages.io_failedRead, location);
- throw new ProvisionException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ProvisionException.REPOSITORY_FAILED_READ, msg, ioe));
- }
- }
-
- private interface XMLConstants extends org.eclipse.equinox.internal.p2.persistence.XMLConstants {
-
- // Constants defining the structure of the XML for a InstallArtifactRepository
-
- // A format version number for simple artifact repository XML.
- public static final Version CURRENT_VERSION = new Version(1, 0, 0);
- public static final VersionRange XML_TOLERANCE = new VersionRange(CURRENT_VERSION, true, new Version(2, 0, 0), false);
-
- // Constants for processing instructions
- public static final String PI_REPOSITORY_TARGET = "artifactRepository"; //$NON-NLS-1$
- public static XMLWriter.ProcessingInstruction[] PI_DEFAULTS = new XMLWriter.ProcessingInstruction[] {XMLWriter.ProcessingInstruction.makeClassVersionInstruction(PI_REPOSITORY_TARGET, InstallArtifactRepository.class, CURRENT_VERSION)};
-
- // Constants for artifact repository elements
- public static final String REPOSITORY_ELEMENT = "repository"; //$NON-NLS-1$
- public static final String REPOSITORY_PROPERTIES_ELEMENT = "repositoryProperties"; //$NON-NLS-1$
- public static final String MAPPING_RULES_ELEMENT = "mappings"; //$NON-NLS-1$
- public static final String MAPPING_RULE_ELEMENT = "rule"; //$NON-NLS-1$
- public static final String ARTIFACTS_ELEMENT = "artifacts"; //$NON-NLS-1$
- public static final String ARTIFACT_ELEMENT = "artifact"; //$NON-NLS-1$
- public static final String PROCESSING_STEPS_ELEMENT = "processing"; //$NON-NLS-1$
- public static final String PROCESSING_STEP_ELEMENT = "step"; //$NON-NLS-1$
-
- public static final String MAPPING_RULE_FILTER_ATTRIBUTE = "filter"; //$NON-NLS-1$
- public static final String MAPPING_RULE_OUTPUT_ATTRIBUTE = "output"; //$NON-NLS-1$
-
- public static final String ARTIFACT_CLASSIFIER_ATTRIBUTE = CLASSIFIER_ATTRIBUTE;
-
- public static final String STEP_DATA_ATTRIBUTE = "data"; //$NON-NLS-1$
- public static final String STEP_REQUIRED_ATTRIBUTE = "required"; //$NON-NLS-1$
- }
-
- // XML writer for a InstallArtifactRepository
- protected class Writer extends XMLWriter implements XMLConstants {
-
- public Writer(OutputStream output) throws IOException {
- super(output, PI_DEFAULTS);
- }
-
- /**
- * Write the given artifact repository to the output stream.
- */
- public void write(InstallArtifactRepository repository) {
- start(REPOSITORY_ELEMENT);
- attribute(NAME_ATTRIBUTE, repository.getName());
- attribute(TYPE_ATTRIBUTE, repository.getType());
- attribute(VERSION_ATTRIBUTE, repository.getVersion());
- attributeOptional(PROVIDER_ATTRIBUTE, repository.getProvider());
- attributeOptional(DESCRIPTION_ATTRIBUTE, repository.getDescription()); // TODO: could be cdata?
-
- writeProperties(repository.getProperties());
- writeArtifacts(repository.getDescriptors());
-
- end(REPOSITORY_ELEMENT);
- flush();
- }
-
- private void writeArtifacts(Collection<IArtifactDescriptor> artifactDescriptors) {
- start(ARTIFACTS_ELEMENT);
- attribute(COLLECTION_SIZE_ATTRIBUTE, artifactDescriptors.size());
- for (IArtifactDescriptor idescriptor : artifactDescriptors) {
- ArtifactDescriptor descriptor = (ArtifactDescriptor)idescriptor;
- IArtifactKey key = descriptor.getArtifactKey();
- start(ARTIFACT_ELEMENT);
- attribute(ARTIFACT_CLASSIFIER_ATTRIBUTE, key.getClassifier());
- attribute(ID_ATTRIBUTE, key.getId());
- attribute(VERSION_ATTRIBUTE, key.getVersion());
- writeProcessingSteps(descriptor.getProcessingSteps());
- writeProperties(descriptor.getProperties());
- writeProperties(REPOSITORY_PROPERTIES_ELEMENT, descriptor.getRepositoryProperties());
- end(ARTIFACT_ELEMENT);
- }
- end(ARTIFACTS_ELEMENT);
- }
-
- private void writeProcessingSteps(ProcessingStepDescriptor[] processingSteps) {
- if (processingSteps.length > 0) {
- start(PROCESSING_STEPS_ELEMENT);
- attribute(COLLECTION_SIZE_ATTRIBUTE, processingSteps.length);
- for (int i = 0; i < processingSteps.length; i++) {
- start(PROCESSING_STEP_ELEMENT);
- attribute(ID_ATTRIBUTE, processingSteps[i].getProcessorId());
- attribute(STEP_DATA_ATTRIBUTE, processingSteps[i].getData());
- attribute(STEP_REQUIRED_ATTRIBUTE, processingSteps[i].isRequired());
- end(PROCESSING_STEP_ELEMENT);
- }
- end(PROCESSING_STEPS_ELEMENT);
- }
- }
- }
-
- /*
- * Parser for the contents of a InstallArtifactRepository,
- * as written by the Writer class.
- */
- private class Parser extends XMLParser implements XMLConstants {
-
- private InstallArtifactRepository theRepository;
- final URL location;
-
- public Parser(BundleContext _context, String _bundleId, URL _location) {
- super(_context, _bundleId);
- location = _location;
- }
-
- public void parse(File file) throws IOException {
- parse(new FileInputStream(file));
- }
-
- public synchronized void parse(InputStream stream) throws IOException {
- this.status = null;
- try {
- // TODO: currently not caching the parser since we make no assumptions
- // or restrictions on concurrent parsing
- getParser();
- RepositoryHandler repositoryHandler = new RepositoryHandler();
- xmlReader.setContentHandler(new RepositoryDocHandler(REPOSITORY_ELEMENT, repositoryHandler));
- xmlReader.parse(new InputSource(stream));
- if (isValidXML()) {
- theRepository = repositoryHandler.getRepository();
- }
- } catch (SAXException e) {
- throw new IOException(e.getMessage());
- } catch (ParserConfigurationException e) {
- throw new IOException(e.getMessage());
- } finally {
- stream.close();
- }
- }
-
- public InstallArtifactRepository getRepository() {
- return theRepository;
- }
-
- @Override
- protected Object getRootObject() {
- return theRepository;
- }
-
- private final class RepositoryDocHandler extends DocHandler {
-
- public RepositoryDocHandler(String rootName, RootHandler rootHandler) {
- super(rootName, rootHandler);
- }
-
- @Override
- public void processingInstruction(String target, String data) throws SAXException {
- if (PI_REPOSITORY_TARGET.equals(target)) {
- // TODO: should the root handler be constructed based on class
- // via an extension registry mechanism?
- // String clazz = extractPIClass(data);
- // TODO: version tolerance by extension
- Version repositoryVersion = extractPIVersion(target, data);
- if (!XML_TOLERANCE.isIncluded(repositoryVersion)) {
- throw new SAXException(NLS.bind(Messages.io_incompatibleVersion, repositoryVersion, XML_TOLERANCE));
- }
- }
- }
-
- }
-
- private final class RepositoryHandler extends RootHandler {
-
- private final String[] required = new String[] {NAME_ATTRIBUTE, TYPE_ATTRIBUTE, VERSION_ATTRIBUTE};
- private final String[] optional = new String[] {DESCRIPTION_ATTRIBUTE, PROVIDER_ATTRIBUTE};
-
- private String[] attrValues = new String[required.length + optional.length];
-
- private PropertiesHandler propertiesHandler = null;
- private ArtifactsHandler artifactsHandler = null;
-
- private InstallArtifactRepository repository = null;
-
- public RepositoryHandler() {
- super();
- }
-
- public InstallArtifactRepository getRepository() {
- return repository;
- }
-
- @Override
- protected void handleRootAttributes(Attributes attributes) {
- attrValues = parseAttributes(attributes, required, optional);
- attrValues[2] = checkVersion(REPOSITORY_ELEMENT, VERSION_ATTRIBUTE, attrValues[2]).toString();
- }
-
- @Override
- public void startElement(String name, Attributes attributes) {
- if (ARTIFACTS_ELEMENT.equals(name)) {
- if (artifactsHandler == null) {
- artifactsHandler = new ArtifactsHandler(this, attributes);
- } else {
- duplicateElement(this, name, attributes);
- }
- } else if (PROPERTIES_ELEMENT.equals(name)) {
- if (propertiesHandler == null) {
- propertiesHandler = new PropertiesHandler(this, attributes);
- } else {
- duplicateElement(this, name, attributes);
- }
- } else {
- invalidElement(name, attributes);
- }
- }
-
- @Override
- protected void finished() {
- if (isValidXML()) {
- Map properties = (propertiesHandler == null ? new OrderedProperties(0) //
- : propertiesHandler.getProperties());
- Set<ArtifactDescriptor> artifacts = (artifactsHandler == null ? new HashSet<ArtifactDescriptor>(0) //
- : artifactsHandler.getArtifacts());
- repository = new InstallArtifactRepository(
- attrValues[0], attrValues[1], attrValues[2], Parser.this.location,
- attrValues[3], attrValues[4], artifacts, properties);
- }
- }
- }
-
- protected class ArtifactsHandler extends AbstractHandler {
-
- private Set<ArtifactDescriptor> artifacts;
-
- public ArtifactsHandler(AbstractHandler _parentHandler, Attributes attributes) {
- super(_parentHandler, ARTIFACTS_ELEMENT);
- String size = parseOptionalAttribute(attributes, COLLECTION_SIZE_ATTRIBUTE);
- artifacts = (size != null ? new LinkedHashSet<ArtifactDescriptor>(new Integer(size).intValue()) : new LinkedHashSet<ArtifactDescriptor>(4));
- }
-
- public Set<ArtifactDescriptor> getArtifacts() {
- return artifacts;
- }
-
- @Override
- public void startElement(String name, Attributes attributes) {
- if (name.equals(ARTIFACT_ELEMENT)) {
- new ArtifactHandler(this, attributes, artifacts);
- } else {
- invalidElement(name, attributes);
- }
- }
- }
-
- protected class ArtifactHandler extends AbstractHandler {
-
- private final String[] required = new String[] {ARTIFACT_CLASSIFIER_ATTRIBUTE, ID_ATTRIBUTE, VERSION_ATTRIBUTE};
-
- private Set<ArtifactDescriptor> artifacts;
- ArtifactDescriptor currentArtifact = null;
-
- private PropertiesHandler propertiesHandler = null;
- private PropertiesHandler repositoryPropertiesHandler = null;
- private ProcessingStepsHandler processingStepsHandler = null;
-
- public ArtifactHandler(AbstractHandler _parentHandler, Attributes attributes, Set<ArtifactDescriptor> _artifacts) {
- super(_parentHandler, ARTIFACT_ELEMENT);
- this.artifacts = _artifacts;
- String[] values = parseRequiredAttributes(attributes, required);
- Version version = checkVersion(ARTIFACT_ELEMENT, VERSION_ATTRIBUTE, values[2]);
- // TODO: resolve access restriction on ArtifactKey construction
- currentArtifact = new ArtifactDescriptor(new ArtifactKey(values[0], values[1], version));
- }
-
- public ArtifactDescriptor getArtifact() {
- return currentArtifact;
- }
-
- @Override
- public void startElement(String name, Attributes attributes) {
- if (PROCESSING_STEPS_ELEMENT.equals(name)) {
- if (processingStepsHandler == null) {
- processingStepsHandler = new ProcessingStepsHandler(this, attributes);
- } else {
- duplicateElement(this, name, attributes);
- }
- } else if (PROPERTIES_ELEMENT.equals(name)) {
- if (propertiesHandler == null) {
- propertiesHandler = new PropertiesHandler(this, attributes);
- } else {
- duplicateElement(this, name, attributes);
- }
- } else if (REPOSITORY_PROPERTIES_ELEMENT.equals(name)) {
- if (repositoryPropertiesHandler == null) {
- repositoryPropertiesHandler = new PropertiesHandler(this, attributes);
- } else {
- duplicateElement(this, name, attributes);
- }
- } else {
- invalidElement(name, attributes);
- }
- }
-
- @Override
- protected void finished() {
- if (isValidXML() && currentArtifact != null) {
- Map properties = (propertiesHandler == null ? new OrderedProperties(0) : propertiesHandler.getProperties());
- currentArtifact.addProperties(properties);
-
- properties = (repositoryPropertiesHandler == null ? new OrderedProperties(0) : repositoryPropertiesHandler.getProperties());
- currentArtifact.addRepositoryProperties(properties);
-
- ProcessingStepDescriptor[] processingSteps = (processingStepsHandler == null ? new ProcessingStepDescriptor[0] //
- : processingStepsHandler.getProcessingSteps());
- currentArtifact.setProcessingSteps(processingSteps);
- artifacts.add(currentArtifact);
- }
- }
- }
-
- protected class ProcessingStepsHandler extends AbstractHandler {
-
- private List<ProcessingStepDescriptor> processingSteps;
-
- public ProcessingStepsHandler(AbstractHandler _parentHandler, Attributes attributes) {
- super(_parentHandler, PROCESSING_STEPS_ELEMENT);
- String size = parseOptionalAttribute(attributes, COLLECTION_SIZE_ATTRIBUTE);
- processingSteps = (size != null ? new ArrayList<ProcessingStepDescriptor>(new Integer(size).intValue()) : new ArrayList<ProcessingStepDescriptor>(4));
- }
-
- public ProcessingStepDescriptor[] getProcessingSteps() {
- return processingSteps.toArray(new ProcessingStepDescriptor[processingSteps.size()]);
- }
-
- @Override
- public void startElement(String name, Attributes attributes) {
- if (name.equals(PROCESSING_STEP_ELEMENT)) {
- new ProcessingStepHandler(this, attributes, processingSteps);
- } else {
- invalidElement(name, attributes);
- }
- }
- }
-
- protected class ProcessingStepHandler extends AbstractHandler {
-
- private final String[] required = new String[] {ID_ATTRIBUTE, STEP_REQUIRED_ATTRIBUTE};
- private final String[] optional = new String[] {STEP_DATA_ATTRIBUTE};
-
- public ProcessingStepHandler(AbstractHandler _parentHandler, Attributes attributes, List<ProcessingStepDescriptor> processingSteps) {
- super(_parentHandler, PROCESSING_STEP_ELEMENT);
- String[] attributeValues = parseAttributes(attributes, required, optional);
- processingSteps.add(new ProcessingStepDescriptor(attributeValues[0], attributeValues[1], checkBoolean(PROCESSING_STEP_ELEMENT, STEP_REQUIRED_ATTRIBUTE, attributeValues[2]).booleanValue()));
- }
-
- @Override
- public void startElement(String name, Attributes attributes) {
- invalidElement(name, attributes);
- }
- }
-
- @Override
- protected String getErrorMessage() {
- return Messages.io_parseError;
- }
-
- @Override
- public String toString() {
- // TODO:
- return null;
- }
-
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstalledFile.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstalledFile.java
deleted file mode 100644
index 0cba8bdcfd..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/InstalledFile.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.repo.artifact;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author DSchaefe
- *
- */
-public class InstalledFile {
-
- private final File file;
- private final long lastModified;
-
- public InstalledFile(File _file, long _lastModified) {
- file = _file;
- lastModified = _lastModified;
- }
-
- InstalledFile(String line) {
- String[] entries = line.split(","); //$NON-NLS-1$
- if (entries.length < 2) {
- file = null;
- lastModified = 0;
- return;
- }
- file = new File(entries[0]);
- lastModified = Long.parseLong(entries[1]);
- }
-
- public File getFile() {
- return file;
- }
-
- public long getLastModified() {
- return lastModified;
- }
-
- public void uninstall() {
- if (file != null && file.lastModified() == lastModified) {
- File f = file;
- while (f != null && f.delete())
- f = f.getParentFile();
- }
- }
-
- void write(BufferedWriter out) throws IOException {
- out.write(file.getAbsolutePath());
- out.write(',');
- out.write(String.valueOf(lastModified));
- out.newLine();
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/Messages.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/Messages.java
deleted file mode 100644
index 2e1d3cca1a..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/Messages.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.repo.artifact;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author DSchaefe
- *
- */
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.cdt.p2.internal.repo.artifact.messages"; //$NON-NLS-1$
-
- public static String io_failedRead;
- public static String io_incompatibleVersion;
- public static String io_parseError;
-
- static {
- // initialize resource bundles
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // Do not instantiate
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/TarExtractor.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/TarExtractor.java
deleted file mode 100644
index 43b3fb0ca3..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/TarExtractor.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.repo.artifact;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
-
-import org.apache.tools.bzip2.CBZip2InputStream;
-import org.apache.tools.tar.TarEntry;
-import org.apache.tools.tar.TarInputStream;
-
-/**
- * @author DSchaefe
- *
- */
-public class TarExtractor extends Thread {
-
- private final InputStream in;
- private final File installDir;
- private final FileListWriter fileListWriter;
- private final String compression;
-
- public TarExtractor(InputStream in, File installDir, FileListWriter fileListWriter, String compression) {
- this.in = in;
- this.installDir = installDir;
- this.fileListWriter = fileListWriter;
- this.compression = compression;
- }
-
- @Override
- public void run() {
- try {
- InputStream compIn;
- if (InstallArtifactRepository.GZIP_COMPRESSION.equals(compression))
- compIn = new GZIPInputStream(in);
- else if (InstallArtifactRepository.BZIP2_COMPRESSION.equals(compression)) {
- // Skip the magic bytes first
- in.read(new byte[2]);
- compIn = new CBZip2InputStream(in);
- } else {
- // No idea
- return;
- }
-
- TarInputStream tarIn = new TarInputStream(compIn);
- for (TarEntry tarEntry = tarIn.getNextEntry(); tarEntry != null; tarEntry = tarIn.getNextEntry()) {
- File outFile = new File(installDir, tarEntry.getName());
- if (tarEntry.isDirectory()) {
- outFile.mkdirs();
- } else {
- if (outFile.exists())
- outFile.delete();
- else
- outFile.getParentFile().mkdirs();
- FileOutputStream outStream = new FileOutputStream(outFile);
- tarIn.copyEntryContents(outStream);
- outStream.close();
- long lastModified = tarEntry.getModTime().getTime();
- outFile.setLastModified(lastModified);
- fileListWriter.addFile(new InstalledFile(outFile, lastModified));
- }
- }
- tarIn.close();
- fileListWriter.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/ZipExtractor.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/ZipExtractor.java
deleted file mode 100644
index 793c2325c4..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/ZipExtractor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.eclipse.cdt.p2.internal.repo.artifact;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-public class ZipExtractor extends Thread {
-
- private final InputStream in;
- private final File installDir;
- private final FileListWriter fileListWriter;
-
- public ZipExtractor(InputStream in, File installDir, FileListWriter fileListWriter) {
- this.in = in;
- this.installDir = installDir;
- this.fileListWriter = fileListWriter;
- }
-
- @Override
- public void run() {
- try {
- ZipInputStream zipIn = new ZipInputStream(in);
- for (ZipEntry zipEntry = zipIn.getNextEntry(); zipEntry != null; zipEntry = zipIn.getNextEntry()) {
- File outFile = new File(installDir, zipEntry.getName());
- if (zipEntry.isDirectory()) {
- outFile.mkdirs();
- } else {
- if (outFile.exists())
- outFile.delete();
- else
- outFile.getParentFile().mkdirs();
- FileOutputStream outStream = new FileOutputStream(outFile);
- copyStream(zipIn, false, outStream, true);
- long lastModified = zipEntry.getTime();
- outFile.setLastModified(lastModified);
- fileListWriter.addFile(new InstalledFile(outFile, lastModified));
- }
- zipIn.closeEntry();
- }
- // Keep reading until there's none left
- while (in.read() != -1);
- zipIn.close();
- fileListWriter.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
-
- private static int copyStream(InputStream in, boolean closeIn, OutputStream out, boolean closeOut) throws IOException {
- try {
- int written = 0;
- byte[] buffer = new byte[1024];
- int len;
- while ((len = in.read(buffer)) != -1) {
- out.write(buffer, 0, len);
- written += len;
- }
- return written;
- } finally {
- try {
- if (closeIn) {
- in.close();
- }
- } finally {
- if (closeOut) {
- out.close();
- }
- }
- }
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/messages.properties b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/messages.properties
deleted file mode 100644
index a0aa4f7ad8..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/repo/artifact/messages.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Wind River Systems and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Doug Schaefer (Wind River) - initial API and implementation
-###############################################################################
-
-io_failedRead=Unable to read repository at {0}.
-io_incompatibleVersion=Install artifact repository has incompatible version {0}; expected {1}.
-io_parseError=Error parsing install artifact repository.
- \ No newline at end of file
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/CollectAction.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/CollectAction.java
deleted file mode 100644
index 9b849ec57a..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/CollectAction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.touchpoint;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.cdt.p2.internal.repo.artifact.InstallArtifactRepository;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.p2.artifact.repository.MirrorRequest;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRequest;
-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.engine.InstallableUnitOperand;
-import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction;
-import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
-import org.eclipse.equinox.internal.provisional.p2.metadata.IInstallableUnit;
-
-/**
- * @author DSchaefe
- *
- */
-public class CollectAction extends ProvisioningAction {
-
- public static final String ACTION_NAME = "collect";
-
- @Override
- public IStatus execute(Map parameters) {
- try {
- InstallableUnitOperand operand = (InstallableUnitOperand)parameters.get("operand");
- IInstallableUnit installableUnit = operand.second();
- IProfile profile = (IProfile)parameters.get("profile"); //$NON-NLS-1$
-
- IArtifactRequest[] requests;
- IArtifactKey[] toDownload = installableUnit.getArtifacts();
- if (toDownload == null || toDownload.length == 0)
- requests = new IArtifactRequest[0];
- else {
- IArtifactRepository destination = InstallArtifactRepository.getRepository(profile);
- requests = new IArtifactRequest[toDownload.length];
- for (int i = 0; i < toDownload.length; i++)
- requests[i] = new MirrorRequest(toDownload[i], destination, null, null);
- }
-
- Collection artifactRequests = (Collection)parameters.get("artifactRequests");
- artifactRequests.add(requests);
- return Status.OK_STATUS;
- } catch (ProvisionException e) {
- return e.getStatus();
- }
- }
-
- @Override
- public IStatus undo(Map parameters) {
- // No undo
- return Status.OK_STATUS;
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/SDKTouchpoint.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/SDKTouchpoint.java
deleted file mode 100644
index 7a6279d9af..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/SDKTouchpoint.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.touchpoint;
-
-import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction;
-import org.eclipse.equinox.internal.provisional.p2.engine.Touchpoint;
-import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
-import org.eclipse.equinox.internal.provisional.p2.metadata.TouchpointType;
-import org.osgi.framework.Version;
-
-/**
- * @author DSchaefe
- *
- */
-public class SDKTouchpoint extends Touchpoint {
-
- public static final TouchpointType TOUCHPOINT_TYPE = MetadataFactory.createTouchpointType(SDKTouchpoint.class.getName(), new Version("1"));
-
- @Override
- public ProvisioningAction getAction(String actionId) {
- if (CollectAction.ACTION_NAME.equals(actionId))
- return new CollectAction();
- else if (UninstallAction.ACTION_NAME.equals(actionId))
- return new UninstallAction();
- else
- return null;
- }
-
- @Override
- public TouchpointType getTouchpointType() {
- return TOUCHPOINT_TYPE;
- }
-
-}
diff --git a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/UninstallAction.java b/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/UninstallAction.java
deleted file mode 100644
index 85b270528c..0000000000
--- a/p2/org.eclipse.cdt.p2/src/org/eclipse/cdt/p2/internal/touchpoint/UninstallAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Doug Schaefer - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.cdt.p2.internal.touchpoint;
-
-import java.util.Map;
-
-import org.eclipse.cdt.p2.internal.repo.artifact.InstallArtifactRepository;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.internal.provisional.p2.artifact.repository.IArtifactRepository;
-import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
-import org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction;
-import org.eclipse.equinox.internal.provisional.p2.metadata.IArtifactKey;
-
-/**
- * @author DSchaefe
- *
- */
-public class UninstallAction extends ProvisioningAction {
-
- public static final String ACTION_NAME = "uninstall";
-
- @Override
- public IStatus execute(Map parameters) {
- IProfile profile = (IProfile)parameters.get("profile");
- IArtifactKey artifact = (IArtifactKey)parameters.get("artifact");
-
- try {
- IArtifactRepository repo = InstallArtifactRepository.getRepository(profile);
- repo.removeDescriptor(artifact);
- } catch (ProvisionException e) {
- return e.getStatus();
- }
- return Status.OK_STATUS;
- }
-
- @Override
- public IStatus undo(Map parameters) {
- return Status.OK_STATUS;
- }
-
-}
diff --git a/windows/org.eclipse.cdt.msw.build/.classpath b/windows/org.eclipse.cdt.msw.build/.classpath
deleted file mode 100644
index 751c8f2e50..0000000000
--- a/windows/org.eclipse.cdt.msw.build/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/windows/org.eclipse.cdt.msw.build/.cvsignore b/windows/org.eclipse.cdt.msw.build/.cvsignore
deleted file mode 100644
index ba077a4031..0000000000
--- a/windows/org.eclipse.cdt.msw.build/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/windows/org.eclipse.cdt.msw.build/.project b/windows/org.eclipse.cdt.msw.build/.project
deleted file mode 100644
index e97910dcff..0000000000
--- a/windows/org.eclipse.cdt.msw.build/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.msw.build</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/windows/org.eclipse.cdt.msw.build/.settings/org.eclipse.jdt.core.prefs b/windows/org.eclipse.cdt.msw.build/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0f0eb3002b..0000000000
--- a/windows/org.eclipse.cdt.msw.build/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jul 23 15:38:07 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF b/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
deleted file mode 100644
index 492bcb702b..0000000000
--- a/windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: MSVC Build Integration Plug-in
-Bundle-SymbolicName: org.eclipse.cdt.msw.build;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.cdt.msw.build.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.managedbuilder.core
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/windows/org.eclipse.cdt.msw.build/build.properties b/windows/org.eclipse.cdt.msw.build/build.properties
deleted file mode 100644
index 30b2fc40bd..0000000000
--- a/windows/org.eclipse.cdt.msw.build/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- plugin.xml
diff --git a/windows/org.eclipse.cdt.msw.build/plugin.properties b/windows/org.eclipse.cdt.msw.build/plugin.properties
deleted file mode 100644
index 05150db904..0000000000
--- a/windows/org.eclipse.cdt.msw.build/plugin.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-toolchain.name=Microsoft Visual C++
-
-compiler.name=C/C++ Compiler (cl)
-rc.name=Resource Compiler (rc)
-linker.name=Linker (link)
-lib.name=Library Manager (lib)
-
-config.debug=Debug
-config.release=Release \ No newline at end of file
diff --git a/windows/org.eclipse.cdt.msw.build/plugin.xml b/windows/org.eclipse.cdt.msw.build/plugin.xml
deleted file mode 100644
index 982f0a8721..0000000000
--- a/windows/org.eclipse.cdt.msw.build/plugin.xml
+++ /dev/null
@@ -1,658 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
- <managedBuildRevision fileVersion="4.0.0"/>
- <toolChain
- archList="all"
- configurationEnvironmentSupplier="org.eclipse.cdt.msw.build.WinEnvironmentVariableSupplier"
- id="org.eclipse.cdt.msvc.toolchain.base"
- isAbstract="true"
- name="%toolchain.name"
- osList="win32"
- targetTool="org.eclipse.cdt.msvc.link;org.eclipse.cdt.msvc.lib">
- <targetPlatform
- archList="all"
- binaryParser="org.eclipse.cdt.core.PE"
- id="org.eclipse.cdt.msvc.targetPlatform"
- osList="win32">
- </targetPlatform>
- <builder
- id="org.eclipse.cdt.msvc.builder"
- isVariableCaseSensitive="false"
- superClass="org.eclipse.cdt.build.core.internal.builder">
- </builder>
- <tool
- command="cl /c"
- errorParsers="org.eclipse.cdt.core.VCErrorParser"
- id="org.eclipse.cdt.msvc.cl"
- name="%compiler.name"
- natureFilter="both"
- outputFlag="/Fo">
- <supportedProperties>
- <property
- id="org.eclipse.cdt.build.core.buildType">
- <value
- id="org.eclipse.cdt.build.core.buildType.debug">
- </value>
- <value
- id="org.eclipse.cdt.build.core.buildType.release">
- </value>
- </property>
- </supportedProperties>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.optimization"
- name="Optimization"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.optimization"
- id="org.eclipse.cdt.msvc.cl.option.optimization"
- name="Optimization"
- resourceFilter="all"
- valueType="enumerated">
- <enumeratedOptionValue
- id="org.eclipse.cdt.msvc.cl.option.optimization.default"
- isDefault="false"
- name="Default"/>
- <enumeratedOptionValue
- command="/O1"
- id="org.eclipse.cdt.msvc.cl.option.optimization.1"
- isDefault="false"
- name="Minimize Size (/O1)"/>
- <enumeratedOptionValue
- command="/O2"
- id="org.eclipse.cdt.msvc.cl.option.optimization.2"
- isDefault="true"
- name="Maximize Speed (/O2)"/>
- <enablement
- attribute="value"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="org.eclipse.cdt.msvc.cl.option.optimization.2">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildType"
- value="org.eclipse.cdt.build.core.buildType.release">
- </checkBuildProperty>
- </enablement>
- <enablement
- attribute="value"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="org.eclipse.cdt.msvc.cl.option.optimization.default">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildType"
- value="org.eclipse.cdt.build.core.buildType.debug">
- </checkBuildProperty>
- </enablement>
- </option>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- name="Code Generation"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- id="org.eclipse.cdt.msvc.cl.option.arch"
- name="Minimum CPU Architecture"
- resourceFilter="all"
- valueType="enumerated">
- <enumeratedOptionValue
- id="org.eclipse.cdt.msvc.cl.option.arch.default"
- isDefault="true"
- name="Default"/>
- <enumeratedOptionValue
- command="/arch:SSE"
- id="org.eclipse.cdt.msvc.cl.option.arch.sse"
- isDefault="false"
- name="SSE (/arch:SSE)"/>
- <enumeratedOptionValue
- id="org.eclipse.cdt.msvc.cl.option.arch.sse2"
- isDefault="false"
- name="SSE2 (/arch:SSE2)"/>
- </option>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- command="/clr"
- defaultValue="false"
- id="org.eclipse.cdt.msvc.cl.option.clr"
- name="Common Language Runtime (/clr)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- command="/EHs"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.cl.option.exceptions"
- name="Enable C++ Exception Handling (/EHs)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- commandFalse="/GR-"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.cl.option.rtti"
- name="Enable Run-Time Type Information (/GR)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.codegen"
- id="org.eclipse.cdt.msvc.cl.option.runtime"
- name="Run-Time Library"
- resourceFilter="all"
- valueType="enumerated">
- <enumeratedOptionValue
- command="/MT"
- id="org.eclipse.cdt.msvc.cl.option.runtime.mt"
- isDefault="false"
- name="Multi-Threaded Static (/MT)"/>
- <enumeratedOptionValue
- command="/MTd"
- id="org.eclipse.cdt.msvc.cl.option.runtime.mtd"
- isDefault="false"
- name="Multi-Threaded Static Debug (/MTd)"/>
- <enumeratedOptionValue
- command="/MD"
- id="org.eclipse.cdt.msvc.cl.option.runtime.md"
- isDefault="true"
- name="Multi-Threaded DLL (/MD)"/>
- <enumeratedOptionValue
- command="/MDd"
- id="org.eclipse.cdt.msvc.cl.option.runtime.mdd"
- isDefault="false"
- name="Multi-Threaded DLL Debug (/MDd)"/>
- </option>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.debug"
- name="Debugging"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.debug"
- id="org.eclipse.cdt.msvc.cl.option.debugFormat"
- name="Debug Information Format"
- resourceFilter="all"
- valueType="enumerated">
- <enumeratedOptionValue
- id="org.eclipse.cdt.msvc.cl.option.debugFormat.none"
- isDefault="true"
- name="None"/>
- <enumeratedOptionValue
- command="/Z7"
- id="org.eclipse.cdt.msvc.cl.option.debugFormat.c7"
- isDefault="false"
- name="C7 Compatible (/Z7)"/>
- <enumeratedOptionValue
- command="/Zi"
- id="org.eclipse.cdt.msvc.cl.option.debugFormat.complete"
- isDefault="false"
- name="Complete (/Zi)"/>
- <enablement
- attribute="value"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="org.eclipse.cdt.msvc.cl.option.debugFormat.none">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildType"
- value="org.eclipse.cdt.build.core.buildType.release">
- </checkBuildProperty>
- </enablement>
- <enablement
- attribute="value"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="org.eclipse.cdt.msvc.cl.option.debugFormat.complete">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildType"
- value="org.eclipse.cdt.build.core.buildType.debug">
- </checkBuildProperty>
- </enablement>
- </option>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.preprocessor"
- name="Preprocessor"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.preprocessor"
- command="/D"
- id="org.eclipse.cdt.msvc.cl.option.macros"
- name="Defines (/D)"
- resourceFilter="all"
- valueType="definedSymbols"/>
- <option
- browseType="directory"
- category="org.eclipse.cdt.msvc.cl.optionCategory.preprocessor"
- command="/I"
- id="org.eclipse.cdt.msvc.cl.option.includes"
- name="Include Path (/I)"
- resourceFilter="all"
- valueType="includePath"/>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.language"
- name="Language"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.language"
- command="/openmp"
- defaultValue="false"
- id="org.eclipse.cdt.msvc.cl.option.openmp"
- name="Enable OpenMP (/openmp)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.language"
- commandFalse="/Za"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.cl.option.langExtensions"
- name="Enable Language Extensions (/Ze,/Za)"
- resourceFilter="all"
- valueType="boolean"/>
- <optionCategory
- id="org.eclipse.cdt.msvc.cl.optionCategory.miscellaneous"
- name="Miscellaneous"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.miscellaneous"
- command="/nologo"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.cl.option.nologo"
- name="Suppress Banner (/nologo)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.cl.optionCategory.miscellaneous"
- id="org.eclipse.cdt.msvc.cl.option.others"
- name="Other Options"
- resourceFilter="all"
- valueType="stringList"/>
- <inputType
- dependencyContentType="org.eclipse.cdt.core.cxxHeader"
- id="org.eclipse.cdt.msvc.cl.inputType"
- scannerConfigDiscoveryProfileId="org.eclipse.cdt.msw.build.clScannerInfo"
- sourceContentType="org.eclipse.cdt.core.cxxSource">
- </inputType>
- <outputType
- id="org.eclipse.cdt.msvc.cl.outputType"
- outputs="obj">
- </outputType>
- </tool>
- <tool
- command="rc"
- errorParsers="org.eclipse.cdt.core.VCErrorParser"
- id="org.eclipse.cdt.msvc.rc"
- name="%rc.name"
- natureFilter="both"
- outputFlag="/Fo"
- >
- <optionCategory
- id="org.eclipse.cdt.msvc.rc.optionCategory.preprocessor"
- name="Preprocessor"/>
- <option
- browseType="directory"
- category="org.eclipse.cdt.msvc.rc.optionCategory.preprocessor"
- command="/I"
- id="org.eclipse.cdt.msvc.rc.option.includes"
- name="Include Path (/I)"
- resourceFilter="all"
- valueType="includePath"/>
- <option
- category="org.eclipse.cdt.msvc.rc.optionCategory.preprocessor"
- command="/D"
- id="org.eclipse.cdt.msvc.rc.option.defines"
- name="Defines (/D)"
- resourceFilter="all"
- valueType="definedSymbols"/>
- <optionCategory
- id="org.eclipse.cdt.msvc.rc.optionCategory.misc"
- name="Miscellaneous"/>
- <option
- category="org.eclipse.cdt.msvc.rc.optionCategory.misc"
- id="org.eclipse.cdt.msvc.rc.option.others"
- name="Other Options"
- resourceFilter="all"
- valueType="stringList"/>
- <inputType
- id="org.eclipse.cdt.msvc.rc.inputType"
- sources="rc">
- </inputType>
- <outputType
- id="org.eclipse.cdt.msvc.rc.outputType"
- outputs="res">
- </outputType>
- </tool>
- <tool
- command="link"
- errorParsers="org.eclipse.cdt.core.VCErrorParser"
- id="org.eclipse.cdt.msvc.link"
- name="%linker.name"
- natureFilter="both"
- outputFlag="/OUT:"
- >
- <supportedProperties>
- <property
- id="org.eclipse.cdt.build.core.buildArtefactType">
- <value
- id="org.eclipse.cdt.build.core.buildArtefactType.exe"></value>
- <value
- id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib">
- </value>
- </property>
- </supportedProperties>
- <option
- command="/DLL"
- defaultValue="false"
- id="org.eclipse.cdt.msvc.link.option.dll"
- name="Build a DLL"
- resourceFilter="all"
- valueType="boolean">
- <enablement
- attribute="defaultValue"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="true">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildArtefactType"
- value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib">
- </checkBuildProperty>
- </enablement>
- </option>
- <optionCategory
- id="org.eclipse.cdt.msvc.link.optionCategory.general"
- name="General"/>
- <option
- category="org.eclipse.cdt.msvc.link.optionCategory.general"
- command="/debug"
- defaultValue="false"
- id="org.eclipse.cdt.msvc.link.option.debug"
- name="Generate Debug Info (/debug)"
- resourceFilter="all"
- valueType="boolean">
- <enablement
- attribute="value"
- type="CONTAINER_ATTRIBUTE"
- value="true">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildType"
- value="org.eclipse.cdt.build.core.buildType.debug">
- </checkBuildProperty>
- </enablement>
- </option>
- <option
- category="org.eclipse.cdt.msvc.link.optionCategory.general"
- command="/nologo"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.link.option.nologo"
- name="Suppress Banner (/nologo)"
- resourceFilter="all"
- valueType="boolean"/>
- <option
- category="org.eclipse.cdt.msvc.link.optionCategory.general"
- id="org.eclipse.cdt.msvc.link.option.others"
- name="Other Options"
- resourceFilter="all"
- valueType="stringList"/>
- <optionCategory
- id="org.eclipse.cdt.msvc.link.optionCategory.libraries"
- name="Libraries"/>
- <option
- browseType="directory"
- category="org.eclipse.cdt.msvc.link.optionCategory.libraries"
- command="/libpath:"
- id="org.eclipse.cdt.msvc.link.option.libpath"
- name="Additional Libpath (/libpath)"
- resourceFilter="all"
- valueType="stringList"/>
- <option
- browseType="file"
- category="org.eclipse.cdt.msvc.link.optionCategory.libraries"
- id="org.eclipse.cdt.msvc.link.option.libraries"
- name="Libraries"
- resourceFilter="all"
- valueType="libs"/>
- <inputType
- id="org.eclipse.cdt.msvc.link.inputType"
- multipleOfType="true"
- sources="res,obj">
- </inputType>
- <outputType
- id="org.eclipse.cdt.msvc.link.outputType"
- outputs="exe">
- </outputType>
- <outputType
- id="org.eclipse.cdt.msvc.link.outputType.dll"
- outputs="dll">
- </outputType>
- </tool>
- <tool
- command="lib"
- id="org.eclipse.cdt.msvc.lib"
- name="%lib.name"
- natureFilter="both"
- outputFlag="/OUT:"
- >
- <supportedProperties>
- <property
- id="org.eclipse.cdt.build.core.buildArtefactType">
- <value
- id="org.eclipse.cdt.build.core.buildArtefactType.staticLib">
- </value>
- </property>
- </supportedProperties>
- <optionCategory
- id="org.eclipse.cdt.msvc.lib.optionCategory.general"
- name="General"/>
- <option
- category="org.eclipse.cdt.msvc.lib.optionCategory.general"
- command="/nologo"
- defaultValue="true"
- id="org.eclipse.cdt.msvc.lib.option.nologo"
- name="Suppress Banner (/nologo)"
- resourceFilter="all"
- valueType="boolean"/>
- <inputType
- id="org.eclipse.cdt.msvc.lib.inputType"
- sources="obj,res">
- </inputType>
- <outputType
- id="org.eclipse.cdt.msvc.lib.outputType"
- outputs="lib">
- </outputType>
- </tool>
- </toolChain>
- <configuration
- artifactExtension="exe"
- id="org.eclipse.cdt.msvc.configuration">
- <enablement
- attribute="artifactExtension"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="dll">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildArtefactType"
- value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"></checkBuildProperty>
- </enablement>
- <enablement
- attribute="artifactExtension"
- extensionAdjustment="false"
- type="CONTAINER_ATTRIBUTE"
- value="lib">
- <checkBuildProperty
- property="org.eclipse.cdt.build.core.buildArtefactType"
- value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"></checkBuildProperty>
- </enablement>
- </configuration>
- <projectType
- buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe"
- id="org.eclipse.cdt.msvc.projectType.exe"
- projectEnvironmentSupplier="org.eclipse.cdt.msw.build.WinEnvironmentVariableSupplier">
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
- id="org.eclipse.cdt.msvc.exe.debug"
- name="%config.debug"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.exe.debug"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.exe.debug"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.exe.debug"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.exe.debug"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.link.exe.debug"
- superClass="org.eclipse.cdt.msvc.link">
- </tool>
- </toolChain>
- </configuration>
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
- id="org.eclipse.cdt.msvc.exe.release"
- name="%config.release"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.exe.release"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.exe.release"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.exe.release"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.exe.release"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.link.exe.release"
- superClass="org.eclipse.cdt.msvc.link">
- </tool>
- </toolChain>
- </configuration>
- </projectType>
- <projectType
- buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
- id="org.eclipse.cdt.msvc.projectType.dll"
- projectEnvironmentSupplier="org.eclipse.cdt.msw.build.WinEnvironmentVariableSupplier">
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
- id="org.eclipse.cdt.msvc.dll.debug"
- name="%config.debug"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.dll.debug"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.dll.debug"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.dll.debug"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.dll.debug"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.link.dll.debug"
- superClass="org.eclipse.cdt.msvc.link">
- </tool>
- </toolChain>
- </configuration>
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
- id="org.eclipse.cdt.msvc.dll.release"
- name="%config.release"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.dll.release"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.dll.release"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.dll.release"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.dll.release"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.link.dll.release"
- superClass="org.eclipse.cdt.msvc.link">
- </tool>
- </toolChain>
- </configuration>
- </projectType>
- <projectType
- buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib"
- id="org.eclipse.cdt.msvc.projectType.lib"
- projectEnvironmentSupplier="org.eclipse.cdt.msw.build.WinEnvironmentVariableSupplier">
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
- id="org.eclipse.cdt.msvc.lib.debug"
- name="%config.debug"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.lib.debug"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.lib.debug"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.lib.debug"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.lib.debug"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.lib.lib.debug"
- superClass="org.eclipse.cdt.msvc.lib">
- </tool>
- </toolChain>
- </configuration>
- <configuration
- buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
- id="org.eclipse.cdt.msvc.lib.release"
- name="%config.release"
- parent="org.eclipse.cdt.msvc.configuration">
- <toolChain
- id="org.eclipse.cdt.msvc.toolchain.lib.release"
- superClass="org.eclipse.cdt.msvc.toolchain.base">
- <targetPlatform
- id="org.eclipse.cdt.msvc.targetPlatform.lib.release"
- superClass="org.eclipse.cdt.msvc.targetPlatform">
- </targetPlatform>
- <tool
- id="org.eclipse.cdt.msvc.cl.lib.release"
- superClass="org.eclipse.cdt.msvc.cl">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.rc.lib.release"
- superClass="org.eclipse.cdt.msvc.rc">
- </tool>
- <tool
- id="org.eclipse.cdt.msvc.lib.lib.release"
- superClass="org.eclipse.cdt.msvc.lib">
- </tool>
- </toolChain>
- </configuration>
- </projectType>
- </extension>
- <extension
- id="clScannerInfo"
- name="Windows SDK Scanner Info Provider"
- point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
- <scannerInfoCollector
- class="org.eclipse.cdt.msw.build.WinScannerInfoCollector"
- scope="project">
- </scannerInfoCollector>
- </extension>
-
-</plugin>
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java
deleted file mode 100644
index c9e6ca453f..0000000000
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.cdt.msw.build;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "net.sf.wascana.msvc.build";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java
deleted file mode 100644
index baae87bd6a..0000000000
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.cdt.msw.build;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredScannerInfoSerializable;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * @author Doug Schaefer
- *
- */
-public class WinDiscoveredPathInfo implements IDiscoveredPathInfo {
-
- private final IPath[] paths;
- private final Map<String, String> symbols = new HashMap<String, String>();
-
- public WinDiscoveredPathInfo() {
- // Include paths
- String sdkDir = WinEnvironmentVariableSupplier.getSDKDir();
- if (sdkDir != null) {
- String vcDir = WinEnvironmentVariableSupplier.getVCDir();
- paths = new IPath[] {
- new Path(vcDir.concat("Include")),
- new Path(vcDir.concat("Include\\Sys")),
- new Path(sdkDir.concat("Include")),
- new Path(sdkDir.concat("Include\\gl"))
- };
- } else
- paths = new IPath[0];
-
- symbols.put("_M_IX86", "600");
- symbols.put("_WIN32", "1");
- symbols.put("_MSC_VER", "1400");
- }
-
- public IPath[] getIncludePaths() {
- return paths;
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IDiscoveredScannerInfoSerializable getSerializable() {
- return null;
- }
-
- public Map<String, String> getSymbols() {
- return symbols;
- }
-
-}
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
deleted file mode 100644
index e759581b15..0000000000
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.cdt.msw.build;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
-import org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier;
-import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider;
-import org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier;
-import org.eclipse.cdt.utils.WindowsRegistry;
-
-/**
- * @author DSchaefer
- *
- */
-public class WinEnvironmentVariableSupplier
- implements IConfigurationEnvironmentVariableSupplier, IProjectEnvironmentVariableSupplier {
-
- private Map<String, IBuildEnvironmentVariable> envvars;
-
- private static class WindowsBuildEnvironmentVariable implements IBuildEnvironmentVariable {
-
- private final String name;
- private final String value;
- private final int operation;
-
- public WindowsBuildEnvironmentVariable(String name, String value, int operation) {
- this.name = name;
- this.value = value;
- this.operation = operation;
- }
-
- public String getDelimiter() {
- return ";";
- }
-
- public String getName() {
- return name;
- }
-
- public String getValue() {
- return value;
- }
-
- public int getOperation() {
- return operation;
- }
-
- }
-
- public IBuildEnvironmentVariable getVariable(String variableName,
- IManagedProject project, IEnvironmentVariableProvider provider) {
- if (envvars == null)
- initvars();
- return envvars.get(variableName);
- }
-
- public IBuildEnvironmentVariable getVariable(String variableName,
- IConfiguration configuration, IEnvironmentVariableProvider provider) {
- if (envvars == null)
- initvars();
- return envvars.get(variableName);
- }
-
- public IBuildEnvironmentVariable[] getVariables(IManagedProject project,
- IEnvironmentVariableProvider provider) {
- if (envvars == null)
- initvars();
- return envvars.values().toArray(new IBuildEnvironmentVariable[envvars.size()]);
- }
-
- public IBuildEnvironmentVariable[] getVariables(
- IConfiguration configuration, IEnvironmentVariableProvider provider) {
- if (envvars == null)
- initvars();
- return envvars.values().toArray(new IBuildEnvironmentVariable[envvars.size()]);
- }
-
- private void addvar(IBuildEnvironmentVariable var) {
- envvars.put(var.getName(), var);
- }
-
- public static String getSDKDir() {
- WindowsRegistry reg = WindowsRegistry.getRegistry();
-
- String[] keys = {
- "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.1",
- "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0A",
- "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0",
- };
-
- for (int i = 0; i < keys.length; ++i) {
- String sdkDir = reg.getLocalMachineValue(keys[i], "InstallationFolder");
- if (sdkDir != null)
- return sdkDir;
- }
-
- return null;
- }
-
- public static String getVCDir() {
- WindowsRegistry reg = WindowsRegistry.getRegistry();
-
- String vcDir = reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VC7", "9.0");
- if (vcDir != null)
- return vcDir;
-
- // Try full SDK with compiler
- String sdkDir = getSDKDir();
- if (sdkDir != null)
- return sdkDir.concat("VC\\");
-
- return null;
- }
-
- public static String getVSDir() {
- WindowsRegistry reg = WindowsRegistry.getRegistry();
- return reg.getLocalMachineValue("SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7", "9.0");
- }
-
- private void initvars() {
- envvars = new HashMap<String, IBuildEnvironmentVariable>();
-
- // The SDK Location
- String sdkDir = getSDKDir();
- if (sdkDir == null)
- return;
-
- String vcDir = getVCDir();
-
- // INCLUDE
- StringBuffer buff = new StringBuffer();
- buff.append(vcDir).append("Include;");
- buff.append(vcDir).append("Include\\Sys;");
- buff.append(sdkDir).append("Include;");
- buff.append(sdkDir).append("Include\\gl;");
- addvar(new WindowsBuildEnvironmentVariable("INCLUDE", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
-
- // LIB
- buff = new StringBuffer();
- buff.append(vcDir).append("Lib;");
- buff.append(sdkDir).append("Lib;");
- addvar(new WindowsBuildEnvironmentVariable("LIB", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
-
- // PATH
- buff = new StringBuffer();
-
- String vsDir = getVSDir();
- if (vsDir != null)
- buff.append(vsDir).append("Common7\\IDE;");
-
- buff.append(vcDir).append("Bin;");
- buff.append(sdkDir).append("Bin;");
- addvar(new WindowsBuildEnvironmentVariable("PATH", buff.toString(), IBuildEnvironmentVariable.ENVVAR_PREPEND));
- }
-
-}
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java
deleted file mode 100644
index e955c51202..0000000000
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.cdt.msw.build;
-
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector3;
-import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
-import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * @author Doug Schaefer
- *
- */
-public class WinScannerInfoCollector implements IScannerInfoCollector3 {
-
- public void contributeToScannerConfig(Object resource, Map scannerInfo) {
- }
-
- public List getCollectedScannerInfo(Object resource, ScannerInfoTypes type) {
- return null;
- }
-
- public IDiscoveredPathInfo createPathInfoObject() {
- return new WinDiscoveredPathInfo();
- }
-
- public void setInfoContext(InfoContext context) {
- }
-
- public void setProject(IProject project) {
- }
-
- public void updateScannerConfiguration(IProgressMonitor monitor) throws CoreException {
- }
-
-}

Back to the top