diff options
Diffstat (limited to 'eclipse.platform.releng.tychoeclipsebuilder')
12 files changed, 116 insertions, 117 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product index 9fa2fa552..d6f71a67a 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="eclipse-junit-tests" uid="eclipse-junit-tests" version="4.7.1.qualifier" useFeatures="true" includeLaunchers="false"> +<product name="eclipse-junit-tests" uid="eclipse-junit-tests" version="4.7.2.qualifier" useFeatures="true" includeLaunchers="false"> <license> <url>http://eclipse.org/legal/epl/notice.php</url> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties index 7a2a17459..4238acbc5 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties @@ -7,12 +7,12 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\\\ec org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.7.1-linux-gtk.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.7.1-linux-gtk-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.7.1-win32.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.7.1-win32-x86_64.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.7.1-macosx-cocoa-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.7.1a-linux-gtk.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.7.1a-win32.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.7.1a-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.7.1a-macosx-cocoa-x86_64.tar.gz org.eclipse.equinox.p2.tests.current.build.repo=http\://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId} -org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.7/R-4.7.1-201709061700 +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.7/R-4.7.1a-201710090410 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties index f15f4410b..3f42e5b3c 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties @@ -5,4 +5,4 @@ buildId=${buildId} # such as "4.5" instead of "4.5.0". eclipseStream=${releaseNumberSDK} # similar for previous release version -previousReleaseVersion=4.7.1 +previousReleaseVersion=4.7.1a diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh index d08f6219e..dfc2ac672 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh @@ -7,8 +7,8 @@ mkdir -p workarea/${buildId}/eclipse-testing -#cp /home/files/buildzips/oxygen/R/R-4.7.1-201709061700/eclipse-SDK-4.7.1-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ -cp /home/files/buildzips/oxygen/R/R-4.7.1-201709061700/eclipse-platform-4.7.1-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ +#cp /home/files/buildzips/oxygen/R/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/oxygen/R/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh index 6d60612c2..bfed54dd4 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh @@ -58,7 +58,7 @@ then exit 1 else echo "stableEclipseInstallation directory found, as expected, at ${stableEclipseInstallLocation}" - # should only be one tar file there, with a name similar to eclipse-platform-4.7.1-linux-gtk-x86_64.tar.gz + # should only be one tar file there, with a name similar to eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz # so for simplicity, we'll assume all is well and untar what ever we find. tar -xf ${stableEclipseInstallLocation}/*tar.gz -C ${stableEclipseInstallLocation} fi diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product index 8ece13bc2..15b1f7ef6 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product uid="org.eclipse.equinox.sdk.product" useFeatures="true" includeLaunchers="false" version="4.7.1.qualifier"> +<product uid="org.eclipse.equinox.sdk.product" useFeatures="true" includeLaunchers="false" version="4.7.2.qualifier"> <license> <url>http://eclipse.org/legal/epl/notice.php</url> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product index 1889d58df..074e9a4ae 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="4.7.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="4.7.2.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> + <programArgs>-console -nosplash -consolelog -noexit + </programArgs> + <vmArgs>-Declipse.ignoreApp=true + </vmArgs> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + </vmArgsMac> </launcherArgs> <windowImages/> @@ -29,13 +32,13 @@ <license> <url>http://eclipse.org/legal/epl/notice.php</url> <text> -Eclipse Foundation Software User Agreement + Eclipse Foundation Software User Agreement April 9, 2014 Usage Of Content THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). +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 @@ -50,47 +53,47 @@ 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 +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. +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"). +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"). + 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". + 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 + 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. + - 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 +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 +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 + - 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 +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. +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. @@ -113,12 +116,12 @@ 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 +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 +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"). +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 @@ -127,13 +130,13 @@ in accordance with the Specification. By using Provisioning Technology in such a 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, + 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 + 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 @@ -146,7 +149,7 @@ 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, +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. @@ -158,8 +161,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U </plugins> <features> - <feature id="org.eclipse.equinox.p2.core.feature" /> - <feature id="org.eclipse.equinox.core.feature" /> + <feature id="org.eclipse.equinox.p2.core.feature"/> + <feature id="org.eclipse.equinox.core.feature"/> </features> <configurations> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product index c0b2a8cef..11ffc1655 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.sdk" application="org.eclipse.ui.ide.workbench" version="4.7.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.sdk" application="org.eclipse.ui.ide.workbench" version="4.7.2.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product index ba1b6e602..840f61d21 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.7.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.7.2.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product index c7888378e..dfc9c933b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product @@ -1,15 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="4.7.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="4.7.2.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> <launcherArgs> - <programArgs> --launcher.appendVmargs</programArgs> - <vmArgs>-Xms40m -Xmx384m</vmArgs> - <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> + <programArgs>--launcher.appendVmargs + </programArgs> + <vmArgs>-Xms40m -Xmx384m + </vmArgs> + <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + </vmArgsMac> </launcherArgs> <windowImages/> @@ -17,11 +20,6 @@ <launcher name="eclipse"> <linux icon="icons/icon.xpm"/> <macosx icon="icons/Eclipse.icns"/> - <solaris - solarisLarge="icons/solaris/Eclipse.l.pm" - solarisMedium="icons/solaris/Eclipse.m.pm" - solarisSmall="icons/solaris/Eclipse.s.pm" - solarisTiny="icons/solaris/Eclipse.t.pm"/> <win useIco="true"> <ico path="icons/eclipse.ico"/> <bmp/> @@ -34,13 +32,13 @@ <license> <url>http://eclipse.org/legal/epl/notice.php</url> <text> -Eclipse Foundation Software User Agreement + Eclipse Foundation Software User Agreement April 9, 2014 Usage Of Content THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). +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 @@ -55,47 +53,47 @@ 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 +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. +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"). +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"). + 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". + 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 + 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. + - 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 +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 +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 + - 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 +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. +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. @@ -119,12 +117,12 @@ 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 +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 +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"). +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 @@ -133,13 +131,13 @@ in accordance with the Specification. By using Provisioning Technology in such a 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, + 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 + 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 @@ -152,7 +150,7 @@ 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, +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. diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product index ae116feed..249b0d3a6 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product @@ -1,25 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="4.7.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Eclipse RCP" uid="org.eclipse.rcp.id" version="4.7.2.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> <launcherArgs> - <programArgs> --launcher.appendVmargs</programArgs> - <vmArgs>-Xms40m -Xmx384m</vmArgs> - <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> + <programArgs>--launcher.appendVmargs + </programArgs> + <vmArgs>-Xms40m -Xmx384m + </vmArgs> + <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + </vmArgsMac> </launcherArgs> <launcher name="eclipse"> <linux icon="icons/icon.xpm"/> <macosx icon="icons/Eclipse.icns"/> - <solaris - solarisLarge="icons/solaris/Eclipse.l.pm" - solarisMedium="icons/solaris/Eclipse.m.pm" - solarisSmall="icons/solaris/Eclipse.s.pm" - solarisTiny="icons/solaris/Eclipse.t.pm"/> <win useIco="true"> <ico path="icons/eclipse.ico"/> <bmp/> @@ -32,13 +30,13 @@ <license> <url>http://eclipse.org/legal/epl/notice.php</url> <text> -Eclipse Foundation Software User Agreement + Eclipse Foundation Software User Agreement April 9, 2014 Usage Of Content THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR -OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). +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 @@ -53,47 +51,47 @@ 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 +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. +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"). +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"). + 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". + 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 + 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. + - 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 +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 +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 + - 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 +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. +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. @@ -116,12 +114,12 @@ 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 +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 +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"). +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 @@ -130,13 +128,13 @@ in accordance with the Specification. By using Provisioning Technology in such a 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, + 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 + 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 @@ -149,7 +147,7 @@ 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, +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. diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product index 2556d4e52..db574de08 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product +++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.7.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.7.2.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> |