Skip to content
Snippets Groups Projects
Commit 06cb4ebf authored by Lorenzo Pivetta's avatar Lorenzo Pivetta
Browse files

Porting to Tango 9.3.3

parent 7e658447
Branches master
Tags 1.1.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile
+ 1
− 1
View file @ 06cb4ebf
......@@ -3,4 +3,4 @@ NAME_SRV = 651d-srv
CXXFLAGS =
LDFLAGS =
include ../makefiles/Make-8.1.2.c.in
include ../makefiles/Make-9.3.3.in
src/ClassFactory.cpp
+ 0
− 16
View file @ 06cb4ebf
/*----- PROTECTED REGION ID(Mks651d::ClassFactory.cpp) ENABLED START -----*/
static const char *RcsId = "$Id: ClassFactory.cpp,v 1.2 2012-03-08 09:50:01 mdm Exp $";
//=============================================================================
//
// file : ClassFactory.cpp
......@@ -11,21 +10,6 @@ static const char *RcsId = "$Id: ClassFactory.cpp,v 1.2 2012-03-08 09:50:01 mdm
//
// project : Mks651d.
//
// $Author: mdm $
//
// $Revision: 1.2 $
// $Date: 2012-03-08 09:50:01 $
//
// SVN only:
// $HeadURL: $
//
// CVS only:
// $Source: /home/cvsadm/cvsroot/fermi/servers/651d/src/ClassFactory.cpp,v $
// $Log: ClassFactory.cpp,v $
// Revision 1.2 2012-03-08 09:50:01 mdm
// New version of server
//
//
//=============================================================================
// This file is generated by POGO
// (Program Obviously used to Generate tango Object)
......
src/Mks651d.cpp
+ 3
− 19
View file @ 06cb4ebf
/*----- PROTECTED REGION ID(Mks651d.cpp) ENABLED START -----*/
static const char *RcsId = "$Id: Mks651d.cpp,v 1.2 2012-03-08 09:50:01 mdm Exp $";
//=============================================================================
//
// file : Mks651d.cpp
......@@ -12,21 +11,6 @@ static const char *RcsId = "$Id: Mks651d.cpp,v 1.2 2012-03-08 09:50:01 mdm Exp $
//
// project : Mks651d.
//
// $Author: mdm $
//
// $Revision: 1.2 $
// $Date: 2012-03-08 09:50:01 $
//
// SVN only:
// $HeadURL: $
//
// CVS only:
// $Source: /home/cvsadm/cvsroot/fermi/servers/651d/src/Mks651d.cpp,v $
// $Log: Mks651d.cpp,v $
// Revision 1.2 2012-03-08 09:50:01 mdm
// New version of server
//
//
//=============================================================================
// This file is generated by POGO
// (Program Obviously used to Generate tango Object)
......@@ -99,7 +83,7 @@ namespace Mks651d_ns
*/
//--------------------------------------------------------
Mks651d::Mks651d(Tango::DeviceClass *cl, string &s)
: Tango::Device_4Impl(cl, s.c_str())
: TANGO_BASE_CLASS(cl, s.c_str())
{
/*----- PROTECTED REGION ID(Mks651d::constructor_1) ENABLED START -----*/
......@@ -109,7 +93,7 @@ Mks651d::Mks651d(Tango::DeviceClass *cl, string &s)
}
//--------------------------------------------------------
Mks651d::Mks651d(Tango::DeviceClass *cl, const char *s)
: Tango::Device_4Impl(cl, s)
: TANGO_BASE_CLASS(cl, s)
{
/*----- PROTECTED REGION ID(Mks651d::constructor_2) ENABLED START -----*/
......@@ -119,7 +103,7 @@ Mks651d::Mks651d(Tango::DeviceClass *cl, const char *s)
}
//--------------------------------------------------------
Mks651d::Mks651d(Tango::DeviceClass *cl, const char *s, const char *d)
: Tango::Device_4Impl(cl, s, d)
: TANGO_BASE_CLASS(cl, s, d)
{
/*----- PROTECTED REGION ID(Mks651d::constructor_3) ENABLED START -----*/
......
src/Mks651d.h
+ 1
− 16
View file @ 06cb4ebf
......@@ -7,21 +7,6 @@
//
// project : Mks651d.
//
// $Author: mdm $
//
// $Revision: 1.2 $
// $Date: 2012-03-08 09:50:01 $
//
// SVN only:
// $HeadURL: $
//
// CVS only:
// $Source: /home/cvsadm/cvsroot/fermi/servers/651d/src/Mks651d.h,v $
// $Log: Mks651d.h,v $
// Revision 1.2 2012-03-08 09:50:01 mdm
// New version of server
//
//
//=============================================================================
// This file is generated by POGO
// (Program Obviously used to Generate tango Object)
......@@ -51,7 +36,7 @@ namespace Mks651d_ns
/*----- PROTECTED REGION END -----*/ // Mks651d::Additional Class Declarations
class Mks651d : public Tango::Device_4Impl
class Mks651d : public TANGO_BASE_CLASS
{
......
src/Mks651dClass.cpp
+ 0
− 147
View file @ 06cb4ebf
/*----- PROTECTED REGION ID(Mks651dClass.cpp) ENABLED START -----*/
static const char *RcsId = "$Id: Mks651dClass.cpp,v 1.2 2012-03-08 09:50:01 mdm Exp $";
static const char *TagName = "$Name: $";
static const char *CvsPath = "$Source: /home/cvsadm/cvsroot/fermi/servers/651d/src/Mks651dClass.cpp,v $";
static const char *SvnPath = "$HeadURL: $";
static const char *HttpServer = "http://www.esrf.eu/computing/cs/tango/tango_doc/ds_doc/";
//=============================================================================
//
// file : Mks651dClass.cpp
......@@ -15,21 +10,6 @@ static const char *HttpServer = "http://www.esrf.eu/computing/cs/tango/tango_doc
//
// project : Mks651d.
//
// $Author: mdm $
//
// $Revision: 1.2 $
// $Date: 2012-03-08 09:50:01 $
//
// SVN only:
// $HeadURL: $
//
// CVS only:
// $Source: /home/cvsadm/cvsroot/fermi/servers/651d/src/Mks651dClass.cpp,v $
// $Log: Mks651dClass.cpp,v $
// Revision 1.2 2012-03-08 09:50:01 mdm
// New version of server
//
//
//=============================================================================
// This file is generated by POGO
// (Program Obviously used to Generate tango Object)
......@@ -799,134 +779,7 @@ void Mks651dClass::set_default_property()
//--------------------------------------------------------
void Mks651dClass::write_class_property()
{
// First time, check if database used
if (Tango::Util::_UseDb == false)
return;
Tango::DbData data;
string classname = get_name();
string header;
string::size_type start, end;
// Put title
Tango::DbDatum title("ProjectTitle");
string str_title("Mks651d");
title << str_title;
data.push_back(title);
// Put Description
Tango::DbDatum description("Description");
vector<string> str_desc;
str_desc.push_back("");
description << str_desc;
data.push_back(description);
// put cvs or svn location
string filename("Mks651d");
filename += "Class.cpp";
// check for cvs information
string src_path(CvsPath);
start = src_path.find("/");
if (start!=string::npos)
{
end = src_path.find(filename);
if (end>start)
{
string strloc = src_path.substr(start, end-start);
// Check if specific repository
start = strloc.find("/cvsroot/");
if (start!=string::npos && start>0)
{
string repository = strloc.substr(0, start);
if (repository.find("/segfs/")!=string::npos)
strloc = "ESRF:" + strloc.substr(start, strloc.length()-start);
}
Tango::DbDatum cvs_loc("cvs_location");
cvs_loc << strloc;
data.push_back(cvs_loc);
}
}
// check for svn information
else
{
string src_path(SvnPath);
start = src_path.find("://");
if (start!=string::npos)
{
end = src_path.find(filename);
if (end>start)
{
header = "$HeadURL: ";
start = header.length();
string strloc = src_path.substr(start, (end-start));
Tango::DbDatum svn_loc("svn_location");
svn_loc << strloc;
data.push_back(svn_loc);
}
}
}
// Get CVS or SVN revision tag
// CVS tag
string tagname(TagName);
header = "$Name: ";
start = header.length();
string endstr(" $");
end = tagname.find(endstr);
if (end!=string::npos && end>start)
{
string strtag = tagname.substr(start, end-start);
Tango::DbDatum cvs_tag("cvs_tag");
cvs_tag << strtag;
data.push_back(cvs_tag);
}
// SVN tag
string svnpath(SvnPath);
header = "$HeadURL: ";
start = header.length();
end = svnpath.find(endstr);
if (end!=string::npos && end>start)
{
string strloc = svnpath.substr(start, end-start);
string tagstr ("/tags/");
start = strloc.find(tagstr);
if ( start!=string::npos )
{
start = start + tagstr.length();
end = strloc.find(filename);
string strtag = strloc.substr(start, end-start-1);
Tango::DbDatum svn_tag("svn_tag");
svn_tag << strtag;
data.push_back(svn_tag);
}
}
// Get URL location
string httpServ(HttpServer);
if (httpServ.length()>0)
{
Tango::DbDatum db_doc_url("doc_url");
db_doc_url << httpServ;
data.push_back(db_doc_url);
}
// Put inheritance
Tango::DbDatum inher_datum("InheritedFrom");
vector<string> inheritance;
inheritance.push_back("Device_Impl");
inher_datum << inheritance;
data.push_back(inher_datum);
// Call database and and values
get_db_class()->put_property(data);
}
......
src/Mks651dClass.h
+ 0
− 16
View file @ 06cb4ebf
......@@ -9,22 +9,6 @@
// It contains all properties and methods which the .
// Mks651d requires only once e.g. the commands.
//
// project : Mks651d.
//
// $Author: mdm $
//
// $Revision: 1.2 $
// $Date: 2012-03-08 09:50:01 $
//
// SVN only:
// $HeadURL: $
//
// CVS only:
// $Source: /home/cvsadm/cvsroot/fermi/servers/651d/src/Mks651dClass.h,v $
// $Log: Mks651dClass.h,v $
// Revision 1.2 2012-03-08 09:50:01 mdm
// New version of server
//
//
//=============================================================================
// This file is generated by POGO
......
src/Mks651dStateMachine.cpp
+ 0
− 16
View file @ 06cb4ebf
/*----- PROTECTED REGION ID(Mks651dStateMachine.cpp) ENABLED START -----*/
static const char *RcsId = "$Id: Mks651dStateMachine.cpp,v 1.2 2012-03-08 09:50:01 mdm Exp $";
//=============================================================================
//
// file : Mks651dStateMachine.cpp
......@@ -9,21 +8,6 @@ static const char *RcsId = "$Id: Mks651dStateMachine.cpp,v 1.2 2012-03-08 09:50:
//
// project : Mks651d.
//
// $Author: mdm $
//
// $Revision: 1.2 $
// $Date: 2012-03-08 09:50:01 $
//
// SVN only:
// $HeadURL: $
//
// CVS only:
// $Source: /home/cvsadm/cvsroot/fermi/servers/651d/src/Mks651dStateMachine.cpp,v $
// $Log: Mks651dStateMachine.cpp,v $
// Revision 1.2 2012-03-08 09:50:01 mdm
// New version of server
//
//
//=============================================================================
// This file is generated by POGO
// (Program Obviously used to Generate tango Object)
......
src/ThreadGuard.h
+ 0
− 3
View file @ 06cb4ebf
/*
* ThreadGuard.h
*
* Created on: Nov 30, 2011
* Author: mdm
*/
#ifndef THREADGUARD_H_
......
src/main.cpp
+ 0
− 16
View file @ 06cb4ebf
/*PROTECTED REGION ID(Mks651d::main.cpp) ENABLED START*/
static const char *RcsId = "$Id: main.cpp,v 1.2 2012-03-08 09:50:01 mdm Exp $";
//=============================================================================
//
// file : Mks651d.cpp
......@@ -11,21 +10,6 @@ static const char *RcsId = "$Id: main.cpp,v 1.2 2012-03-08 09:50:01 mdm Exp $";
//
// project : Mks651d.
//
// $Author: mdm $
//
// $Revision: 1.2 $
// $Date: 2012-03-08 09:50:01 $
//
// SVN only:
// $HeadURL: $
//
// CVS only:
// $Source: /home/cvsadm/cvsroot/fermi/servers/651d/src/main.cpp,v $
// $Log: main.cpp,v $
// Revision 1.2 2012-03-08 09:50:01 mdm
// New version of server
//
//
//=============================================================================
// This file is generated by POGO
// (Program Obviously used to Generate tango Object)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment