mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-20 06:35:50 +02:00
classify and decorate using raw description
This commit is contained in:
parent
1b825a396c
commit
6701ea687a
5 changed files with 50 additions and 10 deletions
|
@ -249,7 +249,7 @@ Contributors:
|
||||||
<enablement>
|
<enablement>
|
||||||
<and>
|
<and>
|
||||||
<objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>
|
<objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>
|
||||||
<objectState name="classification" value="*executable(binary)*"/>
|
<objectState name="classification" value="*executable*"/>
|
||||||
</and>
|
</and>
|
||||||
</enablement>
|
</enablement>
|
||||||
</decorator>
|
</decorator>
|
||||||
|
@ -264,9 +264,11 @@ Contributors:
|
||||||
<and>
|
<and>
|
||||||
<objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>
|
<objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>
|
||||||
<or>
|
<or>
|
||||||
<objectState name="classification" value="*executable(script)*"/>
|
|
||||||
<objectState name="classification" value="script"/>
|
|
||||||
<objectState name="classification" value="symbolic link(script)*"/>
|
<objectState name="classification" value="symbolic link(script)*"/>
|
||||||
|
<and>
|
||||||
|
<objectState name="classification" value="*script*"/>
|
||||||
|
<objectState name="classification" value="*executable*"/>
|
||||||
|
</and>
|
||||||
</or>
|
</or>
|
||||||
</and>
|
</and>
|
||||||
</enablement>
|
</enablement>
|
||||||
|
@ -295,7 +297,12 @@ Contributors:
|
||||||
<enablement>
|
<enablement>
|
||||||
<and>
|
<and>
|
||||||
<objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>
|
<objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>
|
||||||
<objectState name="classification" value="*module*"/>
|
<or>
|
||||||
|
<objectState name="classification" value="*module*"/>
|
||||||
|
<objectState name="classification" value="*archive*"/>
|
||||||
|
<objectState name="classification" value="*shared object*"/>
|
||||||
|
<objectState name="extension" value="so a so so.*"/>
|
||||||
|
</or>
|
||||||
</and>
|
</and>
|
||||||
</enablement>
|
</enablement>
|
||||||
</decorator>
|
</decorator>
|
||||||
|
|
|
@ -402,7 +402,8 @@ public class FileClassifier extends Thread
|
||||||
if (_systemSupportsClassFilesOnly) {
|
if (_systemSupportsClassFilesOnly) {
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
/* DKM - let the client have the raw type instead of doing this for it
|
||||||
|
*
|
||||||
boolean matchesLib = (fulltype.indexOf(STR_SHARED_OBJECT) > -1) || (fulltype.indexOf(STR_OBJECT_MODULE) > -1) || (fulltype.indexOf(STR_ARCHIVE) > -1);
|
boolean matchesLib = (fulltype.indexOf(STR_SHARED_OBJECT) > -1) || (fulltype.indexOf(STR_OBJECT_MODULE) > -1) || (fulltype.indexOf(STR_ARCHIVE) > -1);
|
||||||
|
|
||||||
boolean matchesExe = (fulltype.indexOf(STR_EXECUTABLE) > -1);
|
boolean matchesExe = (fulltype.indexOf(STR_EXECUTABLE) > -1);
|
||||||
|
@ -435,10 +436,11 @@ public class FileClassifier extends Thread
|
||||||
{
|
{
|
||||||
type = STR_DIRECTORY;
|
type = STR_DIRECTORY;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
// finally, if the full type contains the symbolic link string, then we
|
// finally, if the full type contains the symbolic link string, then we
|
||||||
// know
|
// know
|
||||||
// we have a symbolic link
|
// we have a symbolic link
|
||||||
else if (fulltype.startsWith(symbolicLinkStr))
|
if (fulltype.startsWith(symbolicLinkStr))
|
||||||
{
|
{
|
||||||
type = resolveSymbolicLink(parentFile, name, fulltype, symbolicLinkStr, resolveLink, specialEncoding);
|
type = resolveSymbolicLink(parentFile, name, fulltype, symbolicLinkStr, resolveLink, specialEncoding);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,16 @@ else
|
||||||
$timeoutIN = $ARGV[3];
|
$timeoutIN = $ARGV[3];
|
||||||
$ticketIN = $ARGV[4];
|
$ticketIN = $ARGV[4];
|
||||||
|
|
||||||
|
if (defined($ARGV[5]))
|
||||||
|
{
|
||||||
|
$javaHome = $ARGV[5];
|
||||||
|
$javaExe = "$javaHome/bin/java";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$javaExe = "java"
|
||||||
|
}
|
||||||
|
|
||||||
$pwdIN = <STDIN>;
|
$pwdIN = <STDIN>;
|
||||||
chomp($pwdIN);
|
chomp($pwdIN);
|
||||||
|
|
||||||
|
@ -36,7 +46,8 @@ else
|
||||||
if ($passwd eq $encryptedPWD)
|
if ($passwd eq $encryptedPWD)
|
||||||
{
|
{
|
||||||
print("success\n");
|
print("success\n");
|
||||||
system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
|
|
||||||
|
system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
|
||||||
1;
|
1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -15,6 +15,16 @@ else
|
||||||
$timeoutIN = $ARGV[3];
|
$timeoutIN = $ARGV[3];
|
||||||
$ticketIN = $ARGV[4];
|
$ticketIN = $ARGV[4];
|
||||||
|
|
||||||
|
if (defined($ARGV[5]))
|
||||||
|
{
|
||||||
|
$javaHome = $ARGV[5];
|
||||||
|
$javaExe = "$javaHome/bin/java";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$javaExe = "java"
|
||||||
|
}
|
||||||
|
|
||||||
$pwdIN = <STDIN>;
|
$pwdIN = <STDIN>;
|
||||||
chomp($pwdIN);
|
chomp($pwdIN);
|
||||||
|
|
||||||
|
@ -45,8 +55,8 @@ else
|
||||||
$suOptions="-";
|
$suOptions="-";
|
||||||
}
|
}
|
||||||
|
|
||||||
system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
|
system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
|
||||||
1;
|
1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -15,6 +15,16 @@ else
|
||||||
$timeoutIN = $ARGV[3];
|
$timeoutIN = $ARGV[3];
|
||||||
$ticketIN = $ARGV[4];
|
$ticketIN = $ARGV[4];
|
||||||
|
|
||||||
|
if (defined($ARGV[5]))
|
||||||
|
{
|
||||||
|
$javaHome = $ARGV[5];
|
||||||
|
$javaExe = "$javaHome/bin/java";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$javaExe = "java"
|
||||||
|
}
|
||||||
|
|
||||||
$pwdIN = <STDIN>;
|
$pwdIN = <STDIN>;
|
||||||
chomp($pwdIN);
|
chomp($pwdIN);
|
||||||
|
|
||||||
|
@ -45,7 +55,7 @@ else
|
||||||
$suOptions="-";
|
$suOptions="-";
|
||||||
}
|
}
|
||||||
|
|
||||||
system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
|
system("su $suOptions $userIN -c '$javaExe -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
|
||||||
1;
|
1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Reference in a new issue