1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-26 10:25:32 +02:00

Bug 315124 - [terminal][local][releng] Local Terminal does not work if installed stand-alone without Terminal View

This commit is contained in:
Martin Oberhuber 2010-06-03 07:22:21 +00:00
parent b2b7fa9008
commit d35676718f
10 changed files with 29 additions and 17 deletions

View file

@ -49,7 +49,7 @@
</ant> </ant>
<ant antfile="${genericTargets}" target="${target}"> <ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" /> <property name="type" value="feature" />
<property name="id" value="org.eclipse.tm.terminal.local" /> <property name="id" value="org.eclipse.tm.terminal.local.sdk" />
</ant> </ant>
</target> </target>
@ -111,7 +111,7 @@
<antcall target="unpackUpdateJarsForPackaging" /> <antcall target="unpackUpdateJarsForPackaging" />
</target> </target>
<target name="assemble.org.eclipse.tm.terminal.local"> <target name="assemble.org.eclipse.tm.terminal.local.sdk">
<property name="archiveName" value="TM-terminal-local-incubation-${buildId}.zip"/> <property name="archiveName" value="TM-terminal-local-incubation-${buildId}.zip"/>
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
<antcall target="unpackUpdateJarsForPackaging" /> <antcall target="unpackUpdateJarsForPackaging" />

View file

@ -1,5 +1,6 @@
feature@org.eclipse.tm.terminal=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature feature@org.eclipse.tm.terminal=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
feature@org.eclipse.tm.terminal.local=v201005290650,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature feature@org.eclipse.tm.terminal.local=v201005290650,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature
feature@org.eclipse.tm.terminal.local.sdk=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local.sdk-feature
feature@org.eclipse.tm.terminal.sdk=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature feature@org.eclipse.tm.terminal.sdk=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature

View file

@ -42,7 +42,7 @@
version="0.0.0"/> version="0.0.0"/>
<includes <includes
id="org.eclipse.tm.terminal.local" id="org.eclipse.tm.terminal.local.sdk"
version="0.0.0"/> version="0.0.0"/>
<includes <includes

View file

@ -154,6 +154,9 @@
<include name="**/org.eclipse.tm.terminal.local*" /> <include name="**/org.eclipse.tm.terminal.local*" />
<include name="**/org.eclipse.tm.terminal.local*/**" /> <include name="**/org.eclipse.tm.terminal.local*/**" />
<include name="**/org.eclipse.tm.terminal.local*/**/**" /> <include name="**/org.eclipse.tm.terminal.local*/**/**" />
<include name="**/org.eclipse.tm.terminal.view_*" />
<include name="**/org.eclipse.tm.terminal.view_*/**" />
<include name="**/org.eclipse.tm.terminal.view_*/**/**" />
</zipfileset> </zipfileset>
</zip> </zip>

View file

@ -1,5 +1,6 @@
feature@org.eclipse.tm.terminal=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature feature@org.eclipse.tm.terminal=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
feature@org.eclipse.tm.terminal.local=v201005290650,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature feature@org.eclipse.tm.terminal.local=v201005290650,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature
feature@org.eclipse.tm.terminal.local.sdk=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local.sdk-feature
feature@org.eclipse.tm.terminal.sdk=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature feature@org.eclipse.tm.terminal.sdk=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature

View file

@ -15,4 +15,3 @@ bin.includes = feature.xml,\
epl-v10.html,\ epl-v10.html,\
license.html,\ license.html,\
eclipse_update_120.jpg eclipse_update_120.jpg
generate.plugin@org.eclipse.tm.terminal.local.source=org.eclipse.tm.terminal.local

View file

@ -26,7 +26,7 @@ tmUpdateSiteName=Target Management 3.2 Updates
# "description" property - description of the feature # "description" property - description of the feature
description=A terminal emulation for local shells and external tools.\n\ description=A terminal emulation for local shells and external tools.\n\
Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac. Includes Source. Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac.
# "copyright" property - text of the "Feature Update Copyright" # "copyright" property - text of the "Feature Update Copyright"
copyright=\ copyright=\

View file

@ -34,16 +34,14 @@
<discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/> <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
</url> </url>
<includes
id="org.eclipse.tm.terminal"
version="0.0.0"/>
<requires> <requires>
<import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/> <import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.debug.core"/> <import plugin="org.eclipse.debug.core"/>
<import plugin="org.eclipse.debug.ui"/> <import plugin="org.eclipse.debug.ui"/>
<import plugin="org.eclipse.jface"/> <import plugin="org.eclipse.jface"/>
<import plugin="org.eclipse.tm.terminal" version="3.0.0" match="equivalent"/>
<import plugin="org.eclipse.tm.terminal.view" version="2.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.ui.externaltools"/> <import plugin="org.eclipse.ui.externaltools"/>
</requires> </requires>
@ -55,11 +53,4 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.eclipse.tm.terminal.local.source"
download-size="25"
install-size="43"
version="0.0.0"
unpack="false"/>
</feature> </feature>

View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.tm.terminal.local.sdk-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>

View file

@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Activator: org.eclipse.tm.internal.terminal.local.LocalTerminalActivator Bundle-Activator: org.eclipse.tm.internal.terminal.local.LocalTerminalActivator
Bundle-Localization: plugin Bundle-Localization: plugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.tm.terminal;bundle-version="2.0.0", Require-Bundle: org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)",
org.eclipse.cdt.core;bundle-version="5.2.0", org.eclipse.cdt.core;bundle-version="5.2.0",
org.eclipse.core.runtime, org.eclipse.core.runtime,
org.eclipse.debug.core, org.eclipse.debug.core,