Menu
▾
▴
dsim-svn — Subversion activity mailing list
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(23) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(16) |
Feb
(13) |
Mar
(1) |
Apr
(6) |
May
(4) |
Jun
(3) |
Jul
(33) |
Aug
(3) |
Sep
(16) |
Oct
(7) |
Nov
(20) |
Dec
(2) |
|
From: <sng...@us...> - 2010-07-29 10:11:31
|
Revision: 116
http://dsim.svn.sourceforge.net/dsim/?rev=116&view=rev
Author: snguyenkim
Date: 2010-07-29 10:11:24 +0000 (Thu, 29 Jul 2010)
Log Message:
-----------
asynchronous log server
Modified Paths:
--------------
trunk/dsim/test/boost/asio/log_server/Makefile.am
trunk/dsim/test/boost/asio/log_server/README
trunk/dsim/test/boost/asio/log_server/asynServer.cpp
trunk/dsim/test/boost/asio/log_server/client.cpp
Added Paths:
-----------
trunk/dsim/test/boost/asio/log_server/networkFunctions.cpp
trunk/dsim/test/boost/asio/log_server/synServer.cpp
trunk/dsim/test/boost/asio/log_server/test.txt
Removed Paths:
-------------
trunk/dsim/test/boost/asio/log_server/server.cpp
Modified: trunk/dsim/test/boost/asio/log_server/Makefile.am
===================================================================
--- trunk/dsim/test/boost/asio/log_server/Makefile.am 2010-07-26 15:45:19 UTC (rev 115)
+++ trunk/dsim/test/boost/asio/log_server/Makefile.am 2010-07-29 10:11:24 UTC (rev 116)
@@ -5,17 +5,17 @@
MAINTAINERCLEANFILES = Makefile.in
-check_PROGRAMS = client server asynServer
+check_PROGRAMS = client synServer asynServer
client_SOURCES = client.cpp
client_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
client_LDFLAGS = $(BOOST_LIBS) $(BOOST_DATE_TIME_LIB) $(BOOST_ASIO_LIB)
client_LDADD =
-server_SOURCES = server.cpp
-server_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
-server_LDFLAGS = $(BOOST_LIBS) $(BOOST_DATE_TIME_LIB) $(BOOST_ASIO_LIB)
-server_LDADD =
+synServer_SOURCES = synServer.cpp
+synServer_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
+synServer_LDFLAGS = $(BOOST_LIBS) $(BOOST_DATE_TIME_LIB) $(BOOST_ASIO_LIB)
+synServer_LDADD =
asynServer_SOURCES = asynServer.cpp
asynServer_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
Modified: trunk/dsim/test/boost/asio/log_server/README
===================================================================
--- trunk/dsim/test/boost/asio/log_server/README 2010-07-26 15:45:19 UTC (rev 115)
+++ trunk/dsim/test/boost/asio/log_server/README 2010-07-29 10:11:24 UTC (rev 116)
@@ -1,7 +1,3 @@
-* Log server modele using ASIO
- Client 1 will take input1 to send to server
- Client 2 will take inpu2 to send to server
- Server will log these two files into server.log
-
-* For verifying:
- Client 1 & Client 2 don't intefere -> in server.log, 2 parts (for client 1 & client 2) are seperated
\ No newline at end of file
+* synServer is synchronous and asynServer is asynchronous log server
+* asynServer log to file corresponding to client's IP while synServer uses only server.log
+* asynServer creates a seperate thread for handling each client
Modified: trunk/dsim/test/boost/asio/log_server/asynServer.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/asynServer.cpp 2010-07-26 15:45:19 UTC (rev 115)
+++ trunk/dsim/test/boost/asio/log_server/asynServer.cpp 2010-07-29 10:11:24 UTC (rev 116)
@@ -5,6 +5,7 @@
#include <ctime>
#include <iostream>
#include <string>
+#include <fstream>
// Boost.ASIO
#include <iostream>
#include <boost/asio.hpp>
@@ -28,8 +29,8 @@
typedef boost::shared_ptr<TCPConnection> Pointer_T;
/** Create a TCP connection, from a given Boost.ASIO service. */
- static Pointer_T create (boost::asio::io_service& ioIOService) {
- TCPConnection* oConnectionPtr = new TCPConnection (ioIOService);
+ static Pointer_T create (boost::asio::io_service& ioIOService, string lLogFile) {
+ TCPConnection* oConnectionPtr = new TCPConnection (ioIOService, lLogFile);
assert (oConnectionPtr != NULL);
return Pointer_T (oConnectionPtr);
}
@@ -41,23 +42,48 @@
/** Process the incoming client request, by giving it back the time of day. */
void start() {
+ ostringstream ostr;
+ ostr << _socket.remote_endpoint();
+ string clientFullName=ostr.str(); //127.0.0.1:73784
+ string clientName= clientFullName.substr(0,clientFullName.find(":")); //127.0.0.1
- _message = make_daytime_string();
+ ostringstream oss;
+ oss << clientName << ".log";
+ log_file= oss.str(); // each client log into a seperate file which ends by log. Ex:127.0.0.1.log
+ cout << "Received client: " << clientName << " Corresponding log file:" << log_file << endl;
+
+ ofstream out (log_file.c_str(), ios::app); // open log file
+ if (out == NULL){
+ cout << log_file << " :openning problem!" << endl;
+ return ;
+ }
+
+ boost::system::error_code lTransferError;
+ boost::array<char, 1024> lBuffer;
+ for(;;){
+ size_t lLength = _socket.read_some (boost::asio::buffer (lBuffer), lTransferError);
+ out.write(lBuffer.data(),lLength);
- boost::system::error_code lIgnoredError;
- boost::asio::async_write (_socket, boost::asio::buffer (_message),
- boost::bind (&TCPConnection::handleWrite,
- shared_from_this(),
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred));
+ if (lTransferError == boost::asio::error::eof) {
+ // Connection closed cleanly by peer.
+ cout << "EOF found: Transfer finished\n >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> \n" ;
+ break;
+ } else if (lTransferError) {
+ // Some other error.
+ throw boost::system::system_error (lTransferError);
+ }
+// std::cout.write (lBuffer.data(), lLength);
+ }
+ out.close();
}
private:
// //////////// Constructors & Destructors /////////////
/** Constructor. */
- TCPConnection (boost::asio::io_service& ioIOService)
+ TCPConnection (boost::asio::io_service& ioIOService, string lLogFile)
: _socket (ioIOService) {
+ log_file = lLogFile;
}
void handleWrite (const boost::system::error_code& iErrorCode,
@@ -77,6 +103,9 @@
/** TCP/IP socket. */
boost::asio::ip::tcp::socket _socket;
+
+ /** Log file prefix */
+ string log_file;
};
@@ -85,11 +114,12 @@
public:
// //////////// Constructors & Destructors /////////////
/** Constructor.
- <br>Create a listener for IP/TCP v4, listening on port 2624 (corresponding
- to the "aria" service, as specified within the /etc/services file) */
- TCPServer (boost::asio::io_service& ioIOService) : _acceptor (ioIOService,
- boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), 2624)) {
+ <br>Create a listener for IP/TCP v4 and listening on port lPort */
+ TCPServer (boost::asio::io_service& ioIOService, int lPort, string lLogFile) : _acceptor (ioIOService,
+ boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), lPort)) {
+ log_file = lLogFile;
startAccept();
+
}
@@ -97,8 +127,7 @@
// ///////////////// Technical Methods ///////////////////
/** Accept (socket) connection from any client. */
void startAccept() {
- TCPConnection::Pointer_T lConnection =
- TCPConnection::create (_acceptor.io_service());
+ TCPConnection::Pointer_T lConnection = TCPConnection::create (_acceptor.io_service(), log_file);
boost::asio::ip::tcp::socket& lSocket = lConnection->socket();
_acceptor.async_accept (lSocket,
@@ -109,9 +138,11 @@
/** Process the (socket) connection from any client. */
void handleAccept (TCPConnection::Pointer_T ioConnection,const boost::system::error_code& iError) {
- cout << "received 1 client" << endl;
+ static int nbConnections = 0;
+ nbConnections ++ ;
+ cout << "Has received:" << nbConnections << " clients" << endl;
if (!iError) {
- ioConnection->start();
+ ioConnection -> start();
startAccept();
}
}
@@ -121,23 +152,40 @@
// /////////// Attributes /////////////
/** Connection acceptor. */
boost::asio::ip::tcp::acceptor _acceptor;
+ string log_file;
};
// //////////////////// M A I N /////////////////////////////
int main (int argc, char* argv[]) {
- try {
+ string log_file = "abcd.log";
+ int listening_port = 2624;//corresponding to the "aria" service, as specified within the /etc/services file
- boost::asio::io_service lIOService;
- TCPServer lServer (lIOService);
+ cout << "Syntax: ./asynServer [file_to_log] [listening_port]" << endl;
+ cout << "By default, server listens on port 2624 and file_to_log=\"abcd.log\"" << endl;
- lIOService.run();
+ if (argc > 2){
+ listening_port = atoi(argv[2]);
+ log_file = string(argv[1]);
+ }
+ cout << "=======================================================================================" << endl;
+ cout << "Server log to file:" << log_file << endl;
+ cout << "Server listening on port:" << listening_port << endl;
+ cout << "=======================================================================================" << endl;
- } catch (std::exception& lException) {
- std::cerr << lException.what() << std::endl;
- }
+
+ try {
- return 0;
+ boost::asio::io_service lIOService;
+ TCPServer lServer (lIOService, listening_port, log_file);
+
+ lIOService.run();
+
+ } catch (std::exception& lException) {
+ std::cerr << lException.what() << std::endl;
+ }
+
+ return 0;
}
Modified: trunk/dsim/test/boost/asio/log_server/client.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/client.cpp 2010-07-26 15:45:19 UTC (rev 115)
+++ trunk/dsim/test/boost/asio/log_server/client.cpp 2010-07-29 10:11:24 UTC (rev 116)
@@ -8,28 +8,33 @@
#include <boost/array.hpp>
// Sleep funtion
#include <unistd.h>
+//Some network functions
+#include "networkFunctions.cpp"
-std::string lHostname = "localhost";
-const std::string lServiceName = "aria"; // The "aria" service corresponds to the port 2624 see /etc/services
+
+std::string lServerName = "localhost";
+std::string lServiceName = "aria"; // The "aria" service corresponds to the port 2624 see /etc/services
std::string sendFile="test.txt";
int attempt=0; //Nb of attemps to connect to server
+int lServerPort = 2624;
/* Send filename's content to server */
void send_file (std::string filename){
using namespace std;
-
+ // testing if file exists
+ fstream fst (filename.c_str(), ios::in);
+ if (fst == NULL){
+ cout << filename << " does not exist !" << endl;
+ exit(1);
+ }
+
// try to get a socket (communication canal)
while(1){
- // testing if file exists
- fstream fst (filename.c_str(), ios::in);
- if (fst == NULL){
- cout << filename << " does not exist !" << endl;
- exit(1);
- }
+
boost::asio::io_service lIOService;
boost::asio::ip::tcp::socket lSocket (lIOService);
boost::asio::ip::tcp::resolver lResolver (lIOService);
- boost::asio::ip::tcp::resolver::query lQuery (lHostname, lServiceName);
+ boost::asio::ip::tcp::resolver::query lQuery (lServerName, lServiceName);
boost::asio::ip::tcp::resolver::iterator lEnd;
boost::system::error_code lError = boost::asio::error::host_not_found;
@@ -83,18 +88,22 @@
int main (int argc, char* argv[]) {
using namespace std;
- cout << "Syntax: ./client [file_to_send] [server_name] " << endl;
- cout << "By default, file_to_send= \"test.txt\" and server_name=\"localhost\" " << endl;
+ cout << "Syntax: ./client [file_to_send] [server_name] [server_port] " << endl;
+ cout << "By default, file_to_send= \"test.txt\" and server_name=\"localhost\" and server_port=2624 " << endl;
- if (argc > 2) {
+ if (argc > 3) {
sendFile = string(argv[1]);
- lHostname = string (argv[2]);
+ lServerName = string (argv[2]);
+ lServerPort = atoi(argv[3]);
+ lServiceName = port_to_service(lServerPort);
}else if (argc == 2)
sendFile = string(argv[1]);
+ cout << "=======================================================================================" << endl;
cout << "File to send:" << sendFile << endl;
- cout << "Server:" << lHostname << endl;
- cout << "====================================================================" << endl;
+ cout << "Server name:" << lServerName << endl;
+ cout << "Server port:" << lServerPort << endl;
+ cout << "=======================================================================================" << endl;
send_file(sendFile);
return 0;
Added: trunk/dsim/test/boost/asio/log_server/networkFunctions.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/networkFunctions.cpp (rev 0)
+++ trunk/dsim/test/boost/asio/log_server/networkFunctions.cpp 2010-07-29 10:11:24 UTC (rev 116)
@@ -0,0 +1,64 @@
+// STL
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <ctime>
+#include <unistd.h>
+
+#include <netdb.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+using namespace std;
+
+/* return the port corresponding to service name s using /etc/services
+For ex: aria returns 2624
+*/
+int service_to_port(string s){
+ servent* a = getservbyname(s.c_str(), NULL);
+ endservent();
+
+ if (a!= NULL)
+ return htons(a -> s_port);
+ else{
+ cout << "No service with name:" << s << " is found" << endl;
+ return -1;
+ }
+}
+string port_to_service(int p){
+ servent* a = getservbyport(htons(p), NULL);
+ endservent();
+
+ if (a!= NULL)
+ return a -> s_name;
+ else{
+ cout << "No service with port:" << p << " is found" << endl;
+ return "";
+ }
+}
+/* Ex: Takes 172.16.134.217 , returns nceorilnx03.nce.amadeus.net*/
+string ip_to_hostname(string s){
+ struct hostent *he;
+ struct in_addr ipv4addr;
+ inet_pton(AF_INET, s.c_str(), &ipv4addr);
+ he = gethostbyaddr(&ipv4addr, sizeof ipv4addr, AF_INET);
+ cout << "finish searching\n";
+ if (he!= NULL)
+ return he->h_name;
+ else{
+ cout << "Can't find hostname corresponding to: " << s << endl;
+ return "";
+ }
+
+
+
+
+}
+// int main(){
+// cout << service_to_port("ariaa") << endl;
+// cout << port_to_service(22) << endl;
+//
+// // string add="172.16.134.217";
+// string add="173.163.134.217";
+// cout << ip_to_hostname(add) << endl;
+// return 0;
+// }
\ No newline at end of file
Deleted: trunk/dsim/test/boost/asio/log_server/server.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/server.cpp 2010-07-26 15:45:19 UTC (rev 115)
+++ trunk/dsim/test/boost/asio/log_server/server.cpp 2010-07-29 10:11:24 UTC (rev 116)
@@ -1,83 +0,0 @@
-// Log server
-// STL
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <ctime>
-// Boost.ASIO
-#include <boost/asio.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-#include <unistd.h>
-
-
-// //////////////////// M A I N /////////////////////////////
-int main (int argc, char* argv[]) {
- using namespace std;
-
- int listening_port = 2624;//corresponding to the "aria" service, as specified within the /etc/services file
- string log_file= "server.log";
-
- cout << "Syntax: ./server [file_to_log] [listening_port]" << endl;
- cout << "By default, server listens on port 2624 and file_to_log=\"server.log\"" << endl;
-
- if (argc > 2){
- listening_port = atoi(argv[2]);
- log_file = string(argv[1]);
- }else if (argc == 2)
- log_file = string(argv[1]);
-
- cout << "Server log to file:" << log_file << endl;
- cout << "Server listening on port:" << listening_port << endl;
- cout << "======================================================================" << endl;
-
-
- try {
-
- boost::asio::io_service lIOService;
-
- // Create a listener for IP/TCP v4, listening on listening_port
- boost::asio::ip::tcp::acceptor lAcceptor (lIOService,
- boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), listening_port));
-
- int nbConnections = 0;
- for (;;) {
- boost::asio::ip::tcp::socket lSocket (lIOService);
- lAcceptor.accept (lSocket); //will block until a new connection has been accepted successfully or an error occurs.
- nbConnections ++;
- std::cout << "Nb of connections:" << nbConnections << std::endl;
- cout << "received client: " << lSocket.remote_endpoint() << endl;
-
- boost::system::error_code lIgnoredError;
- boost::system::error_code lTransferError;
- boost::array<char, 1024> lBuffer;
-
- ofstream out (log_file.c_str(), ios::app); // open log file
- if (out == NULL){
- cout << log_file << " does not exist !" << endl;
- return -1;
- }
- for(;;){
- size_t lLength = lSocket.read_some (boost::asio::buffer (lBuffer), lTransferError);
- out.write(lBuffer.data(),lLength);
-
- if (lTransferError == boost::asio::error::eof) {
- // Connection closed cleanly by peer.
- cout << "EOF found: Transfer finished\n" ;
- break;
- } else if (lTransferError) {
- // Some other error.
- throw boost::system::system_error (lTransferError);
- }
-// std::cout.write (lBuffer.data(), lLength);
- }
- out.close();
- }
-
- } catch (std::exception& lException) {
- std::cerr << lException.what() << std::endl;
- }
-
- return 0;
-}
-
Copied: trunk/dsim/test/boost/asio/log_server/synServer.cpp (from rev 115, trunk/dsim/test/boost/asio/log_server/server.cpp)
===================================================================
--- trunk/dsim/test/boost/asio/log_server/synServer.cpp (rev 0)
+++ trunk/dsim/test/boost/asio/log_server/synServer.cpp 2010-07-29 10:11:24 UTC (rev 116)
@@ -0,0 +1,83 @@
+// Log server
+// STL
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <ctime>
+// Boost.ASIO
+#include <boost/asio.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+#include <unistd.h>
+
+
+// //////////////////// M A I N /////////////////////////////
+int main (int argc, char* argv[]) {
+ using namespace std;
+
+ int listening_port = 2624;//corresponding to the "aria" service, as specified within the /etc/services file
+ string log_file= "server.log";
+
+ cout << "Syntax: ./server [file_to_log] [listening_port]" << endl;
+ cout << "By default, server listens on port 2624 and file_to_log=\"server.log\"" << endl;
+
+ if (argc > 2){
+ listening_port = atoi(argv[2]);
+ log_file = string(argv[1]);
+ }else if (argc == 2)
+ log_file = string(argv[1]);
+
+ cout << "=======================================================================================" << endl;
+ cout << "Server log to file:" << log_file << endl;
+ cout << "Server listening on port:" << listening_port << endl;
+ cout << "=======================================================================================" << endl;
+
+
+ try {
+
+ boost::asio::io_service lIOService;
+
+ // Create a listener for IP/TCP v4, listening on listening_port
+ boost::asio::ip::tcp::acceptor lAcceptor (lIOService,
+ boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), listening_port));
+
+ int nbConnections = 0;
+ for (;;) {
+ boost::asio::ip::tcp::socket lSocket (lIOService);
+ lAcceptor.accept (lSocket); //will block until a new connection has been accepted successfully or an error occurs.
+ nbConnections ++;
+ std::cout << "Nb of connections:" << nbConnections << std::endl;
+ cout << "received client: " << lSocket.remote_endpoint() << endl;
+
+ boost::system::error_code lTransferError;
+ boost::array<char, 1024> lBuffer;
+
+ ofstream out (log_file.c_str(), ios::app); // open log file
+ if (out == NULL){
+ cout << log_file << " does not exist !" << endl;
+ return -1;
+ }
+ for(;;){
+ size_t lLength = lSocket.read_some (boost::asio::buffer (lBuffer), lTransferError);
+ out.write(lBuffer.data(),lLength);
+
+ if (lTransferError == boost::asio::error::eof) {
+ // Connection closed cleanly by peer.
+ cout << "EOF found: Transfer finished\n >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> \n" ;
+ break;
+ } else if (lTransferError) {
+ // Some other error.
+ throw boost::system::system_error (lTransferError);
+ }
+// std::cout.write (lBuffer.data(), lLength);
+ }
+ out.close();
+ }
+
+ } catch (std::exception& lException) {
+ std::cerr << lException.what() << std::endl;
+ }
+
+ return 0;
+}
+
Added: trunk/dsim/test/boost/asio/log_server/test.txt
===================================================================
--- trunk/dsim/test/boost/asio/log_server/test.txt (rev 0)
+++ trunk/dsim/test/boost/asio/log_server/test.txt 2010-07-29 10:11:24 UTC (rev 116)
@@ -0,0 +1,86 @@
+//Client
+// STL
+#include <iostream>
+#include <string>
+#include <fstream>
+// Boost.ASIO
+#include <boost/asio.hpp>
+#include <boost/array.hpp>
+// Sleep funtion
+#include <unistd.h>
+
+/* Send filename's content to server */
+void send_file (std::string filename){
+ using namespace std;
+ std::string lHostname = "localhost";
+ // Service name (as specified within /etc/services)
+ // The "aria" service corresponds to the port 2624
+ const std::string lServiceName = "aria";
+ int attempt=0;
+ // try to get a socket (communication canal)
+ while(1){
+ try {
+ boost::asio::io_service lIOService;
+ boost::asio::ip::tcp::socket lSocket (lIOService);
+
+ boost::asio::ip::tcp::resolver lResolver (lIOService);
+ boost::asio::ip::tcp::resolver::query lQuery (lHostname, lServiceName);
+ boost::asio::ip::tcp::resolver::iterator itEndPoint =lResolver.resolve (lQuery);
+ boost::asio::ip::tcp::resolver::iterator lEnd;
+ boost::system::error_code lError = boost::asio::error::host_not_found;
+
+ while (lError && itEndPoint != lEnd) {
+ const boost::asio::ip::tcp::endpoint lEndPoint = *itEndPoint;
+
+ // DEBUG
+ // std::cout << "Testing end point: " << lEndPoint << std::endl;
+ // std::cout << "Testing lError: " << lError << std::endl;
+ lSocket.close();
+ lSocket.connect (lEndPoint, lError);
+ ++itEndPoint;
+ }
+
+ if (lError) {
+ std::cout << "Cannot find corresponding endpoint at:" << attempt << " attempts" << std::endl;
+ attempt ++;
+ sleep(1);
+ continue;
+ throw boost::system::system_error (lError);
+ }
+ assert (!lError);
+ cout << "Socket is opened !\n";
+ // File sending part
+ fstream fst (filename.c_str(), ios::in);
+ char * buffer; //contains file's content
+
+ // get length of file:
+ fst.seekg (0, ios::end);
+ int length = fst.tellg();
+ fst.seekg (0, ios::beg);
+
+ cout << "file length:" << length << endl;
+ buffer = new char[length];
+ fst.read(buffer,length);
+
+ boost::system::error_code lIgnoredError;
+ boost::asio::write (lSocket, boost::asio::buffer (buffer),boost::asio::transfer_all(), lIgnoredError);
+
+ return;
+ } catch (std::exception& lException) {
+ std::cerr << lException.what() << std::endl;
+ }
+ }
+}
+
+// /////////// M A I N ////////////////
+int main (int argc, char* argv[]) {
+ using namespace std;
+ string filename = "input";
+ if (argc >= 2) {
+ filename = string(argv[1]);
+ }
+ send_file(filename);
+ return 0;
+}
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sng...@us...> - 2010-07-26 15:45:26
|
Revision: 115
http://dsim.svn.sourceforge.net/dsim/?rev=115&view=rev
Author: snguyenkim
Date: 2010-07-26 15:45:19 +0000 (Mon, 26 Jul 2010)
Log Message:
-----------
Update log server
Modified Paths:
--------------
trunk/dsim/test/boost/asio/log_server/Makefile.am
trunk/dsim/test/boost/asio/log_server/client.cpp
trunk/dsim/test/boost/asio/log_server/server.cpp
Added Paths:
-----------
trunk/dsim/test/boost/asio/log_server/asynServer.cpp
Modified: trunk/dsim/test/boost/asio/log_server/Makefile.am
===================================================================
--- trunk/dsim/test/boost/asio/log_server/Makefile.am 2010-07-24 19:00:16 UTC (rev 114)
+++ trunk/dsim/test/boost/asio/log_server/Makefile.am 2010-07-26 15:45:19 UTC (rev 115)
@@ -5,7 +5,7 @@
MAINTAINERCLEANFILES = Makefile.in
-check_PROGRAMS = client server
+check_PROGRAMS = client server asynServer
client_SOURCES = client.cpp
client_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
@@ -17,3 +17,7 @@
server_LDFLAGS = $(BOOST_LIBS) $(BOOST_DATE_TIME_LIB) $(BOOST_ASIO_LIB)
server_LDADD =
+asynServer_SOURCES = asynServer.cpp
+asynServer_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
+asynServer_LDFLAGS = $(BOOST_LIBS) $(BOOST_DATE_TIME_LIB) $(BOOST_ASIO_LIB)
+asynServer_LDADD =
\ No newline at end of file
Added: trunk/dsim/test/boost/asio/log_server/asynServer.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/asynServer.cpp (rev 0)
+++ trunk/dsim/test/boost/asio/log_server/asynServer.cpp 2010-07-26 15:45:19 UTC (rev 115)
@@ -0,0 +1,143 @@
+// Boost.ASIO Tutorial - Daytime3:
+// http://www.boost.org/doc/libs/1_40_0/doc/html/boost_asio/tutorial/tutdaytime3.html
+// STL
+#include <cassert>
+#include <ctime>
+#include <iostream>
+#include <string>
+// Boost.ASIO
+#include <iostream>
+#include <boost/asio.hpp>
+#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+using namespace std;
+// //////////////////////////////////////////////////////////
+std::string make_daytime_string() {
+ const std::time_t now = std::time(0);
+ return std::ctime (&now);
+}
+
+// //////////////////////////////////////////////////////////
+/** Class handling TCP connections for a given server. */
+class TCPConnection : public boost::enable_shared_from_this<TCPConnection> {
+ public:
+ /** Pointer on a TCP connection. */
+ typedef boost::shared_ptr<TCPConnection> Pointer_T;
+
+ /** Create a TCP connection, from a given Boost.ASIO service. */
+ static Pointer_T create (boost::asio::io_service& ioIOService) {
+ TCPConnection* oConnectionPtr = new TCPConnection (ioIOService);
+ assert (oConnectionPtr != NULL);
+ return Pointer_T (oConnectionPtr);
+ }
+
+ /** Get the underlying TCP socket. */
+ boost::asio::ip::tcp::socket& socket() {
+ return _socket;
+ }
+
+ /** Process the incoming client request, by giving it back the time of day. */
+ void start() {
+
+ _message = make_daytime_string();
+
+ boost::system::error_code lIgnoredError;
+ boost::asio::async_write (_socket, boost::asio::buffer (_message),
+ boost::bind (&TCPConnection::handleWrite,
+ shared_from_this(),
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
+ }
+
+
+ private:
+ // //////////// Constructors & Destructors /////////////
+ /** Constructor. */
+ TCPConnection (boost::asio::io_service& ioIOService)
+ : _socket (ioIOService) {
+ }
+
+ void handleWrite (const boost::system::error_code& iErrorCode,
+ const size_t iTransferredBytes) {
+ // start();
+ }
+
+
+ private:
+ // ///////////////// Technical Methods ///////////////////
+
+
+ private:
+ // /////////// Attributes /////////////
+ /** Time of day. */
+ std::string _message;
+
+ /** TCP/IP socket. */
+ boost::asio::ip::tcp::socket _socket;
+};
+
+
+/** Class starting a TCP server, and handling incoming requests. */
+class TCPServer {
+ public:
+ // //////////// Constructors & Destructors /////////////
+ /** Constructor.
+ <br>Create a listener for IP/TCP v4, listening on port 2624 (corresponding
+ to the "aria" service, as specified within the /etc/services file) */
+ TCPServer (boost::asio::io_service& ioIOService) : _acceptor (ioIOService,
+ boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), 2624)) {
+ startAccept();
+ }
+
+
+ private:
+ // ///////////////// Technical Methods ///////////////////
+ /** Accept (socket) connection from any client. */
+ void startAccept() {
+ TCPConnection::Pointer_T lConnection =
+ TCPConnection::create (_acceptor.io_service());
+
+ boost::asio::ip::tcp::socket& lSocket = lConnection->socket();
+ _acceptor.async_accept (lSocket,
+ boost::bind (&TCPServer::handleAccept, this,
+ lConnection,
+ boost::asio::placeholders::error));
+ }
+
+ /** Process the (socket) connection from any client. */
+ void handleAccept (TCPConnection::Pointer_T ioConnection,const boost::system::error_code& iError) {
+ cout << "received 1 client" << endl;
+ if (!iError) {
+ ioConnection->start();
+ startAccept();
+ }
+ }
+
+
+ private:
+ // /////////// Attributes /////////////
+ /** Connection acceptor. */
+ boost::asio::ip::tcp::acceptor _acceptor;
+ };
+
+
+// //////////////////// M A I N /////////////////////////////
+int main (int argc, char* argv[]) {
+
+ try {
+
+ boost::asio::io_service lIOService;
+ TCPServer lServer (lIOService);
+
+ lIOService.run();
+
+ } catch (std::exception& lException) {
+ std::cerr << lException.what() << std::endl;
+ }
+
+ return 0;
+}
+
Modified: trunk/dsim/test/boost/asio/log_server/client.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/client.cpp 2010-07-24 19:00:16 UTC (rev 114)
+++ trunk/dsim/test/boost/asio/log_server/client.cpp 2010-07-26 15:45:19 UTC (rev 115)
@@ -9,71 +9,94 @@
// Sleep funtion
#include <unistd.h>
+std::string lHostname = "localhost";
+const std::string lServiceName = "aria"; // The "aria" service corresponds to the port 2624 see /etc/services
+std::string sendFile="test.txt";
+int attempt=0; //Nb of attemps to connect to server
+
/* Send filename's content to server */
void send_file (std::string filename){
using namespace std;
- std::string lHostname = "localhost";
- // Service name (as specified within /etc/services)
- // The "aria" service corresponds to the port 2624
- const std::string lServiceName = "aria";
// try to get a socket (communication canal)
- try {
+ while(1){
+ // testing if file exists
+ fstream fst (filename.c_str(), ios::in);
+ if (fst == NULL){
+ cout << filename << " does not exist !" << endl;
+ exit(1);
+ }
boost::asio::io_service lIOService;
boost::asio::ip::tcp::socket lSocket (lIOService);
-
boost::asio::ip::tcp::resolver lResolver (lIOService);
boost::asio::ip::tcp::resolver::query lQuery (lHostname, lServiceName);
- boost::asio::ip::tcp::resolver::iterator itEndPoint =lResolver.resolve (lQuery);
+
boost::asio::ip::tcp::resolver::iterator lEnd;
boost::system::error_code lError = boost::asio::error::host_not_found;
+ try {
+ boost::asio::ip::tcp::resolver::iterator itEndPoint =lResolver.resolve (lQuery);
- while (lError && itEndPoint != lEnd) {
- const boost::asio::ip::tcp::endpoint lEndPoint = *itEndPoint;
+ while (lError && itEndPoint != lEnd) {
+ const boost::asio::ip::tcp::endpoint lEndPoint = *itEndPoint;
- // DEBUG
-// std::cout << "Testing end point: " << lEndPoint << std::endl;
-// std::cout << "Testing lError: " << lError << std::endl;
- lSocket.close();
- lSocket.connect (lEndPoint, lError);
- ++itEndPoint;
- }
+ // std::cout << "Testing end point: " << lEndPoint << std::endl;
+ // std::cout << "Testing lError: " << lError << std::endl;
+ lSocket.close();
+ lSocket.connect (lEndPoint, lError);
+ ++itEndPoint;
+ }
- if (lError) {
- std::cout << "Cannot find corresponding endpoint" << std::endl;
- throw boost::system::system_error (lError);
- }
- assert (!lError);
- cout << "Socket is opened !\n";
- // File sending part
- fstream fst (filename.c_str(), ios::in);
- char * buffer; //contains file's content
+ if (lError) {
+ std::cout << "Cannot find corresponding endpoint at:" << attempt << " attempts" << std::endl;
+ attempt ++;
+ sleep(2); // not good to be too active
+ continue;
+ throw boost::system::system_error (lError);
+ }
+ assert (!lError);
+// cout << "Socket is opened !\n";
+
+ // File sending part
+ char * buffer; //contains file's content
- // get length of file:
- fst.seekg (0, ios::end);
- int length = fst.tellg();
- fst.seekg (0, ios::beg);
+ // get length of file:
+ fst.seekg (0, ios::end);
+ int length = fst.tellg();
+ fst.seekg (0, ios::beg);
- cout << "file length:" << length << endl;
- buffer = new char[length];
- fst.read(buffer,length);
+ cout << "file length:" << length << endl;
+ buffer = new char[length];
+ fst.read(buffer,length);
- boost::system::error_code lIgnoredError;
- boost::asio::write (lSocket, boost::asio::buffer (buffer),boost::asio::transfer_all(), lIgnoredError);
-
- } catch (std::exception& lException) {
- std::cerr << lException.what() << std::endl;
+ boost::system::error_code lIgnoredError;
+ boost::asio::write (lSocket, boost::asio::buffer (buffer),boost::asio::transfer_all(), lIgnoredError);
+
+ cout << "Transfer finished" << endl;
+ return;
+ } catch (std::exception& lException) {
+ std::cerr << lException.what() << std::endl;
+ }
}
}
// /////////// M A I N ////////////////
int main (int argc, char* argv[]) {
using namespace std;
- string filename = "input";
- if (argc >= 2) {
- filename = string(argv[1]);
- }
- send_file(filename);
+
+ cout << "Syntax: ./client [file_to_send] [server_name] " << endl;
+ cout << "By default, file_to_send= \"test.txt\" and server_name=\"localhost\" " << endl;
+
+ if (argc > 2) {
+ sendFile = string(argv[1]);
+ lHostname = string (argv[2]);
+ }else if (argc == 2)
+ sendFile = string(argv[1]);
+
+ cout << "File to send:" << sendFile << endl;
+ cout << "Server:" << lHostname << endl;
+ cout << "====================================================================" << endl;
+
+ send_file(sendFile);
return 0;
}
Modified: trunk/dsim/test/boost/asio/log_server/server.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/server.cpp 2010-07-24 19:00:16 UTC (rev 114)
+++ trunk/dsim/test/boost/asio/log_server/server.cpp 2010-07-26 15:45:19 UTC (rev 115)
@@ -7,40 +7,63 @@
// Boost.ASIO
#include <boost/asio.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
-using namespace std;
+#include <unistd.h>
+
+
// //////////////////// M A I N /////////////////////////////
int main (int argc, char* argv[]) {
using namespace std;
+
+ int listening_port = 2624;//corresponding to the "aria" service, as specified within the /etc/services file
+ string log_file= "server.log";
+
+ cout << "Syntax: ./server [file_to_log] [listening_port]" << endl;
+ cout << "By default, server listens on port 2624 and file_to_log=\"server.log\"" << endl;
+
+ if (argc > 2){
+ listening_port = atoi(argv[2]);
+ log_file = string(argv[1]);
+ }else if (argc == 2)
+ log_file = string(argv[1]);
+
+ cout << "Server log to file:" << log_file << endl;
+ cout << "Server listening on port:" << listening_port << endl;
+ cout << "======================================================================" << endl;
+
+
try {
boost::asio::io_service lIOService;
- // Create a listener for IP/TCP v4, listening on port 2624 (corresponding
- // to the "aria" service, as specified within the /etc/services file)
+ // Create a listener for IP/TCP v4, listening on listening_port
boost::asio::ip::tcp::acceptor lAcceptor (lIOService,
- boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), 2624));
+ boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), listening_port));
int nbConnections = 0;
for (;;) {
boost::asio::ip::tcp::socket lSocket (lIOService);
- lAcceptor.accept (lSocket);
+ lAcceptor.accept (lSocket); //will block until a new connection has been accepted successfully or an error occurs.
nbConnections ++;
std::cout << "Nb of connections:" << nbConnections << std::endl;
+ cout << "received client: " << lSocket.remote_endpoint() << endl;
boost::system::error_code lIgnoredError;
boost::system::error_code lTransferError;
boost::array<char, 1024> lBuffer;
- ofstream out ("server.log", ios::app); //file to write log
-
+ ofstream out (log_file.c_str(), ios::app); // open log file
+ if (out == NULL){
+ cout << log_file << " does not exist !" << endl;
+ return -1;
+ }
for(;;){
size_t lLength = lSocket.read_some (boost::asio::buffer (lBuffer), lTransferError);
out.write(lBuffer.data(),lLength);
-
+
if (lTransferError == boost::asio::error::eof) {
// Connection closed cleanly by peer.
- cout << "EOF error\n" ;
+ cout << "EOF found: Transfer finished\n" ;
break;
} else if (lTransferError) {
// Some other error.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-24 19:00:22
|
Revision: 114
http://dsim.svn.sourceforge.net/dsim/?rev=114&view=rev
Author: denis_arnaud
Date: 2010-07-24 19:00:16 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Added TravelCCM for the document generation.
Modified Paths:
--------------
trunk/dsim/doc/doxygen_html.cfg.in
Modified: trunk/dsim/doc/doxygen_html.cfg.in
===================================================================
--- trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 18:27:24 UTC (rev 113)
+++ trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 19:00:16 UTC (rev 114)
@@ -578,6 +578,7 @@
@top_srcdir@/airsched \
@top_srcdir@/rmol \
@top_srcdir@/airinv \
+ @top_srcdir@/travelccm \
@top_srcdir@/dsim \
@top_srcdir@/doc/local \
@top_builddir@/doc/local \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-24 18:27:31
|
Revision: 113
http://dsim.svn.sourceforge.net/dsim/?rev=113&view=rev
Author: denis_arnaud
Date: 2010-07-24 18:27:24 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Updated the tool for document generation (in order to produce PDF documents).
Modified Paths:
--------------
trunk/dsim/Makefile.am
trunk/dsim/doc/Makefile.am
trunk/dsim/doc/doxygen_html.cfg.in
Property Changed:
----------------
trunk/dsim/
Property changes on: trunk/dsim
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
configure.sh
COPYING
INSTALL
ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
dsim-config
dsim.pc
dsim.spec
libtool
dsim-html-doc-*.tar.*
dsim-*.tar.*
dsim.m4
build
latex
+ autom4te.cache
configure.sh
COPYING
INSTALL
ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
dsim-config
dsim.pc
dsim.spec
libtool
dsim-*.tar.*
dsim.m4
build
latex
Modified: trunk/dsim/Makefile.am
===================================================================
--- trunk/dsim/Makefile.am 2010-07-24 17:09:42 UTC (rev 112)
+++ trunk/dsim/Makefile.am 2010-07-24 18:27:24 UTC (rev 113)
@@ -1,4 +1,4 @@
-## top directory
+## dsim top directory
include $(top_srcdir)/Makefile.common
ACLOCAL_AMFLAGS = -I config
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-24 17:09:42 UTC (rev 112)
+++ trunk/dsim/doc/Makefile.am 2010-07-24 18:27:24 UTC (rev 113)
@@ -2,7 +2,7 @@
include $(top_srcdir)/doc/local/sources.mk
include $(top_srcdir)/doc/tutorial/sources.mk
include $(top_srcdir)/doc/tutorial/src/sources.mk
-#
+# StdAir
include $(top_srcdir)/stdair/basic/sources.mk
include $(top_srcdir)/stdair/bom/sources.mk
include $(top_srcdir)/stdair/factory/sources.mk
@@ -11,6 +11,7 @@
include $(top_srcdir)/stdair/service/sources.mk
include $(top_srcdir)/stdair/core/sources.mk
include $(top_srcdir)/stdair/batches/sources.mk
+# TraDemGen
#include $(top_srcdir)/trademgen/basic/sources.mk
#include $(top_srcdir)/trademgen/bom/sources.mk
#include $(top_srcdir)/trademgen/factory/sources.mk
@@ -18,6 +19,7 @@
#include $(top_srcdir)/trademgen/service/sources.mk
#include $(top_srcdir)/trademgen/core/sources.mk
#include $(top_srcdir)/trademgen/batches/sources.mk
+# AirSched
include $(top_srcdir)/airsched/basic/sources.mk
include $(top_srcdir)/airsched/bom/sources.mk
include $(top_srcdir)/airsched/factory/sources.mk
@@ -25,12 +27,14 @@
include $(top_srcdir)/airsched/service/sources.mk
include $(top_srcdir)/airsched/core/sources.mk
include $(top_srcdir)/airsched/batches/sources.mk
+# AirRAC
#include $(top_srcdir)/airrac/basic/sources.mk
#include $(top_srcdir)/airrac/bom/sources.mk
#include $(top_srcdir)/airrac/factory/sources.mk
#include $(top_srcdir)/airrac/command/sources.mk
#include $(top_srcdir)/airrac/service/sources.mk
#include $(top_srcdir)/airrac/core/sources.mk
+# RMOL
include $(top_srcdir)/rmol/basic/sources.mk
include $(top_srcdir)/rmol/field/sources.mk
include $(top_srcdir)/rmol/bom/sources.mk
@@ -39,12 +43,16 @@
include $(top_srcdir)/rmol/service/sources.mk
include $(top_srcdir)/rmol/core/sources.mk
include $(top_srcdir)/rmol/batches/sources.mk
-#include $(top_srcdir)/airinv/basic/sources.mk
-#include $(top_srcdir)/airinv/bom/sources.mk
-#include $(top_srcdir)/airinv/factory/sources.mk
-#include $(top_srcdir)/airinv/command/sources.mk
-#include $(top_srcdir)/airinv/service/sources.mk
-#include $(top_srcdir)/airinv/core/sources.mk
+# AirInv
+include $(top_srcdir)/airinv/basic/sources.mk
+include $(top_srcdir)/airinv/bom/sources.mk
+include $(top_srcdir)/airinv/factory/sources.mk
+include $(top_srcdir)/airinv/command/sources.mk
+include $(top_srcdir)/airinv/service/sources.mk
+include $(top_srcdir)/airinv/core/sources.mk
+include $(top_srcdir)/airinv/batches/sources.mk
+include $(top_srcdir)/airinv/server/sources.mk
+# AvlCal
#include $(top_srcdir)/avlcal/basic/sources.mk
#include $(top_srcdir)/avlcal/bom/sources.mk
#include $(top_srcdir)/avlcal/factory/sources.mk
@@ -52,6 +60,7 @@
#include $(top_srcdir)/avlcal/service/sources.mk
#include $(top_srcdir)/avlcal/core/sources.mk
#include $(top_srcdir)/avlcal/batches/sources.mk
+# SimFQT
#include $(top_srcdir)/simfqt/basic/sources.mk
#include $(top_srcdir)/simfqt/bom/sources.mk
#include $(top_srcdir)/simfqt/factory/sources.mk
@@ -59,6 +68,7 @@
#include $(top_srcdir)/simfqt/service/sources.mk
#include $(top_srcdir)/simfqt/core/sources.mk
#include $(top_srcdir)/simfqt/batches/sources.mk
+# SimCRS
#include $(top_srcdir)/simcrs/basic/sources.mk
#include $(top_srcdir)/simcrs/bom/sources.mk
#include $(top_srcdir)/simcrs/factory/sources.mk
@@ -66,13 +76,15 @@
#include $(top_srcdir)/simcrs/service/sources.mk
#include $(top_srcdir)/simcrs/core/sources.mk
#include $(top_srcdir)/simcrs/batches/sources.mk
-#include $(top_srcdir)/travelccm/basic/sources.mk
-#include $(top_srcdir)/travelccm/bom/sources.mk
-#include $(top_srcdir)/travelccm/factory/sources.mk
-#include $(top_srcdir)/travelccm/command/sources.mk
-#include $(top_srcdir)/travelccm/service/sources.mk
-#include $(top_srcdir)/travelccm/core/sources.mk
-#include $(top_srcdir)/travelccm/batches/sources.mk
+# TravelCCM
+include $(top_srcdir)/travelccm/basic/sources.mk
+include $(top_srcdir)/travelccm/bom/sources.mk
+include $(top_srcdir)/travelccm/factory/sources.mk
+include $(top_srcdir)/travelccm/command/sources.mk
+include $(top_srcdir)/travelccm/service/sources.mk
+include $(top_srcdir)/travelccm/core/sources.mk
+include $(top_srcdir)/travelccm/batches/sources.mk
+# DSim
include $(top_srcdir)/dsim/basic/sources.mk
include $(top_srcdir)/dsim/bom/sources.mk
include $(top_srcdir)/dsim/factory/sources.mk
@@ -121,6 +133,23 @@
$(rmol_fac_h_sources) $(rmol_fac_cc_sources) \
$(rmol_cmd_h_sources) $(rmol_cmd_cc_sources) \
$(rmol_svc_h_sources) $(rmol_svc_cc_sources) \
+ $(airinv_batches_h_sources) $(airinv_batches_cc_sources) \
+ $(airinv_service_h_sources) $(airinv_service_cc_sources) \
+ $(airinv_bas_h_sources) $(airinv_bas_cc_sources) \
+ $(airinv_bom_h_sources) $(airinv_bom_cc_sources) \
+ $(airinv_fac_h_sources) $(airinv_fac_cc_sources) \
+ $(airinv_dba_h_sources) $(airinv_dba_cc_sources) \
+ $(airinv_cmd_h_sources) $(airinv_cmd_cc_sources) \
+ $(airinv_svc_h_sources) $(airinv_svc_cc_sources) \
+ $(airinv_svr_h_sources) $(airinv_svr_cc_sources) \
+ $(airinv_clt_h_sources) $(airinv_clt_cc_sources) \
+ $(travelccm_service_h_sources) $(travelccm_service_cc_sources) \
+ $(travelccm_batches_h_sources) $(travelccm_batches_cc_sources) \
+ $(travelccm_bas_h_sources) $(travelccm_bas_cc_sources) \
+ $(travelccm_bom_h_sources) $(travelccm_bom_cc_sources) \
+ $(travelccm_fac_h_sources) $(travelccm_fac_cc_sources) \
+ $(travelccm_cmd_h_sources) $(travelccm_cmd_cc_sources) \
+ $(travelccm_svc_h_sources) $(travelccm_svc_cc_sources) \
$(dsim_service_h_sources) $(dsim_service_cc_sources) \
$(dsim_bas_h_sources) $(dsim_bas_cc_sources) \
$(dsim_bom_h_sources) $(dsim_bom_cc_sources) \
Modified: trunk/dsim/doc/doxygen_html.cfg.in
===================================================================
--- trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 17:09:42 UTC (rev 112)
+++ trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 18:27:24 UTC (rev 113)
@@ -575,7 +575,9 @@
# with spaces.
INPUT = @top_srcdir@/stdair \
+ @top_srcdir@/airsched \
@top_srcdir@/rmol \
+ @top_srcdir@/airinv \
@top_srcdir@/dsim \
@top_srcdir@/doc/local \
@top_builddir@/doc/local \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-24 17:09:48
|
Revision: 112
http://dsim.svn.sourceforge.net/dsim/?rev=112&view=rev
Author: denis_arnaud
Date: 2010-07-24 17:09:42 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Updated the licence for generated documentation.
Modified Paths:
--------------
trunk/dsim/doc/local/copyright.doc
Modified: trunk/dsim/doc/local/copyright.doc
===================================================================
--- trunk/dsim/doc/local/copyright.doc 2010-07-24 16:55:49 UTC (rev 111)
+++ trunk/dsim/doc/local/copyright.doc 2010-07-24 17:09:42 UTC (rev 112)
@@ -2,16 +2,20 @@
\page copyright Copyright and License
-\section gnugpl GNU GENERAL PUBLIC LICENSE
+\section gnugpl GNU LESSER GENERAL PUBLIC LICENSE
-\subsection version Version 2, June 1991
+\subsection version Version 2.1, February 1999
\verbatim
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+as the successor of the GNU Library Public License, version 2, hence
+the version number 2.1.]
\endverbatim
@@ -19,212 +23,383 @@
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
The precise terms and conditions for copying, distribution and
-modification follow.
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
-
\section terms TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
-Activities other than copying, distribution and modification are not
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
- a) You must cause the modified files to carry prominent notices
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
+identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
+on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+entire whole, and thus to each and every part regardless of who wrote
+it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
-collective works based on the Program.
+collective works based on the Library.
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
- 5. You are not required to accept this License, since you have not
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
+distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+the Library or works based on it.
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+You are not responsible for enforcing compliance by third parties with
this License.
- 7. If, as a consequence of a court judgment or allegation of patent
+ 11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+refrain entirely from distribution of the Library.
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
+integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
@@ -235,122 +410,109 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
- 8. If the distribution and/or use of the Program is restricted in
+ 12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
\subsection nowarranty NO WARRANTY
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
\subsection endofterms END OF TERMS AND CONDITIONS
\section howtoapply How to Apply These Terms to Your New Programs
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
\verbatim
- <one line to give the program's name and a brief idea of what it does.>
+ <one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
\endverbatim
Also add information on how to contact you by electronic and paper mail.
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-\verbatim
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-\endverbatim
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
+school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
\verbatim
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
- <signature of Ty Coon>, 1 April 1989
+ <signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
\endverbatim
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
+That's all there is to it!
+
+<a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">Source</a>
+
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-24 16:55:55
|
Revision: 111
http://dsim.svn.sourceforge.net/dsim/?rev=111&view=rev
Author: denis_arnaud
Date: 2010-07-24 16:55:49 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Updated the tool for document generation (in order to produce PDF documents).
Modified Paths:
--------------
trunk/dsim/doc/Makefile.am
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-24 16:29:46 UTC (rev 110)
+++ trunk/dsim/doc/Makefile.am 2010-07-24 16:55:49 UTC (rev 111)
@@ -150,7 +150,7 @@
bzip2 -9 -c > $(top_builddir)/$(tex_tarname).tar.bz2
rm -rf $(top_builddir)/$(tex_tarname)
-install-data-local: html-local tex-local
+install-data-local: html-local
$(mkinstalldirs) $(DESTDIR)$(docdir)
if test -d html; then \
$(mkinstalldirs) $(DESTDIR)$(docdir)/html; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-24 16:29:52
|
Revision: 110
http://dsim.svn.sourceforge.net/dsim/?rev=110&view=rev
Author: denis_arnaud
Date: 2010-07-24 16:29:46 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Updated the tool for document generation (in order to produce PDF documents).
Modified Paths:
--------------
trunk/dsim/Makefile.am
trunk/dsim/doc/Makefile.am
Modified: trunk/dsim/Makefile.am
===================================================================
--- trunk/dsim/Makefile.am 2010-07-24 16:24:03 UTC (rev 109)
+++ trunk/dsim/Makefile.am 2010-07-24 16:29:46 UTC (rev 110)
@@ -74,4 +74,3 @@
upload-tex: dist-tex
@UPLOAD_COMMAND@ @PACKAGE_TARNAME@-tex-@VERSION@.tar.gz \
@PACKAGE_TARNAME@-tex-@VERSION@.tar.bz2
-
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-24 16:24:03 UTC (rev 109)
+++ trunk/dsim/doc/Makefile.am 2010-07-24 16:29:46 UTC (rev 110)
@@ -158,6 +158,13 @@
$(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/html; \
done \
fi
+ $(mkinstalldirs) $(DESTDIR)$(docdir)
+ if test -d latex; then \
+ $(mkinstalldirs) $(DESTDIR)$(docdir)/latex; \
+ for f in latex/*; do \
+ $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/latex; \
+ done \
+ fi
uninstall-local:
rm -rf $(DESTDIR)$(docdir)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-24 16:24:10
|
Revision: 109
http://dsim.svn.sourceforge.net/dsim/?rev=109&view=rev
Author: denis_arnaud
Date: 2010-07-24 16:24:03 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Updated the tool for document generation (in order to produce PDF documents).
Modified Paths:
--------------
trunk/dsim/doc/doxygen_html.cfg.in
Modified: trunk/dsim/doc/doxygen_html.cfg.in
===================================================================
--- trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 16:15:30 UTC (rev 108)
+++ trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 16:24:03 UTC (rev 109)
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.7.1
+# Doxyfile 1.6.2-20100208
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project
@@ -14,204 +14,215 @@
# Project related configuration options
#---------------------------------------------------------------------------
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
# http://www.gnu.org/software/libiconv for the list of possible encodings.
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
PROJECT_NAME = @PACKAGE_NAME@
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER = @PACKAGE_VERSION@
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY =
+OUTPUT_DIRECTORY =
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
# otherwise cause performance problems for the file system.
CREATE_SUBDIRS = NO
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
-# Spanish, Swedish, and Ukrainian.
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
# Set to NO to disable this.
BRIEF_MEMBER_DESC = YES
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
# brief descriptions will be completely suppressed.
REPEAT_BRIEF = YES
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
-ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF =
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
# description.
ALWAYS_DETAILED_SEC = NO
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
# operators of the base classes will not be shown.
INLINE_INHERITED_MEMB = YES
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
# to NO the shortest path that makes the file name unique will be used.
FULL_PATH_NAMES = YES
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
# path to strip.
STRIP_FROM_PATH = @top_srcdir@/
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag.
STRIP_FROM_INC_PATH = @top_srcdir@/
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = YES
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
# (thus requiring an explicit @brief command for a brief description.)
JAVADOC_AUTOBRIEF = YES
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
# an explicit \brief command for a brief description.)
QT_AUTOBRIEF = NO
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
# description. Set this tag to YES if you prefer the old behaviour instead.
MULTILINE_CPP_IS_BRIEF = NO
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
# re-implements.
INHERIT_DOCS = YES
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
# be part of the file/class/namespace that contains it.
SEPARATE_MEMBER_PAGES = NO
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
TAB_SIZE = 8
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
# You can put \n's in the value part of an alias to insert newlines.
-ALIASES =
+ALIASES =
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
# of all members will be omitted, etc.
OPTIMIZE_OUTPUT_FOR_C = NO
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
# scopes will look different, etc.
OPTIMIZE_OUTPUT_JAVA = NO
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
# Fortran.
OPTIMIZE_FOR_FORTRAN = NO
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
# VHDL.
OPTIMIZE_OUTPUT_VHDL = NO
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = YES
@@ -221,58 +232,58 @@
CPP_CLI_SUPPORT = NO
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
# instead of private inheritance when no explicit protection keyword is present.
SIP_SUPPORT = NO
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
# methods anyway, you should set this option to NO.
IDL_PROPERTY_SUPPORT = YES
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
# all members of a group must be documented explicitly.
DISTRIBUTE_GROUP_DOC = YES
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
# the \nosubgrouping command.
SUBGROUPING = YES
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
# types are typedef'ed and only the typedef is referenced, never the tag name.
TYPEDEF_HIDES_STRUCT = NO
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
# determine which symbols to keep in memory and which to flush to disk.
# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols
SYMBOL_CACHE_SIZE = 0
@@ -281,266 +292,275 @@
# Build related configuration options
#---------------------------------------------------------------------------
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = YES
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
EXTRACT_PRIVATE = NO
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
EXTRACT_STATIC = YES
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
# If set to NO only classes defined in header files are included.
EXTRACT_LOCAL_CLASSES = YES
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
# If set to NO (the default) only methods in the interface are included.
EXTRACT_LOCAL_METHODS = NO
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
# anonymous namespace are hidden.
EXTRACT_ANON_NSPACES = NO
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
# This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_MEMBERS = NO
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
# overviews. This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_CLASSES = YES
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
# documentation.
HIDE_FRIEND_COMPOUNDS = NO
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
# function's detailed documentation block.
HIDE_IN_BODY_DOCS = NO
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
# Set it to YES to include the internal documentation.
INTERNAL_DOCS = YES
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
# and Mac users are advised to set this option to NO.
CASE_SENSE_NAMES = YES
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
# documentation. If set to YES the scope will be hidden.
HIDE_SCOPE_NAMES = NO
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
# of that file.
SHOW_INCLUDE_FILES = YES
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
INLINE_INFO = YES
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
# declaration order.
SORT_MEMBER_DOCS = NO
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
# declaration order.
SORT_BRIEF_DOCS = NO
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
# the group names will appear in their defined order.
SORT_GROUP_NAMES = NO
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
+# Note: This option applies only to the class list, not to the
# alphabetical list.
SORT_BY_SCOPE_NAME = NO
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
GENERATE_TODOLIST = YES
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
# commands in the documentation.
GENERATE_TESTLIST = YES
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
# commands in the documentation.
GENERATE_BUGLIST = YES
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
# \deprecated commands in the documentation.
GENERATE_DEPRECATEDLIST= YES
-# The ENABLED_SECTIONS tag can be used to enable conditional
+# The ENABLED_SECTIONS tag can be used to enable conditional
# documentation sections, marked by \if sectionname ... \endif.
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
MAX_INITIALIZER_LINES = 30
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
# list will mention the files that were used to generate the documentation.
SHOW_USED_FILES = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
# in the documentation. The default is NO.
SHOW_DIRECTORIES = YES
# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
+# This will remove the Files entry from the Quick Index and from the
# Folder Tree View (if specified). The default is YES.
SHOW_FILES = YES
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page. This will remove the Namespaces entry from the Quick Index
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
# and from the Folder Tree View (if specified). The default is YES.
SHOW_NAMESPACES = YES
-# The FILE_VERSION_FILTER tag can be used to specify a program or
-# script that doxygen should invoke to get the current version for
-# each file (typically from the version control system). Doxygen will
-# invoke the program by executing (via popen()) the command <command>
-# <input-file>, where <command> is the value of the
-# FILE_VERSION_FILTER tag, and <input-file> is the name of an input
-# file provided by doxygen. Whatever the program writes to standard
-# output is used as the file version. See the manual for examples.
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
-FILE_VERSION_FILTER =
+FILE_VERSION_FILTER =
-# The LAYOUT_FILE tag can be used to specify a layout file which will
-# be parsed by doxygen. The layout file controls the global structure
-# of the generated output files in an output format independent
-# way. The create the layout file that represents doxygen's defaults,
-# run doxygen with the -l option. You can optionally specify a file
-# name after the option, if omitted DoxygenLayout.xml will be used as
-# the name of the layout file.
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
-LAYOUT_FILE =
+LAYOUT_FILE =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-# The QUIET tag can be used to turn on/off the messages that are generated
+# The QUIET tag can be used to turn on/off the messages that are generated
# by doxygen. Possible values are YES and NO. If left blank NO is used.
QUIET = NO
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
# NO is used.
WARNINGS = YES
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
# automatically be disabled.
WARN_IF_UNDOCUMENTED = YES
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
# don't exist or using markup commands wrongly.
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
# documentation.
WARN_NO_PARAMDOC = NO
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
# be obtained via FILE_VERSION_FILTER)
WARN_FORMAT = "$file:$line: $text"
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
# to stderr.
WARN_LOGFILE = doxygen_html.log
@@ -549,122 +569,125 @@
# configuration options related to the input files
#---------------------------------------------------------------------------
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
INPUT = @top_srcdir@/stdair \
- @top_srcdir@/rmol \
- @top_srcdir@/dsim \
+ @top_srcdir@/rmol \
+ @top_srcdir@/dsim \
@top_srcdir@/doc/local \
@top_builddir@/doc/local \
@top_srcdir@/doc/tutorial
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
# the list of possible encodings.
INPUT_ENCODING = UTF-8
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
FILE_PATTERNS = *.hpp \
*.cpp \
*.doc
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
# If left blank NO is used.
RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = @top_builddir@/@PACKAGE@/config.h \
@top_srcdir@/@PACKAGE@/config_msvc.h
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-EXCLUDE_PATTERNS =
+EXCLUDE_PATTERNS =
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
# AClass::ANamespace, ANamespace::*Test
-EXCLUDE_SYMBOLS =
+EXCLUDE_SYMBOLS =
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
# the \include command).
EXAMPLE_PATH = @top_srcdir@/doc/tutorial/src \
@top_srcdir@/test
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
# blank all files are included.
EXAMPLE_PATTERNS = *.hpp \
*.cpp \
*.ref
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
# Possible values are YES and NO. If left blank NO is used.
EXAMPLE_RECURSIVE = NO
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
# the \image command).
IMAGE_PATH = @top_srcdir@/doc/images
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
# ignored.
-INPUT_FILTER =
+INPUT_FILTER =
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
# is applied to all files.
-FILTER_PATTERNS =
+FILTER_PATTERNS =
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
# files to browse (i.e. when SOURCE_BROWSER is set to YES).
FILTER_SOURCE_FILES = NO
@@ -673,32 +696,32 @@
# configuration options related to source browsing
#---------------------------------------------------------------------------
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
# VERBATIM_HEADERS is set to NO.
SOURCE_BROWSER = YES
-# Setting the INLINE_SOURCES tag to YES will include the body
+# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
INLINE_SOURCES = NO
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
# fragments. Normal C and C++ comments will always remain visible.
STRIP_CODE_COMMENTS = YES
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
# functions referencing it will be listed.
REFERENCED_BY_RELATION = YES
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
# called/used by that function will be listed.
REFERENCES_RELATION = YES
@@ -706,20 +729,21 @@
# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code. Otherwise they will link to the documentstion.
+# link to the source code.
+# Otherwise they will link to the documentation.
REFERENCES_LINK_SOURCE = YES
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
# will need version 4.8.6 or higher.
USE_HTAGS = NO
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
# which an include is specified. Set to NO to disable this.
VERBATIM_HEADERS = YES
@@ -728,130 +752,141 @@
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
# contains a lot of classes, structs, unions or interfaces.
ALPHABETICAL_INDEX = YES
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
# in which this list will be split (can be a number in the range [1..20])
COLS_IN_ALPHA_INDEX = 4
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
# generate HTML output.
GENERATE_HTML = YES
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
HTML_OUTPUT = html
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
# doxygen will generate files with .html extension.
HTML_FILE_EXTENSION = .html
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard header.
HTML_HEADER = @top_srcdir@/doc/local/@PACKAGE@_header.html
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
HTML_FOOTER = @top_srcdir@/doc/local/@PACKAGE@_footer.html
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
+# If the HTML_TIMESTAMP tag is set to YES then the generated HTML
+# documentation will contain the timesstamp.
+
+HTML_TIMESTAMP = NO
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
# stylesheet in the HTML output directory as well, or it will be erased!
-HTML_STYLESHEET =
+HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = NO
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
# NO a bullet list will be used.
HTML_ALIGN_MEMBERS = YES
-# If the HTML_DYNAMIC_SECTIONS tag is se...
[truncated message content] |
|
From: <den...@us...> - 2010-07-24 16:15:36
|
Revision: 108
http://dsim.svn.sourceforge.net/dsim/?rev=108&view=rev
Author: denis_arnaud
Date: 2010-07-24 16:15:30 +0000 (Sat, 24 Jul 2010)
Log Message:
-----------
[Doc] Updated the tool for document generation (in order to produce PDF documents).
Modified Paths:
--------------
trunk/dsim/Makefile.am
trunk/dsim/doc/Makefile.am
trunk/dsim/doc/doxygen_html.cfg.in
Property Changed:
----------------
trunk/dsim/
Property changes on: trunk/dsim
___________________________________________________________________
Modified: svn:ignore
- autom4te.cache
configure.sh
COPYING
INSTALL
ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
dsim-config
dsim.pc
dsim.spec
libtool
dsim-html-doc-*.tar.*
dsim-*.tar.*
dsim.m4
build
+ autom4te.cache
configure.sh
COPYING
INSTALL
ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
config.log
config.status
configure
dsim-config
dsim.pc
dsim.spec
libtool
dsim-html-doc-*.tar.*
dsim-*.tar.*
dsim.m4
build
latex
Modified: trunk/dsim/Makefile.am
===================================================================
--- trunk/dsim/Makefile.am 2010-07-23 19:07:51 UTC (rev 107)
+++ trunk/dsim/Makefile.am 2010-07-24 16:15:30 UTC (rev 108)
@@ -45,18 +45,24 @@
dist-html:
$(MAKE) -C doc dist-html
+dist-tex:
+ $(MAKE) -C doc dist-tex
-snapshot: snapshot-src snapshot-html
+snapshot: snapshot-src snapshot-html snapshot-tex
+
snapshot-src:
$(MAKE) dist distdir=@PACKAGE_TARNAME@-`date +"%Y%m%d"`
snapshot-html:
$(MAKE) -C doc dist-html html_tarname=@PACKAGE_TARNAME@-doc-`date +"%Y%m%d"`
-upload: upload-src upload-html
+snapshot-tex:
+ $(MAKE) -C doc dist-tex tex_tarname=@PACKAGE_TARNAME@-tex-`date +"%Y%m%d"`
+upload: upload-src upload-html upload-tex
+
upload-src: dist
@UPLOAD_COMMAND@ @PACKAGE_TARNAME@-@VERSION@.tar.gz \
@PACKAGE_TARNAME@-@VERSION@.tar.bz2
@@ -65,3 +71,7 @@
@UPLOAD_COMMAND@ @PACKAGE_TARNAME@-doc-@VERSION@.tar.gz \
@PACKAGE_TARNAME@-doc-@VERSION@.tar.bz2
+upload-tex: dist-tex
+ @UPLOAD_COMMAND@ @PACKAGE_TARNAME@-tex-@VERSION@.tar.gz \
+ @PACKAGE_TARNAME@-tex-@VERSION@.tar.bz2
+
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-23 19:07:51 UTC (rev 107)
+++ trunk/dsim/doc/Makefile.am 2010-07-24 16:15:30 UTC (rev 108)
@@ -1,6 +1,8 @@
+# dsim doc sub-directory
include $(top_srcdir)/doc/local/sources.mk
include $(top_srcdir)/doc/tutorial/sources.mk
include $(top_srcdir)/doc/tutorial/src/sources.mk
+#
include $(top_srcdir)/stdair/basic/sources.mk
include $(top_srcdir)/stdair/bom/sources.mk
include $(top_srcdir)/stdair/factory/sources.mk
@@ -84,6 +86,7 @@
docdir = @docdir@
html_tarname = @PACKAGE_TARNAME@-doc-@PACKAGE_VERSION@
+tex_tarname = @PACKAGE_TARNAME@-tex-@PACKAGE_VERSION@
noinst_DATA = sourceforge/howto_release_dsim.html.in
EXTRA_DIST = $(noinst_DATA)
@@ -139,7 +142,15 @@
bzip2 -9 -c > $(top_builddir)/$(html_tarname).tar.bz2
rm -rf $(top_builddir)/$(html_tarname)
-install-data-local: html-local
+dist-tex: html-local
+ cp -a $(top_builddir)/doc/latex $(top_builddir)/$(tex_tarname)
+ tar chof - $(top_builddir)/$(tex_tarname) | \
+ gzip --best -c > $(top_builddir)/$(tex_tarname).tar.gz
+ tar chof - $(top_builddir)/$(tex_tarname) | \
+ bzip2 -9 -c > $(top_builddir)/$(tex_tarname).tar.bz2
+ rm -rf $(top_builddir)/$(tex_tarname)
+
+install-data-local: html-local tex-local
$(mkinstalldirs) $(DESTDIR)$(docdir)
if test -d html; then \
$(mkinstalldirs) $(DESTDIR)$(docdir)/html; \
@@ -152,4 +163,4 @@
rm -rf $(DESTDIR)$(docdir)
clean-local:
- rm -rf html *.log *.tag
+ rm -rf html latex *.log *.tag
Modified: trunk/dsim/doc/doxygen_html.cfg.in
===================================================================
--- trunk/dsim/doc/doxygen_html.cfg.in 2010-07-23 19:07:51 UTC (rev 107)
+++ trunk/dsim/doc/doxygen_html.cfg.in 2010-07-24 16:15:30 UTC (rev 108)
@@ -955,7 +955,7 @@
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
-GENERATE_LATEX = NO
+GENERATE_LATEX = YES
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -978,7 +978,7 @@
# LaTeX documents. This may be useful for small projects and may help to
# save some trees in general.
-COMPACT_LATEX = NO
+COMPACT_LATEX = YES
# The PAPER_TYPE tag can be used to set the paper type that is used
# by the printer. Possible values are: a4, a4wide, letter, legal and
@@ -1003,13 +1003,13 @@
# contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer.
-PDF_HYPERLINKS = NO
+PDF_HYPERLINKS = YES
# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
# plain latex in the generated Makefile. Set this option to YES to get a
# higher quality PDF documentation.
-USE_PDFLATEX = NO
+USE_PDFLATEX = YES
# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
# command to the generated LaTeX files. This will instruct LaTeX to keep
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-23 19:08:01
|
Revision: 107
http://dsim.svn.sourceforge.net/dsim/?rev=107&view=rev
Author: denis_arnaud
Date: 2010-07-23 19:07:51 +0000 (Fri, 23 Jul 2010)
Log Message:
-----------
[Doc] Added AirSched within the Doxygen-generated documentation.
Modified Paths:
--------------
trunk/dsim/doc/Makefile.am
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-23 15:00:29 UTC (rev 106)
+++ trunk/dsim/doc/Makefile.am 2010-07-23 19:07:51 UTC (rev 107)
@@ -16,13 +16,13 @@
#include $(top_srcdir)/trademgen/service/sources.mk
#include $(top_srcdir)/trademgen/core/sources.mk
#include $(top_srcdir)/trademgen/batches/sources.mk
-#include $(top_srcdir)/airsched/basic/sources.mk
-#include $(top_srcdir)/airsched/bom/sources.mk
-#include $(top_srcdir)/airsched/factory/sources.mk
-#include $(top_srcdir)/airsched/command/sources.mk
-#include $(top_srcdir)/airsched/service/sources.mk
-#include $(top_srcdir)/airsched/core/sources.mk
-#include $(top_srcdir)/airsched/batches/sources.mk
+include $(top_srcdir)/airsched/basic/sources.mk
+include $(top_srcdir)/airsched/bom/sources.mk
+include $(top_srcdir)/airsched/factory/sources.mk
+include $(top_srcdir)/airsched/command/sources.mk
+include $(top_srcdir)/airsched/service/sources.mk
+include $(top_srcdir)/airsched/core/sources.mk
+include $(top_srcdir)/airsched/batches/sources.mk
#include $(top_srcdir)/airrac/basic/sources.mk
#include $(top_srcdir)/airrac/bom/sources.mk
#include $(top_srcdir)/airrac/factory/sources.mk
@@ -102,6 +102,14 @@
$(stdair_fac_h_sources) $(stdair_fac_cc_sources) \
$(stdair_cmd_h_sources) $(stdair_cmd_cc_sources) \
$(stdair_svc_h_sources) $(stdair_svc_cc_sources) \
+ $(airsched_batches_h_sources) $(airsched_batches_cc_sources) \
+ $(airsched_service_h_sources) $(airsched_service_cc_sources) \
+ $(airsched_bas_h_sources) $(airsched_bas_cc_sources) \
+ $(airsched_bom_h_sources) $(airsched_bom_cc_sources) \
+ $(airsched_fac_h_sources) $(airsched_fac_cc_sources) \
+ $(airsched_dba_h_sources) $(airsched_dba_cc_sources) \
+ $(airsched_cmd_h_sources) $(airsched_cmd_cc_sources) \
+ $(airsched_svc_h_sources) $(airsched_svc_cc_sources) \
$(rmol_service_h_sources) $(rmol_service_cc_sources) \
$(rmol_batches_h_sources) $(rmol_batches_cc_sources) \
$(rmol_bas_h_sources) $(rmol_bas_cc_sources) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-23 15:00:38
|
Revision: 106
http://dsim.svn.sourceforge.net/dsim/?rev=106&view=rev
Author: denis_arnaud
Date: 2010-07-23 15:00:29 +0000 (Fri, 23 Jul 2010)
Log Message:
-----------
[Doc] Removed generated documentation files.
Removed Paths:
-------------
trunk/dsim/doc/images/Makefile
trunk/dsim/doc/images/Makefile.in
trunk/dsim/doc/local/Makefile
trunk/dsim/doc/local/Makefile.in
trunk/dsim/doc/tutorial/Makefile
trunk/dsim/doc/tutorial/Makefile.in
trunk/dsim/doc/tutorial/src/Makefile
trunk/dsim/doc/tutorial/src/Makefile.in
Property Changed:
----------------
trunk/dsim/doc/images/
trunk/dsim/doc/local/
trunk/dsim/doc/tutorial/
trunk/dsim/doc/tutorial/src/
Property changes on: trunk/dsim/doc/images
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Deleted: trunk/dsim/doc/images/Makefile
===================================================================
--- trunk/dsim/doc/images/Makefile 2010-07-23 14:59:27 UTC (rev 105)
+++ trunk/dsim/doc/images/Makefile 2010-07-23 15:00:29 UTC (rev 106)
@@ -1,429 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# doc/images/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-pkgdatadir = $(datadir)/dsim
-pkgincludedir = $(includedir)/dsim
-pkglibdir = $(libdir)/dsim
-pkglibexecdir = $(libexecdir)/dsim
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.common
-subdir = doc/images
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/ax_boost.m4 \
- $(top_srcdir)/config/ax_mysql.m4 \
- $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gsl.m4 \
- $(top_srcdir)/config/librt.m4 $(top_srcdir)/config/libtool.m4 \
- $(top_srcdir)/config/ltoptions.m4 \
- $(top_srcdir)/config/ltsugar.m4 \
- $(top_srcdir)/config/ltversion.m4 \
- $(top_srcdir)/config/lt~obsolete.m4 \
- $(top_srcdir)/config/openmpi.m4 $(top_srcdir)/config/python.m4 \
- $(top_srcdir)/config/soci.m4 $(top_srcdir)/config/xerces.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/stdair/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run automake-1.11
-AWK = gawk
-BOOST_ASIO_LIB = -lboost_system -lboost_thread-mt -lboost_date_time -lboost_regex -lboost_serialization
-BOOST_CFLAGS = -pthread -I/usr/include
-BOOST_DATE_TIME_LIB = -lboost_date_time
-BOOST_FILESYSTEM_LIB = -lboost_filesystem
-BOOST_IOSTREAMS_LIB = -lboost_iostreams
-BOOST_LIBS = -L/usr/lib64
-BOOST_MPI_LIB = -lboost_mpi -lboost_serialization -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi
-BOOST_MPI_PYTHON_LIB = -lboost_mpi_python -lboost_serialization -lboost_python -L/usr/lib64 -lpython2.6 -lpthread -ldl -lutil -lm -lboost_mpi -lboost_serialization -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi
-BOOST_PROGRAM_OPTIONS_LIB = -lboost_program_options
-BOOST_PYTHON_LIB = -lboost_python -L/usr/lib64 -lpython2.6 -lpthread -ldl -lutil -lm
-BOOST_REGEX_LIB = -lboost_regex
-BOOST_SERIALIZATION_LIB = -lboost_serialization
-BOOST_SIGNALS_LIB = -lboost_signals
-BOOST_SYSTEM_LIB = -lboost_system
-BOOST_THREAD_LIB = -lboost_thread-mt
-BOOST_UNIT_TEST_FRAMEWORK_LIB = -lboost_unit_test_framework
-BOOST_VERSION = 1_41
-BOOST_WSERIALIZATION_LIB = -lboost_wserialization
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS =
-CPPUNIT_CFLAGS =
-CPPUNIT_CONFIG = /usr/bin/cppunit-config
-CPPUNIT_LIBS = -lcppunit -ldl
-CPPUNIT_VERSION = 1.12.1
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -Wall
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DSYMUTIL =
-DUMPBIN =
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = /bin/grep -E
-EXEEXT =
-FGREP = /bin/grep -F
-GENERIC_LIBRARY_VERSION = 99:99:99
-GREP = /bin/grep
-GSL_CFLAGS = -I/usr/include
-GSL_CONFIG = /usr/bin/gsl-config
-GSL_LIBS = -lgsl -lgslcblas -lm
-GSL_VERSION = 1.13
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = -L/usr/lib64
-LIBOBJS =
-LIBS =
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO =
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-MPIGEN_CFLAGS = -I/usr/include/openmpi-x86_64 -I/usr/include/openmpi-x86_64/openmpi -I/usr/include/openmpi-x86_64/64 -m64
-MPIGEN_LIBS = -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi
-MPIGEN_VERSION = 1.3.3
-MYSQL_CFLAGS = -I/usr/include/mysql
-MYSQL_C_LIB = mysqlclient
-MYSQL_LIBS = -L/usr/lib64/mysql -lmysqlclient
-MYSQL_VERSION = 5.1.47
-NM = /usr/bin/nm -B
-NMEDIT =
-OBJDUMP = objdump
-OBJEXT = o
-OPENMPI_CFLAGS = -I/usr/include/openmpi-x86_64 -I/usr/include/openmpi-x86_64/openmpi -I/usr/include/openmpi-x86_64/64 -m64
-OPENMPI_LIBS = -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi
-OPENMPI_VERSION = 1.3.3
-OTOOL =
-OTOOL64 =
-PACKAGE = dsim
-PACKAGE_BUGREPORT = den...@us...
-PACKAGE_NAME = DSIM
-PACKAGE_STRING = DSIM 99.99.99
-PACKAGE_TARNAME = dsim
-PACKAGE_URL =
-PACKAGE_VERSION = 99.99.99
-PATH_SEPARATOR = :
-PERL = /usr/bin/perl
-PYTHON = /usr/bin/python
-PYTHON_ADD_LIBS = -lpthread -ldl -lutil -lm
-PYTHON_CFLAGS = -I/usr/include/python2.6
-PYTHON_LIBS = -L/usr/lib64 -lpython2.6
-PYTHON_VERSION = 2.6.4
-RANLIB = ranlib
-RPM_RELEASE = 1
-RT_LIBS = -lrt
-SED = /bin/sed
-SET_MAKE =
-SHELL = /bin/sh
-SOCI_CFLAGS = -DSOCI_HEADERS_BURIED -DSOCI_MYSQL_HEADERS_BURIED -I/usr/include/mysql
-SOCI_CORE_LIB = soci_core
-SOCI_LIBS = -L/usr/lib64/mysql -lmysqlclient -lsoci_core -lsoci_mysql -ldl
-SOCI_VERSION = 3.0.0
-STRIP = strip
-UPLOAD_COMMAND = ncftpput -u ori-data -v orinet.nce.amadeus.net /remote/oridata/www/oridist/projects/dsim/99.99.99
-VERSION = 99.99.99
-XERCES_CFLAGS = -I/usr/include
-XERCES_LIBS = -L/usr/lib64 -lxerces-c
-XERCES_VERSION = 3.0.1
-abs_builddir = /home/dan/dev/sim/dsimsvn/trunk/dsim/doc/images
-abs_srcdir = /home/dan/dev/sim/dsimsvn/trunk/dsim/doc/images
-abs_top_builddir = /home/dan/dev/sim/dsimsvn/trunk/dsim
-abs_top_srcdir = /home/dan/dev/sim/dsimsvn/trunk/dsim
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN =
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias =
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-diff_ok = yes
-docdir = ${datarootdir}/doc/dsim-99.99.99
-doxygen_ok = yes
-dvidir = ${docdir}
-dvips_ok = yes
-exec_prefix = ${prefix}
-gs_ok = yes
-host = x86_64-unknown-linux-gnu
-host_alias =
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/install-sh
-latex_ok = yes
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-lt_ECHO = echo
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /home/dan/dev/deliveries/dsim-99.99.99
-program_transform_name = s,x,x,
-psdir = ${docdir}
-python_configdir = /usr/lib64/python2.6/config
-python_incdir =
-python_libdir = /usr/lib64
-sbindir = ${exec_prefix}/sbin
-sed_ok = yes
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias =
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-AM_LDFLAGS =
-EXTRA_DIST = dsim_logo.png sfx_logo.png favicon.ico
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/images/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/images/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Deleted: trunk/dsim/doc/images/Makefile.in
===================================================================
--- trunk/dsim/doc/images/Makefile.in 2010-07-23 14:59:27 UTC (rev 105)
+++ trunk/dsim/doc/images/Makefile.in 2010-07-23 15:00:29 UTC (rev 106)
@@ -1,429 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/Makefile.common
-subdir = doc/images
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/ax_boost.m4 \
- $(top_srcdir)/config/ax_mysql.m4 \
- $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gsl.m4 \
- $(top_srcdir)/config/librt.m4 $(top_srcdir)/config/libtool.m4 \
- $(top_srcdir)/config/ltoptions.m4 \
- $(top_srcdir)/config/ltsugar.m4 \
- $(top_srcdir)/config/ltversion.m4 \
- $(top_srcdir)/config/lt~obsolete.m4 \
- $(top_srcdir)/config/openmpi.m4 $(top_srcdir)/config/python.m4 \
- $(top_srcdir)/config/soci.m4 $(top_srcdir)/config/xerces.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/stdair/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CFLAGS = @BOOST_CFLAGS@
-BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@
-BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@
-BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@
-BOOST_LIBS = @BOOST_LIBS@
-BOOST_MPI_LIB = @BOOST_MPI_LIB@
-BOOST_MPI_PYTHON_LIB = @BOOST_MPI_PYTHON_LIB@
-BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
-BOOST_PYTHON_LIB = @BOOST_PYTHON_LIB@
-BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
-BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
-BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@
-BOOST_VERSION = @BOOST_VERSION@
-BOOST_WSERIALIZATION_LIB = @BOOST_WSERIALIZATION_LIB@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
-CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
-CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CPPUNIT_VERSION = @CPPUNIT_VERSION@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
-GREP = @GREP@
-GSL_CFLAGS = @GSL_CFLAGS@
-GSL_CONFIG = @GSL_CONFIG@
-GSL_LIBS = @GSL_LIBS@
-GSL_VERSION = @GSL_VERSION@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MPIGEN_CFLAGS = @MPIGEN_CFLAGS@
-MPIGEN_LIBS = @MPIGEN_LIBS@
-MPIGEN_VERSION = @MPIGEN_VERSION@
-MYSQL_CFLAGS = @MYSQL_CFLAGS@
-MYSQL_C_LIB = @MYSQL_C_LIB@
-MYSQL_LIBS = @MYSQL_LIBS@
-MYSQL_VERSION = @MYSQL_VERSION@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
-OPENMPI_LIBS = @OPENMPI_LIBS@
-OPENMPI_VERSION = @OPENMPI_VERSION@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PYTHON = @PYTHON@
-PYTHON_ADD_LIBS = @PYTHON_ADD_LIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-RPM_RELEASE = @RPM_RELEASE@
-RT_LIBS = @RT_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SOCI_CFLAGS = @SOCI_CFLAGS@
-SOCI_CORE_LIB = @SOCI_CORE_LIB@
-SOCI_LIBS = @SOCI_LIBS@
-SOCI_VERSION = @SOCI_VERSION@
-STRIP = @STRIP@
-UPLOAD_COMMAND = @UPLOAD_COMMAND@
-VERSION = @VERSION@
-XERCES_CFLAGS = @XERCES_CFLAGS@
-XERCES_LIBS = @XERCES_LIBS@
-XERCES_VERSION = @XERCES_VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-diff_ok = @diff_ok@
-docdir = @docdir@
-doxygen_ok = @doxygen_ok@
-dvidir = @dvidir@
-dvips_ok = @dvips_ok@
-exec_prefix = @exec_prefix@
-gs_ok = @gs_ok@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-latex_ok = @latex_ok@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-python_configdir = @python_configdir@
-python_incdir = @python_incdir@
-python_libdir = @python_libdir@
-sbindir = @sbindir@
-sed_ok = @sed_ok@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-AM_LDFLAGS =
-EXTRA_DIST = dsim_logo.png sfx_logo.png favicon.ico
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/images/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/images/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-@SET_MAKE@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Property changes on: trunk/dsim/doc/local
___________________________________________________________________
Modified: svn:ignore
- index.doc
+ .deps
.libs
Makefile.in
Makefile
index.doc
Deleted: trunk/dsim/doc/local/Makefile
===================================================================
--- trunk/dsim/doc/local/Makefile 2010-07-23 14:59:27 UTC (rev 105)
+++ trunk/dsim/doc/local/Makefile 2010-07-23 15:00:29 UTC (rev 106)
@@ -1,449 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# doc/local/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-pkgdatadir = $(datadir)/dsim
-pkgincludedir = $(includedir)/dsim
-pkglibdir = $(libdir)/dsim
-pkglibexecdir = $(libexecdir)/dsim
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/index.doc.in $(srcdir)/sources.mk \
- $(top_srcdir)/Makefile.common
-subdir = doc/local
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/ax_boost.m4 \
- $(top_srcdir)/config/ax_mysql.m4 \
- $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gsl.m4 \
- $(top_srcdir)/config/librt.m4 $(top_srcdir)/config/libtool.m4 \
- $(top_srcdir)/config/ltoptions.m4 \
- $(top_srcdir)/config/ltsugar.m4 \
- $(top_srcdir)/config/ltversion.m4 \
- $(top_srcdir)/config/lt~obsolete.m4 \
- $(top_srcdir)/config/openmpi.m4 $(top_srcdir)/config/python.m4 \
- $(top_srcdir)/config/soci.m4 $(top_srcdir)/config/xerces.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/stdair/config.h
-CONFIG_CLEAN_FILES = index.doc
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run automake-1.11
-AWK = gawk
-BOOST_ASIO_LIB = -lboost_system -lboost_thread-mt -lboost_date_time -lboost_regex -lboost_serialization
-BOOST_CFLAGS = -pthread -I/usr/include
-BOOST_DATE_TIME_LIB = -lboost_date_time
-BOOST_FILESYSTEM_LIB = -lboost_filesystem
-BOOST_IOSTREAMS_LIB = -lboost_iostreams
-BOOST_LIBS = -L/usr/lib64
-BOOST_MPI_LIB = -lboost_mpi -lboost_serialization -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi
-BOOST_MPI_PYTHON_LIB = -lboost_mpi_python -lboost_serialization -lboost_python -L/usr/lib64 -lpython2.6 -lpthread -ldl -lutil -lm -lboost_mpi -lboost_serialization -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi
-BOOST_PROGRAM_OPTIONS_LIB = -lboost_program_options
-BOOST_PYTHON_LIB = -lboost_python -L/usr/lib64 -lpython2.6 -lpthread -ldl -lutil -lm
-BOOST_REGEX_LIB = -lboost_regex
-BOOST_SERIALIZATION_LIB = -lboost_serialization
-BOOST_SIGNALS_LIB = -lboost_signals
-BOOST_SYSTEM_LIB = -lboost_system
-BOOST_THREAD_LIB = -lboost_thread-mt
-BOOST_UNIT_TEST_FRAMEWORK_LIB = -lboost_unit_test_framework
-BOOST_VERSION = 1_41
-BOOST_WSERIALIZATION_LIB = -lboost_wserialization
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS =
-CPPUNIT_CFLAGS =
-CPPUNIT_CONFIG = /usr/bin/cppunit-config
-CPPUNIT_LIBS = -lcppunit -ldl
-CPPUNIT_VERSION = 1.12.1
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -Wall
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DSYMUTIL =
-DUMPBIN =
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = /bin/grep -E
-EXEEXT =
-FGREP = /bin/grep -F
-GENERIC_LIBRARY_VERSION = 99:99:99
-GREP = /bin/grep
-GSL_CFLAGS = -I/usr/include
-GSL_CONFIG = /usr/bin/gsl-config
-GSL_LIBS = -lgsl -lgslcblas -lm
-GSL_VERSION = 1.13
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = -L/usr/lib64
-LIBOBJS =
-LIBS =
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO =
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-MPIGEN_CFLAGS = -I/usr/include/openmpi-x86_64 -I/usr/include/openmpi-x86_64/openmpi -I/usr/include/openmpi-x86_64/64 -m64
-MPIGEN_LIBS = -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi
-MPIGEN_VERSION = 1.3.3
-MYSQL_CFLAGS = -I/usr/include/mysql
-MYSQL_C_LIB = mysqlclient
-MYSQL_LIBS = -L/usr/lib64/mysql -lmysqlclient
-MYSQL_VERSION = 5.1.47
-NM = /usr/bin/nm -B
-NMEDIT =
-OBJDUMP = objdump
-OBJEXT = o
-OPENMPI_CFLAGS = -I/usr/include/openmpi-x86_64 -I/usr/include/openmpi-x86_64/openmpi -I/usr/include/openmpi-x86_64/64 -m64
-OPENMPI_LIBS = -L/usr/lib64/openmpi/lib -lmpi_cxx -lmpi
-OPENMPI_VERSION = 1.3.3
-OTOOL =
-OTOOL64 =
-PACKAGE = dsim
-PACKAGE_BUGREPORT = den...@us...
-PACKAGE_NAME = DSIM
-PACKAGE_STRING = DSIM 99.99.99
-PACKAGE_TARNAME = dsim
-PACKAGE_URL =
-PACKAGE_VERSION = 99.99.99
-PATH_SEPARATOR = :
-PERL = /usr/bin/perl
-PYTHON = /usr/bin/python
-PYTHON_ADD_LIBS = -lpthread -ldl -lutil -lm
-PYTHON_CFLAGS = -I/usr/include/python2.6
-PYTHON_LIBS = -L/usr/lib64 -lpython2.6
-PYTHON_VERSION = 2.6.4
-RANLIB = ranlib
-RPM_RELEASE = 1
-RT_LIBS = -lrt
-SED = /bin/sed
-SET_MAKE =
-SHELL = /bin/sh
-SOCI_CFLAGS = -DSOCI_HEADERS_BURIED -DSOCI_MYSQL_HEADERS_BURIED -I/usr/include/mysql
-SOCI_CORE_LIB = soci_core
-SOCI_LIBS = -L/usr/lib64/mysql -lmysqlclient -lsoci_core -lsoci_mysql -ldl
-SOCI_VERSION = 3.0.0
-STRIP = strip
-UPLOAD_COMMAND = ncftpput -u ori-data -v orinet.nce.amadeus.net /remote/oridata/www/oridist/projects/dsim/99.99.99
-VERSION = 99.99.99
-XERCES_CFLAGS = -I/usr/include
-XERCES_LIBS = -L/usr/lib64 -lxerces-c
-XERCES_VERSION = 3.0.1
-abs_builddir = /home/dan/dev/sim/dsimsvn/trunk/dsim/doc/local
-abs_srcdir = /home/dan/dev/sim/dsimsvn/trunk/dsim/doc/local
-abs_top_builddir = /home/dan/dev/sim/dsimsvn/trunk/dsim
-abs_top_srcdir = /home/dan/dev/sim/dsimsvn/trunk/dsim
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN =
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias =
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-diff_ok = yes
-docdir = ${datarootdir}/doc/dsim-99.99.99
-doxygen_ok = yes
-dvidir = ${docdir}
-dvips_ok = yes
-exec_prefix = ${prefix}
-gs_ok = yes
-host = x86_64-unknown-linux-gnu
-host_alias =
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/install-sh
-latex_ok = yes
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-lt_ECHO = echo
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /home/dan/dev/deliveries/dsim-99.99.99
-program_transform_name = s,x,x,
-psdir = ${docdir}
-python_configdir = /usr/lib64/python2.6/config
-python_incdir =
-python_libdir = /usr/lib64
-sbindir = ${exec_prefix}/sbin
-sed_ok = yes
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias =
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-AM_LDFLAGS =
-doc_local_sources = \
- $(top_srcdir)/doc/local/authors.doc \
- $(top_srcdir)/doc/local/codingrules.doc \
- $(top_srcdir)/doc/local/copyright.doc \
- $(top_srcdir)/doc/local/documentation.doc \
- $(top_srcdir)/doc/local/features.doc \
- $(top_srcdir)/doc/local/help_wanted.doc \
- $(top_srcdir)/doc/local/installation.doc \
- $(top_srcdir)/doc/local/linking.doc \
- $(top_srcdir)/doc/local/test.doc \
- $(top_srcdir)/doc/local/users_guide.doc \
- $(top_srcdir)/doc/local/verification.doc
-
-html_local_sources = \
- $(top_srcdir)/doc/local/dsim_footer.html \
- $(top_srcdir)/doc/local/dsim_header.html
-
-EXTRA_DIST = $(doc_local_sources) $(html_local_sources)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(srcdir)/sources.mk $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/local/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/local/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-index.doc: $(top_builddir)/config.status $(srcdir)/index.doc.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Deleted: trunk/dsim/doc/local/Makefile.in
===================================================================
--- trunk/dsim/doc/local/Makefile.in 2010-07-23 14:59:27 UTC (rev 105)
+++ trunk/dsim/doc/local/Makefile.in 2010-07-23 15:00:29 UTC (rev 106)
@@ -1,449 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/index.doc.in $(srcdir)/sources.mk \
- $(top_srcdir)/Makefile.common
-subdir = doc/local
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/ax_boost.m4 \
- $(top_srcdir)/config/ax_mysql.m4 \
- $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gsl.m4 \
- $(top_srcdir)/config/librt.m4 $(top_srcdir)/config/libtool.m4 \
- $(top_srcdir)/config/ltoptions.m4 \
- $(top_srcdir)/config/ltsugar.m4 \
- $(top_srcdir)/config/ltversion.m4 \
- $(top_srcdir)/config/lt~obsolete.m4 \
- $(top_srcdir)/config/openmpi.m4 $(top_srcdir)/config/python.m4 \
- $(top_srcdir)/config/soci.m4 $(top_srcdir)/config/xerces.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/stdair/config.h
-CONFIG_CLEAN_FILES = index.doc
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BOOST_ASIO_LIB = @BOOST_ASIO_LIB@
-BOOST_CFLAGS = @BOOST_CFLAGS@
-BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@
-BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@
-BOOST_IOSTREAMS_LIB = @BOOST_IOSTREAMS_LIB@
-BOOST_LIBS = @BOOST_LIBS@
-BOOST_MPI_LIB = @BOOST_MPI_LIB@
-BOOST_MPI_PYTHON_LIB = @BOOST_MPI_PYTHON_LIB@
-BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
-BOOST_PYTHON_LIB = @BOOST_PYTHON_LIB@
-BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
-BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
-BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
-BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
-BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@
-BOOST_VERSION = @BOOST_VERSION@
-BOOST_WSERIALIZATION_LIB = @BOOST_WSERIALIZATION_LIB@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
-CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
-CPPUNIT_LIBS = @CPPUNIT_LIBS@
-CPPUNIT_VERSION = @CPPUNIT_VERSION@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@
-GREP = @GREP@
-GSL_CFLAGS = @GSL_CFLAGS@
-GSL_CONFIG = @GSL_CONFIG@
-GSL_LIBS = @GSL_LIBS@
-GSL_VERSION = @GSL_VERSION@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MPIGEN_CFLAGS = @MPIGEN_CFLAGS@
-MPIGEN_LIBS = @MPIGEN_LIBS@
-MPIGEN_VERSION = @MPIGEN_VERSION@
-MYSQL_CFLAGS = @MYSQL_CFLAGS@
-MYSQL_C_LIB = @MYSQL_C_LIB@
-MYSQL_LIBS = @MYSQL_LIBS@
-MYSQL_VERSION = @MYSQL_VERSION@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
-OPENMPI_LIBS = @OPENMPI_LIBS@
-OPENMPI_VERSION = @OPENMPI_VERSION@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PYTHON = @PYTHON@
-PYTHON_ADD_LIBS = @PYTHON_ADD_LIBS@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-RPM_RELEASE = @RPM_RELEASE@
-RT_LIBS = @RT_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SOCI_CFLAGS = @SOCI_CFLAGS@
-SOCI_CORE_LIB = @SOCI_CORE_LIB@
-SOCI_LIBS = @SOCI_LIBS@
-SOCI_VERSION = @SOCI_VERSION@
-STRIP = @STRIP@
-UPLOAD_COMMAND = @UPLOAD_COMMAND@
-VERSION = @VERSION@
-XERCES_CFLAGS = @XERCES_CFLAGS@
-XERCES_LIBS = @XERCES_LIBS@
-XERCES_VERSION = @XERCES_VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-diff_ok = @diff_ok@
-docdir = @docdir@
-doxygen_ok = @doxygen_ok@
-dvidir = @dvidir@
-dvips_ok = @dvips_ok@
-exec_prefix = @exec_prefix@
-gs_ok = @gs_ok@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-latex_ok = @latex_ok@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-python_configdir = @python_configdir@
-python_incdir = @python_incdir@
-python_libdir = @python_libdir@
-sbindir = @sbindir@
-sed_ok = @sed_ok@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
-AM_LDFLAGS =
-doc_local_sources = \
- $(top_srcdir)/doc/local/authors.doc \
- $(top_srcdir)/doc/local/codingrules.doc \
- $(top_srcdir)/doc/local/copyright.doc \
- $(top_srcdir)/doc/local/documentation.doc \
- $(top_srcdir)/doc/local/features.doc \
- $(top_srcdir)/doc/local/help_wanted.doc \
- $(top_srcdir)/doc/local/installation.doc \
- $(top_srcdir)/doc/local/linking.doc \
- $(top_srcdir)/doc/local/test.doc \
- $(top_srcdir)/doc/local/users_guide.doc \
- $(top_srcdir)/doc/local/verification.doc
-
-html_local_sources = \
- $(top_srcdir)/doc/local/dsim_footer.html \
- $(top_srcdir)/doc/local/dsim_header.html
-
-EXTRA_DIST = $(doc_local_sources) $(html_local_sources)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.common $(srcdir)/sources.mk $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/local/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/local/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-index.doc: $(top_builddir)/config.status $(srcdir)/index.doc.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-@SET_MAKE@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Property changes on: trunk/dsim/doc/tutorial
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
Deleted: trunk/dsim/doc/tutorial/Makefile
===================================================================
--- trunk/dsim/doc/tutorial/Makefile 2010-07-23 14:59:27 UTC (rev 105)
+++ trunk/dsim/doc/tutorial/Makefile 2010-07-23 15:00:29 UTC (rev 106)
@@ -1,650 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# doc/tutorial/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-pkgdatadir = $(datadir)/dsim
-pkgincludedir = $(includedir)/dsim
-pkglibdir = $(libdir)/dsim
-pkglibexecdir = $(libexecdir)/dsim
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/sources.mk $(top_srcdir)/Makefile.common
-subdir = doc/tutorial
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/config/ax_boost.m4 \
- $(top_srcdir)/config/ax_mysql.m4 \
- $(top_srcdir)/config/cppunit.m4 $(top_srcdir)/config/gsl.m4 \
- $(top_srcdir)/config/librt.m4 $(top_srcdir)/config/libtool.m4 \
- $(top_srcdir)/config/ltoptions.m4 \
- $(top_srcdir)/config/ltsugar.m4 \
- $(top_srcdir)/config/ltversion.m4 \
- $(top_srcdir)/config/lt~obsolete.m4 \
- $(top_srcdir)/config/openmpi.m4 $(top_srcdir)/config/python.m4 \
- $(top_srcdir)/config/soci.m4 $(top_srcdir)/config/xerces.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/stdair/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
-ACLOCAL = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dan/dev/sim/dsimsvn/trunk/dsim/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dan/d...
[truncated message content] |
|
From: <den...@us...> - 2010-07-23 14:59:34
|
Revision: 105
http://dsim.svn.sourceforge.net/dsim/?rev=105&view=rev
Author: denis_arnaud
Date: 2010-07-23 14:59:27 +0000 (Fri, 23 Jul 2010)
Log Message:
-----------
[Dev] Replaced the new XXX_Service() by boost::make_shared<XXX_Service>().
Modified Paths:
--------------
trunk/dsim/dsim/command/DBManager.cpp
trunk/dsim/dsim/service/DSIM_Service.cpp
Modified: trunk/dsim/dsim/command/DBManager.cpp
===================================================================
--- trunk/dsim/dsim/command/DBManager.cpp 2010-07-20 23:45:35 UTC (rev 104)
+++ trunk/dsim/dsim/command/DBManager.cpp 2010-07-23 14:59:27 UTC (rev 105)
@@ -142,14 +142,14 @@
DBManager::prepareSelectOnAirlineCodeStatement (ioSociSession,
lSelectStatement,
iAirlineCode, ioAirline);
- const bool shouldDoReset = true;
+ //const bool shouldDoReset = true;
bool hasStillData = iterateOnStatement (lSelectStatement, ioAirline);
if (hasStillData == true) {
oHasRetrievedAirline = true;
}
// Sanity check
- const bool shouldNotDoReset = false;
+ //const bool shouldNotDoReset = false;
hasStillData = iterateOnStatement (lSelectStatement, ioAirline);
// Debug
Modified: trunk/dsim/dsim/service/DSIM_Service.cpp
===================================================================
--- trunk/dsim/dsim/service/DSIM_Service.cpp 2010-07-20 23:45:35 UTC (rev 104)
+++ trunk/dsim/dsim/service/DSIM_Service.cpp 2010-07-23 14:59:27 UTC (rev 105)
@@ -4,6 +4,8 @@
// STL
#include <cassert>
#include <ostream>
+// Boost
+#include <boost/make_shared.hpp>
// SOCI
#include <soci/core/soci.h>
// StdAir
@@ -104,8 +106,7 @@
// Note that the track on the object memory is kept thanks to the Boost
// Smart Pointers component.
stdair::STDAIR_ServicePtr_T lSTDAIR_Service_ptr =
- stdair::STDAIR_ServicePtr_T (new stdair::STDAIR_Service (iLogParams,
- iDBParams));
+ boost::make_shared<stdair::STDAIR_Service> (iLogParams, iDBParams);
// Retrieve the root of the BOM tree, on which all of the other BOM objects
// will be attached
@@ -136,17 +137,16 @@
// on the Service object, and deletes that object when it is no longer
// referenced (e.g., at the end of the process).
SIMCRS_ServicePtr_T lSIMCRS_Service =
- SIMCRS_ServicePtr_T (new SIMCRS::SIMCRS_Service (lSTDAIR_Service_ptr,
- lCRSCode,
- iScheduleInputFilename));
+ boost::make_shared<SIMCRS::SIMCRS_Service> (lSTDAIR_Service_ptr,
+ lCRSCode,
+ iScheduleInputFilename);
lDSIM_ServiceContext.setSIMCRS_Service (lSIMCRS_Service);
// TODO: do not hardcode the demand input file.
// Initialise the TRADEMGEN service handler
TRADEMGEN_ServicePtr_T lTRADEMGEN_Service =
- TRADEMGEN_ServicePtr_T (new TRADEMGEN::
- TRADEMGEN_Service (lSTDAIR_Service_ptr,
- iDemandInputFilename));
+ boost::make_shared<TRADEMGEN::TRADEMGEN_Service> (lSTDAIR_Service_ptr,
+ iDemandInputFilename);
lDSIM_ServiceContext.setTRADEMGEN_Service (lTRADEMGEN_Service);
}
@@ -195,7 +195,7 @@
throw NonInitialisedServiceException();
}
assert (_dsimServiceContext != NULL);
- DSIM_ServiceContext& lDSIM_ServiceContext = *_dsimServiceContext;
+ //DSIM_ServiceContext& lDSIM_ServiceContext = *_dsimServiceContext;
// Get the date-time for the present time
boost::posix_time::ptime lNowDateTime =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-20 23:45:41
|
Revision: 104
http://dsim.svn.sourceforge.net/dsim/?rev=104&view=rev
Author: denis_arnaud
Date: 2010-07-20 23:45:35 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
[Doc] Prefixed the source file variables with dsim.
Modified Paths:
--------------
trunk/dsim/doc/Makefile.am
trunk/dsim/doc/doxygen_html.cfg.in
trunk/dsim/doc/local/dsim_header.html
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
+++ trunk/dsim/doc/Makefile.am 2010-07-20 23:45:35 UTC (rev 104)
@@ -29,13 +29,14 @@
#include $(top_srcdir)/airrac/command/sources.mk
#include $(top_srcdir)/airrac/service/sources.mk
#include $(top_srcdir)/airrac/core/sources.mk
-#include $(top_srcdir)/rmol/basic/sources.mk
-#include $(top_srcdir)/rmol/bom/sources.mk
-#include $(top_srcdir)/rmol/factory/sources.mk
-#include $(top_srcdir)/rmol/command/sources.mk
-#include $(top_srcdir)/rmol/service/sources.mk
-#include $(top_srcdir)/rmol/core/sources.mk
-#include $(top_srcdir)/rmol/batches/sources.mk
+include $(top_srcdir)/rmol/basic/sources.mk
+include $(top_srcdir)/rmol/field/sources.mk
+include $(top_srcdir)/rmol/bom/sources.mk
+include $(top_srcdir)/rmol/factory/sources.mk
+include $(top_srcdir)/rmol/command/sources.mk
+include $(top_srcdir)/rmol/service/sources.mk
+include $(top_srcdir)/rmol/core/sources.mk
+include $(top_srcdir)/rmol/batches/sources.mk
#include $(top_srcdir)/airinv/basic/sources.mk
#include $(top_srcdir)/airinv/bom/sources.mk
#include $(top_srcdir)/airinv/factory/sources.mk
@@ -101,6 +102,14 @@
$(stdair_fac_h_sources) $(stdair_fac_cc_sources) \
$(stdair_cmd_h_sources) $(stdair_cmd_cc_sources) \
$(stdair_svc_h_sources) $(stdair_svc_cc_sources) \
+ $(rmol_service_h_sources) $(rmol_service_cc_sources) \
+ $(rmol_batches_h_sources) $(rmol_batches_cc_sources) \
+ $(rmol_bas_h_sources) $(rmol_bas_cc_sources) \
+ $(rmol_fld_h_sources) $(rmol_fld_cc_sources) \
+ $(rmol_bom_h_sources) $(rmol_bom_cc_sources) \
+ $(rmol_fac_h_sources) $(rmol_fac_cc_sources) \
+ $(rmol_cmd_h_sources) $(rmol_cmd_cc_sources) \
+ $(rmol_svc_h_sources) $(rmol_svc_cc_sources) \
$(dsim_service_h_sources) $(dsim_service_cc_sources) \
$(dsim_bas_h_sources) $(dsim_bas_cc_sources) \
$(dsim_bom_h_sources) $(dsim_bom_cc_sources) \
Modified: trunk/dsim/doc/doxygen_html.cfg.in
===================================================================
--- trunk/dsim/doc/doxygen_html.cfg.in 2010-07-20 23:08:53 UTC (rev 103)
+++ trunk/dsim/doc/doxygen_html.cfg.in 2010-07-20 23:45:35 UTC (rev 104)
@@ -554,7 +554,9 @@
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = @top_srcdir@/@PACKAGE@ \
+INPUT = @top_srcdir@/stdair \
+ @top_srcdir@/rmol \
+ @top_srcdir@/dsim \
@top_srcdir@/doc/local \
@top_builddir@/doc/local \
@top_srcdir@/doc/tutorial
Modified: trunk/dsim/doc/local/dsim_header.html
===================================================================
--- trunk/dsim/doc/local/dsim_header.html 2010-07-20 23:08:53 UTC (rev 103)
+++ trunk/dsim/doc/local/dsim_header.html 2010-07-20 23:45:35 UTC (rev 104)
@@ -10,10 +10,10 @@
<body>
<div style="width: 100%; height: 40px; background-color: #ffff00; border: 1px solid #b0b0b0; margin: 5px 5px 5px 0; padding: 2px;">
- <a href="http://stdair.sourceforge.net"><img width="150" height="40"
- src="stdair_logo.png" alt="StdAir Logo"
+ <a href="http://dsim.sourceforge.net"><img width="150" height="40"
+ src="dsim_logo.png" alt="StdAir Logo"
style="float: left; border: 0;"></a>
- <a href="http://www.sourceforge.net/projects/stdair"><img width="150"
+ <a href="http://sourceforge.net/projects/dsim/"><img width="150"
height="40" src="sfx_logo.png" alt="Sourceforge Logo"
style="float: right; border: 0;"></a>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-20 23:08:59
|
Revision: 103
http://dsim.svn.sourceforge.net/dsim/?rev=103&view=rev
Author: denis_arnaud
Date: 2010-07-20 23:08:53 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
[Doc] Prefixed the source file variables with stdair.
Modified Paths:
--------------
trunk/dsim/doc/Makefile.am
trunk/dsim/dsim/basic/Makefile.am
trunk/dsim/dsim/basic/sources.mk
trunk/dsim/dsim/batches/Makefile.am
trunk/dsim/dsim/batches/sources.mk
trunk/dsim/dsim/bom/Makefile.am
trunk/dsim/dsim/bom/sources.mk
trunk/dsim/dsim/command/Makefile.am
trunk/dsim/dsim/command/sources.mk
trunk/dsim/dsim/config/Makefile.am
trunk/dsim/dsim/core/Makefile.am
trunk/dsim/dsim/core/sources.mk
trunk/dsim/dsim/factory/Makefile.am
trunk/dsim/dsim/factory/sources.mk
trunk/dsim/dsim/service/Makefile.am
trunk/dsim/dsim/service/sources.mk
Modified: trunk/dsim/doc/Makefile.am
===================================================================
--- trunk/dsim/doc/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/doc/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,13 +1,14 @@
include $(top_srcdir)/doc/local/sources.mk
include $(top_srcdir)/doc/tutorial/sources.mk
include $(top_srcdir)/doc/tutorial/src/sources.mk
-#include $(top_srcdir)/stdair/basic/sources.mk
-#include $(top_srcdir)/stdair/bom/sources.mk
-#include $(top_srcdir)/stdair/factory/sources.mk
-#include $(top_srcdir)/stdair/command/sources.mk
-#include $(top_srcdir)/stdair/service/sources.mk
-#include $(top_srcdir)/stdair/core/sources.mk
-#include $(top_srcdir)/stdair/batches/sources.mk
+include $(top_srcdir)/stdair/basic/sources.mk
+include $(top_srcdir)/stdair/bom/sources.mk
+include $(top_srcdir)/stdair/factory/sources.mk
+include $(top_srcdir)/stdair/dbadaptor/sources.mk
+include $(top_srcdir)/stdair/command/sources.mk
+include $(top_srcdir)/stdair/service/sources.mk
+include $(top_srcdir)/stdair/core/sources.mk
+include $(top_srcdir)/stdair/batches/sources.mk
#include $(top_srcdir)/trademgen/basic/sources.mk
#include $(top_srcdir)/trademgen/bom/sources.mk
#include $(top_srcdir)/trademgen/factory/sources.mk
@@ -94,11 +95,18 @@
html/index.html: doxygen_html.cfg \
$(doc_local_sources) $(html_local_sources) \
$(doc_tutorial_sources) $(cpp_tutorial_sources) \
- $(bas_h_sources) $(bas_cc_sources) \
- $(bom_h_sources) $(bom_cc_sources) \
- $(fac_h_sources) $(fac_cc_sources) \
- $(cmd_h_sources) $(cmd_cc_sources) \
- $(svc_h_sources) $(svc_cc_sources)
+ $(stdair_service_h_sources) $(stdair_service_cc_sources) \
+ $(stdair_bas_h_sources) $(stdair_bas_cc_sources) \
+ $(stdair_bom_h_sources) $(stdair_bom_cc_sources) \
+ $(stdair_fac_h_sources) $(stdair_fac_cc_sources) \
+ $(stdair_cmd_h_sources) $(stdair_cmd_cc_sources) \
+ $(stdair_svc_h_sources) $(stdair_svc_cc_sources) \
+ $(dsim_service_h_sources) $(dsim_service_cc_sources) \
+ $(dsim_bas_h_sources) $(dsim_bas_cc_sources) \
+ $(dsim_bom_h_sources) $(dsim_bom_cc_sources) \
+ $(dsim_fac_h_sources) $(dsim_fac_cc_sources) \
+ $(dsim_cmd_h_sources) $(dsim_cmd_cc_sources) \
+ $(dsim_svc_h_sources) $(dsim_svc_cc_sources)
doxygen $<; \
if test -d html; then \
cp $(srcdir)/images/dsim_logo.png html; \
Modified: trunk/dsim/dsim/basic/Makefile.am
===================================================================
--- trunk/dsim/dsim/basic/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/basic/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,11 +1,13 @@
-## basic sub-directory
+## dsim/basic sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbas.la
+#
+noinst_LTLIBRARIES = libdsimbas.la
-libbas_la_SOURCES= $(bas_h_sources) $(bas_cc_sources)
-libbas_la_CXXFLAGS =
+libdsimbas_la_SOURCES = $(dsim_bas_h_sources) $(dsim_bas_cc_sources)
+libdsim_bas_la_CXXFLAGS =
+
#pkgincludedir = $(includedir)/@PACKAGE@/basic
#pkginclude_HEADERS = $(bas_h_sources)
Modified: trunk/dsim/dsim/basic/sources.mk
===================================================================
--- trunk/dsim/dsim/basic/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/basic/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,3 +1,5 @@
-bas_h_sources = $(top_srcdir)/dsim/basic/BasConst_General.hpp \
- $(top_srcdir)/dsim/basic/BasConst_DSIM_Service.hpp
-bas_cc_sources = $(top_srcdir)/dsim/basic/BasConst.cpp
+dsim_bas_h_sources = \
+ $(top_srcdir)/dsim/basic/BasConst_General.hpp \
+ $(top_srcdir)/dsim/basic/BasConst_DSIM_Service.hpp
+dsim_bas_cc_sources = \
+ $(top_srcdir)/dsim/basic/BasConst.cpp
Modified: trunk/dsim/dsim/batches/Makefile.am
===================================================================
--- trunk/dsim/dsim/batches/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/batches/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-# batches
+# dsim/batches
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -10,7 +10,7 @@
# Binaries (batches)
bin_PROGRAMS = simulate
-simulate_SOURCES = $(batches_h_sources) $(batches_cc_sources)
+simulate_SOURCES = $(dsim_batches_h_sources) $(dsim_batches_cc_sources)
simulate_CXXFLAGS = $(BOOST_CFLAGS)
simulate_LDADD =
simulate_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(SOCI_LIBS) \
Modified: trunk/dsim/dsim/batches/sources.mk
===================================================================
--- trunk/dsim/dsim/batches/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/batches/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,2 +1,2 @@
-batches_h_sources =
-batches_cc_sources = $(top_srcdir)/dsim/batches/simulate.cpp
+dsim_batches_h_sources =
+dsim_batches_cc_sources = $(top_srcdir)/dsim/batches/simulate.cpp
Modified: trunk/dsim/dsim/bom/Makefile.am
===================================================================
--- trunk/dsim/dsim/bom/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/bom/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,12 +1,14 @@
-## bom sub-directory
+## dsim/bom sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libbom.la
+#
+noinst_LTLIBRARIES= libdsimbom.la
-libbom_la_SOURCES= $(bom_h_sources) $(bom_cc_sources)
-libbom_la_CXXFLAGS =
-libbom_la_LDFLAGS =
+libdsimbom_la_SOURCES= $(dsim_bom_h_sources) $(dsim_bom_cc_sources)
+libdsimbom_la_CXXFLAGS =
+libdsimbom_la_LDFLAGS =
+
#pkgincludedir = $(includedir)/@PACKAGE@/bom
#pkginclude_HEADERS = $(bom_h_sources)
Modified: trunk/dsim/dsim/bom/sources.mk
===================================================================
--- trunk/dsim/dsim/bom/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/bom/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,7 +1,9 @@
-bom_h_sources = $(top_srcdir)/dsim/bom/BomAbstract.hpp \
- $(top_srcdir)/dsim/bom/StructAbstract.hpp \
- $(top_srcdir)/dsim/bom/ConfigurationParameters.hpp \
- $(top_srcdir)/dsim/bom/RDSParameters.hpp
-bom_cc_sources = $(top_srcdir)/dsim/bom/BomAbstract.cpp \
- $(top_srcdir)/dsim/bom/ConfigurationParameters.cpp \
- $(top_srcdir)/dsim/bom/RDSParameters.cpp
+dsim_bom_h_sources = \
+ $(top_srcdir)/dsim/bom/BomAbstract.hpp \
+ $(top_srcdir)/dsim/bom/StructAbstract.hpp \
+ $(top_srcdir)/dsim/bom/ConfigurationParameters.hpp \
+ $(top_srcdir)/dsim/bom/RDSParameters.hpp
+dsim_bom_cc_sources = \
+ $(top_srcdir)/dsim/bom/BomAbstract.cpp \
+ $(top_srcdir)/dsim/bom/ConfigurationParameters.cpp \
+ $(top_srcdir)/dsim/bom/RDSParameters.cpp
Modified: trunk/dsim/dsim/command/Makefile.am
===================================================================
--- trunk/dsim/dsim/command/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/command/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,13 +1,14 @@
-## command sub-directory
+## dsim/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libcmd.la
+#
+noinst_LTLIBRARIES = libdsimcmd.la
-libcmd_la_SOURCES= $(cmd_h_sources) $(cmd_cc_sources)
-libcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS)
-libcmd_la_LIBADD =
-libcmd_la_LDFLAGS = $(BOOST_LIBS) $(SOCI_LIBS) \
+libdsimcmd_la_SOURCES = $(dsim_cmd_h_sources) $(dsim_cmd_cc_sources)
+libdsimcmd_la_CXXFLAGS = $(BOOST_CFLAGS) $(SOCI_CFLAGS)
+libdsimcmd_la_LIBADD =
+libdsimcmd_la_LDFLAGS = $(BOOST_LIBS) $(SOCI_LIBS) \
$(top_builddir)/simcrs/core/libsimcrs.la \
$(top_builddir)/trademgen/core/libtrademgen.la
Modified: trunk/dsim/dsim/command/sources.mk
===================================================================
--- trunk/dsim/dsim/command/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/command/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,8 +1,8 @@
-cmd_h_sources = \
+dsim_cmd_h_sources = \
$(top_srcdir)/dsim/command/CmdAbstract.hpp \
$(top_srcdir)/dsim/command/DBManager.hpp \
$(top_srcdir)/dsim/command/Simulator.hpp
-cmd_cc_sources = \
+dsim_cmd_cc_sources = \
$(top_srcdir)/dsim/command/CmdAbstract.cpp \
$(top_srcdir)/dsim/command/DBManager.cpp \
$(top_srcdir)/dsim/command/Simulator.cpp
\ No newline at end of file
Modified: trunk/dsim/dsim/config/Makefile.am
===================================================================
--- trunk/dsim/dsim/config/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/config/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-# config
+# dsim/config
include $(top_srcdir)/Makefile.common
## Source directory
Modified: trunk/dsim/dsim/core/Makefile.am
===================================================================
--- trunk/dsim/dsim/core/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/core/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-# core
+# dsim/core
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
@@ -12,15 +12,16 @@
# Library
lib_LTLIBRARIES = libdsim.la
-libdsim_la_SOURCES = $(service_h_sources) $(service_cc_sources)
+libdsim_la_SOURCES = $(dsim_service_h_sources) $(dsim_service_cc_sources)
libdsim_la_LIBADD = \
- $(top_builddir)/dsim/basic/libbas.la \
- $(top_builddir)/dsim/bom/libbom.la \
- $(top_builddir)/dsim/factory/libfac.la \
- $(top_builddir)/dsim/command/libcmd.la \
- $(top_builddir)/dsim/service/libsvc.la
+ $(top_builddir)/dsim/basic/libdsimbas.la \
+ $(top_builddir)/dsim/bom/libdsimbom.la \
+ $(top_builddir)/dsim/factory/libdsimfac.la \
+ $(top_builddir)/dsim/command/libdsimcmd.la \
+ $(top_builddir)/dsim/service/libdsimsvc.la
libdsim_la_LDFLAGS = \
- $(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) \
+ $(BOOST_DATE_TIME_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_FILESYSTEM_LIB) \
$(top_builddir)/stdair/core/libstdair.la \
$(top_builddir)/airsched/core/libairsched.la \
$(top_builddir)/simcrs/core/libsimcrs.la \
Modified: trunk/dsim/dsim/core/sources.mk
===================================================================
--- trunk/dsim/dsim/core/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/core/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,4 +1,4 @@
-service_h_sources = \
- $(top_srcdir)/dsim/DSIM_Types.hpp \
- $(top_srcdir)/dsim/DSIM_Service.hpp
-service_cc_sources =
+dsim_service_h_sources = \
+ $(top_srcdir)/dsim/DSIM_Types.hpp \
+ $(top_srcdir)/dsim/DSIM_Service.hpp
+dsim_service_cc_sources =
Modified: trunk/dsim/dsim/factory/Makefile.am
===================================================================
--- trunk/dsim/dsim/factory/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/factory/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,11 +1,13 @@
-## factory sub-directory
+## dsim/factory sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libfac.la
+#
+noinst_LTLIBRARIES= libdsimfac.la
-libfac_la_SOURCES= $(fac_h_sources) $(fac_cc_sources)
-libfac_la_CXXFLAGS =
+libdsimfac_la_SOURCES= $(dsim_fac_h_sources) $(dsim_fac_cc_sources)
+libdsimfac_la_CXXFLAGS =
+
#pkgincludedir = $(includedir)/@PACKAGE@/factory
#pkginclude_HEADERS = $(fac_h_sources)
Modified: trunk/dsim/dsim/factory/sources.mk
===================================================================
--- trunk/dsim/dsim/factory/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/factory/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,9 +1,9 @@
-fac_h_sources = \
+dsim_fac_h_sources = \
$(top_srcdir)/dsim/factory/FacBomAbstract.hpp \
$(top_srcdir)/dsim/factory/FacServiceAbstract.hpp \
$(top_srcdir)/dsim/factory/FacSupervisor.hpp \
$(top_srcdir)/dsim/factory/FacDsimServiceContext.hpp
-fac_cc_sources = \
+dsim_fac_cc_sources = \
$(top_srcdir)/dsim/factory/FacBomAbstract.cpp \
$(top_srcdir)/dsim/factory/FacServiceAbstract.cpp \
$(top_srcdir)/dsim/factory/FacSupervisor.cpp \
Modified: trunk/dsim/dsim/service/Makefile.am
===================================================================
--- trunk/dsim/dsim/service/Makefile.am 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/service/Makefile.am 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,11 +1,13 @@
-## command sub-directory
+## dsim/command sub-directory
include $(top_srcdir)/Makefile.common
include $(srcdir)/sources.mk
-noinst_LTLIBRARIES= libsvc.la
+#
+noinst_LTLIBRARIES = libdsimsvc.la
-libsvc_la_SOURCES= $(svc_h_sources) $(svc_cc_sources)
-libsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+libdsimsvc_la_SOURCES = $(dsim_svc_h_sources) $(dsim_svc_cc_sources)
+libdsimsvc_la_CXXFLAGS = $(BOOST_CFLAGS)
+
#pkgincludedir = $(includedir)/@PACKAGE@/service
#pkginclude_HEADERS = $(svc_h_sources)
Modified: trunk/dsim/dsim/service/sources.mk
===================================================================
--- trunk/dsim/dsim/service/sources.mk 2010-07-20 22:17:42 UTC (rev 102)
+++ trunk/dsim/dsim/service/sources.mk 2010-07-20 23:08:53 UTC (rev 103)
@@ -1,5 +1,7 @@
-svc_h_sources = $(top_srcdir)/dsim/service/ServiceAbstract.hpp \
- $(top_srcdir)/dsim/service/DSIM_ServiceContext.hpp
-svc_cc_sources = $(top_srcdir)/dsim/service/ServiceAbstract.cpp \
- $(top_srcdir)/dsim/service/DSIM_ServiceContext.cpp \
- $(top_srcdir)/dsim/service/DSIM_Service.cpp
+dsim_svc_h_sources = \
+ $(top_srcdir)/dsim/service/ServiceAbstract.hpp \
+ $(top_srcdir)/dsim/service/DSIM_ServiceContext.hpp
+dsim_svc_cc_sources = \
+ $(top_srcdir)/dsim/service/ServiceAbstract.cpp \
+ $(top_srcdir)/dsim/service/DSIM_ServiceContext.cpp \
+ $(top_srcdir)/dsim/service/DSIM_Service.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-20 22:17:50
|
Revision: 102
http://dsim.svn.sourceforge.net/dsim/?rev=102&view=rev
Author: denis_arnaud
Date: 2010-07-20 22:17:42 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
[Doc] Added structure to generate documentation (with Doxygen).
Modified Paths:
--------------
trunk/dsim/COPYING
trunk/dsim/Makefile.am
trunk/dsim/configure.ac
Added Paths:
-----------
trunk/dsim/doc/Makefile.am
trunk/dsim/doc/doxygen_html.cfg.in
trunk/dsim/doc/images/
trunk/dsim/doc/images/Makefile
trunk/dsim/doc/images/Makefile.am
trunk/dsim/doc/images/Makefile.in
trunk/dsim/doc/images/dsim_logo.png
trunk/dsim/doc/images/dsim_logo.xcf
trunk/dsim/doc/images/favicon.ico
trunk/dsim/doc/images/sfx_logo.png
trunk/dsim/doc/local/
trunk/dsim/doc/local/Makefile
trunk/dsim/doc/local/Makefile.am
trunk/dsim/doc/local/Makefile.in
trunk/dsim/doc/local/authors.doc
trunk/dsim/doc/local/codingrules.doc
trunk/dsim/doc/local/copyright.doc
trunk/dsim/doc/local/documentation.doc
trunk/dsim/doc/local/dsim_footer.html
trunk/dsim/doc/local/dsim_header.html
trunk/dsim/doc/local/features.doc
trunk/dsim/doc/local/help_wanted.doc
trunk/dsim/doc/local/index.doc.in
trunk/dsim/doc/local/installation.doc
trunk/dsim/doc/local/linking.doc
trunk/dsim/doc/local/sources.mk
trunk/dsim/doc/local/test.doc
trunk/dsim/doc/local/users_guide.doc
trunk/dsim/doc/local/verification.doc
trunk/dsim/doc/sourceforge/
trunk/dsim/doc/sourceforge/howto_release_dsim.html.in
trunk/dsim/doc/sourceforge/howto_release_stdair.html
trunk/dsim/doc/tutorial/
trunk/dsim/doc/tutorial/Makefile
trunk/dsim/doc/tutorial/Makefile.am
trunk/dsim/doc/tutorial/Makefile.in
trunk/dsim/doc/tutorial/bpsk.doc
trunk/dsim/doc/tutorial/convcode.doc
trunk/dsim/doc/tutorial/interleaver.doc
trunk/dsim/doc/tutorial/itfile.doc
trunk/dsim/doc/tutorial/ldpc_bersim_awgn.doc
trunk/dsim/doc/tutorial/ldpc_gen_codes.doc
trunk/dsim/doc/tutorial/matlab_itpp.doc
trunk/dsim/doc/tutorial/mimoconv.doc
trunk/dsim/doc/tutorial/mog.doc
trunk/dsim/doc/tutorial/qpsk_simulation.doc
trunk/dsim/doc/tutorial/rayleigh.doc
trunk/dsim/doc/tutorial/reedsolomon.doc
trunk/dsim/doc/tutorial/sources.mk
trunk/dsim/doc/tutorial/spread.doc
trunk/dsim/doc/tutorial/src/
trunk/dsim/doc/tutorial/src/Makefile
trunk/dsim/doc/tutorial/src/Makefile.am
trunk/dsim/doc/tutorial/src/Makefile.in
trunk/dsim/doc/tutorial/src/bpsk.cpp
trunk/dsim/doc/tutorial/src/bpsk.ref
trunk/dsim/doc/tutorial/src/convcode.cpp
trunk/dsim/doc/tutorial/src/convcode.ref
trunk/dsim/doc/tutorial/src/interleaver.cpp
trunk/dsim/doc/tutorial/src/interleaver.ref
trunk/dsim/doc/tutorial/src/ldpc_bersim_awgn.cpp
trunk/dsim/doc/tutorial/src/ldpc_gen_codes.cpp
trunk/dsim/doc/tutorial/src/mimoconv.cpp
trunk/dsim/doc/tutorial/src/mog.cpp
trunk/dsim/doc/tutorial/src/qpsk_simulation.cpp
trunk/dsim/doc/tutorial/src/qpsk_simulation.ref
trunk/dsim/doc/tutorial/src/rayleigh.cpp
trunk/dsim/doc/tutorial/src/read_it_file.cpp
trunk/dsim/doc/tutorial/src/reedsolomon.cpp
trunk/dsim/doc/tutorial/src/reedsolomon.ref
trunk/dsim/doc/tutorial/src/sources.mk
trunk/dsim/doc/tutorial/src/spread.cpp
trunk/dsim/doc/tutorial/src/spread.ref
trunk/dsim/doc/tutorial/src/timer.cpp
trunk/dsim/doc/tutorial/src/timer.ref
trunk/dsim/doc/tutorial/src/vector_and_matrix.cpp
trunk/dsim/doc/tutorial/src/vector_and_matrix.ref
trunk/dsim/doc/tutorial/src/write_it_file.cpp
trunk/dsim/doc/tutorial/timer.doc
trunk/dsim/doc/tutorial/tutorial.doc
trunk/dsim/doc/tutorial/vector_and_matrix.doc
Property Changed:
----------------
trunk/dsim/doc/
trunk/dsim/test/master_slave/
Modified: trunk/dsim/COPYING
===================================================================
--- trunk/dsim/COPYING 2010-07-16 14:15:14 UTC (rev 101)
+++ trunk/dsim/COPYING 2010-07-20 22:17:42 UTC (rev 102)
@@ -1,674 +1,504 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+ Preamble
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
- The precise terms and conditions for copying, distribution and
-modification follow.
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
- TERMS AND CONDITIONS
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
- 0. Definitions.
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
- "This License" refers to version 3 of the GNU General Public License.
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
- A "covered work" means either the unmodified Program or a work based
-on the Program.
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
- 1. Source Code.
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
+ a) The modified work must itself be a software library.
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
- The Corresponding Source for a work in source code form is that
-same work.
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
- 2. Basic Permissions.
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
- 4. Conveying Verbatim Copies.
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
- 5. Conveying Modified Source Versions.
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
- 6. Conveying Non-Source Forms.
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
this License.
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
- 13. Use with the GNU Affero General Public License.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
- 14. Revised Versions of this License.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
- 15. Disclaimer of Warranty.
+ NO WARRANTY
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- 16. Limitation of Liability.
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE ...
[truncated message content] |
|
From: <den...@us...> - 2010-07-16 14:15:24
|
Revision: 101
http://dsim.svn.sourceforge.net/dsim/?rev=101&view=rev
Author: denis_arnaud
Date: 2010-07-16 14:15:14 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
[Test Boost.ASIO] Ignored generated files.
Modified Paths:
--------------
trunk/dsim/test/boost/asio/daytime3.cpp
trunk/dsim/test/boost/asio/log_server/client.cpp
trunk/dsim/test/boost/asio/log_server/server.cpp
Property Changed:
----------------
trunk/dsim/test/boost/asio/chat/
trunk/dsim/test/boost/asio/log_server/
trunk/dsim/test/boost/asio/logd/log/
Property changes on: trunk/dsim/test/boost/asio/chat
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
chat_client
chat_server
Modified: trunk/dsim/test/boost/asio/daytime3.cpp
===================================================================
--- trunk/dsim/test/boost/asio/daytime3.cpp 2010-07-16 13:05:31 UTC (rev 100)
+++ trunk/dsim/test/boost/asio/daytime3.cpp 2010-07-16 14:15:14 UTC (rev 101)
@@ -62,6 +62,7 @@
void handleWrite (const boost::system::error_code& iErrorCode,
const size_t iTransferredBytes) {
+ // start();
}
Property changes on: trunk/dsim/test/boost/asio/log_server
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
client
server
server.log
Modified: trunk/dsim/test/boost/asio/log_server/client.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/client.cpp 2010-07-16 13:05:31 UTC (rev 100)
+++ trunk/dsim/test/boost/asio/log_server/client.cpp 2010-07-16 14:15:14 UTC (rev 101)
@@ -12,7 +12,7 @@
/* Send filename's content to server */
void send_file (std::string filename){
using namespace std;
- std::string lHostname = "fed2";
+ std::string lHostname = "localhost";
// Service name (as specified within /etc/services)
// The "aria" service corresponds to the port 2624
const std::string lServiceName = "aria";
Modified: trunk/dsim/test/boost/asio/log_server/server.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/server.cpp 2010-07-16 13:05:31 UTC (rev 100)
+++ trunk/dsim/test/boost/asio/log_server/server.cpp 2010-07-16 14:15:14 UTC (rev 101)
@@ -30,7 +30,7 @@
boost::system::error_code lIgnoredError;
boost::system::error_code lTransferError;
- boost::array<char, 4> lBuffer;
+ boost::array<char, 1024> lBuffer;
ofstream out ("server.log", ios::app); //file to write log
Property changes on: trunk/dsim/test/boost/asio/logd/log
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile.in
Makefile
logd.log
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-16 13:05:37
|
Revision: 100
http://dsim.svn.sourceforge.net/dsim/?rev=100&view=rev
Author: denis_arnaud
Date: 2010-07-16 13:05:31 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
[Test Boost] Ignored generated files in Boost.ASIO dedicated directory.
Property Changed:
----------------
trunk/dsim/test/boost/asio/logger/
Property changes on: trunk/dsim/test/boost/asio/logger
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile.in
Makefile
daytime_client
+ .deps
.libs
Makefile.in
Makefile
daytime_client
daytime_service
daytime_service.log
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sng...@us...> - 2010-07-16 12:56:51
|
Revision: 99
http://dsim.svn.sourceforge.net/dsim/?rev=99&view=rev
Author: snguyenkim
Date: 2010-07-16 12:56:45 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
Chatting program using boost asio
Added Paths:
-----------
trunk/dsim/test/boost/asio/chat/
trunk/dsim/test/boost/asio/chat/Makefile.am
trunk/dsim/test/boost/asio/chat/chat_client.cpp
trunk/dsim/test/boost/asio/chat/chat_message.hpp
trunk/dsim/test/boost/asio/chat/chat_server.cpp
Added: trunk/dsim/test/boost/asio/chat/Makefile.am
===================================================================
--- trunk/dsim/test/boost/asio/chat/Makefile.am (rev 0)
+++ trunk/dsim/test/boost/asio/chat/Makefile.am 2010-07-16 12:56:45 UTC (rev 99)
@@ -0,0 +1,19 @@
+## test/boost/asio sub-directory
+include $(top_srcdir)/Makefile.common
+
+##
+
+MAINTAINERCLEANFILES = Makefile.in
+
+check_PROGRAMS = chat_client chat_server
+
+chat_client_SOURCES = chat_client.cpp
+chat_client_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
+chat_client_LDFLAGS = $(BOOST_LIBS) $(BOOST_DATE_TIME_LIB) $(BOOST_ASIO_LIB)
+chat_client_LDADD =
+
+chat_server_SOURCES = chat_server.cpp
+chat_server_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
+chat_server_LDFLAGS = $(BOOST_LIBS) $(BOOST_DATE_TIME_LIB) $(BOOST_ASIO_LIB)
+chat_server_LDADD =
+
Added: trunk/dsim/test/boost/asio/chat/chat_client.cpp
===================================================================
--- trunk/dsim/test/boost/asio/chat/chat_client.cpp (rev 0)
+++ trunk/dsim/test/boost/asio/chat/chat_client.cpp 2010-07-16 12:56:45 UTC (rev 99)
@@ -0,0 +1,187 @@
+//
+// chat_client.cpp
+// ~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2010 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <cstdlib>
+#include <deque>
+#include <iostream>
+#include <boost/bind.hpp>
+#include <boost/asio.hpp>
+#include <boost/thread.hpp>
+#include "chat_message.hpp"
+
+using boost::asio::ip::tcp;
+
+typedef std::deque<chat_message> chat_message_queue;
+
+class chat_client
+{
+public:
+ chat_client(boost::asio::io_service& io_service,
+ tcp::resolver::iterator endpoint_iterator)
+ : io_service_(io_service),
+ socket_(io_service)
+ {
+ tcp::endpoint endpoint = *endpoint_iterator;
+ socket_.async_connect(endpoint,
+ boost::bind(&chat_client::handle_connect, this,
+ boost::asio::placeholders::error, ++endpoint_iterator));
+ }
+
+ void write(const chat_message& msg)
+ {
+ io_service_.post(boost::bind(&chat_client::do_write, this, msg));
+ }
+
+ void close()
+ {
+ io_service_.post(boost::bind(&chat_client::do_close, this));
+ }
+
+private:
+
+ void handle_connect(const boost::system::error_code& error,
+ tcp::resolver::iterator endpoint_iterator)
+ {
+ if (!error)
+ {
+ boost::asio::async_read(socket_,
+ boost::asio::buffer(read_msg_.data(), chat_message::header_length),
+ boost::bind(&chat_client::handle_read_header, this,
+ boost::asio::placeholders::error));
+ }
+ else if (endpoint_iterator != tcp::resolver::iterator())
+ {
+ socket_.close();
+ tcp::endpoint endpoint = *endpoint_iterator;
+ socket_.async_connect(endpoint,
+ boost::bind(&chat_client::handle_connect, this,
+ boost::asio::placeholders::error, ++endpoint_iterator));
+ }
+ }
+
+ void handle_read_header(const boost::system::error_code& error)
+ {
+ if (!error && read_msg_.decode_header())
+ {
+ boost::asio::async_read(socket_,
+ boost::asio::buffer(read_msg_.body(), read_msg_.body_length()),
+ boost::bind(&chat_client::handle_read_body, this,
+ boost::asio::placeholders::error));
+ }
+ else
+ {
+ do_close();
+ }
+ }
+
+ void handle_read_body(const boost::system::error_code& error)
+ {
+ if (!error)
+ {
+ std::cout.write(read_msg_.body(), read_msg_.body_length());
+ std::cout << "\n";
+ boost::asio::async_read(socket_,
+ boost::asio::buffer(read_msg_.data(), chat_message::header_length),
+ boost::bind(&chat_client::handle_read_header, this,
+ boost::asio::placeholders::error));
+ }
+ else
+ {
+ do_close();
+ }
+ }
+
+ void do_write(chat_message msg)
+ {
+ bool write_in_progress = !write_msgs_.empty();
+ write_msgs_.push_back(msg);
+ if (!write_in_progress)
+ {
+ boost::asio::async_write(socket_,
+ boost::asio::buffer(write_msgs_.front().data(),
+ write_msgs_.front().length()),
+ boost::bind(&chat_client::handle_write, this,
+ boost::asio::placeholders::error));
+ }
+ }
+
+ void handle_write(const boost::system::error_code& error)
+ {
+ if (!error)
+ {
+ write_msgs_.pop_front();
+ if (!write_msgs_.empty())
+ {
+ boost::asio::async_write(socket_,
+ boost::asio::buffer(write_msgs_.front().data(),
+ write_msgs_.front().length()),
+ boost::bind(&chat_client::handle_write, this,
+ boost::asio::placeholders::error));
+ }
+ }
+ else
+ {
+ do_close();
+ }
+ }
+
+ void do_close()
+ {
+ socket_.close();
+ }
+
+private:
+ boost::asio::io_service& io_service_;
+ tcp::socket socket_;
+ chat_message read_msg_;
+ chat_message_queue write_msgs_;
+};
+
+int main(int argc, char* argv[])
+{
+ try
+ {
+ if (argc != 3)
+ {
+ std::cerr << "Usage: chat_client <host> <port>\n";
+ return 1;
+ }
+
+ boost::asio::io_service io_service;
+
+ tcp::resolver resolver(io_service);
+ tcp::resolver::query query(argv[1], argv[2]);
+ tcp::resolver::iterator iterator = resolver.resolve(query);
+
+ chat_client c(io_service, iterator);
+
+ boost::thread t(boost::bind(&boost::asio::io_service::run, &io_service));
+
+ char line[chat_message::max_body_length + 1];
+ while (std::cin.getline(line, chat_message::max_body_length + 1))
+ {
+ using namespace std; // For strlen and memcpy.
+ chat_message msg;
+ msg.body_length(strlen(line));
+ memcpy(msg.body(), line, msg.body_length());
+ msg.encode_header();
+ c.write(msg);
+ }
+
+ c.close();
+ t.join();
+ }
+ catch (std::exception& e)
+ {
+ std::cerr << "Exception: " << e.what() << "\n";
+ }
+
+ return 0;
+}
Added: trunk/dsim/test/boost/asio/chat/chat_message.hpp
===================================================================
--- trunk/dsim/test/boost/asio/chat/chat_message.hpp (rev 0)
+++ trunk/dsim/test/boost/asio/chat/chat_message.hpp 2010-07-16 12:56:45 UTC (rev 99)
@@ -0,0 +1,93 @@
+//
+// chat_message.hpp
+// ~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2010 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef CHAT_MESSAGE_HPP
+#define CHAT_MESSAGE_HPP
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+class chat_message
+{
+public:
+ enum { header_length = 4 };
+ enum { max_body_length = 512 };
+
+ chat_message()
+ : body_length_(0)
+ {
+ }
+
+ const char* data() const
+ {
+ return data_;
+ }
+
+ char* data()
+ {
+ return data_;
+ }
+
+ size_t length() const
+ {
+ return header_length + body_length_;
+ }
+
+ const char* body() const
+ {
+ return data_ + header_length;
+ }
+
+ char* body()
+ {
+ return data_ + header_length;
+ }
+
+ size_t body_length() const
+ {
+ return body_length_;
+ }
+
+ void body_length(size_t length)
+ {
+ body_length_ = length;
+ if (body_length_ > max_body_length)
+ body_length_ = max_body_length;
+ }
+
+ bool decode_header()
+ {
+ using namespace std; // For strncat and atoi.
+ char header[header_length + 1] = "";
+ strncat(header, data_, header_length);
+ body_length_ = atoi(header);
+ if (body_length_ > max_body_length)
+ {
+ body_length_ = 0;
+ return false;
+ }
+ return true;
+ }
+
+ void encode_header()
+ {
+ using namespace std; // For sprintf and memcpy.
+ char header[header_length + 1] = "";
+ sprintf(header, "%4d", body_length_);
+ memcpy(data_, header, header_length);
+ }
+
+private:
+ char data_[header_length + max_body_length];
+ size_t body_length_;
+};
+
+#endif // CHAT_MESSAGE_HPP
Added: trunk/dsim/test/boost/asio/chat/chat_server.cpp
===================================================================
--- trunk/dsim/test/boost/asio/chat/chat_server.cpp (rev 0)
+++ trunk/dsim/test/boost/asio/chat/chat_server.cpp 2010-07-16 12:56:45 UTC (rev 99)
@@ -0,0 +1,244 @@
+//
+// chat_server.cpp
+// ~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2010 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <algorithm>
+#include <cstdlib>
+#include <deque>
+#include <iostream>
+#include <list>
+#include <set>
+#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/asio.hpp>
+#include "chat_message.hpp"
+
+using boost::asio::ip::tcp;
+
+//----------------------------------------------------------------------
+
+typedef std::deque<chat_message> chat_message_queue;
+
+//----------------------------------------------------------------------
+
+class chat_participant
+{
+public:
+ virtual ~chat_participant() {}
+ virtual void deliver(const chat_message& msg) = 0;
+};
+
+typedef boost::shared_ptr<chat_participant> chat_participant_ptr;
+
+//----------------------------------------------------------------------
+
+class chat_room
+{
+public:
+ void join(chat_participant_ptr participant)
+ {
+ participants_.insert(participant);
+ std::for_each(recent_msgs_.begin(), recent_msgs_.end(),
+ boost::bind(&chat_participant::deliver, participant, _1));
+ }
+
+ void leave(chat_participant_ptr participant)
+ {
+ participants_.erase(participant);
+ }
+
+ void deliver(const chat_message& msg)
+ {
+ recent_msgs_.push_back(msg);
+ while (recent_msgs_.size() > max_recent_msgs)
+ recent_msgs_.pop_front();
+
+ std::for_each(participants_.begin(), participants_.end(),
+ boost::bind(&chat_participant::deliver, _1, boost::ref(msg)));
+ }
+
+private:
+ std::set<chat_participant_ptr> participants_;
+ enum { max_recent_msgs = 100 };
+ chat_message_queue recent_msgs_;
+};
+
+//----------------------------------------------------------------------
+
+class chat_session
+ : public chat_participant,
+ public boost::enable_shared_from_this<chat_session>
+{
+public:
+ chat_session(boost::asio::io_service& io_service, chat_room& room)
+ : socket_(io_service),
+ room_(room)
+ {
+ }
+
+ tcp::socket& socket()
+ {
+ return socket_;
+ }
+
+ void start()
+ {
+ room_.join(shared_from_this());
+ boost::asio::async_read(socket_,
+ boost::asio::buffer(read_msg_.data(), chat_message::header_length),
+ boost::bind(
+ &chat_session::handle_read_header, shared_from_this(),
+ boost::asio::placeholders::error));
+ }
+
+ void deliver(const chat_message& msg)
+ {
+ bool write_in_progress = !write_msgs_.empty();
+ write_msgs_.push_back(msg);
+ if (!write_in_progress)
+ {
+ boost::asio::async_write(socket_,
+ boost::asio::buffer(write_msgs_.front().data(),
+ write_msgs_.front().length()),
+ boost::bind(&chat_session::handle_write, shared_from_this(),
+ boost::asio::placeholders::error));
+ }
+ }
+
+ void handle_read_header(const boost::system::error_code& error)
+ {
+ if (!error && read_msg_.decode_header())
+ {
+ boost::asio::async_read(socket_,
+ boost::asio::buffer(read_msg_.body(), read_msg_.body_length()),
+ boost::bind(&chat_session::handle_read_body, shared_from_this(),
+ boost::asio::placeholders::error));
+ }
+ else
+ {
+ room_.leave(shared_from_this());
+ }
+ }
+
+ void handle_read_body(const boost::system::error_code& error)
+ {
+ if (!error)
+ {
+ room_.deliver(read_msg_);
+ boost::asio::async_read(socket_,
+ boost::asio::buffer(read_msg_.data(), chat_message::header_length),
+ boost::bind(&chat_session::handle_read_header, shared_from_this(),
+ boost::asio::placeholders::error));
+ }
+ else
+ {
+ room_.leave(shared_from_this());
+ }
+ }
+
+ void handle_write(const boost::system::error_code& error)
+ {
+ if (!error)
+ {
+ write_msgs_.pop_front();
+ if (!write_msgs_.empty())
+ {
+ boost::asio::async_write(socket_,
+ boost::asio::buffer(write_msgs_.front().data(),
+ write_msgs_.front().length()),
+ boost::bind(&chat_session::handle_write, shared_from_this(),
+ boost::asio::placeholders::error));
+ }
+ }
+ else
+ {
+ room_.leave(shared_from_this());
+ }
+ }
+
+private:
+ tcp::socket socket_;
+ chat_room& room_;
+ chat_message read_msg_;
+ chat_message_queue write_msgs_;
+};
+
+typedef boost::shared_ptr<chat_session> chat_session_ptr;
+
+//----------------------------------------------------------------------
+
+class chat_server
+{
+public:
+ chat_server(boost::asio::io_service& io_service,
+ const tcp::endpoint& endpoint)
+ : io_service_(io_service),
+ acceptor_(io_service, endpoint)
+ {
+ chat_session_ptr new_session(new chat_session(io_service_, room_));
+ acceptor_.async_accept(new_session->socket(),
+ boost::bind(&chat_server::handle_accept, this, new_session,
+ boost::asio::placeholders::error));
+ }
+
+ void handle_accept(chat_session_ptr session,
+ const boost::system::error_code& error)
+ {
+ if (!error)
+ {
+ session->start();
+ chat_session_ptr new_session(new chat_session(io_service_, room_));
+ acceptor_.async_accept(new_session->socket(),
+ boost::bind(&chat_server::handle_accept, this, new_session,
+ boost::asio::placeholders::error));
+ }
+ }
+
+private:
+ boost::asio::io_service& io_service_;
+ tcp::acceptor acceptor_;
+ chat_room room_;
+};
+
+typedef boost::shared_ptr<chat_server> chat_server_ptr;
+typedef std::list<chat_server_ptr> chat_server_list;
+
+//----------------------------------------------------------------------
+
+int main(int argc, char* argv[])
+{
+ try
+ {
+ if (argc < 2)
+ {
+ std::cerr << "Usage: chat_server <port> [<port> ...]\n";
+ return 1;
+ }
+
+ boost::asio::io_service io_service;
+
+ chat_server_list servers;
+ for (int i = 1; i < argc; ++i)
+ {
+ using namespace std; // For atoi.
+ tcp::endpoint endpoint(tcp::v4(), atoi(argv[i]));
+ chat_server_ptr server(new chat_server(io_service, endpoint));
+ servers.push_back(server);
+ }
+
+ io_service.run();
+ }
+ catch (std::exception& e)
+ {
+ std::cerr << "Exception: " << e.what() << "\n";
+ }
+
+ return 0;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sng...@us...> - 2010-07-16 12:46:02
|
Revision: 98
http://dsim.svn.sourceforge.net/dsim/?rev=98&view=rev
Author: snguyenkim
Date: 2010-07-16 12:45:55 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/dsim/configure.ac
Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac 2010-07-16 12:44:59 UTC (rev 97)
+++ trunk/dsim/configure.ac 2010-07-16 12:45:55 UTC (rev 98)
@@ -515,10 +515,14 @@
test/boost/asio/Makefile
test/boost/asio/httpd/Makefile
test/boost/asio/logd/Makefile
+ test/boost/asio/log_server/Makefile
test/boost/asio/logger/Makefile
+ test/boost/asio/chat/Makefile
test/boost/filesystem/Makefile
test/boost/iostreams/Makefile
test/boost/mpi/Makefile
+ test/boost/mpi/master_slave/Makefile
+ test/boost/mpi/log_server/Makefile
test/boost/mpl/Makefile
test/boost/spirit/Makefile
test/boost/serialization/Makefile
@@ -535,6 +539,7 @@
test/simcrs/Makefile
test/travelccm/Makefile
test/dsim/Makefile
+ test/master_slave/Makefile
)
AC_OUTPUT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sng...@us...> - 2010-07-16 12:45:05
|
Revision: 97
http://dsim.svn.sourceforge.net/dsim/?rev=97&view=rev
Author: snguyenkim
Date: 2010-07-16 12:44:59 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
master-slave-log_server model for dsim using only openMPI for communication
Added Paths:
-----------
trunk/dsim/test/master_slave/
trunk/dsim/test/master_slave/Makefile.am
trunk/dsim/test/master_slave/README
trunk/dsim/test/master_slave/log_server.cpp
trunk/dsim/test/master_slave/master.cpp
trunk/dsim/test/master_slave/myStringLib.cpp
trunk/dsim/test/master_slave/run.sh
trunk/dsim/test/master_slave/slave.cpp
Added: trunk/dsim/test/master_slave/Makefile.am
===================================================================
--- trunk/dsim/test/master_slave/Makefile.am (rev 0)
+++ trunk/dsim/test/master_slave/Makefile.am 2010-07-16 12:44:59 UTC (rev 97)
@@ -0,0 +1,33 @@
+# batches
+include $(top_srcdir)/Makefile.common
+
+## Source directory
+
+MAINTAINERCLEANFILES = Makefile.in
+
+
+# Binaries (batches)
+bin_PROGRAMS = master slave log_server
+
+master_SOURCES = master.cpp
+master_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
+master_LDADD =
+master_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LIBS) $(BOOST_MPI_LIB) \
+ $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/airsched/core/libairsched.la
+
+
+slave_SOURCES = slave.cpp
+slave_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
+slave_LDADD =
+slave_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LIBS) $(BOOST_MPI_LIB) \
+ $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/airsched/core/libairsched.la
+
+
+log_server_SOURCES = log_server.cpp
+log_server_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
+log_server_LDADD =
+log_server_LDFLAGS = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LIBS) $(BOOST_MPI_LIB) \
+ $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/airsched/core/libairsched.la
Added: trunk/dsim/test/master_slave/README
===================================================================
--- trunk/dsim/test/master_slave/README (rev 0)
+++ trunk/dsim/test/master_slave/README 2010-07-16 12:44:59 UTC (rev 97)
@@ -0,0 +1,12 @@
+* Master-slave-log_server model:
+ - Master receive demands (BookingRequest), get the TravelSolutionList and send each to the corresponding slave (by using slaveTable[]) (copied and modified from /airsched/batches/aisched.cpp)
+ - Each slave works on an inventory: one for BA, one for AA,... ( need to add AIRINV functionalities).
+ - Everytime slave receives order from master, he send log message to log_server and log_server will write this message in server.log.
+
+* log_server uses the mecanisme of locking i.e. he takes care of slave one by one. Slave will wake up every second to see if log_master has accepted his demand.
+
+* Run run.sh and see master.log for result
+
+* This model uses openMPI like mean of comunication, so log_server uses more resource than it should be (~ 33 % CPU all the time). See test/boost/asio/log_server for another log_server model which uses BOOST ASIO ( a lot better in term of CPU)
+
+* myStringLib.cpp contains some useful functions for string
\ No newline at end of file
Added: trunk/dsim/test/master_slave/log_server.cpp
===================================================================
--- trunk/dsim/test/master_slave/log_server.cpp (rev 0)
+++ trunk/dsim/test/master_slave/log_server.cpp 2010-07-16 12:44:59 UTC (rev 97)
@@ -0,0 +1,97 @@
+/*
+* Object: Make a simple log server
+* Utilisation: Run log_server_client.sh
+* Problem: avoid competitive sending, i.d 2 slaves send in a same time
+* Solution: Server takes care of slave one by one
+* Note: Usage of inactive_wait funtion, which reduces CPU charge evidently
+*/
+
+#include <boost/mpi.hpp>
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <unistd.h>
+#include <time.h>
+#include <sys/types.h>
+#include<stdio.h>
+
+using namespace std;
+namespace mpi=boost::mpi;
+
+/* Write message to filename */
+void logToFile(string filename, string message){
+ ofstream out;
+ out.open(filename.c_str(), ios_base::app);
+ out << message << "\n" ;
+ out.close();
+}
+
+//inactive waiting: wake up every 1s for verifying if there is a message
+void inactive_wait(mpi::communicator& world){
+ boost::optional<mpi::status> stat = boost::none;//stat is not initialised
+ while(1){
+ stat = world.iprobe(mpi::any_source, mpi::any_tag); //inactive waiting
+
+ //usleep(100);//we have the faster result but it takes more CPU
+ sleep(1); //better choice
+
+ if (stat){
+ stat = boost::none; //stat goes back to waiting state
+ return;//ah, someone calls me !
+ }
+
+ }
+ //world.probe(root,tag);//active waiting: take much more resources
+}
+
+int main(int argc, char ** argv){
+ mpi::environment env(argc, argv);
+ mpi::communicator world;
+
+ int root = 0; //server's rank
+ int log_server=1;
+ int tag = 0; // the tag (or the port) used for communication
+ int dest;
+
+ int rank = world.rank(); //process's rank
+ int nbSlave = world.size() -2; //number of slaves
+ string message; // message received from client
+ bool yes=true;
+
+ int nb_of_quit_signal = 0;
+
+ if (rank==log_server){
+ cout << "Log server rank:" << rank << endl;
+ cout << "=============================================================" << endl;
+
+ while (1){
+ //waits for a demand, might takes a while as client aren't always gossip
+// inactive_wait(world);
+ world.recv(mpi::any_source,tag,dest);
+
+ // Exit if nb_of_quit_signal = nbSlave
+ if (dest == -1){
+ cout << "log server receive quit signal from 1 slave... " << endl;
+ nb_of_quit_signal ++;
+ cout << "nb of quit signal:" << nb_of_quit_signal << endl;
+ if (nb_of_quit_signal == nbSlave)
+ break;
+
+ cout << "still " << nbSlave - nb_of_quit_signal << " quit signal to wait...." << endl;
+ continue;
+ }
+
+ cout << "server received from client: " << dest << endl ;
+ world.send(dest,tag,yes); //ok, you can do it
+
+ // waiting for message from client
+// inactive_wait(world);
+ world.recv(dest,tag,message);
+
+ logToFile("server.log", message);
+ cout << "server received: " << message << endl ;
+ }
+ }
+
+ return 0;
+};
Added: trunk/dsim/test/master_slave/master.cpp
===================================================================
--- trunk/dsim/test/master_slave/master.cpp (rev 0)
+++ trunk/dsim/test/master_slave/master.cpp 2010-07-16 12:44:59 UTC (rev 97)
@@ -0,0 +1,440 @@
+// STL
+#include <cassert>
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <string>
+#include<string>
+#include<map>
+// Boost (Extended STL)
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/program_options.hpp>
+#include <boost/tokenizer.hpp>
+#include <boost/lexical_cast.hpp>
+// StdAir
+#include <stdair/STDAIR_Types.hpp>
+#include <stdair/STDAIR_Service.hpp>
+#include <stdair/bom/BookingRequestStruct.hpp>
+#include <stdair/bom/TravelSolutionStruct.hpp>
+#include <stdair/bom/BomSource.hpp>
+#include <stdair/bom/BomTypes.hpp>
+#include <stdair/factory/FacBomContent.hpp>
+// AIRSCHED
+#include <airsched/AIRSCHED_Service.hpp>
+#include <airsched/config/airsched-paths.hpp>
+// MPI
+#include <boost/mpi.hpp>
+// Some string functions
+#include "myStringLib.cpp"
+
+namespace mpi=boost::mpi;
+using namespace std;
+
+
+
+// //////// Type definitions ///////
+typedef std::vector<std::string> WordList_T;
+
+
+// //////// Constants //////
+/** Default name and location for the log file. */
+const std::string K_AIRSCHED_DEFAULT_LOG_FILENAME ("master.log");
+
+/** Default name and location for the (CSV) input file. */
+const std::string K_AIRSCHED_DEFAULT_INPUT_FILENAME ("../../test/samples/schedule03.csv");
+
+/** Default booking request string, to be seached against the AirSched
+ network. */
+const std::string K_AIRSCHED_DEFAULT_BOOKING_REQUEST ("NCE BKK NCE 2007-04-21 2007-03-21 08:32:00 C 1 DF RO 5 NONE 10:00:00 2000.0 20.0");
+
+// //////////////////////////////////////////////////////////////////////
+void tokeniseStringIntoWordList (const std::string& iPhrase,
+ WordList_T& ioWordList) {
+// Empty the word list
+ioWordList.clear();
+
+// Boost Tokeniser
+typedef boost::tokenizer<boost::char_separator<char> > Tokeniser_T;
+
+// Define the separators
+const boost::char_separator<char> lSepatorList(" .,;:|+-*/_=!@#$%`~^&(){}[]?'<>\"");
+
+// Initialise the phrase to be tokenised
+Tokeniser_T lTokens (iPhrase, lSepatorList);
+for (Tokeniser_T::const_iterator tok_iter = lTokens.begin();
+ tok_iter != lTokens.end(); ++tok_iter) {
+ const std::string& lTerm = *tok_iter;
+ ioWordList.push_back (lTerm);
+}
+
+}
+
+// //////////////////////////////////////////////////////////////////////
+std::string createStringFromWordList (const WordList_T& iWordList) {
+std::ostringstream oStr;
+
+unsigned short idx = iWordList.size();
+for (WordList_T::const_iterator itWord = iWordList.begin();
+ itWord != iWordList.end(); ++itWord, --idx) {
+ const std::string& lWord = *itWord;
+ oStr << lWord;
+ if (idx > 1) {
+ oStr << " ";
+ }
+}
+
+return oStr.str();
+}
+
+// ///////// Parsing of Options & Configuration /////////
+// A helper function to simplify the main part.
+template<class T> std::ostream& operator<< (std::ostream& os,
+ const std::vector<T>& v) {
+std::copy (v.begin(), v.end(), std::ostream_iterator<T> (std::cout, " "));
+return os;
+}
+
+/** Early return status (so that it can be differentiated from an error). */
+const int K_AIRSCHED_EARLY_RETURN_STATUS = 99;
+
+/** Read and parse the command line options. */
+int readConfiguration (int argc, char* argv[], int& ioRandomDraws,
+ stdair::Filename_T& ioInputFilename,
+ std::string& ioLogFilename,
+ std::string& ioBookingRequestString) {
+
+// Initialise the travel query string, if that one is empty
+if (ioBookingRequestString.empty() == true) {
+ ioBookingRequestString = K_AIRSCHED_DEFAULT_BOOKING_REQUEST;
+}
+
+// Transform the query string into a list of words (STL strings)
+WordList_T lWordList;
+tokeniseStringIntoWordList (ioBookingRequestString, lWordList);
+
+
+// Declare a group of options that will be allowed only on command line
+boost::program_options::options_description generic ("Generic options");
+generic.add_options()
+ ("prefix", "print installation prefix")
+ ("version,v", "print version string")
+ ("help,h", "produce help message");
+
+// Declare a group of options that will be allowed both on command
+// line and in config file
+boost::program_options::options_description config ("Configuration");
+config.add_options()
+ ("input,i",
+ boost::program_options::value< std::string >(&ioInputFilename)->default_value(K_AIRSCHED_DEFAULT_INPUT_FILENAME),
+ "(CVS) input file for the demand distributions")
+ ("log,l",
+ boost::program_options::value< std::string >(&ioLogFilename)->default_value(K_AIRSCHED_DEFAULT_LOG_FILENAME),
+ "Filename for the logs")
+ ("bkg_req,b",
+ boost::program_options::value< WordList_T >(&lWordList)->multitoken(),
+ "Booking request word list (e.g. NCE BKK NCE 2007-04-21 2007-04-21 10:00:00 C 1 DF RO 5 NONE 10:0:0 2000.0 20.0), which sould be located at the end of the command line (otherwise, the other options would be interpreted as part of that booking request word list)")
+ ;
+
+// Hidden options, will be allowed both on command line and
+// in config file, but will not be shown to the user.
+boost::program_options::options_description hidden ("Hidden options");
+hidden.add_options()
+ ("copyright",
+ boost::program_options::value< std::vector<std::string> >(),
+ "Show the copyright (license)");
+
+boost::program_options::options_description cmdline_options;
+cmdline_options.add(generic).add(config).add(hidden);
+
+boost::program_options::options_description config_file_options;
+config_file_options.add(config).add(hidden);
+
+boost::program_options::options_description visible ("Allowed options");
+visible.add(generic).add(config);
+
+boost::program_options::positional_options_description p;
+p.add ("copyright", -1);
+
+boost::program_options::variables_map vm;
+boost::program_options::
+ store (boost::program_options::command_line_parser (argc, argv).
+ options (cmdline_options).positional(p).run(), vm);
+
+std::ifstream ifs ("airsched.cfg");
+boost::program_options::store (parse_config_file (ifs, config_file_options),
+ vm);
+boost::program_options::notify (vm);
+
+if (vm.count ("help")) {
+ std::cout << visible << std::endl;
+ return K_AIRSCHED_EARLY_RETURN_STATUS;
+}
+
+if (vm.count ("version")) {
+ std::cout << PACKAGE_NAME << ", version " << PACKAGE_VERSION << std::endl;
+ return K_AIRSCHED_EARLY_RETURN_STATUS;
+}
+
+if (vm.count ("prefix")) {
+ std::cout << "Installation prefix: " << PREFIXDIR << std::endl;
+ return K_AIRSCHED_EARLY_RETURN_STATUS;
+}
+
+if (vm.count ("input")) {
+ ioInputFilename = vm["input"].as< std::string >();
+ std::cout << "Input filename is: " << ioInputFilename << std::endl;
+}
+
+if (vm.count ("log")) {
+ ioLogFilename = vm["log"].as< std::string >();
+ std::cout << "Log filename is: " << ioLogFilename << std::endl;
+}
+
+// Rebuild the booking request query string
+ioBookingRequestString = createStringFromWordList (lWordList);
+
+// Suppress some potential separators (such as ':', '-' or '/')
+tokeniseStringIntoWordList (ioBookingRequestString, lWordList);
+ioBookingRequestString = createStringFromWordList (lWordList);
+std::cout << "The booking request string is: " << ioBookingRequestString
+ << std::endl;
+
+return 0;
+}
+
+// //////////////////////////////////////////////////////////////
+stdair::BookingRequestStruct
+parseBookingRequest (const std::string& iRequestOption) {
+
+typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+boost::char_separator<char> sep(" ");
+
+tokenizer tokens (iRequestOption, sep);
+
+// Origin (e.g., "NCE")
+tokenizer::iterator tok_iter = tokens.begin();
+assert (tok_iter != tokens.end());
+const stdair::AirportCode_T iOrigin (*tok_iter);
+
+// Destination (e.g., "BKK")
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::AirportCode_T iDestination (*tok_iter);
+
+// POS (e.g., "NCE")
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::AirportCode_T iPOS (*tok_iter);
+
+// Preferred departure date (e.g., "2007-04-21")
+++tok_iter; assert (tok_iter != tokens.end());
+const short lDepDateYear = boost::lexical_cast<short> (*tok_iter);
+++tok_iter; assert (tok_iter != tokens.end());
+const short lDepDateMonth = boost::lexical_cast<short> (*tok_iter);
+++tok_iter; assert (tok_iter != tokens.end());
+const short lDepDateDay = boost::lexical_cast<short> (*tok_iter);
+const stdair::Date_T iDepartureDate(lDepDateYear, lDepDateMonth, lDepDateDay);
+
+// Request date (e.g., "2007-03-21")
+++tok_iter; assert (tok_iter != tokens.end());
+const short lReqDateYear = boost::lexical_cast<short> (*tok_iter);
+++tok_iter; assert (tok_iter != tokens.end());
+const short lReqDateMonth = boost::lexical_cast<short> (*tok_iter);
+++tok_iter; assert (tok_iter != tokens.end());
+const short lReqDateDay = boost::lexical_cast<short> (*tok_iter);
+const stdair::Date_T iRequestDate (lReqDateYear, lReqDateMonth, lReqDateDay);
+
+// Request time (e.g., "08:34:23")
+++tok_iter; assert (tok_iter != tokens.end());
+const short lReqTimeHours = boost::lexical_cast<short> (*tok_iter);
+++tok_iter; assert (tok_iter != tokens.end());
+const short lReqTimeMinutes = boost::lexical_cast<short> (*tok_iter);
+++tok_iter; assert (tok_iter != tokens.end());
+const short lReqTimeSeconds = boost::lexical_cast<short> (*tok_iter);
+const stdair::Duration_T iRequestTime (lReqTimeHours, lReqTimeMinutes,
+ lReqTimeSeconds);
+
+// Request date-time (aggregation of the two items above)
+const stdair::DateTime_T iRequestDateTime (iRequestDate, iRequestTime);
+
+// Preferred cabin (e.g., "C")
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::CabinCode_T iPreferredCabin (*tok_iter);
+
+// Party size (e.g., 1)
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::NbOfSeats_T iPartySize = 1;
+
+// Channel (e.g., "DF")
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::ChannelLabel_T iChannel (*tok_iter);
+
+// Trip type (e.g., "RO")
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::TripType_T iTripType (*tok_iter);
+
+// Stay duration (e.g., 5)
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::DayDuration_T iStayDuration = 5;
+
+// Frequent flyer (e.g., "NONE")
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::FrequentFlyer_T iFrequentFlyerType ("NONE");
+
+// Preferred departure time (e.g., "10:00:00")
+++tok_iter; assert (tok_iter != tokens.end());
+const short lPrefTimeHours = boost::lexical_cast<short> (*tok_iter);
+++tok_iter; assert (tok_iter != tokens.end());
+const short lPrefTimeMinutes = boost::lexical_cast<short> (*tok_iter);
+++tok_iter; assert (tok_iter != tokens.end());
+const short lPrefTimeSeconds = boost::lexical_cast<short> (*tok_iter);
+const stdair::Duration_T iPreferredDepartureTime (lPrefTimeHours,
+ lPrefTimeMinutes,
+ lPrefTimeSeconds);
+
+// Willingness-to-pay (e.g., 2000.0)
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::WTP_T iWTP = 2000.0;
+
+// Value of time (e.g., 20.0)
+++tok_iter; assert (tok_iter != tokens.end());
+const stdair::PriceValue_T iValueOfTime = 20.0;
+
+// Build and return the booking request structure
+return stdair::BookingRequestStruct (iOrigin, iDestination, iPOS,
+ iDepartureDate, iRequestDateTime,
+ iPreferredCabin, iPartySize, iChannel,
+ iTripType, iStayDuration,
+ iFrequentFlyerType,
+ iPreferredDepartureTime, iWTP,
+ iValueOfTime);
+}
+
+
+
+// ///////// M A I N ////////////
+int main (int argc, char* argv[]) {
+// try {
+ // Maps contains (name_of_airline, num_of_correspondant_slave)
+ std::map<string,int> slaveTable;
+ slaveTable["BA"] = 2;
+ slaveTable["AA"] = 3;
+
+ mpi::environment env(argc, argv);
+ mpi::communicator world;
+
+ int root = 0; //server's rank
+ int tag = 0; // the tag (or the port) used for communication
+ int dest;
+ int log_server=1;
+
+ int rank = world.rank(); //process's rank
+ int nbSlave = world.size() -2; // number of slaves
+ string message; // message received from client
+ bool yes=true;
+
+
+ if (rank==0){
+ cout << "We have " << world.size() -2 << " clients " << endl;
+ cout << "=============================================================" << endl;
+
+
+ // Number of random draws to be generated (best if greater than 100)
+ int lRandomDraws = 0;
+
+ // Input file name
+ stdair::Filename_T lInputFilename;
+
+ // Output log File
+ std::string lLogFilename;
+
+ // Booking request string
+ std::string lBookingRequestString;
+
+ // Call the command-line option parser
+ const int lOptionParserStatus =
+ readConfiguration (argc, argv, lRandomDraws, lInputFilename,
+ lLogFilename, lBookingRequestString);
+
+ if (lOptionParserStatus == K_AIRSCHED_EARLY_RETURN_STATUS) {
+ return 0;
+ }
+
+ // Check wether or not a (CSV) input file should be read
+ bool hasInputFile = false;
+ if (lInputFilename.empty() == false) {
+ hasInputFile = true;
+ }
+
+ // Set the log parameters
+ std::ofstream logOutputFile;
+ // Open and clean the log outputfile
+ logOutputFile.open (lLogFilename.c_str());
+ logOutputFile.clear();
+
+ // Initialise the AirSched service object
+ const stdair::BasLogParams lLogParams (stdair::LOG::DEBUG, logOutputFile);
+ AIRSCHED::AIRSCHED_Service airschedService (lLogParams, lInputFilename);
+
+
+ // Create a booking request
+ const stdair::BookingRequestStruct& lBookingRequest =
+ parseBookingRequest (lBookingRequestString);
+
+ // DEBUG
+ // std::cout << "Booking request: " << lBookingRequest << std::endl;
+
+ // Get the corresponding travel solutions
+ stdair::TravelSolutionList_T lTravelSolutionList;
+ airschedService.getTravelSolutions (lTravelSolutionList, lBookingRequest);
+
+ unsigned short idx = 1;
+ for (stdair::TravelSolutionList_T::const_iterator itTS =
+ lTravelSolutionList.begin();
+ itTS != lTravelSolutionList.end(); ++itTS, ++idx) {
+ cout << "==============================================" << endl;
+ const stdair::TravelSolutionStruct& lTS = *itTS;
+
+ using namespace std;
+// cout << "TravelSolution:"<< idx <<":description:" << lTS.describe() << endl;
+
+ const stdair::KeyList_T& lSegmentDateKeyList = lTS.getSegmentDateKeyList();
+ for (int i=0; i< lSegmentDateKeyList.size(); i++){
+ string lSegmentDateKey = lSegmentDateKeyList[i] ;
+// cout << "SegmentDateKey:" << i << ":" << lSegmentDateKey << endl ;
+
+ //get the corresponding slave
+ int slaveNum = slaveTable[getFirstOccurence(lSegmentDateKey, ",")];
+// cout << "Corresponding slave:" << slaveNum << endl;
+
+ // Sending to corresponding slave
+ ostringstream oss;
+ oss << "master sent to slave:" << slaveNum << ":SegmentDateKey:"<< lSegmentDateKey ;
+ message = oss.str();
+ world.send(slaveNum,tag,message);
+ }
+
+// const stdair::ClassList_String_T& BCKeyList= lTS.getBookingClassKeyList ();
+// cout << "BC key:" << BCKeyList << endl ;
+
+ }
+
+// Sending finishing singal to slaves
+ for (int slaveNum=2; slaveNum < world.size(); slaveNum++)
+ world.send(slaveNum,tag,"finish");
+
+ }
+
+
+ // Start a mini-simulation
+ // airschedService.simulate();
+
+// } catch (const std::exception& stde) {
+// std::cerr << "Standard exception: " << stde.what() << std::endl;
+// return -1;
+
+// } catch (...) {
+// return -1;
+// }
+
+return 0;
+}
Added: trunk/dsim/test/master_slave/myStringLib.cpp
===================================================================
--- trunk/dsim/test/master_slave/myStringLib.cpp (rev 0)
+++ trunk/dsim/test/master_slave/myStringLib.cpp 2010-07-16 12:44:59 UTC (rev 97)
@@ -0,0 +1,69 @@
+#include <iostream>
+#include <sstream>
+#include <string>
+
+/*
+* Return phrase if phrase doesn't contain delimiter
+* if not, for ex, with delimiter=":", phrase="abc:def"
+* StringSplit returns abc
+* and phrase="def"
+*/
+std::string StringSplit(std::string & phrase, std::string delimiter){
+ using namespace std;
+ int cutAt = phrase.find(delimiter);
+ if (phrase == "")
+ return "";
+ if( cutAt != std::string::npos ){
+ if(cutAt > 0){
+ std::string tmp = phrase.substr(0,cutAt);
+ phrase = phrase.substr(cutAt+1);
+ return tmp;
+ }
+ }else{
+ std::string tmp = phrase;
+ phrase = "";
+ return tmp;
+ }
+}
+
+/*
+* Same as StringSplit but doesn't destroy phrase
+*/
+std::string getFirstOccurence(std::string phrase, std::string delimiter){
+ using namespace std;
+ int cutAt = phrase.find(delimiter);
+ if (phrase == "")
+ return "";
+ if( cutAt != std::string::npos ){
+ if(cutAt > 0){
+ std::string tmp = phrase.substr(0,cutAt);
+ return tmp;
+ }
+ }else{
+ std::string tmp = phrase;
+ return tmp;
+ }
+}
+
+/* return s+a */
+std::string joinString(std::string s,int a){
+ std::ostringstream oss;
+ oss << s;
+ oss << a;
+ return oss.str();
+}
+
+/* return s+a */
+std::string joinString(std::string s,std::string a){
+ std::ostringstream oss;
+ oss << s;
+ oss << a;
+ return oss.str();
+}
+
+std::string joinString(int s,int a){
+ std::ostringstream oss;
+ oss << s;
+ oss << a;
+ return oss.str();
+}
\ No newline at end of file
Added: trunk/dsim/test/master_slave/run.sh
===================================================================
--- trunk/dsim/test/master_slave/run.sh (rev 0)
+++ trunk/dsim/test/master_slave/run.sh 2010-07-16 12:44:59 UTC (rev 97)
@@ -0,0 +1,7 @@
+# Execute log_server on localhost, 4 client on localhost (or fed1, fed2)
+#!/bin/sh
+rm -fv log
+
+/usr/lib/openmpi/bin/mpirun --host localhost -n 1 ./master :\
+ --host localhost -n 1 ./log_server :\
+ --host localhost -n 2 ./slave
Property changes on: trunk/dsim/test/master_slave/run.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/dsim/test/master_slave/slave.cpp
===================================================================
--- trunk/dsim/test/master_slave/slave.cpp (rev 0)
+++ trunk/dsim/test/master_slave/slave.cpp 2010-07-16 12:44:59 UTC (rev 97)
@@ -0,0 +1,75 @@
+#include <boost/mpi.hpp>
+#include <iostream>
+#include <string>
+#include <unistd.h>
+#include <time.h>
+#include <sys/types.h>
+#include<stdio.h>
+
+using namespace std;
+namespace mpi=boost::mpi;
+
+//inactive waiting: wake up every 1s for verifying if there is a message
+void inactive_wait(mpi::communicator& world, int source=mpi::any_source){
+ boost::optional<mpi::status> stat = boost::none;//stat is not initialised
+ while(1){
+ stat = world.iprobe(source, mpi::any_tag); //inactive waiting
+
+ //usleep(100);//we have the faster result but it takes more CPU
+ sleep(1); //better choice
+
+ if (stat){
+ stat = boost::none; //stat goes back to waiting state
+ return;//ah, someone calls me !
+ }
+
+ }
+ //world.probe(root,tag);//active waiting: take much more resources
+}
+
+
+
+int main(int argc, char ** argv ){
+ mpi::environment env(argc, argv);
+ mpi::communicator world;
+
+ int root = 0; //server's rank
+ int log_server=1;
+ int tag = 0; // the tag (or the port) used for communication
+ int dest;
+
+ int rank = world.rank(); //process's rank
+ string message; // message received from master
+ bool tmp;
+
+ if (rank > 1){
+ cout << "Slave rank:" << rank << endl;
+ while (1){
+ //waits for demand from master, which is not frequent
+// inactive_wait(world, root);
+ world.recv(root, tag, message);
+
+ //Exit if receive "finish" from master
+ if (message.find ("finish") != string::npos){
+ cout << "slave:" << rank << " is quitting..." << endl;
+
+ world.send(log_server, tag, -1);
+ break;
+ }
+
+ cout << "slave:" << rank << " received:" << message << endl;
+
+ world.send(log_server, tag, rank); //try to get a place
+
+ //waits for a response, might takes a while as server takes care of someone else
+// inactive_wait(world, log_server);
+ world.recv(log_server, tag, tmp );
+
+ // Now I can send my message
+ cout << "slave " << rank << " is sending to log server:" << message << endl;
+ world.send(log_server,tag, message);
+ }
+ }
+ return 0;
+};
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sng...@us...> - 2010-07-16 12:05:43
|
Revision: 96
http://dsim.svn.sourceforge.net/dsim/?rev=96&view=rev
Author: snguyenkim
Date: 2010-07-16 12:05:35 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
Simple log server using Boost Asio
Modified Paths:
--------------
trunk/dsim/test/boost/asio/daytime1.cpp
trunk/dsim/test/boost/asio/timer1.cpp
trunk/dsim/test/boost/asio/timer2.cpp
Added Paths:
-----------
trunk/dsim/test/boost/asio/log_server/
trunk/dsim/test/boost/asio/log_server/Makefile.am
trunk/dsim/test/boost/asio/log_server/README
trunk/dsim/test/boost/asio/log_server/client.cpp
trunk/dsim/test/boost/asio/log_server/server.cpp
Modified: trunk/dsim/test/boost/asio/daytime1.cpp
===================================================================
--- trunk/dsim/test/boost/asio/daytime1.cpp 2010-07-15 13:56:57 UTC (rev 95)
+++ trunk/dsim/test/boost/asio/daytime1.cpp 2010-07-16 12:05:35 UTC (rev 96)
@@ -28,6 +28,7 @@
boost::asio::ip::tcp::resolver lResolver (lIOService);
boost::asio::ip::tcp::resolver::query lQuery (lHostname, lServiceName);
+// boost::asio::ip::tcp::resolver::query lQuery (lHostname, "daytime");
boost::asio::ip::tcp::resolver::iterator itEndPoint =
lResolver.resolve (lQuery);
Added: trunk/dsim/test/boost/asio/log_server/Makefile.am
===================================================================
--- trunk/dsim/test/boost/asio/log_server/Makefile.am (rev 0)
+++ trunk/dsim/test/boost/asio/log_server/Makefile.am 2010-07-16 12:05:35 UTC (rev 96)
@@ -0,0 +1,19 @@
+## test/boost/asio sub-directory
+include $(top_srcdir)/Makefile.common
+
+##
+
+MAINTAINERCLEANFILES = Makefile.in
+
+check_PROGRAMS = client server
+
+client_SOURCES = client.cpp
+client_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
+client_LDFLAGS = $(BOOST_LIBS) $(BOOST_DATE_TIME_LIB) $(BOOST_ASIO_LIB)
+client_LDADD =
+
+server_SOURCES = server.cpp
+server_CXXFLAGS = $(BOOST_CFLAGS) $(BOOST_CFLAGS)
+server_LDFLAGS = $(BOOST_LIBS) $(BOOST_DATE_TIME_LIB) $(BOOST_ASIO_LIB)
+server_LDADD =
+
Added: trunk/dsim/test/boost/asio/log_server/README
===================================================================
--- trunk/dsim/test/boost/asio/log_server/README (rev 0)
+++ trunk/dsim/test/boost/asio/log_server/README 2010-07-16 12:05:35 UTC (rev 96)
@@ -0,0 +1,7 @@
+* Log server modele using ASIO
+ Client 1 will take input1 to send to server
+ Client 2 will take inpu2 to send to server
+ Server will log these two files into server.log
+
+* For verifying:
+ Client 1 & Client 2 don't intefere -> in server.log, 2 parts (for client 1 & client 2) are seperated
\ No newline at end of file
Added: trunk/dsim/test/boost/asio/log_server/client.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/client.cpp (rev 0)
+++ trunk/dsim/test/boost/asio/log_server/client.cpp 2010-07-16 12:05:35 UTC (rev 96)
@@ -0,0 +1,80 @@
+//Client
+// STL
+#include <iostream>
+#include <string>
+#include <fstream>
+// Boost.ASIO
+#include <boost/asio.hpp>
+#include <boost/array.hpp>
+// Sleep funtion
+#include <unistd.h>
+
+/* Send filename's content to server */
+void send_file (std::string filename){
+ using namespace std;
+ std::string lHostname = "fed2";
+ // Service name (as specified within /etc/services)
+ // The "aria" service corresponds to the port 2624
+ const std::string lServiceName = "aria";
+
+ // try to get a socket (communication canal)
+ try {
+ boost::asio::io_service lIOService;
+ boost::asio::ip::tcp::socket lSocket (lIOService);
+
+ boost::asio::ip::tcp::resolver lResolver (lIOService);
+ boost::asio::ip::tcp::resolver::query lQuery (lHostname, lServiceName);
+ boost::asio::ip::tcp::resolver::iterator itEndPoint =lResolver.resolve (lQuery);
+ boost::asio::ip::tcp::resolver::iterator lEnd;
+ boost::system::error_code lError = boost::asio::error::host_not_found;
+
+ while (lError && itEndPoint != lEnd) {
+ const boost::asio::ip::tcp::endpoint lEndPoint = *itEndPoint;
+
+ // DEBUG
+// std::cout << "Testing end point: " << lEndPoint << std::endl;
+// std::cout << "Testing lError: " << lError << std::endl;
+ lSocket.close();
+ lSocket.connect (lEndPoint, lError);
+ ++itEndPoint;
+ }
+
+ if (lError) {
+ std::cout << "Cannot find corresponding endpoint" << std::endl;
+ throw boost::system::system_error (lError);
+ }
+ assert (!lError);
+ cout << "Socket is opened !\n";
+ // File sending part
+ fstream fst (filename.c_str(), ios::in);
+ char * buffer; //contains file's content
+
+ // get length of file:
+ fst.seekg (0, ios::end);
+ int length = fst.tellg();
+ fst.seekg (0, ios::beg);
+
+ cout << "file length:" << length << endl;
+ buffer = new char[length];
+ fst.read(buffer,length);
+
+ boost::system::error_code lIgnoredError;
+ boost::asio::write (lSocket, boost::asio::buffer (buffer),boost::asio::transfer_all(), lIgnoredError);
+
+ } catch (std::exception& lException) {
+ std::cerr << lException.what() << std::endl;
+ }
+}
+
+// /////////// M A I N ////////////////
+int main (int argc, char* argv[]) {
+ using namespace std;
+ string filename = "input";
+ if (argc >= 2) {
+ filename = string(argv[1]);
+ }
+ send_file(filename);
+ return 0;
+}
+
+
Added: trunk/dsim/test/boost/asio/log_server/server.cpp
===================================================================
--- trunk/dsim/test/boost/asio/log_server/server.cpp (rev 0)
+++ trunk/dsim/test/boost/asio/log_server/server.cpp 2010-07-16 12:05:35 UTC (rev 96)
@@ -0,0 +1,60 @@
+// Log server
+// STL
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <ctime>
+// Boost.ASIO
+#include <boost/asio.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+using namespace std;
+
+// //////////////////// M A I N /////////////////////////////
+int main (int argc, char* argv[]) {
+ using namespace std;
+ try {
+
+ boost::asio::io_service lIOService;
+
+ // Create a listener for IP/TCP v4, listening on port 2624 (corresponding
+ // to the "aria" service, as specified within the /etc/services file)
+ boost::asio::ip::tcp::acceptor lAcceptor (lIOService,
+ boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), 2624));
+
+ int nbConnections = 0;
+ for (;;) {
+ boost::asio::ip::tcp::socket lSocket (lIOService);
+ lAcceptor.accept (lSocket);
+ nbConnections ++;
+ std::cout << "Nb of connections:" << nbConnections << std::endl;
+
+ boost::system::error_code lIgnoredError;
+ boost::system::error_code lTransferError;
+ boost::array<char, 4> lBuffer;
+
+ ofstream out ("server.log", ios::app); //file to write log
+
+ for(;;){
+ size_t lLength = lSocket.read_some (boost::asio::buffer (lBuffer), lTransferError);
+ out.write(lBuffer.data(),lLength);
+
+ if (lTransferError == boost::asio::error::eof) {
+ // Connection closed cleanly by peer.
+ cout << "EOF error\n" ;
+ break;
+ } else if (lTransferError) {
+ // Some other error.
+ throw boost::system::system_error (lTransferError);
+ }
+// std::cout.write (lBuffer.data(), lLength);
+ }
+ out.close();
+ }
+
+ } catch (std::exception& lException) {
+ std::cerr << lException.what() << std::endl;
+ }
+
+ return 0;
+}
+
Modified: trunk/dsim/test/boost/asio/timer1.cpp
===================================================================
--- trunk/dsim/test/boost/asio/timer1.cpp 2010-07-15 13:56:57 UTC (rev 95)
+++ trunk/dsim/test/boost/asio/timer1.cpp 2010-07-16 12:05:35 UTC (rev 96)
@@ -9,12 +9,15 @@
// /////////// M A I N ////////////////
int main (int argc, char* argv[]) {
- boost::asio::io_service lIOService;
- boost::asio::deadline_timer lTimer (lIOService, boost::posix_time::seconds(1));
+ boost::asio::io_service lIOService;
+ boost::asio::deadline_timer lTimer (lIOService, boost::posix_time::seconds(5));
- lTimer.wait();
+ lTimer.wait();
- std::cout << "We have waited 1 second" << std::endl;
+ //This line won't be printed immediately(), contrary to case lTimer.async_wait()
+ std::cout << "Waiting 5s...." << std::endl;
- return 0;
+ std::cout << "We have waited 5 second" << std::endl;
+
+ return 0;
}
Modified: trunk/dsim/test/boost/asio/timer2.cpp
===================================================================
--- trunk/dsim/test/boost/asio/timer2.cpp 2010-07-15 13:56:57 UTC (rev 95)
+++ trunk/dsim/test/boost/asio/timer2.cpp 2010-07-16 12:05:35 UTC (rev 96)
@@ -8,25 +8,28 @@
// ////////////////////////////////////////////////////////
void print (const boost::system::error_code& iErrorCode) {
- std::cout << "The call-back function has been triggered on a slave task";
- std::cout << ", after having waited for 1 second" << std::endl;
+ std::cout << "The call-back function has been triggered on a slave task";
+ std::cout << ", after having waited for 5 second" << std::endl;
}
// /////////////////////// M A I N /////////////////////////////
int main (int argc, char* argv[]) {
- boost::asio::io_service lIOService;
- boost::asio::deadline_timer lTimer (lIOService, boost::posix_time::seconds(1));
+ boost::asio::io_service lIOService;
+ boost::asio::deadline_timer lTimer (lIOService, boost::posix_time::seconds(5));
- // Asynchronous wait: when the timer reaches the deadline, the call-back
- // (here, the print() function) is called
- lTimer.async_wait (print);
+ // Asynchronous wait: when the timer reaches the deadline, the call-back
+ // (here, the print() function) is called
+ lTimer.async_wait (print);
- // Wait until the timer reaches the deadline. At that moment, the call-back
- // is called
- lIOService.run();
+ //This line will be printed immediately(), contrary to case lTimer.wait()
+ std::cout << "Waiting 5s...." << std::endl;
- std::cout << "The master task has come back in foreground" << std::endl;
-
- return 0;
+ // Wait until the timer reaches the deadline. At that moment, the call-back
+ // is called
+ lIOService.run();
+
+ std::cout << "The master task has come back in foreground" << std::endl;
+
+ return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-15 13:57:03
|
Revision: 95
http://dsim.svn.sourceforge.net/dsim/?rev=95&view=rev
Author: denis_arnaud
Date: 2010-07-15 13:56:57 +0000 (Thu, 15 Jul 2010)
Log Message:
-----------
[Test Boost.ASIO] Added a readme file in the log service example (logger).
Added Paths:
-----------
trunk/dsim/test/boost/asio/logger/README
Added: trunk/dsim/test/boost/asio/logger/README
===================================================================
--- trunk/dsim/test/boost/asio/logger/README (rev 0)
+++ trunk/dsim/test/boost/asio/logger/README 2010-07-15 13:56:57 UTC (rev 95)
@@ -0,0 +1,10 @@
+
+#
+# That program shows how to use log service on the client side.
+# It needs a "day-time" server running, otherwise, an error like
+# "connection refused" will be triggered.
+# Such a day-time server is to be found in the parent directory:
+# * daytime2
+# * daytime3
+#
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sng...@us...> - 2010-07-15 12:04:00
|
Revision: 94
http://dsim.svn.sourceforge.net/dsim/?rev=94&view=rev
Author: snguyenkim
Date: 2010-07-15 12:03:53 +0000 (Thu, 15 Jul 2010)
Log Message:
-----------
add some macros for logging
Modified Paths:
--------------
trunk/dsim/test/boost/mpi/log_server/Makefile.am
trunk/dsim/test/boost/mpi/log_server/log_server.cpp
Added Paths:
-----------
trunk/dsim/test/boost/mpi/log_server/README
trunk/dsim/test/boost/mpi/log_server/log_service.hpp
trunk/dsim/test/boost/mpi/log_server/run.sh
Removed Paths:
-------------
trunk/dsim/test/boost/mpi/log_server/ex.log
trunk/dsim/test/boost/mpi/log_server/log_server_client.sh
Modified: trunk/dsim/test/boost/mpi/log_server/Makefile.am
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/Makefile.am 2010-07-12 08:10:43 UTC (rev 93)
+++ trunk/dsim/test/boost/mpi/log_server/Makefile.am 2010-07-15 12:03:53 UTC (rev 94)
@@ -11,12 +11,12 @@
#
check_PROGRAMS = log_server client
-
#
log_server_SOURCES = log_server.cpp
log_server_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
-log_server_LDFLAGS = $(BOOST_LIBS) $(BOOST_MPI_LIB)
-log_server_LDADD =
+log_server_LDFLAGS = $(BOOST_LIBS) $(BOOST_MPI_LIB) \
+ $(top_builddir)/stdair/core/libstdair.la \
+ $(top_builddir)/airsched/core/libairsched.la
#
client_SOURCES = client.cpp
Added: trunk/dsim/test/boost/mpi/log_server/README
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/README (rev 0)
+++ trunk/dsim/test/boost/mpi/log_server/README 2010-07-15 12:03:53 UTC (rev 94)
@@ -0,0 +1,5 @@
+log_service.hpp contains some macros for logging ( copied & modified from Logger.hpp) like LOG_ERROR(logFile,message_to_log), LOG_DEBUG(logFile,message_to_log)
+
+Log_server & clients use MPI for communication -> not efficient (log_server takes 33% of CPU)
+
+Run run.sh (Ctrl-C for stops), then see ex.log for the log
\ No newline at end of file
Deleted: trunk/dsim/test/boost/mpi/log_server/ex.log
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/ex.log 2010-07-12 08:10:43 UTC (rev 93)
+++ trunk/dsim/test/boost/mpi/log_server/ex.log 2010-07-15 12:03:53 UTC (rev 94)
@@ -1,18 +0,0 @@
-1 says alo
-2 says alo
-1 says alo
-2 says alo
-1 says alo
-2 says alo
-1 says alo
-2 says alo
-1 says alo
-2 says alo
-1 says alo
-2 says alo
-1 says alo
-2 says alo
-1 says alo
-2 says alo
-1 says alo
-2 says alo
Modified: trunk/dsim/test/boost/mpi/log_server/log_server.cpp
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/log_server.cpp 2010-07-12 08:10:43 UTC (rev 93)
+++ trunk/dsim/test/boost/mpi/log_server/log_server.cpp 2010-07-15 12:03:53 UTC (rev 94)
@@ -14,7 +14,10 @@
#include <time.h>
#include <sys/types.h>
#include<stdio.h>
+// Some log macros
+#include"log_service.hpp"
+
using namespace std;
namespace mpi=boost::mpi;
@@ -44,6 +47,7 @@
//world.probe(root,tag);//active waiting: take much more resources
}
+
int main(int argc, char ** argv){
mpi::environment env(argc, argv);
mpi::communicator world;
@@ -54,9 +58,12 @@
int rank = world.rank(); //process's rank
string message; // message received from client
- bool yes=true, tmp;
+ bool yes=true;
if (rank==0){
+
+
+
cout << "We have " << world.size() -1 << " clients " << endl;
cout << "=============================================================" << endl;
@@ -72,7 +79,8 @@
inactive_wait(world);
world.recv(dest,tag,message);
- logToFile("ex.log", message);
+ LOG_DEBUG("ex.log", message);
+
cout << "server received: " << message << endl ;
}
}
Deleted: trunk/dsim/test/boost/mpi/log_server/log_server_client.sh
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/log_server_client.sh 2010-07-12 08:10:43 UTC (rev 93)
+++ trunk/dsim/test/boost/mpi/log_server/log_server_client.sh 2010-07-15 12:03:53 UTC (rev 94)
@@ -1,5 +0,0 @@
-# Execute log_server on localhost, 4 client on localhost (or fed1, fed2)
-#!/bin/sh
-
-/usr/lib/openmpi/bin/mpirun --host localhost -n 1 log_server :\
- --host localhost -n 2 client
Added: trunk/dsim/test/boost/mpi/log_server/log_service.hpp
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/log_service.hpp (rev 0)
+++ trunk/dsim/test/boost/mpi/log_server/log_service.hpp 2010-07-15 12:03:53 UTC (rev 94)
@@ -0,0 +1,77 @@
+/* Log library: contains some useful macros for logging */
+
+#include <sstream>
+#include <fstream>
+#include <string>
+#include <map>
+
+/* logFile: file contains log */
+/* iToBeLogged: message needs to be looged */
+/* iLevel: log level(ex: CRITICAL, NOTIFICATION,...)*/
+// /////////////// LOG MACROS /////////////////
+
+
+#define LOG_CORE(logFile,iLevel, iToBeLogged) \
+ { std::ostringstream ostr; ostr << iToBeLogged; \
+ log (logFile,iLevel, __LINE__, __FILE__, ostr.str()); }
+
+#define LOG_CRITICAL(logFile,iToBeLogged) \
+ LOG_CORE (logFile,CRITICAL, iToBeLogged)
+
+#define LOG_ERROR(logFile,iToBeLogged) \
+ LOG_CORE (logFile,ERROR, iToBeLogged)
+
+#define LOG_NOTIFICATION(logFile,iToBeLogged) \
+ LOG_CORE (logFile,NOTIFICATION, iToBeLogged)
+
+#define LOG_WARNING(logFile,iToBeLogged) \
+ LOG_CORE (logFile,WARNING, iToBeLogged)
+
+#define LOG_DEBUG(logFile,iToBeLogged) \
+ LOG_CORE (logFile,DEBUG, iToBeLogged)
+
+#define LOG_VERBOSE(logFile,iToBeLogged) \
+ LOG_CORE (logFile,VERBOSE, iToBeLogged)
+// /////////// (END OF) LOG MACROS /////////////
+
+
+typedef enum {
+ CRITICAL = 0,
+ ERROR,
+ NOTIFICATION,
+ WARNING,
+ DEBUG,
+ VERBOSE,
+ LAST_VALUE
+} EN_LogLevel;
+
+
+/** Main log entry. */
+void log (std::string logFile,const EN_LogLevel iLevel, const int iLineNumber,
+ const std::string& iFileName, std::string iToBeLogged) {
+ using namespace std;
+
+ std::map<int,string> logTable;
+
+ logTable[CRITICAL] = "CRITICAL";
+ logTable[ERROR] = "ERROR";
+ logTable[NOTIFICATION]="NOTIFICATION";
+ logTable[WARNING]="WARNING";
+ logTable[DEBUG]="DEBUG";
+ logTable[VERBOSE]="VERBOSE";
+ logTable[LAST_VALUE]="LAST_VALUE";
+
+ ofstream out;
+ out.open(logFile.c_str(), ios_base::app);
+ out << "[" << logTable[iLevel] << "]" << iFileName << ":"
+ << iLineNumber << ": " << iToBeLogged << std::endl;
+ out.close();
+}
+
+/*Testing the possibility to use LOG_DEBUG*/
+void log_testing(){
+ LOG_DEBUG("test.log","hello!");
+
+}
+
+
Added: trunk/dsim/test/boost/mpi/log_server/run.sh
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/run.sh (rev 0)
+++ trunk/dsim/test/boost/mpi/log_server/run.sh 2010-07-15 12:03:53 UTC (rev 94)
@@ -0,0 +1,7 @@
+# Execute log_server on localhost, 4 client on localhost (or fed1, fed2)
+#!/bin/sh
+
+rm -fv ex.log
+
+/usr/lib/openmpi/bin/mpirun --host localhost -n 1 ./log_server :\
+ --host localhost -n 3 ./client
Property changes on: trunk/dsim/test/boost/mpi/log_server/run.sh
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-12 08:10:49
|
Revision: 93
http://dsim.svn.sourceforge.net/dsim/?rev=93&view=rev
Author: denis_arnaud
Date: 2010-07-12 08:10:43 +0000 (Mon, 12 Jul 2010)
Log Message:
-----------
[Test MPI] Had the building (of MPI master/slave test) use Autotools.
Added Paths:
-----------
trunk/dsim/test/boost/mpi/master_slave/Makefile.am
Removed Paths:
-------------
trunk/dsim/test/boost/mpi/master_slave/Makefile
trunk/dsim/test/boost/mpi/master_slave/master
trunk/dsim/test/boost/mpi/master_slave/slave
Property Changed:
----------------
trunk/dsim/test/boost/mpi/master_slave/
Property changes on: trunk/dsim/test/boost/mpi/master_slave
___________________________________________________________________
Added: svn:ignore
+ .deps
.libs
Makefile
Makefile.in
master
slave
Deleted: trunk/dsim/test/boost/mpi/master_slave/Makefile
===================================================================
--- trunk/dsim/test/boost/mpi/master_slave/Makefile 2010-07-12 08:00:51 UTC (rev 92)
+++ trunk/dsim/test/boost/mpi/master_slave/Makefile 2010-07-12 08:10:43 UTC (rev 93)
@@ -1,11 +0,0 @@
-ALL: master slave
-
-CC = mpicxx -lmpi_cxx -L/usr/lib/openmpi/lib/ -lboost_mpi
-
-master: master.cpp
- $(CC) master.cpp -o master
-slave: slave.cpp
- $(CC) slave.cpp -o slave
-
-clean:
- rm -fv master slave
Added: trunk/dsim/test/boost/mpi/master_slave/Makefile.am
===================================================================
--- trunk/dsim/test/boost/mpi/master_slave/Makefile.am (rev 0)
+++ trunk/dsim/test/boost/mpi/master_slave/Makefile.am 2010-07-12 08:10:43 UTC (rev 93)
@@ -0,0 +1,25 @@
+## test/boost/mpi/master_slave sub-directory
+include $(top_srcdir)/Makefile.common
+
+MAINTAINERCLEANFILES = Makefile.in
+
+#
+SUBDIRS =
+
+EXTRA_DIST =
+
+#
+check_PROGRAMS = master slave
+
+
+#
+master_SOURCES = master.cpp
+master_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
+master_LDFLAGS = $(BOOST_LIBS) $(BOOST_MPI_LIB)
+master_LDADD =
+
+#
+slave_SOURCES = slave.cpp
+slave_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
+slave_LDFLAGS = $(BOOST_LIBS) $(BOOST_MPI_LIB)
+slave_LDADD =
Deleted: trunk/dsim/test/boost/mpi/master_slave/master
===================================================================
(Binary files differ)
Deleted: trunk/dsim/test/boost/mpi/master_slave/slave
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <den...@us...> - 2010-07-12 08:00:59
|
Revision: 92
http://dsim.svn.sourceforge.net/dsim/?rev=92&view=rev
Author: denis_arnaud
Date: 2010-07-12 08:00:51 +0000 (Mon, 12 Jul 2010)
Log Message:
-----------
[Test MPI] Had the building (of MPI log server test) use Autotools.
Modified Paths:
--------------
trunk/dsim/test/boost/mpi/log_server/Makefile.am
Modified: trunk/dsim/test/boost/mpi/log_server/Makefile.am
===================================================================
--- trunk/dsim/test/boost/mpi/log_server/Makefile.am 2010-07-12 07:58:47 UTC (rev 91)
+++ trunk/dsim/test/boost/mpi/log_server/Makefile.am 2010-07-12 08:00:51 UTC (rev 92)
@@ -12,14 +12,6 @@
check_PROGRAMS = log_server client
-# mpi_c must be compiled with mpic++
-# Note: mpic++/mpiCC is a wrapper around the MPI C++ compiler, and knows
-# where MPI is installed. So, there is no need to specify any other
-# CFLAGS or LDFLAGS at that stage.
-mpi_c_SOURCES = mpi_c.cpp
-mpi_c: $(mpi_c_SOURCES)
- mpic++ -o $@ $<
-
#
log_server_SOURCES = log_server.cpp
log_server_CXXFLAGS = $(BOOST_CFLAGS) $(MPIGEN_CFLAGS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
