uLab
/
remotelaboratory
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/remotelaboratory
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix remaining name references to use the uLab system name

Browse Source 
Fix incorrect Debian init scripts and a wrong binary name
master
Timothy Pearson 11 years ago
parent e21781df2e
commit b4426c06a4
34 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File

2
clients/tde/debian/control
Unescape View File

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 5.0), cdbs, tdelibs4-trinity-dev, libtqtrla-dev, libtdekrb-trinity-dev, xutils, chrpath, gettext, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
Homepage: http://remotefpga.pearsoncomputing.net/
Homepage: http://ulab.pearsoncomputing.net/
Package: remote-laboratory-client-trinity
Architecture: any

2
clients/tde/remotelab.lsm
Unescape View File

@ -6,7 +6,7 @@ Description: Graphical remote laboratory client
Keywords: tde
author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Maintained-by: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Home-page: http://remotefpga.pearsoncomputing.net/
Home-page: http://ulab.pearsoncomputing.net/
Platform: unix
Copying-policy: GPL
End

4
clients/tde/src/app/main.cpp
Unescape View File

@ -40,12 +40,12 @@ static TDEAboutData about(
APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION,
I18N_NOOP("Graphical Remote Laboratory Workspaces Client"), TDEAboutData::License_GPL_V2,
I18N_NOOP("(C) 2012-2013 Timothy Pearson"), 0,
"http://remotefpga.pearsoncomputing.net/", "kb9vqf@pearsoncomputing.net" );
"http://ulab.pearsoncomputing.net/", "kb9vqf@pearsoncomputing.net" );
int main(int argc, char *argv[])
{
about.addAuthor("Timothy Pearson", I18N_NOOP("Author, maintainer"), "kb9vqf@pearsoncomputing.net", "http://remotefpga.pearsoncomputing.net/");
about.addAuthor("Timothy Pearson", I18N_NOOP("Author, maintainer"), "kb9vqf@pearsoncomputing.net", "http://ulab.pearsoncomputing.net/");
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options);

2
clients/tde/src/app/remotemdi.cpp
Unescape View File

@ -356,7 +356,7 @@ void RemoteMDI::connectToServer() {
connect(m_rsvSvrSocket, SIGNAL(connectionClosed()), this, SLOT(connectionClosedHandler()));
connect(m_rsvSvrSocket, TQT_SIGNAL(statusMessageUpdated(const TQString&)), this, TQT_SLOT(updateStatusBarMainMessage(const TQString&) ));
}
m_rsvSvrSocket->setServiceName("remotefpga");
m_rsvSvrSocket->setServiceName("ulab");
if (m_serverHost != "") {
m_rsvSvrSocket->setServerFQDN(m_serverHost);
m_rsvSvrSocket->connectToHost(m_serverHost, 4004);

6
lib/libtqtrla/src/tqtrla.cpp
Unescape View File

@ -147,15 +147,15 @@ namespace KParts
m_socket = new TDEKerberosClientSocket(this);
connect(m_socket, TQT_SIGNAL(statusMessageUpdated(const TQString&)), this, TQT_SLOT(setStatusMessage(const TQString&) ));
}
m_socket->setServiceName("remotefpga");
m_socket->setServiceName("ulab");
m_socket->setServerFQDN(server);
m_socket->connectToHost(server, 4004);
// Finish connecting when appropriate
connToServerState = 0;
connToServerConnecting = true;
m_connectionTimer->start(100, TRUE);
return 0;
}

6
servers/admin_sys_ctl_server_lin/debian/ulab-adminsysctlserver.init
Unescape View File

@ -20,9 +20,9 @@
set -e
PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/opt/trinity/bin/remotefpga_adminsysctlserver
PIDFILE=/var/run/remotefpga_authserver.pid
UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
DAEMON=/opt/trinity/bin/ulab_adminsysctlserver
PIDFILE=/var/run/ulab_adminsysctlserver.pid
UPGRADEFILE=/var/run/ulab_adminsysctlserver.upgrade
DESC="uLab System Administration Control Server"

