Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--features/org.eclipse.tm.tcf.feature/feature.xml16
-rw-r--r--features/org.eclipse.tm.tcf.site/site.xml2
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/agent/GNU/Linux/i386/tcf-agent-0.0.1-1.fc3.i386.rpmbin0 -> 108202 bytes
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/agent/GNU/Linux/i386/tcf-agent-0.0.1-1.fc5.i386.rpmbin127968 -> 131806 bytes
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLogPage.java22
-rw-r--r--plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--plugins/org.eclipse.tm.tcf/build.properties1
-rw-r--r--plugins/org.eclipse.tm.tcf/tcf.jarbin0 -> 378097 bytes
8 files changed, 27 insertions, 17 deletions
diff --git a/features/org.eclipse.tm.tcf.feature/feature.xml b/features/org.eclipse.tm.tcf.feature/feature.xml
index 9f4fc49b4..0152061aa 100644
--- a/features/org.eclipse.tm.tcf.feature/feature.xml
+++ b/features/org.eclipse.tm.tcf.feature/feature.xml
@@ -38,32 +38,32 @@
</requires>
<plugin
- id="org.eclipse.tm.tcf"
+ id="org.eclipse.tm.tcf.core"
download-size="0"
install-size="0"
- version="0.2.0.qualifier"
+ version="0.0.0"
+ fragment="true"
unpack="false"/>
<plugin
- id="org.eclipse.tm.tcf.debug"
+ id="org.eclipse.tm.tcf"
download-size="0"
install-size="0"
- version="0.2.0.qualifier"
+ version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.tcf.debug.ui"
+ id="org.eclipse.tm.tcf.debug"
download-size="0"
install-size="0"
- version="0.2.0.qualifier"
+ version="0.0.0"
unpack="false"/>
<plugin
- id="org.eclipse.tm.tcf.core"
+ id="org.eclipse.tm.tcf.debug.ui"
download-size="0"
install-size="0"
version="0.0.0"
- fragment="true"
unpack="false"/>
</feature>
diff --git a/features/org.eclipse.tm.tcf.site/site.xml b/features/org.eclipse.tm.tcf.site/site.xml
index 3d32833e3..1dd553866 100644
--- a/features/org.eclipse.tm.tcf.site/site.xml
+++ b/features/org.eclipse.tm.tcf.site/site.xml
@@ -3,7 +3,7 @@
<description url="http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/releases/0.2.0">
TCF update site
</description>
- <feature url="features/org.eclipse.tm.tcf.feature_0.2.0.200904201641.jar" id="org.eclipse.tm.tcf.feature" version="0.2.0.200904201641">
+ <feature url="features/org.eclipse.tm.tcf.feature_0.2.0.200905041337.jar" id="org.eclipse.tm.tcf.feature" version="0.2.0.200905041337">
<category name="org.eclipse.tm"/>
</feature>
<category-def name="org.eclipse.tm" label="Remote Access and Device Development"/>
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/agent/GNU/Linux/i386/tcf-agent-0.0.1-1.fc3.i386.rpm b/plugins/org.eclipse.tm.tcf.debug.ui/agent/GNU/Linux/i386/tcf-agent-0.0.1-1.fc3.i386.rpm
new file mode 100644
index 000000000..cddac14f1
--- /dev/null
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/agent/GNU/Linux/i386/tcf-agent-0.0.1-1.fc3.i386.rpm
Binary files differ
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/agent/GNU/Linux/i386/tcf-agent-0.0.1-1.fc5.i386.rpm b/plugins/org.eclipse.tm.tcf.debug.ui/agent/GNU/Linux/i386/tcf-agent-0.0.1-1.fc5.i386.rpm
index ecb6ca515..46b45b9f0 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/agent/GNU/Linux/i386/tcf-agent-0.0.1-1.fc5.i386.rpm
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/agent/GNU/Linux/i386/tcf-agent-0.0.1-1.fc5.i386.rpm
Binary files differ
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLogPage.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLogPage.java
index ef9dacee2..52d6fa26f 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLogPage.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/launch/setup/WizardLogPage.java
@@ -127,17 +127,17 @@ class WizardLogPage extends WizardPage implements Runnable {
s = waitPrompt();
if (s.length() > 0) throw new Exception(s);
send("uname -o", true);
- String os = waitPrompt();
- while (os.endsWith("\n")) os = os.substring(0, os.length() - 1);
+ String os = waitPrompt().replace('\n', ' ').trim();
send("uname -m", true);
- String machine = waitPrompt();
- while (machine.endsWith("\n")) machine = machine.substring(0, machine.length() - 1);
+ String machine = waitPrompt().replace('\n', ' ').trim();
String version = "0.0.1";
- String release = "1.fc5";
+ send("rpm -q --queryformat='%{VERSION}\\n' fedora-release 2>/dev/null ", true);
+ String release = "1.fc" + waitPrompt().replace('\n', ' ').trim();
URL url = null;
String fnm = null;
Bundle bundle = Platform.getBundle(Activator.PLUGIN_ID);
+ String machine0 = machine;
for (;;) {
fnm = "tcf-agent-" + version + "-" + release + "." + machine + ".rpm";
url = FileLocator.find(bundle, new Path("agent/" + os + "/" + machine + "/" + fnm), null);
@@ -145,7 +145,17 @@ class WizardLogPage extends WizardPage implements Runnable {
if (machine.equals("i686")) machine = "i586";
else if (machine.equals("i586")) machine = "i486";
else if (machine.equals("i486")) machine = "i386";
- else break;
+ else {
+ machine = machine0;
+ if (release.equals("1.fc8")) release = "1.fc7";
+ else if (release.equals("1.fc7")) release = "1.fc6";
+ else if (release.equals("1.fc6")) release = "1.fc5";
+ else if (release.equals("1.fc5")) release = "1.fc4";
+ else if (release.equals("1.fc4")) release = "1.fc3";
+ else if (release.equals("1.fc3")) release = "1.fc2";
+ else if (release.equals("1.fc2")) release = "1.fc1";
+ else break;
+ }
}
if (url == null) throw new Exception("Unsupported target OS or CPU");
diff --git a/plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.core.prefs
index 0bf81e2f5..2c3fcf15c 100644
--- a/plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.tm.tcf/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Feb 05 15:38:16 CET 2008
+#Thu Apr 30 00:11:15 PDT 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -85,7 +85,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
diff --git a/plugins/org.eclipse.tm.tcf/build.properties b/plugins/org.eclipse.tm.tcf/build.properties
index f70828ba5..4bb7a42e5 100644
--- a/plugins/org.eclipse.tm.tcf/build.properties
+++ b/plugins/org.eclipse.tm.tcf/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
plugin.properties,\
plugin.xml
src.includes = about.html
+jars.extra.classpath = tcf.jar
diff --git a/plugins/org.eclipse.tm.tcf/tcf.jar b/plugins/org.eclipse.tm.tcf/tcf.jar
new file mode 100644
index 000000000..16d6feb42
--- /dev/null
+++ b/plugins/org.eclipse.tm.tcf/tcf.jar
Binary files differ

Back to the top