diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-27 02:16:11 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-27 02:16:11 -0600 |
| commit | b4426c06a4374b8e1025adce41427f0b1b072721 (patch) | |
| tree | b4181220745e6623995f9db4120a781a2455304a /servers/fpga_server_lin | |
| parent | e21781df2ef6bfdb1a650bab5298b0261c8f7d3c (diff) | |
| download | ulab-b4426c06a4374b8e1025adce41427f0b1b072721.tar.gz ulab-b4426c06a4374b8e1025adce41427f0b1b072721.zip | |
Fix remaining name references to use the uLab system name
Fix incorrect Debian init scripts and a wrong binary name
Diffstat (limited to 'servers/fpga_server_lin')
| -rw-r--r-- | servers/fpga_server_lin/debian/ulab-fpgaserver.init | 6 | ||||
| -rw-r--r-- | servers/fpga_server_lin/src/Makefile.am | 8 | ||||
| -rw-r--r-- | servers/fpga_server_lin/src/fpga_conn.cpp | 2 | ||||
| -rw-r--r-- | servers/fpga_server_lin/src/main.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/servers/fpga_server_lin/debian/ulab-fpgaserver.init b/servers/fpga_server_lin/debian/ulab-fpgaserver.init index 0ac88dc..628fe1d 100644 --- a/servers/fpga_server_lin/debian/ulab-fpgaserver.init +++ b/servers/fpga_server_lin/debian/ulab-fpgaserver.init @@ -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" diff --git a/servers/fpga_server_lin/src/Makefile.am b/servers/fpga_server_lin/src/Makefile.am index 552b50b..284a33f 100644 --- a/servers/fpga_server_lin/src/Makefile.am +++ b/servers/fpga_server_lin/src/Makefile.am @@ -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 diff --git a/servers/fpga_server_lin/src/fpga_conn.cpp b/servers/fpga_server_lin/src/fpga_conn.cpp index d8df085..0570cff 100644 --- a/servers/fpga_server_lin/src/fpga_conn.cpp +++ b/servers/fpga_server_lin/src/fpga_conn.cpp @@ -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())); diff --git a/servers/fpga_server_lin/src/main.cpp b/servers/fpga_server_lin/src/main.cpp index 0097c24..01d31e4 100644 --- a/servers/fpga_server_lin/src/main.cpp +++ b/servers/fpga_server_lin/src/main.cpp @@ -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(); |