8
servers/admin_sys_ctl_server_lin/src/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
bin_PROGRAMS = remotefpga_adminsysctlserver
bin_PROGRAMS = ulab_adminsysctlserver
remotefpga_adminsysctlserver_SOURCES = main.cpp admin_sys_ctl.cpp
ulab_adminsysctlserver_SOURCES = main.cpp admin_sys_ctl.cpp
remotefpga_adminsysctlserver_METASOURCES = AUTO
remotefpga_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
ulab_adminsysctlserver_METASOURCES = AUTO
ulab_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal

2
servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp
Unescape View File

@ -73,7 +73,7 @@ SysCtlSocket::SysCtlSocket(int sock, TQObject *parent, const char *name) :
connect(m_kerberosInitTimer, SIGNAL(timeout()), this, SLOT(finishKerberosHandshake()));
m_servClientTimeout = new TQTimer();
setServiceName("remotefpga");
setServiceName("ulab");
line = 0;
connect(this, SIGNAL(connectionClosed()), SLOT(connectionClosedHandler()));

4
servers/admin_sys_ctl_server_lin/src/main.cpp
Unescape View File

@ -45,7 +45,7 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[])
{
TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("uLab System Administration Control Server"),
TDEAboutData aboutData( "ulab_admin_sys_ctl_server", I18N_NOOP("uLab System Administration Control Server"),
version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
TDEStartupInfo::appStarted();
KSimpleConfig config("remotefpga_adminsysctlserver.conf", false);
KSimpleConfig config("ulab_adminsysctlserver.conf", false);
config.setGroup("Server");
SysCtlServer fpgasvr(0, config.readNumEntry("port", 4015), &config);
return app.exec();

6
servers/admin_user_mgmt_server_lin/debian/ulab-adminusermgmtserver.init
Unescape View File

@ -20,9 +20,9 @@
set -e
PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/opt/trinity/bin/remotefpga_adminsysctlserver
PIDFILE=/var/run/remotefpga_authserver.pid
UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
DAEMON=/opt/trinity/bin/ulab_adminusermgmtserver
PIDFILE=/var/run/ulab_adminusermgmtserver.pid
UPGRADEFILE=/var/run/ulab_adminusermgmtserver.upgrade
DESC="uLab System Administration User Management Server"

8
servers/admin_user_mgmt_server_lin/src/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
bin_PROGRAMS = remotefpga_adminsysctlserver
bin_PROGRAMS = ulab_adminusermgmtserver
remotefpga_adminsysctlserver_SOURCES = main.cpp admin_user_mgmt.cpp
ulab_adminusermgmtserver_SOURCES = main.cpp admin_user_mgmt.cpp
remotefpga_adminsysctlserver_METASOURCES = AUTO
remotefpga_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
ulab_adminusermgmtserver_METASOURCES = AUTO
ulab_adminusermgmtserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal

2
servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp
Unescape View File

@ -73,7 +73,7 @@ SysCtlSocket::SysCtlSocket(int sock, TQObject *parent, const char *name) :
connect(m_kerberosInitTimer, SIGNAL(timeout()), this, SLOT(finishKerberosHandshake()));
m_servClientTimeout = new TQTimer();
setServiceName("remotefpga");
setServiceName("ulab");
line = 0;
connect(this, SIGNAL(connectionClosed()), SLOT(connectionClosedHandler()));

4
servers/admin_user_mgmt_server_lin/src/main.cpp
Unescape View File

@ -45,7 +45,7 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[])
{
TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("uLab System Administration User Management Server"),
TDEAboutData aboutData( "ulab_admin_sys_ctl_server", I18N_NOOP("uLab System Administration User Management Server"),
version, description, TDEAboutData::License_GPL,
"(c) 2013, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
TDEStartupInfo::appStarted();
KSimpleConfig config("remotefpga_adminusermgmtserver.conf", false);
KSimpleConfig config("ulab_adminusermgmtserver.conf", false);
config.setGroup("Server");
UserMgmtServer fpgasvr(0, config.readNumEntry("port", 4016), &config);
return app.exec();

6
servers/auth_server_lin/debian/ulab-authserver.init
Unescape View File

@ -20,9 +20,9 @@
set -e
PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/opt/trinity/bin/remotefpga_authserver
PIDFILE=/var/run/remotefpga_authserver.pid
UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
DAEMON=/opt/trinity/bin/ulab_authserver
PIDFILE=/var/run/ulab_authserver.pid
UPGRADEFILE=/var/run/ulab_authserver.upgrade
DESC="uLab Authentication Server"

8
servers/auth_server_lin/src/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
bin_PROGRAMS = remotefpga_authserver
bin_PROGRAMS = ulab_authserver
remotefpga_authserver_SOURCES = main.cpp auth_conn.cpp
ulab_authserver_SOURCES = main.cpp auth_conn.cpp
remotefpga_authserver_METASOURCES = AUTO
remotefpga_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
ulab_authserver_METASOURCES = AUTO
ulab_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal

6
servers/auth_server_lin/src/auth_conn.cpp
Unescape View File

@ -57,7 +57,7 @@ AuthSocket::AuthSocket(int sock, int serverID, TQObject *parent, const char *nam
m_kerberosInitTimer = new TQTimer();
connect(m_kerberosInitTimer, SIGNAL(timeout()), this, SLOT(finishKerberosHandshake()));
setServiceName("remotefpga");
setServiceName("ulab");
m_loopBuffer.resize(8192); // 8kB
line = 0;
@ -604,7 +604,7 @@ void AuthSocket::commandLoop() {
updateStatistics(STATISTICS_NEW_CONNECTION_EVENT);
if (!m_servClientSocket) m_servClientSocket = new TDEKerberosClientSocket;
m_servClientSocket->setServiceName("remotefpga");
m_servClientSocket->setServiceName("ulab");
m_servClientSocket->setServerFQDN(m_srvServiceHostName);
m_servClientSocket->connectToHost(m_srvServiceHostName, m_srvServicePort);
@ -685,7 +685,7 @@ int AuthSocket::connectToDatabase() {
AuthServer::AuthServer(TQObject* parent) :
TQServerSocket( 4004, 1, parent ), m_database(NULL) {
m_config = new KSimpleConfig("remotefpga_authserver.conf", false);
m_config = new KSimpleConfig("ulab_authserver.conf", false);
if (connectToDatabase() != 0) {
exit(1);

2
servers/auth_server_lin/src/main.cpp
Unescape View File

@ -51,7 +51,7 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[])
{
TDEAboutData aboutData( "remotefpga_auth_server", I18N_NOOP("uLab AuthServer"),
TDEAboutData aboutData( "ulab_auth_server", I18N_NOOP("uLab AuthServer"),
version, description, TDEAboutData::License_GPL,
"(c) 2012-2013, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");

6
servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init
Unescape View File

@ -20,9 +20,9 @@
set -e
PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/opt/trinity/bin/remotefpga_fpgaprogserver
PIDFILE=/var/run/remotefpga_authserver.pid
UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
DAEMON=/opt/trinity/bin/ulab_fpgaprogserver
PIDFILE=/var/run/ulab_fpgaprogserver.pid
UPGRADEFILE=/var/run/ulab_fpgaprogserver.upgrade
DESC="uLab FPGA Programming Server"

8
servers/fpga_programming_server_lin/src/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
bin_PROGRAMS = remotefpga_fpgaprogserver
bin_PROGRAMS = ulab_fpgaprogserver
remotefpga_fpgaprogserver_SOURCES = main.cpp fpga_conn.cpp
ulab_fpgaprogserver_SOURCES = main.cpp fpga_conn.cpp
remotefpga_fpgaprogserver_METASOURCES = AUTO
remotefpga_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
ulab_fpgaprogserver_METASOURCES = AUTO
ulab_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal

2
servers/fpga_programming_server_lin/src/fpga_conn.cpp
Unescape View File

@ -79,7 +79,7 @@ FPGASocket::FPGASocket(int sock, TQObject *parent, const char *name) :
connect(m_kerberosInitTimer, SIGNAL(timeout()), this, SLOT(finishKerberosHandshake()));
m_servClientTimeout = new TQTimer();
setServiceName("remotefpga");
setServiceName("ulab");
line = 0;
connect(this, SIGNAL(connectionClosed()), SLOT(connectionClosedHandler()));

4
servers/fpga_programming_server_lin/src/main.cpp
Unescape View File

@ -45,7 +45,7 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[])
{
TDEAboutData aboutData( "remotefpga_fpgaprog_server", I18N_NOOP("uLab FPGA Programming Server"),
TDEAboutData aboutData( "ulab_fpgaprog_server", I18N_NOOP("uLab FPGA Programming Server"),
version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
TDEStartupInfo::appStarted();
KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_fpgaprogserver.conf", false);
KSimpleConfig config(TQDir::currentDirPath() + "/ulab_fpgaprogserver.conf", false);
config.setGroup("Server");
FPGAServer fpgasvr(0, config.readNumEntry("port", 4012), &config);
return app.exec();

6
servers/fpga_server_lin/debian/ulab-fpgaserver.init
Unescape View File

@ -20,9 +20,9 @@
set -e
PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/opt/trinity/bin/remotefpga_fpgaserver
PIDFILE=/var/run/remotefpga_authserver.pid
UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
DAEMON=/opt/trinity/bin/ulab_fpgaserver
PIDFILE=/var/run/ulab_fpgaserver.pid
UPGRADEFILE=/var/run/ulab_fpgaserver.upgrade
DESC="uLab FPGA Server"

8
servers/fpga_server_lin/src/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
bin_PROGRAMS = remotefpga_fpgaserver
bin_PROGRAMS = ulab_fpgaserver
remotefpga_fpgaserver_SOURCES = main.cpp fpga_conn.cpp
ulab_fpgaserver_SOURCES = main.cpp fpga_conn.cpp
remotefpga_fpgaserver_METASOURCES = AUTO
remotefpga_fpgaserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
ulab_fpgaserver_METASOURCES = AUTO
ulab_fpgaserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal

2
servers/fpga_server_lin/src/fpga_conn.cpp
Unescape View File

@ -63,7 +63,7 @@ FPGASocket::FPGASocket(int sock, TQObject *parent, const char *name) :
m_kerberosInitTimer = new TQTimer();
connect(m_kerberosInitTimer, SIGNAL(timeout()), this, SLOT(finishKerberosHandshake()));
setServiceName("remotefpga");
setServiceName("ulab");
line = 0;
connect(this, SIGNAL(connectionClosed()), SLOT(connectionClosedHandler()));

4
servers/fpga_server_lin/src/main.cpp
Unescape View File

@ -45,7 +45,7 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[])
{
TDEAboutData aboutData( "remotefpga_fpga_server", I18N_NOOP("uLab FPGA Viewer Server"),
TDEAboutData aboutData( "ulab_fpga_server", I18N_NOOP("uLab FPGA Viewer Server"),
version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
TDEStartupInfo::appStarted();
KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_fpgaserver.conf", false);
KSimpleConfig config(TQDir::currentDirPath() + "/ulab_fpgaserver.conf", false);
config.setGroup("Server");
FPGAServer fpgasvr(0, config.readNumEntry("port", 4010), &config);
return app.exec();

6
servers/gpib_server_lin/debian/ulab-gpibserver.init
Unescape View File

@ -20,9 +20,9 @@
set -e
PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/opt/trinity/bin/remotefpga_gpibserver
PIDFILE=/var/run/remotefpga_authserver.pid
UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
DAEMON=/opt/trinity/bin/ulab_gpibserver
PIDFILE=/var/run/ulab_gpibserver.pid
UPGRADEFILE=/var/run/ulab_gpibserver.upgrade
DESC="uLab GPIB Instrumentation Server"

8
servers/gpib_server_lin/src/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
bin_PROGRAMS = remotefpga_gpibserver
bin_PROGRAMS = ulab_gpibserver
remotefpga_gpibserver_SOURCES = commanalyzer_functions.cpp gpib_functions.cpp scope_functions.cpp signal_functions.cpp main.cpp gpib_conn.cpp
ulab_gpibserver_SOURCES = commanalyzer_functions.cpp gpib_functions.cpp scope_functions.cpp signal_functions.cpp main.cpp gpib_conn.cpp
remotefpga_gpibserver_METASOURCES = AUTO
remotefpga_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lgpib
ulab_gpibserver_METASOURCES = AUTO
ulab_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lgpib
KDE_OPTIONS = nofinal

2
servers/gpib_server_lin/src/gpib_conn.cpp
Unescape View File

@ -77,7 +77,7 @@ GPIBSocket::GPIBSocket(int sock, TQObject *parent, const char *name) :
connect(m_kerberosInitTimer, SIGNAL(timeout()), this, SLOT(finishKerberosHandshake()));
m_servClientTimeout = new TQTimer();
setServiceName("remotefpga");
setServiceName("ulab");
line = 0;
connect(this, SIGNAL(connectionClosed()), SLOT(connectionClosedHandler()));

4
servers/gpib_server_lin/src/main.cpp
Unescape View File

@ -45,7 +45,7 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[])
{
TDEAboutData aboutData( "remotefpga_gpib_server", I18N_NOOP("uLab GPIB Server"),
TDEAboutData aboutData( "ulab_gpib_server", I18N_NOOP("uLab GPIB Server"),
version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
TDEStartupInfo::appStarted();
KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_gpibserver.conf", false);
KSimpleConfig config(TQDir::currentDirPath() + "/ulab_gpibserver.conf", false);
config.setGroup("Server");
GPIBServer fpgasvr(0, config.readNumEntry("port", 4013), &config);
return app.exec();

2
servers/gpib_server_lin/src/main_server_lin.cpp
Unescape View File

@ -134,7 +134,7 @@ int k;
int m;
// Configuration stuff
static const char filename[] = "remotefpga_gpib.conf";
static const char filename[] = "ulab_gpib.conf";
char linedata [256];
// Shut up GCC

6
servers/sensor_monitor_server_lin/debian/ulab-sensormonserver.init
Unescape View File

@ -20,9 +20,9 @@
set -e
PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/opt/trinity/bin/remotefpga_sensormonserver
PIDFILE=/var/run/remotefpga_authserver.pid
UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
DAEMON=/opt/trinity/bin/ulab_sensormonserver
PIDFILE=/var/run/ulab_sensormonserver.pid
UPGRADEFILE=/var/run/ulab_sensormonserver.upgrade
DESC="uLab Sensor Monitor Server"

8
servers/sensor_monitor_server_lin/src/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
bin_PROGRAMS = remotefpga_sensormonserver
bin_PROGRAMS = ulab_sensormonserver
remotefpga_sensormonserver_SOURCES = main.cpp sensor_conn.cpp
ulab_sensormonserver_SOURCES = main.cpp sensor_conn.cpp
remotefpga_sensormonserver_METASOURCES = AUTO
remotefpga_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
ulab_sensormonserver_METASOURCES = AUTO
ulab_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal

4
servers/sensor_monitor_server_lin/src/main.cpp
Unescape View File

@ -45,7 +45,7 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[])
{
TDEAboutData aboutData( "remotefpga_sensormon_server", I18N_NOOP("uLab Sensor Monitor Server"),
TDEAboutData aboutData( "ulab_sensormon_server", I18N_NOOP("uLab Sensor Monitor Server"),
version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
TDEStartupInfo::appStarted();
KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_sensormonserver.conf", false);
KSimpleConfig config(TQDir::currentDirPath() + "/ulab_sensormonserver.conf", false);
config.setGroup("Server");
SensorServer sensorsvr(0, config.readNumEntry("port", 4014), &config);
return app.exec();

2
servers/sensor_monitor_server_lin/src/sensor_conn.cpp
Unescape View File

@ -81,7 +81,7 @@ SensorSocket::SensorSocket(int sock, TQObject *parent, const char *name) :
initializeSensors();
setServiceName("remotefpga");
setServiceName("ulab");
connect(this, SIGNAL(connectionClosed()), SLOT(connectionClosedHandler()));
connect(this, SIGNAL(connectionClosed()), parent, SLOT(remoteConnectionClosed()));

Write Preview
Loading…
Cancel
Save