diff options
| author | Thomas Watson | 2014-01-27 15:34:51 +0000 |
|---|---|---|
| committer | Thomas Watson | 2014-01-27 15:34:51 +0000 |
| commit | 3a7f17d65ba4a870db4de35868c7fa92acaa75db (patch) | |
| tree | 5087d60fa6238a7e291bc2b07e5b695b5b66bb4a | |
| parent | 03ad9b1cfc586b4350185115e94742f78e33d1fe (diff) | |
| download | rt.equinox.bundles-3a7f17d65ba4a870db4de35868c7fa92acaa75db.tar.gz rt.equinox.bundles-3a7f17d65ba4a870db4de35868c7fa92acaa75db.tar.xz rt.equinox.bundles-3a7f17d65ba4a870db4de35868c7fa92acaa75db.zip | |
Bug 420725 - Inconsistencies in how executable binaries are copied to rootsI20140128-0800
12 files changed, 0 insertions, 392 deletions
diff --git a/features/org.eclipse.equinox.starterkit.product.feature/.project b/features/org.eclipse.equinox.starterkit.product.feature/.project deleted file mode 100644 index ec889860a..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.equinox.starterkit.product.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/features/org.eclipse.equinox.starterkit.product.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.equinox.starterkit.product.feature/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -line.separator=\n diff --git a/features/org.eclipse.equinox.starterkit.product.feature/build.properties b/features/org.eclipse.equinox.starterkit.product.feature/build.properties deleted file mode 100644 index 1b27871aa..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/build.properties +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################### -# Copyright (c) 2011 IBM Corporation 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: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes = feature.xml,\ - feature.properties -root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe -root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe diff --git a/features/org.eclipse.equinox.starterkit.product.feature/feature.properties b/features/org.eclipse.equinox.starterkit.product.feature/feature.properties deleted file mode 100644 index 99f5c0607..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/feature.properties +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################### -# Copyright (c) 2010, 2011 EclipseSource 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: -# EclipseSource - initial API and implementation -############################################################################### -# feature.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=Equinox OSGi Starter Kit Configuration - -# "providerName" property - name of the company that provides the feature -providerName=Eclipse Equinox Project - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2010 EclipseSource 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\n\ -\n\ -Contributors:\n\ - EclipseSource - initial API and implementation\n -################ end of copyright property ####################################
\ No newline at end of file diff --git a/features/org.eclipse.equinox.starterkit.product.feature/feature.xml b/features/org.eclipse.equinox.starterkit.product.feature/feature.xml deleted file mode 100644 index 017b7ee2f..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/feature.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.equinox.starterkit.product.feature" - label="%featureName" - version="1.2.0.qualifier" - provider-name="%providerName" - license-feature="org.eclipse.license" - license-feature-version="1.0.0.qualifier"> - - <description url="http://www.example.com/description"> - [Enter Feature Description here.] - </description> - - <copyright url="http://www.example.com/copyright"> - [Enter Copyright Description here.] - </copyright> - - <license url="http://www.example.com/license"> - [Enter License Description here.] - </license> - - <includes - id="org.eclipse.equinox.p2.core.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.equinox.core.feature" - version="0.0.0"/> - -</feature> diff --git a/features/org.eclipse.equinox.starterkit.product.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.starterkit.product.feature/forceQualifierUpdate.txt deleted file mode 100644 index 56f1032a8..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/forceQualifierUpdate.txt +++ /dev/null @@ -1,2 +0,0 @@ -# To force a version qualifier update add the bug here -Bug 403352 - Update all parent versions to match our build stream diff --git a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml b/features/org.eclipse.equinox.starterkit.product.feature/pom.xml deleted file mode 100644 index 85d3dc464..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (c) 2012 Eclipse Foundation. - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Distribution License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/org/documents/edl-v10.php - - Contributors: - Igor Fedorenko - initial implementation ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>rt.equinox.bundles</artifactId> - <groupId>org.eclipse.equinox.bundles</groupId> - <version>4.4.0-SNAPSHOT</version> - <relativePath>../../</relativePath> - </parent> - <groupId>org.eclipse.equinox.feature</groupId> - <artifactId>org.eclipse.equinox.starterkit.product.feature</artifactId> - <version>1.2.0-SNAPSHOT</version> - <packaging>eclipse-feature</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <configuration> - <resolver>p2</resolver> - <environments> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86_64</arch> - </environment> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86_64</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86_64</arch> - </environment> - </environments> - </configuration> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-resources-win32.win32.x86</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <overwrite>true</overwrite> - <outputDirectory>${basedir}/executables/win32.win32.x86</outputDirectory> - <resources> - <resource> - <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86</directory> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-resources-win32.win32.x86_64</id> - <phase>validate</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <overwrite>true</overwrite> - <outputDirectory>${basedir}/executables/win32.win32.x86_64</outputDirectory> - <resources> - <resource> - <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/features/org.eclipse.equinox.starterkit.product.feature/product/EclipseRTOSGiStarterKit.product b/features/org.eclipse.equinox.starterkit.product.feature/product/EclipseRTOSGiStarterKit.product deleted file mode 100644 index 90d2add58..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/product/EclipseRTOSGiStarterKit.product +++ /dev/null @@ -1,174 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?pde version="3.5"?> - -<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="1.0.0.@qualifier@" useFeatures="true" includeLaunchers="true"> - - <configIni use="default"> - </configIni> - - <launcherArgs> - <programArgs>-console -nosplash -consolelog -noexit</programArgs> - <vmArgs>-Declipse.ignoreApp=true</vmArgs> - <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> - </launcherArgs> - - <windowImages/> - - <launcher name="rt"> - <macosx icon="/org.eclipse.equinox.starterkit.product.feature/rt.icns"/> - <solaris/> - <win useIco="true"> - <ico path="/org.eclipse.equinox.starterkit.product.feature/rt.ico"/> - <bmp/> - </win> - </launcher> - - <vm> - </vm> - - <license> - <url>http://eclipse.org/legal/epl/notice.php</url> - <text> - Eclipse Foundation Software User Agreement -April 14, 2010 - -Usage Of Content - -THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). -USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS -AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR -NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU -AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT -AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS -OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE -TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED -BELOW, THEN YOU MAY NOT USE THE CONTENT. - -Applicable Licenses - -Unless otherwise indicated, all Content made available by the -Eclipse Foundation is provided to you under the terms and conditions of -the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is -provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content. - -Content includes, but is not limited to, source code, object code, -documentation and other files maintained in the Eclipse Foundation source code -repository ("Repository") in software modules ("Modules") and made available -as downloadable archives ("Downloads"). - - - Content may be structured and packaged into modules to facilitate delivering, - extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), - plug-in fragments ("Fragments"), and features ("Features"). - - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive) - in a directory named "plugins". - - 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 "features". - Within a Feature, files named "feature.xml" may contain a list of the names and version - numbers of the Plug-ins and/or Fragments associated with that Feature. - - Features may also include other Features ("Included Features"). Within a Feature, files - named "feature.xml" may contain a list of the names and version numbers of Included Features. - -The terms and conditions governing Plug-ins and Fragments should be -contained in files named "about.html" ("Abouts"). The terms and -conditions governing Features and Included Features should be contained -in files named "license.html" ("Feature Licenses"). Abouts and Feature -Licenses may be located in any directory of a Download or Module -including, but not limited to the following locations: - - - The top-level (root) directory - - Plug-in and Fragment directories - - Inside Plug-ins and Fragments packaged as JARs - - Sub-directories of the directory named "src" of certain Plug-ins - - Feature directories - -Note: if a Feature made available by the Eclipse Foundation is installed using the -Provisioning Technology (as defined below), you must agree to a license ("Feature -Update License") during the installation process. If the Feature contains -Included Features, the Feature Update License should either provide you -with the terms and conditions governing the Included Features or inform -you where you can locate them. Feature Update Licenses may be found in -the "license" property of files named "feature.properties" found within a Feature. -Such Abouts, Feature Licenses, and Feature Update Licenses contain the -terms and conditions (or references to such terms and conditions) that -govern your use of the associated Content in that directory. - -THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER -TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. -SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO): - - - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html) - - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE) - - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0) - - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html) - - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html) - -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. - -Use of Provisioning Technology - -The Eclipse Foundation makes available provisioning software, examples of which include, -but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for -the purpose of allowing users to install software, documentation, information and/or -other materials (collectively "Installable Software"). This capability is provided with -the intent of allowing such users to install, extend and update Eclipse-based products. -Information about packaging Installable Software is available at -http://eclipse.org/equinox/p2/repository_packaging.html ("Specification"). - -You may use Provisioning Technology to allow other parties to install Installable Software. -You shall be responsible for enabling the applicable license agreements relating to the -Installable Software to be presented to, and accepted by, the users of the Provisioning Technology -in accordance with the Specification. By using Provisioning Technology in such a manner and -making it available in accordance with the Specification, you further acknowledge your -agreement to, and the acquisition of all necessary rights to permit the following: - - 1. A series of actions may occur ("Provisioning Process") in which a user may execute - the Provisioning Technology on a machine ("Target Machine") with the intent of installing, - extending or updating the functionality of an Eclipse-based product. - 2. During the Provisioning Process, the Provisioning Technology may cause third party - Installable Software or a portion thereof to be accessed and copied to the Target Machine. - 3. Pursuant to the Specification, you will provide to the user the terms and conditions that - govern the use of the Installable Software ("Installable Software Agreement") and such - Installable Software Agreement shall be accessed from the Target Machine in accordance - with the Specification. Such Installable Software Agreement must inform the user of the - terms and conditions that govern the Installable Software and must solicit acceptance by - the end user in the manner prescribed in such Installable Software Agreement. Upon such - indication of agreement by the user, the provisioning Technology will complete installation - of the Installable Software. - -Cryptography - -Content may contain encryption software. The country in which you are -currently may have restrictions on the import, possession, and use, -and/or re-export to another country, of encryption software. BEFORE -using any encryption software, please check the country's laws, -regulations and policies concerning the import, possession, or use, and -re-export of encryption software, to see if this is permitted. - -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both. - </text> - </license> - - <plugins> - </plugins> - - <features> - <feature id="org.eclipse.equinox.starterkit.product.feature"/> - <feature id="org.eclipse.osgi.configuration"/> - </features> - - <configurations> - <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> - <plugin id="org.eclipse.equinox.frameworkadmin.equinox" autoStart="true" startLevel="3" /> - <plugin id="org.eclipse.equinox.p2.console" autoStart="true" startLevel="3" /> - <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator" autoStart="true" startLevel="3" /> - <property name="eclipse.ignoreApp" value="true" /> - <property name="osgi.noShutdown" value="true" /> - </configurations> - -</product> diff --git a/features/org.eclipse.equinox.starterkit.product.feature/product/p2.inf b/features/org.eclipse.equinox.starterkit.product.feature/product/p2.inf deleted file mode 100644 index 8818fac68..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/product/p2.inf +++ /dev/null @@ -1,17 +0,0 @@ -instructions.configure= -requires.1.namespace=org.eclipse.equinox.p2.iu -requires.1.name=toolingorg.eclipse.rt.osgistarterkit.macosx -requires.1.filter=(osgi.os=macosx) -requires.1.range=[1.0.0,1.0.0] -requires.1.greedy=true - -units.1.id=toolingorg.eclipse.rt.osgistarterkit.macosx -units.1.version=1.0.0 -units.1.provides.1.namespace=org.eclipse.equinox.p2.iu -units.1.provides.1.name=toolingorg.eclipse.rt.osgistarterkit.macosx -units.1.provides.1.version=1.0.0 -units.1.filter=(osgi.os=macosx) -units.1.touchpoint.id=org.eclipse.equinox.p2.osgi -units.1.touchpoint.version=1.0.0 -units.1.instructions.configure=ln(linkTarget:rt.app/Contents/MacOS/rt,targetDir:${installFolder},linkName:rt); - diff --git a/features/org.eclipse.equinox.starterkit.product.feature/rt.icns b/features/org.eclipse.equinox.starterkit.product.feature/rt.icns Binary files differdeleted file mode 100644 index f7c492d99..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/rt.icns +++ /dev/null diff --git a/features/org.eclipse.equinox.starterkit.product.feature/rt.ico b/features/org.eclipse.equinox.starterkit.product.feature/rt.ico Binary files differdeleted file mode 100644 index 8ac493786..000000000 --- a/features/org.eclipse.equinox.starterkit.product.feature/rt.ico +++ /dev/null @@ -56,7 +56,6 @@ <module>features/org.eclipse.equinox.server.simple</module> <module>features/org.eclipse.equinox.serverside.sdk</module> - <module>features/org.eclipse.equinox.starterkit.product.feature</module> <module>features/org.eclipse.equinox.weaving.sdk</module> <module>bundles/org.eclipse.equinox.bidi.tests</module> <module>bundles/org.eclipse.equinox.cm.test</module> |