mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

updating server runtime scripts to correct package names

Browse source 
adding source and SDK builds
pulling server scripts from correct directory during build
This commit is contained in:
David Dykstal 2006-04-21 21:42:15 +00:00
parent 24479de760
commit 11e2a5c6da
9 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
releng/org.eclipse.rse.build/customTargets.xml
View file

@ -65,12 +65,12 @@
<antcall target="dstore_extra_server.jar"/>
<property name="universalserverfilelist"
value="${buildDirectory}/plugins/org.eclipse.dstore.core/dstore_core.jar,
${buildDirectory}/plugins/org.eclipse.dstore.core/serverscripts/auth.pl,
${buildDirectory}/plugins/org.eclipse.dstore.core/serverscripts/ssl.properties,
${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime/dstore_extra_server.jar,
${buildDirectory}/plugins/org.eclipse.rse.services.dstore/patterns.dat,
${buildDirectory}/plugins/org.eclipse.rse.services/clientserver.jar,
${buildDirectory}/plugins/org.eclipse.rse.services.dstore/dstore_miners.jar,
${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/auth.pl,
${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/ssl.properties,
${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/minerFile.dat,
${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/rsecomm.properties,
${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux,
@ -86,12 +86,12 @@
<copy todir="${packageDirectory}\rseserver">
<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core" includes="dstore_core.jar"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core/serverscripts" includes="auth.pl"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core/serverscripts" includes="ssl.properties"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime" includes ="dstore_extra_server.jar"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="dstore_miners.jar"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="patterns.dat"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services" includes="clientserver.jar"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="auth.pl"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="ssl.properties"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="minerFile.dat"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="rsecomm.properties"/>
<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="server.linux"/>
@ -252,6 +252,19 @@
<zip destfile="${packageDirectory}\rse-runtime-M1.zip" basedir="${packageRuntimeDirectory}"/>
<property name="packageSDKDirectory" location="${packageDirectory}\sdk"/>
<property name="packageSDKRootDirectory" location="${packageSDKDirectory}\eclipse"/>
<mkdir dir="${packageSDKDirectory}"/>
<mkdir dir="${packageSDKRootDirectory}"/>
<unzip src="${packageDirectory}\rse-runtime-M1.zip" dest="${packageSDKRootDirectory}"/>
<unzip src="${buildDirectory}\features\org.eclipse.rse.core\org.eclipse.rse.core_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
<unzip src="${buildDirectory}\features\org.eclipse.rse.dstore\org.eclipse.rse.dstore_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
<unzip src="${buildDirectory}\features\org.eclipse.rse.ftp\org.eclipse.rse.ftp_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
<unzip src="${buildDirectory}\features\org.eclipse.rse.local\org.eclipse.rse.local_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
<zip destfile="${packageDirectory}\rse-SDK-M1.zip" basedir="${packageSDKDirectory}"/>
<!--
<antcall target="serverruntime"/>

2
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/auth.pl
View file

@ -45,7 +45,7 @@ else
$suOptions="-";
}
system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN com.ibm.etools.systems.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN -Xshareclasses:name=RSE,verbose'");
1;
}
else

2
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.linux
View file

@ -1,7 +1,7 @@
#!/usr/bin/perl -w
$port = "4800";
$port = "4035";
$helpFlag = "-h";
if (defined($ARGV[0]))

4
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.unix
View file

@ -32,11 +32,11 @@ else
$oldClasspath = $ENV{CLASSPATH};
$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/universalminers.jar:$plugins_dir/clientserver.jar:$oldClasspath";
$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -DDSTORE_TRACING_ON=$trace com.ibm.etools.systems.dstore.core.server.ServerLauncher $port");
system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -DDSTORE_TRACING_ON=$trace org.eclipse.dstore.core.server.ServerLauncher $port");
$ENV{CLASSPATH}=$oldClasspath;
}

2
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.win.bat
View file

@ -1,2 +1,2 @@
java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% com.ibm.etools.systems.dstore.core.server.ServerLauncher
java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.ServerLauncher

4
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat
View file

@ -12,12 +12,12 @@ if xxx%3 == xxx goto runNoTicket
@echo on
java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% com.ibm.etools.systems.dstore.core.server.Server %PORT% %TIMEOUT% %TICKET%
java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT% %TICKET%
goto done
:runNoTicket
@echo on
java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% com.ibm.etools.systems.dstore.core.server.Server %PORT% %TIMEOUT%
java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT%
goto done
:usage

10
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux
View file

@ -19,7 +19,7 @@ $oldClasspath = $ENV{CLASSPATH};
if ($packaged_as == "jar")
{
$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/universalminers.jar:$plugins_dir/clientserver.jar:$oldClasspath";
$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
}
if ($packaged_as == "src")
{
@ -27,22 +27,22 @@ if ($packaged_as == "src")
}
if (!defined($packaged_as))
{
$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/universalminers.jar:$plugins_dir/clientserver.jar:$oldClasspath";
$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
}
if (!defined($timeout))
{
system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH com.ibm.etools.systems.dstore.core.server.Server $port");
system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH org.eclipse.dstore.core.server.Server $port");
}
else
{
if (!defined($clientUserID))
{
system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH com.ibm.etools.systems.dstore.core.server.Server $port $timeout");
system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH org.eclipse.dstore.core.server.Server $port $timeout");
}
else
{
system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -Dclient.username=$clientUserID com.ibm.etools.systems.dstore.core.server.Server $port $timeout");
system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -Dclient.username=$clientUserID org.eclipse.dstore.core.server.Server $port $timeout");
}
}

6
rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.unix
View file

@ -1,8 +1,8 @@
# Shell script to starat RSE communications server
# This script will start the datastore listening on an available socket
export serverpath=.;
export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:universalminers.jar:clientserver.jar:$CLASSPATH;
export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
if [ $1 ]
then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 org.eclipse.dstore.core.server.Server 0 60000 &
else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false org.eclipse.dstore.core.server.Server 0 60000 &
fi

3
rse/plugins/org.eclipse.rse.services.local/build.properties
View file

@ -2,7 +2,8 @@ bin.includes = META-INF/,\
about.html,\
about.properties,\
plugin.properties,\
localfiles.jar
localfiles.jar,\
patterns.dat
source.localfiles.jar = src/
jars.compile.order = localfiles.jar
output.localfiles.jar = bin/