Menu
▾
▴
nxqd-development — Development mailing list
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(21) |
Aug
(7) |
Sep
(90) |
Oct
(12) |
Nov
(11) |
Dec
(8) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(8) |
Sep
(10) |
Oct
|
Nov
|
Dec
|
|
From: Web H. <web...@us...> - 2006-09-03 06:29:26
|
Update of /cvsroot/nxqd/nxqd/server/src/server In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1032/src/server Modified Files: server.cpp server.hpp Log Message: Stuff Index: server.hpp =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/server.hpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** server.hpp 2 Sep 2006 10:31:27 -0000 1.34 --- server.hpp 3 Sep 2006 06:29:21 -0000 1.35 *************** *** 303,307 **** /* -------- end client methods -------- */ /* -------- the event methods -------- */ ! bool add_event( xsd__int type, xsd__string resource, --- 303,307 ---- /* -------- end client methods -------- */ /* -------- the event methods -------- */ ! void add_event( xsd__int type, xsd__string resource, *************** *** 438,441 **** --- 438,444 ---- open_containers(); + void + verify_containers(); + int xml_value_as_int( const DbXml::XmlValue &v ) const; *************** *** 460,463 **** --- 463,467 ---- container_map_t m_containers; pthread_mutex_t m_containers_mutex; // control m_containers access + pthread_mutex_t m_events_mutex; // control m_containers access pthread_mutex_t m_queue_mutex; Index: server.cpp =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/server.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** server.cpp 2 Sep 2006 10:31:27 -0000 1.50 --- server.cpp 3 Sep 2006 06:29:21 -0000 1.51 *************** *** 6,13 **** #include "nxqd.nsmap" #include <stdarg.h> // contains install path for data dir #include "settings.h" - using namespace DbXml; --- 6,13 ---- #include "nxqd.nsmap" #include <stdarg.h> + #include <iostream> // contains install path for data dir #include "settings.h" using namespace DbXml; *************** *** 616,619 **** --- 616,622 ---- pthread_mutex_init(&m_containers_mutex, NULL); + // needed to control threaded access to events list + pthread_mutex_init(&m_events_mutex, NULL); + // this is a temp as we just want to query the config *************** *** 658,662 **** --- 661,668 ---- m_xml_manager = new XmlManager( get_db_env() ); + verify_containers(); + open_containers(); + // set up the event parameters *************** *** 953,957 **** // hence there is no need to guard access of the m_containers std::map void ! server::open_containers() { unsigned short int ext_len = strlen( server::DB_EXTENSION ); --- 959,963 ---- // hence there is no need to guard access of the m_containers std::map void ! server::verify_containers() { unsigned short int ext_len = strlen( server::DB_EXTENSION ); *************** *** 970,976 **** try { ! //::fnxqdlog( LOG_INFO, "Opening container %s" , entry->d_name); ! XmlContainer container = get_xml_manager().openContainer( entry->d_name, DB_THREAD ); container.addAlias( filename_to_containername( entry->d_name, container_alias ) ); m_containers[ container_alias ] = container; --- 976,1018 ---- try { ! ::fnxqdlog( LOG_INFO, "Verifying container %s" , entry->d_name); ! get_xml_manager().verifyContainer(entry->d_name, ! &std::cout, ! DB_AGGRESSIVE); + } + catch ( std::exception &e ) + { + ::fnxqdlog( LOG_CRIT, "Problem verifying %s (%s)" , entry->d_name, e.what()); + } + } + } + } + else + throw std::runtime_error( strerror( errno ) ); + } + // this happens in the main thread before the worker threads are started + // hence there is no need to guard access of the m_containers std::map + void + server::open_containers() + { + unsigned short int ext_len = strlen( server::DB_EXTENSION ); + std::string full_path = get_db_home_path(); + std::string container_alias; + DIR *home = opendir( full_path.c_str() ); + if ( home != NULL ) + { + struct dirent *entry = NULL; + size_t len = 0; + while ( entry = readdir( home ) ) + { + if ( (len = strlen( entry->d_name )) >= ext_len + 1 ) + if ( strcmp( entry->d_name + len - ext_len, server::DB_EXTENSION ) == 0 ) + { + try + { + ::fnxqdlog( LOG_INFO, "Opening container %s" , entry->d_name); + // XmlContainer container = get_xml_manager().openContainer( entry->d_name, DB_THREAD ); + XmlContainer container = get_xml_manager().openContainer( entry->d_name); container.addAlias( filename_to_containername( entry->d_name, container_alias ) ); m_containers[ container_alias ] = container; *************** *** 1128,1132 **** add_event(CONTAINER_CREATED, *container_name, ! xsd__string(""), manager_event_id++, manager_events); --- 1170,1174 ---- add_event(CONTAINER_CREATED, *container_name, ! xsd__string(), manager_event_id++, manager_events); *************** *** 1222,1226 **** add_event(CONTAINER_DELETED, *container_name, ! xsd__string(""), manager_event_id++, manager_events); --- 1264,1268 ---- add_event(CONTAINER_DELETED, *container_name, ! xsd__string(), manager_event_id++, manager_events); *************** *** 1453,1456 **** --- 1495,1499 ---- if ( strcmp(c->id.c_str(),session_id->c_str())==0) { client_list.erase(client_list.begin()+i); + delete c; return true; } *************** *** 1466,1488 **** where string is a document id or a container name */ ! bool server::add_event( xsd__int type, xsd__string resource, xsd__string source, xsd__long event_id, ! std::vector<event*> &list) { event *ev; // if event list too big, delete oldest events ! if ( list.size() > max_event_list_size ) { ! ev = list[0]; ! std::vector<event*>::iterator itRemove = list.begin(); ! list.erase(itRemove); delete ev; } // add the new event with current time stamp, converted to ms ev = new event(event_id, type, resource, source); ! list.push_back( ev ); } --- 1509,1535 ---- where string is a document id or a container name */ ! void server::add_event( xsd__int type, xsd__string resource, xsd__string source, xsd__long event_id, ! std::vector<event*> &elist) { + + pthread_mutex_lock(&m_events_mutex); + event *ev; // if event list too big, delete oldest events ! if ( elist.size() > max_event_list_size ) { ! ev = elist[0]; ! std::vector<event*>::iterator itRemove = elist.begin(); ! elist.erase(itRemove); delete ev; } // add the new event with current time stamp, converted to ms ev = new event(event_id, type, resource, source); ! elist.push_back( ev ); ! pthread_mutex_unlock( &m_events_mutex ); } *************** *** 1495,1498 **** --- 1542,1546 ---- nxqd__xsd_string_vector &r) { + pthread_mutex_lock(&m_events_mutex); // nxqdlog(LOG_NOTICE, // "nxqd::get_generic_events(from_id=%Ld,period=%Ld)", *************** *** 1510,1513 **** --- 1558,1562 ---- } } + pthread_mutex_unlock( &m_events_mutex ); return true; } |
|
From: Web H. <web...@us...> - 2006-09-02 10:31:30
|
Update of /cvsroot/nxqd/nxqd/server/src/server In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25745/src/server Modified Files: server.cpp server.hpp Log Message: fixed the colr text writing stuff Index: server.hpp =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/server.hpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** server.hpp 2 Sep 2006 08:05:34 -0000 1.33 --- server.hpp 2 Sep 2006 10:31:27 -0000 1.34 *************** *** 10,47 **** #include "client_session.hpp" ! #define RESET 0 ! #define BRIGHT 1 ! #define DIM 2 ! #define UNDERLINE 3 ! #define BLINK 4 ! #define REVERSE 7 ! #define HIDDEN 8 - #define BLACK 0 - #define RED 1 - #define GREEN 2 - #define YELLOW 3 - #define BLUE 4 - #define MAGENTA 5 - #define CYAN 6 - #define WHITE 7 - /* - \033[22;30m - black - \033[22;31m - red - \033[22;32m - green - \033[22;33m - brown - \033[22;34m - blue - \033[22;35m - magenta - \033[22;36m - cyan - \033[22;37m - gray - \033[01;30m - dark gray - \033[01;31m - light red - \033[01;32m - light green - \033[01;33m - yellow - \033[01;34m - light blue - \033[01;35m - light magenta - \033[01;36m - light cyan - \033[01;37m - white - */ void textcolor(int attr, int fg, int bg); --- 10,30 ---- #include "client_session.hpp" ! static const char* fblack = "\033[22;30m"; ! static const char* fred = "\033[22;31m"; ! static const char* fgreen = "\033[22;32m"; ! static const char* fbrown = "\033[22;33m"; ! static const char* fblue = "\033[22;34m"; ! static const char* fmagenta = "\033[22;35m"; ! static const char* fcyan = "\033[22;36m"; ! static const char* fgray = "\033[22;37m"; ! static const char* fdarkgray = "\033[01;30m"; ! static const char* flightred = "\033[22;31m"; ! static const char* flightgreen = "\033[22;32m"; ! static const char* fyellow = "\033[22;33m"; ! static const char* flightblue = "\033[22;34m"; ! static const char* flightmagenta = "\033[22;35m"; ! static const char* flightcyan = "\033[22;36m"; ! static const char* fwhite = "\033[22;37m"; void textcolor(int attr, int fg, int bg); Index: server.cpp =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/server.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** server.cpp 2 Sep 2006 08:05:34 -0000 1.49 --- server.cpp 2 Sep 2006 10:31:27 -0000 1.50 *************** *** 41,52 **** va_start(args, fmt); switch (pri) { ! case LOG_INFO :/*textcolor(RESET, GREEN, WHITE);*/printf("\033[22;32m[info] ");break; ! case LOG_NOTICE :/*textcolor(RESET, BLUE, WHITE);*/printf("\033[22;34m[notice] ");break; ! case LOG_CRIT :/*textcolor(RESET, RED, WHITE);*/printf("\033[22;31m[severe] ");break; ! case LOG_WARNING:/*textcolor(RESET, YELLOW,WHITE);*/printf("\033[01;33m[warning]");break; ! case LOG_ERR :/*textcolor(RESET, RED, WHITE);*/printf("\033[22;31m[error] ");break; } /*textcolor(RESET, BLACK, WHITE);*/ ! printf("\033[22;30m "); vprintf(fmt, args); printf("\n"); --- 41,52 ---- va_start(args, fmt); switch (pri) { ! case LOG_INFO :printf("%s[info] ", fgreen);break; ! case LOG_NOTICE :printf("%s[notice] ", fblue);break; ! case LOG_CRIT :printf("%s[severe] ", fred);break; ! case LOG_WARNING:printf("%s[warning]", fyellow);break; ! case LOG_ERR :printf("%s[error] ", fred);break; } /*textcolor(RESET, BLACK, WHITE);*/ ! printf("%s ",fblack); vprintf(fmt, args); printf("\n"); *************** *** 68,79 **** va_start(args, fmt); switch (pri) { ! case LOG_INFO :/*textcolor(RESET, GREEN, WHITE);*/printf("\033[22;32m[info] ");break; ! case LOG_NOTICE :/*textcolor(RESET, BLUE, WHITE);*/printf("\033[22;34m[notice] ");break; ! case LOG_CRIT :/*textcolor(RESET, RED, WHITE);*/printf("\033[22;31m[severe] ");break; ! case LOG_WARNING:/*textcolor(RESET, YELLOW,WHITE);*/printf("\033[01;33m[warning]");break; ! case LOG_ERR :/*textcolor(RESET, RED, WHITE);*/printf("\033[22;31m[error] ");break; } ! /*textcolor(RESET, BLACK, WHITE);*/ ! printf("\033[22;30m "); vprintf(fmt, args); printf("\n"); --- 68,78 ---- va_start(args, fmt); switch (pri) { ! case LOG_INFO :printf("%s[info] ", fgreen);break; ! case LOG_NOTICE :printf("%s[notice] ", fblue);break; ! case LOG_CRIT :printf("%s[severe] ", fred);break; ! case LOG_WARNING:printf("%s[warning]", fyellow);break; ! case LOG_ERR :printf("%s[error] ", fred);break; } ! printf("%s ",fblack); vprintf(fmt, args); printf("\n"); |
|
From: Web H. <web...@us...> - 2006-09-02 10:30:53
|
Update of /cvsroot/nxqd/nxqd/client/java In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25361/java Modified Files: project.xml Log Message: some misc changes Index: project.xml =================================================================== RCS file: /cvsroot/nxqd/nxqd/client/java/project.xml,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** project.xml 1 Sep 2006 18:53:24 -0000 1.32 --- project.xml 2 Sep 2006 10:30:50 -0000 1.33 *************** *** 25,29 **** <name>nxqd</name> <groupId>nxqd</groupId> ! <currentVersion>1.0.2</currentVersion> <organization> --- 25,29 ---- <name>nxqd</name> <groupId>nxqd</groupId> ! <currentVersion>1.0.3</currentVersion> <organization> |
|
From: Web H. <web...@us...> - 2006-09-02 10:30:28
|
Update of /cvsroot/nxqd/nxqd/client/nxqd-gui In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25328 Modified Files: project.xml Log Message: some misc changes Index: project.xml =================================================================== RCS file: /cvsroot/nxqd/nxqd/client/nxqd-gui/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** project.xml 28 Sep 2005 14:58:44 -0000 1.8 --- project.xml 2 Sep 2006 10:30:22 -0000 1.9 *************** *** 25,29 **** <name>nxqd-gui</name> <groupId>nxqd</groupId> ! <currentVersion>1.0.1</currentVersion> <organization> --- 25,29 ---- <name>nxqd-gui</name> <groupId>nxqd</groupId> ! <currentVersion>1.0.3</currentVersion> <organization> *************** *** 108,112 **** <artifactId>nxqd</artifactId> <groupId>nxqd</groupId> ! <version>1.0.1</version> </dependency> --- 108,112 ---- <artifactId>nxqd</artifactId> <groupId>nxqd</groupId> ! <version>1.0.3</version> </dependency> |
|
From: Web H. <web...@us...> - 2006-09-02 10:30:28
|
Update of /cvsroot/nxqd/nxqd/client/nxqd-gui/src/java/net/sf/nxqd/gui In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25328/src/java/net/sf/nxqd/gui Modified Files: JNxqdContainer.java Log Message: some misc changes Index: JNxqdContainer.java =================================================================== RCS file: /cvsroot/nxqd/nxqd/client/nxqd-gui/src/java/net/sf/nxqd/gui/JNxqdContainer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** JNxqdContainer.java 12 Sep 2005 10:42:52 -0000 1.11 --- JNxqdContainer.java 2 Sep 2006 10:30:24 -0000 1.12 *************** *** 37,40 **** --- 37,41 ---- blobIcon = new ImageIcon(NxqdGui.getResource(getClass(), JNxqdUtils.BLOB_ICON)); + docIcon = new ImageIcon(NxqdGui.getResource(getClass(), JNxqdUtils.DOC_ICON)); *************** *** 63,67 **** toolBar.add(b=NxqdGui.makeButton(JNxqdUtils.ADD_DOC_ICON, "add-doc", ! "add document", "add-doc")); b.addActionListener(new java.awt.event.ActionListener() { --- 64,68 ---- toolBar.add(b=NxqdGui.makeButton(JNxqdUtils.ADD_DOC_ICON, "add-doc", ! "add xml document", "add-doc")); b.addActionListener(new java.awt.event.ActionListener() { *************** *** 72,76 **** toolBar.add(b=NxqdGui.makeButton(JNxqdUtils.ADD_BLOB_ICON, "add-blob", ! "add blob", "add-blob")); b.addActionListener(new java.awt.event.ActionListener() { --- 73,77 ---- toolBar.add(b=NxqdGui.makeButton(JNxqdUtils.ADD_BLOB_ICON, "add-blob", ! "add binary blob", "add-blob")); b.addActionListener(new java.awt.event.ActionListener() { |
|
From: Web H. <web...@us...> - 2006-09-02 08:07:50
|
Update of /cvsroot/nxqd/nxqd/server/scripts In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31193/scripts Modified Files: start_nxqd.sh Log Message: removed echo from start script Index: start_nxqd.sh =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/scripts/start_nxqd.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** start_nxqd.sh 2 Sep 2006 08:05:35 -0000 1.2 --- start_nxqd.sh 2 Sep 2006 08:07:48 -0000 1.3 *************** *** 12,15 **** # Setup the LD_LIBRARY_PATH LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH" - echo $LD_LIBRARY_PATH $BINDIR/nxqd -f $CONFDIR/nxqd-config.xml -d --- 12,14 ---- |
|
From: Web H. <web...@us...> - 2006-09-02 08:05:39
|
Update of /cvsroot/nxqd/nxqd/server/src/server In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30319/src/server Modified Files: server.cpp server.hpp Log Message: bettter syntax highlighting method Index: server.hpp =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/server.hpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** server.hpp 29 Sep 2005 10:41:45 -0000 1.32 --- server.hpp 2 Sep 2006 08:05:34 -0000 1.33 *************** *** 26,30 **** #define CYAN 6 #define WHITE 7 ! void textcolor(int attr, int fg, int bg); --- 26,47 ---- #define CYAN 6 #define WHITE 7 ! /* ! \033[22;30m - black ! \033[22;31m - red ! \033[22;32m - green ! \033[22;33m - brown ! \033[22;34m - blue ! \033[22;35m - magenta ! \033[22;36m - cyan ! \033[22;37m - gray ! \033[01;30m - dark gray ! \033[01;31m - light red ! \033[01;32m - light green ! \033[01;33m - yellow ! \033[01;34m - light blue ! \033[01;35m - light magenta ! \033[01;36m - light cyan ! \033[01;37m - white ! */ void textcolor(int attr, int fg, int bg); Index: server.cpp =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/server.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** server.cpp 17 Jan 2006 16:59:32 -0000 1.48 --- server.cpp 2 Sep 2006 08:05:34 -0000 1.49 *************** *** 41,51 **** va_start(args, fmt); switch (pri) { ! case LOG_INFO :textcolor(RESET, GREEN, BLACK);printf("[info] ");break; ! case LOG_NOTICE :textcolor(RESET, BLUE, BLACK);printf("[notice] ");break; ! case LOG_CRIT :textcolor(RESET, RED, BLACK);printf("[severe] ");break; ! case LOG_WARNING:textcolor(RESET, YELLOW,BLACK);printf("[warning] ");break; ! case LOG_ERR :textcolor(RESET, RED, BLACK);printf("[error] ");break; } ! textcolor(RESET, WHITE, BLACK); vprintf(fmt, args); printf("\n"); --- 41,52 ---- va_start(args, fmt); switch (pri) { ! case LOG_INFO :/*textcolor(RESET, GREEN, WHITE);*/printf("\033[22;32m[info] ");break; ! case LOG_NOTICE :/*textcolor(RESET, BLUE, WHITE);*/printf("\033[22;34m[notice] ");break; ! case LOG_CRIT :/*textcolor(RESET, RED, WHITE);*/printf("\033[22;31m[severe] ");break; ! case LOG_WARNING:/*textcolor(RESET, YELLOW,WHITE);*/printf("\033[01;33m[warning]");break; ! case LOG_ERR :/*textcolor(RESET, RED, WHITE);*/printf("\033[22;31m[error] ");break; } ! /*textcolor(RESET, BLACK, WHITE);*/ ! printf("\033[22;30m "); vprintf(fmt, args); printf("\n"); *************** *** 67,77 **** va_start(args, fmt); switch (pri) { ! case LOG_INFO :textcolor(RESET, GREEN, BLACK);printf("[ info ] ");break; ! case LOG_NOTICE :textcolor(RESET, BLUE, BLACK);printf("[ notice] ");break; ! case LOG_CRIT :textcolor(RESET, RED, BLACK);printf("[ severe] ");break; ! case LOG_WARNING:textcolor(RESET, YELLOW,BLACK);printf("[warning] ");break; ! case LOG_ERR :textcolor(RESET, RED, BLACK);printf("[ error ] ");break; ! } ! textcolor(RESET, WHITE, BLACK); vprintf(fmt, args); printf("\n"); --- 68,79 ---- va_start(args, fmt); switch (pri) { ! case LOG_INFO :/*textcolor(RESET, GREEN, WHITE);*/printf("\033[22;32m[info] ");break; ! case LOG_NOTICE :/*textcolor(RESET, BLUE, WHITE);*/printf("\033[22;34m[notice] ");break; ! case LOG_CRIT :/*textcolor(RESET, RED, WHITE);*/printf("\033[22;31m[severe] ");break; ! case LOG_WARNING:/*textcolor(RESET, YELLOW,WHITE);*/printf("\033[01;33m[warning]");break; ! case LOG_ERR :/*textcolor(RESET, RED, WHITE);*/printf("\033[22;31m[error] ");break; ! } ! /*textcolor(RESET, BLACK, WHITE);*/ ! printf("\033[22;30m "); vprintf(fmt, args); printf("\n"); |
|
From: Web H. <web...@us...> - 2006-09-02 08:05:39
|
Update of /cvsroot/nxqd/nxqd/server/scripts In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30319/scripts Modified Files: start_nxqd.sh Log Message: bettter syntax highlighting method Index: start_nxqd.sh =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/scripts/start_nxqd.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** start_nxqd.sh 31 Aug 2006 20:55:08 -0000 1.1 --- start_nxqd.sh 2 Sep 2006 08:05:35 -0000 1.2 *************** *** 13,15 **** LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH" echo $LD_LIBRARY_PATH ! $BINDIR/nxqd -f $CONFDIR/nxqd-config.xml --- 13,15 ---- LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH" echo $LD_LIBRARY_PATH ! $BINDIR/nxqd -f $CONFDIR/nxqd-config.xml -d |
|
From: Web H. <web...@us...> - 2006-09-02 08:05:39
|
Update of /cvsroot/nxqd/nxqd/server In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30319 Modified Files: configure Log Message: bettter syntax highlighting method Index: configure =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/configure,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** configure 31 Aug 2006 21:51:26 -0000 1.11 --- configure 2 Sep 2006 08:05:35 -0000 1.12 *************** *** 1,5 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59 for nxqd 0.1.6. # # Copyright (C) 2003 Free Software Foundation, Inc. --- 1,5 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59 for nxqd 1.0.3. # # Copyright (C) 2003 Free Software Foundation, Inc. *************** *** 422,427 **** PACKAGE_NAME='nxqd' PACKAGE_TARNAME='nxqd' ! PACKAGE_VERSION='0.1.6' ! PACKAGE_STRING='nxqd 0.1.6' PACKAGE_BUGREPORT='' --- 422,427 ---- PACKAGE_NAME='nxqd' PACKAGE_TARNAME='nxqd' ! PACKAGE_VERSION='1.0.3' ! PACKAGE_STRING='nxqd 1.0.3' PACKAGE_BUGREPORT='' *************** *** 965,969 **** # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures nxqd 0.1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... --- 965,969 ---- # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures nxqd 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... *************** *** 1032,1036 **** if test -n "$ac_init_help"; then case $ac_init_help in ! short | recursive ) echo "Configuration of nxqd 0.1.6:";; esac cat <<\_ACEOF --- 1032,1036 ---- if test -n "$ac_init_help"; then case $ac_init_help in ! short | recursive ) echo "Configuration of nxqd 1.0.3:";; esac cat <<\_ACEOF *************** *** 1175,1179 **** if $ac_init_version; then cat <<\_ACEOF ! nxqd configure 0.1.6 generated by GNU Autoconf 2.59 --- 1175,1179 ---- if $ac_init_version; then cat <<\_ACEOF ! nxqd configure 1.0.3 generated by GNU Autoconf 2.59 *************** *** 1189,1193 **** running configure, to aid debugging if configure makes a mistake. ! It was created by nxqd $as_me 0.1.6, which was generated by GNU Autoconf 2.59. Invocation command line was --- 1189,1193 ---- running configure, to aid debugging if configure makes a mistake. ! It was created by nxqd $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was *************** *** 1917,1921 **** # Define the identity of the package. PACKAGE='nxqd' ! VERSION='0.1.6' --- 1917,1921 ---- # Define the identity of the package. PACKAGE='nxqd' ! VERSION='1.0.3' *************** *** 19747,19751 **** cat >&5 <<_CSEOF ! This file was extended by nxqd $as_me 0.1.6, which was generated by GNU Autoconf 2.59. Invocation command line was --- 19747,19751 ---- cat >&5 <<_CSEOF ! This file was extended by nxqd $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was *************** *** 19810,19814 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ ! nxqd config.status 0.1.6 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" --- 19810,19814 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ ! nxqd config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" |
|
From: Web H. <web...@us...> - 2006-09-01 18:53:36
|
Update of /cvsroot/nxqd/nxqd/client/java In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19124 Modified Files: project.xml Log Message: V1.0.2 Index: project.xml =================================================================== RCS file: /cvsroot/nxqd/nxqd/client/java/project.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** project.xml 28 Sep 2005 13:51:22 -0000 1.31 --- project.xml 1 Sep 2006 18:53:24 -0000 1.32 *************** *** 25,29 **** <name>nxqd</name> <groupId>nxqd</groupId> ! <currentVersion>1.0.1</currentVersion> <organization> --- 25,29 ---- <name>nxqd</name> <groupId>nxqd</groupId> ! <currentVersion>1.0.2</currentVersion> <organization> |
|
From: Web H. <web...@us...> - 2006-08-31 21:51:30
|
Update of /cvsroot/nxqd/nxqd/server In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv10206 Modified Files: configure Makefile.in Log Message: Added delivery target to makefile Index: Makefile.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 30 Aug 2006 18:16:45 -0000 1.4 --- Makefile.in 31 Aug 2006 21:51:26 -0000 1.5 *************** *** 65,68 **** --- 65,69 ---- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) + deliverydir = $(PACKAGE)-$(VERSION)-bin top_distdir = $(distdir) am__remove_distdir = \ *************** *** 95,98 **** --- 96,100 ---- CYGPATH_W = @CYGPATH_W@ DATADIR = @DATADIR@ + DBXML_ROOT = @DBXML_ROOT@ DBXML_CFLAGS = @DBXML_CFLAGS@ DBXML_LIBS = @DBXML_LIBS@ *************** *** 439,442 **** --- 441,467 ---- $(am__remove_distdir) + # This target builds the package ready for upload to Sourceforge + deliverydir: all + @echo "Building delivery $(deliverydir)" + @mkdir -p $(deliverydir)/bin + @mkdir -p $(deliverydir)/conf + @mkdir -p $(deliverydir)/lib + @cp src/server/nxqd $(deliverydir)/bin + @cp scripts/start_nxqd.sh $(deliverydir)/bin + @cp scripts/stop_nxqd.sh $(deliverydir)/bin + @cp src/server/nxqd-config.xml $(deliverydir)/conf + @cp ${DBXML_ROOT}/lib/libdb-4.3.so $(deliverydir)/lib + @cp ${DBXML_ROOT}/lib/libdbxml-2.2.so $(deliverydir)/lib + @cp ${DBXML_ROOT}/lib/libpathan.so.3.0.1 $(deliverydir)/lib + @cp ${DBXML_ROOT}/lib/libxerces-c.so.27 $(deliverydir)/lib + @cp ${DBXML_ROOT}/lib/libdb-4.so $(deliverydir)/lib + @cp ${DBXML_ROOT}/lib/libxquery-1.2.so $(deliverydir)/lib + @tar -cvf $(deliverydir).tar.gz $(deliverydir) + + delivery: deliverydir + @tar -cvf $(deliverydir).tar.gz $(deliverydir) + + + # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another Index: configure =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/configure,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** configure 30 Aug 2006 18:16:45 -0000 1.10 --- configure 31 Aug 2006 21:51:26 -0000 1.11 *************** *** 464,468 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GSOAP_CFLAGS GSOAP_LIBS GSOAP_VERSION BUILD_DATE HOSTNAME DATADIR DBXML_LIBS DBXML_CFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' --- 464,468 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG GSOAP_CFLAGS GSOAP_LIBS GSOAP_VERSION BUILD_DATE HOSTNAME DATADIR DBXML_LIBS DBXML_CFLAGS DBXML_ROOT LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 19102,19105 **** --- 19102,19106 ---- if ( test ${have_libdbxml_2} = "yes" && \ test ${have_dbxml_hpp} = "yes" ); then + DBXML_ROOT="${with_dbxml}"; DBXML_CFLAGS="-I${with_dbxml}/include/dbxml"; DBXML_LIBS="-L${with_dbxml}/lib ${dbxml_link_libs}"; *************** *** 20091,20094 **** --- 20092,20096 ---- s,@HOSTNAME@,$HOSTNAME,;t t s,@DATADIR@,$DATADIR,;t t + s,@DBXML_ROOT@,$DBXML_ROOT,;t t s,@DBXML_LIBS@,$DBXML_LIBS,;t t s,@DBXML_CFLAGS@,$DBXML_CFLAGS,;t t |
|
From: Web H. <web...@us...> - 2006-08-31 20:55:12
|
Update of /cvsroot/nxqd/nxqd/server/scripts In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19594/scripts Added Files: start_nxqd.sh stop_nxqd.sh Log Message: Scripts used in the binary delivery --- NEW FILE: start_nxqd.sh --- #!/bin/sh ### ====================================================================== ### ## ## ## Nxqd Script ## ## ## ### ====================================================================== ### BINDIR=`dirname $0` LIBDIR=$BINDIR/../lib CONFDIR=$BINDIR/../conf # Setup the LD_LIBRARY_PATH LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH" echo $LD_LIBRARY_PATH $BINDIR/nxqd -f $CONFDIR/nxqd-config.xml --- NEW FILE: stop_nxqd.sh --- #!/bin/sh ### ====================================================================== ### ## ## ## Nxqd Script ## ## ## ### ====================================================================== ### BINDIR=`dirname $0` LIBDIR=$BINDIR/../lib CONFDIR=$BINDIR/../conf # Setup the LD_LIBRARY_PATH LD_LIBRARY_PATH="$LIBDIR:$LD_LIBRARY_PATH" $BINDIR/nxqd -f $CONFDIR/nxqd-config.xml -s |
|
From: Web H. <web...@us...> - 2006-08-31 20:51:29
|
Update of /cvsroot/nxqd/nxqd/server/scripts In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17919/scripts Log Message: Directory /cvsroot/nxqd/nxqd/server/scripts added to the repository |
|
From: Web H. <web...@us...> - 2006-08-30 18:16:56
|
Update of /cvsroot/nxqd/nxqd/server/src/gsoap In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27724/server/src/gsoap Modified Files: Makefile.in soapnxqdObject.h soapnxqdProxy.h Log Message: added variable for dbxml version Index: Makefile.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/gsoap/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 17 Jan 2006 16:59:33 -0000 1.4 --- Makefile.in 30 Aug 2006 18:16:48 -0000 1.5 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ *************** *** 16,21 **** - SOURCES = $(nodist_libnxqd_client_support_la_SOURCES) $(nodist_libnxqd_server_support_la_SOURCES) $(libsoap_support_la_SOURCES) $(nodist_libsoap_support_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ --- 16,19 ---- *************** *** 176,179 **** --- 174,178 ---- ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ + ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ Index: soapnxqdObject.h =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/gsoap/soapnxqdObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** soapnxqdObject.h 17 Jan 2006 16:59:33 -0000 1.3 --- soapnxqdObject.h 30 Aug 2006 18:16:48 -0000 1.4 *************** *** 1,4 **** /* soapnxqdObject.h ! Generated by gSOAP 2.7.3 from soap_interface.hpp Copyright (C) 2000-2005, Robert van Engelen, Genivia Inc. All Rights Reserved. This part of the software is released under one of the following licenses: --- 1,4 ---- /* soapnxqdObject.h ! Generated by gSOAP 2.7.6c from soap_interface.hpp Copyright (C) 2000-2005, Robert van Engelen, Genivia Inc. All Rights Reserved. This part of the software is released under one of the following licenses: Index: soapnxqdProxy.h =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/gsoap/soapnxqdProxy.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** soapnxqdProxy.h 17 Jan 2006 16:59:33 -0000 1.5 --- soapnxqdProxy.h 30 Aug 2006 18:16:49 -0000 1.6 *************** *** 1,4 **** /* soapnxqdProxy.h ! Generated by gSOAP 2.7.3 from soap_interface.hpp Copyright (C) 2000-2005, Robert van Engelen, Genivia Inc. All Rights Reserved. This part of the software is released under one of the following licenses: --- 1,4 ---- /* soapnxqdProxy.h ! Generated by gSOAP 2.7.6c from soap_interface.hpp Copyright (C) 2000-2005, Robert van Engelen, Genivia Inc. All Rights Reserved. This part of the software is released under one of the following licenses: |
|
From: Web H. <web...@us...> - 2006-08-30 18:16:56
|
Update of /cvsroot/nxqd/nxqd/server In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27724/server Modified Files: Makefile.in aclocal.m4 configure Log Message: added variable for dbxml version Index: aclocal.m4 =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/aclocal.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aclocal.m4 17 Jan 2006 16:59:32 -0000 1.2 --- aclocal.m4 30 Aug 2006 18:16:45 -0000 1.3 *************** *** 1,3 **** ! # generated automatically by aclocal 1.9.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --- 1,3 ---- ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, *************** *** 14,18 **** # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- [...2755 lines suppressed...] + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) + fi[]dnl + ])# PKG_CHECK_MODULES # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. *************** *** 6247,6251 **** # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.9.5])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- --- 6591,6595 ---- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- Index: Makefile.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 17 Jan 2006 16:59:32 -0000 1.3 --- Makefile.in 30 Aug 2006 18:16:45 -0000 1.4 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ *************** *** 142,145 **** --- 142,146 ---- ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ + ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ Index: configure =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/configure,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure 19 Jan 2006 03:11:17 -0000 1.9 --- configure 30 Aug 2006 18:16:45 -0000 1.10 *************** *** 286,291 **** for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ! if (echo_test_string="`eval $cmd`") 2>/dev/null && ! echo_test_string="`eval $cmd`" && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then --- 286,291 ---- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ! if (echo_test_string=`eval $cmd`) 2>/dev/null && [...7813 lines suppressed...] - { echo "$as_me:$LINENO: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: --- 20261,20264 ---- *************** *** 21249,21252 **** --- 20299,20308 ---- esac done` || { (exit 1); exit 1; } + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF |
|
From: Web H. <web...@us...> - 2006-08-30 18:16:55
|
Update of /cvsroot/nxqd/nxqd/server/src/test In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27724/server/src/test Modified Files: Makefile.in Log Message: added variable for dbxml version Index: Makefile.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/test/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 17 Jan 2006 16:59:33 -0000 1.5 --- Makefile.in 30 Aug 2006 18:16:49 -0000 1.6 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ *************** *** 15,20 **** @SET_MAKE@ - SOURCES = $(container_exists_SOURCES) $(create_container_SOURCES) $(delete_container_SOURCES) $(get_doc_SOURCES) $(list_containers_SOURCES) $(put_doc_SOURCES) $(query_SOURCES) $(rename_container_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ --- 15,18 ---- *************** *** 175,178 **** --- 173,177 ---- ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ + ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ |
|
From: Web H. <web...@us...> - 2006-08-30 18:16:54
|
Update of /cvsroot/nxqd/nxqd/server/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27724/server/src Modified Files: Makefile.in Log Message: added variable for dbxml version Index: Makefile.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 17 Jan 2006 16:59:32 -0000 1.3 --- Makefile.in 30 Aug 2006 18:16:48 -0000 1.4 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ *************** *** 139,142 **** --- 139,143 ---- ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ + ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ |
|
From: Web H. <web...@us...> - 2006-08-30 18:16:54
|
Update of /cvsroot/nxqd/nxqd/server/src/server In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27724/server/src/server Modified Files: Makefile.in Log Message: added variable for dbxml version Index: Makefile.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 17 Jan 2006 16:59:32 -0000 1.3 --- Makefile.in 30 Aug 2006 18:16:49 -0000 1.4 *************** *** 1,3 **** ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ --- 1,3 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ *************** *** 15,20 **** @SET_MAKE@ - SOURCES = $(nxqd_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ --- 15,18 ---- *************** *** 149,152 **** --- 147,151 ---- ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_STRIP = @ac_ct_STRIP@ + ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ |
|
From: Tom M. <tmc...@tg...> - 2006-01-19 03:12:38
|
Deepak, Sorry...dumb me. i submitted the small fix to configure.in and all should work properly for mac osx now. let me know if you run into any more problems :) -tom Deepak Jois wrote: >Hi >I managed to compile nxqd on Mac OS X 10.4.4 w/ Berkeley DB XML >2.2.13. The only problem I encountered was in the configure script. >The script worked in all respects except that it was looking for .so >dynamic libraries. The dynamic libraries in Mac OS X have an >enxtension .dylib instead of .so. > >So can the configure script be changed to take care of this? > >Apart from that everything is great. All the issues raised so far in >this list have been resolved. > >Thanks >-- >-------------------- >Deepak Jois >dee...@gm... > > >------------------------------------------------------- >This SF.net email is sponsored by: Splunk Inc. Do you grep through log files >for problems? Stop! Download the new AJAX search engine that makes >searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! >http://sel.as-us.falkag.net/sel?cmd=k&kid3432&bid#0486&dat1642 >_______________________________________________ >Nxqd-development mailing list >Nxq...@li... >https://lists.sourceforge.net/lists/listinfo/nxqd-development > > |
|
From: Tom M. <tmc...@us...> - 2006-01-19 03:11:26
|
Update of /cvsroot/nxqd/nxqd/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16875 Modified Files: configure configure.in Log Message: small fix to check for correct lib under Mac OS/X (dylib, not so! dumbass) Index: configure =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure 17 Jan 2006 16:59:32 -0000 1.8 --- configure 19 Jan 2006 03:11:17 -0000 1.9 *************** *** 19824,19827 **** --- 19824,19842 ---- dbxml_link_libs="-lpathan -lxerces-c -lxquery -ldbxml-2 -ldb_cxx-4.3" + case "$host" in + i*86-*-linux-* | x86_64-*-linux) + LIB_EXTENSION="so" + ;; + sparc-sun-solaris2.* | i386-pc-solaris2.*) + LIB_EXTENSION="so" + ;; + *-*-cygwin* | *-*-mingw*) + LIB_EXTENSION="lib" + ;; + powerpc-apple-darwin*) + LIB_EXTENSION="dylib" + ;; + esac + ## check for gsoap *************** *** 20004,20010 **** fi ! as_ac_File=`echo "ac_cv_file_"${with_dbxml}/lib/libdbxml-2.so"" | $as_tr_sh` ! echo "$as_me:$LINENO: checking for \"${with_dbxml}/lib/libdbxml-2.so\"" >&5 ! echo $ECHO_N "checking for \"${with_dbxml}/lib/libdbxml-2.so\"... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 --- 20019,20025 ---- fi ! as_ac_File=`echo "ac_cv_file_"${with_dbxml}/lib/libdbxml-2.${LIB_EXTENSION}"" | $as_tr_sh` ! echo "$as_me:$LINENO: checking for \"${with_dbxml}/lib/libdbxml-2.${LIB_EXTENSION}\"" >&5 ! echo $ECHO_N "checking for \"${with_dbxml}/lib/libdbxml-2.${LIB_EXTENSION}\"... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 *************** *** 20014,20018 **** echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } ! if test -r ""${with_dbxml}/lib/libdbxml-2.so""; then eval "$as_ac_File=yes" else --- 20029,20033 ---- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } ! if test -r ""${with_dbxml}/lib/libdbxml-2.${LIB_EXTENSION}""; then eval "$as_ac_File=yes" else Index: configure.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure.in 17 Jan 2006 16:59:32 -0000 1.7 --- configure.in 19 Jan 2006 03:11:17 -0000 1.8 *************** *** 25,28 **** --- 25,43 ---- dbxml_link_libs="-lpathan -lxerces-c -lxquery -ldbxml-2 -ldb_cxx-4.3" + case "$host" in + i*86-*-linux-* | x86_64-*-linux) + LIB_EXTENSION="so" + ;; + sparc-sun-solaris2.* | i386-pc-solaris2.*) + LIB_EXTENSION="so" + ;; + *-*-cygwin* | *-*-mingw*) + LIB_EXTENSION="lib" + ;; + powerpc-apple-darwin*) + LIB_EXTENSION="dylib" + ;; + esac + ## check for gsoap PKG_CHECK_MODULES(GSOAP, gsoap++ >= 2.7, *************** *** 76,80 **** [have_dbxml_hpp="no"] ) ! AC_CHECK_FILE(["${with_dbxml}/lib/libdbxml-2.so"], [have_libdbxml_2="yes"], [have_libdbxml_2="no"] --- 91,95 ---- [have_dbxml_hpp="no"] ) ! AC_CHECK_FILE(["${with_dbxml}/lib/libdbxml-2.${LIB_EXTENSION}"], [have_libdbxml_2="yes"], [have_libdbxml_2="no"] |
|
From: Deepak J. <dee...@gm...> - 2006-01-19 02:44:06
|
Hi I managed to compile nxqd on Mac OS X 10.4.4 w/ Berkeley DB XML 2.2.13. The only problem I encountered was in the configure script. The script worked in all respects except that it was looking for .so dynamic libraries. The dynamic libraries in Mac OS X have an enxtension .dylib instead of .so. So can the configure script be changed to take care of this? Apart from that everything is great. All the issues raised so far in this list have been resolved. Thanks -- -------------------- Deepak Jois dee...@gm... |
|
From: Tom M. <tmc...@us...> - 2006-01-17 16:59:46
|
Update of /cvsroot/nxqd/nxqd/server/src/gsoap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4456/src/gsoap Modified Files: Makefile.in Added Files: soapnxqdObject.h soapnxqdProxy.h Log Message: Fixed attribute XQueries to use string() and not text() for dbxml-2.2.x Index: Makefile.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/gsoap/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 21 Sep 2005 07:50:07 -0000 1.3 --- Makefile.in 17 Jan 2006 16:59:33 -0000 1.4 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 70,86 **** CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(nodist_libnxqd_client_support_la_SOURCES) \ --- 70,86 ---- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(nodist_libnxqd_client_support_la_SOURCES) \ *************** *** 242,246 **** $(wildcard soap[A-Z]*.cpp) \ $(wildcard soap[A-Z]*.h) \ - $(wildcard soapnxqd[A-Z]*.h) \ $(wildcard *.wsdl) \ $(wildcard lib*.la) --- 242,245 ---- *************** *** 365,369 **** # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ --- 364,374 ---- # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ *************** *** 377,381 **** fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done; \ if test "$$dot_seen" = "no"; then \ --- 382,386 ---- fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ *************** *** 385,389 **** mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ --- 390,400 ---- mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ dot_seen=no; \ case "$@" in \ *************** *** 406,410 **** fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: --- 417,421 ---- fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ done && test -z "$$fail" tags-recursive: --- NEW FILE: soapnxqdObject.h --- /* soapnxqdObject.h Generated by gSOAP 2.7.3 from soap_interface.hpp Copyright (C) 2000-2005, Robert van Engelen, Genivia Inc. All Rights Reserved. This part of the software is released under one of the following licenses: GPL, the gSOAP public license, or Genivia's license for commercial use. */ #ifndef soapnxqd_H #define soapnxqd_H #include "soapH.h" class nxqd : public soap { public: nxqd() { static const struct Namespace namespaces[] = { {"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/*/soap-envelope", NULL}, {"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", "http://www.w3.org/*/soap-encoding", NULL}, {"xsi", "http://www.w3.org/2001/XMLSchema-instance", "http://www.w3.org/*/XMLSchema-instance", NULL}, {"xsd", "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/*/XMLSchema", NULL}, {"nxqd", "http://nxqd.sourceforge.net", NULL, NULL}, {NULL, NULL, NULL, NULL} }; soap_init(this); if (!this->namespaces) this->namespaces = namespaces; }; virtual ~nxqd() { soap_destroy(this); soap_end(this); soap_done(this); }; virtual int serve() { return soap_serve(this); }; }; #endif --- NEW FILE: soapnxqdProxy.h --- /* soapnxqdProxy.h Generated by gSOAP 2.7.3 from soap_interface.hpp Copyright (C) 2000-2005, Robert van Engelen, Genivia Inc. All Rights Reserved. This part of the software is released under one of the following licenses: GPL, the gSOAP public license, or Genivia's license for commercial use. */ #ifndef soapnxqd_H #define soapnxqd_H #include "soapH.h" class nxqd { public: struct soap *soap; const char *endpoint; nxqd() { soap = soap_new(); endpoint = "http://localhost:80"; if (soap && !soap->namespaces) { static const struct Namespace namespaces[] = { {"SOAP-ENV", "http://schemas.xmlsoap.org/soap/envelope/", "http://www.w3.org/*/soap-envelope", NULL}, {"SOAP-ENC", "http://schemas.xmlsoap.org/soap/encoding/", "http://www.w3.org/*/soap-encoding", NULL}, {"xsi", "http://www.w3.org/2001/XMLSchema-instance", "http://www.w3.org/*/XMLSchema-instance", NULL}, {"xsd", "http://www.w3.org/2001/XMLSchema", "http://www.w3.org/*/XMLSchema", NULL}, {"nxqd", "http://nxqd.sourceforge.net", NULL, NULL}, {NULL, NULL, NULL, NULL} }; soap->namespaces = namespaces; } }; virtual ~nxqd() { if (soap) { soap_destroy(soap); soap_end(soap); soap_done(soap); free((void*)soap); } }; virtual int nxqd__register_client(std::string &session_id) { return soap ? soap_call_nxqd__register_client(soap, endpoint, NULL, session_id) : SOAP_EOM; }; virtual int nxqd__unregister_client(std::string *session_id, bool &b_result) { return soap ? soap_call_nxqd__unregister_client(soap, endpoint, NULL, session_id, b_result) : SOAP_EOM; }; virtual int nxqd__query(std::string *query, nxqd__xsd_string_vector *nsPrefix, nxqd__xsd_string_vector *nsURI, nxqd__xsd_string_vector &list) { return soap ? soap_call_nxqd__query(soap, endpoint, NULL, query, nsPrefix, nsURI, list) : SOAP_EOM; }; virtual int nxqd__lazyquery(std::string *query, nxqd__xsd_string_vector *nsPrefix, nxqd__xsd_string_vector *nsURI, std::string *ssid, int &query_id) { return soap ? soap_call_nxqd__lazyquery(soap, endpoint, NULL, query, nsPrefix, nsURI, ssid, query_id) : SOAP_EOM; }; virtual int nxqd__get_results(int *numresult, std::string *ssid, int *queryid, nxqd__xsd_string_vector &list) { return soap ? soap_call_nxqd__get_results(soap, endpoint, NULL, numresult, ssid, queryid, list) : SOAP_EOM; }; virtual int nxqd__put_document(std::string *container, std::string *name, std::string *doc, bool &b_result) { return soap ? soap_call_nxqd__put_document(soap, endpoint, NULL, container, name, doc, b_result) : SOAP_EOM; }; virtual int nxqd__get_document(std::string *container, std::string *name, std::string &s_result) { return soap ? soap_call_nxqd__get_document(soap, endpoint, NULL, container, name, s_result) : SOAP_EOM; }; virtual int nxqd__document_exists(std::string *container, std::string *name, bool &b_result) { return soap ? soap_call_nxqd__document_exists(soap, endpoint, NULL, container, name, b_result) : SOAP_EOM; }; virtual int nxqd__delete_document(std::string *container, std::string *name, bool &b_result) { return soap ? soap_call_nxqd__delete_document(soap, endpoint, NULL, container, name, b_result) : SOAP_EOM; }; virtual int nxqd__get_document_count(std::string *container, int &i_result) { return soap ? soap_call_nxqd__get_document_count(soap, endpoint, NULL, container, i_result) : SOAP_EOM; }; virtual int nxqd__get_document_list(std::string *container, nxqd__xsd_string_vector &list) { return soap ? soap_call_nxqd__get_document_list(soap, endpoint, NULL, container, list) : SOAP_EOM; }; virtual int nxqd__put_blob(std::string *container, std::string *name, int *blob, bool &b_result) { return soap ? soap_call_nxqd__put_blob(soap, endpoint, NULL, container, name, blob, b_result) : SOAP_EOM; }; virtual int nxqd__get_blob(std::string *container, std::string *name, int &blob) { return soap ? soap_call_nxqd__get_blob(soap, endpoint, NULL, container, name, blob) : SOAP_EOM; }; virtual int nxqd__blob_exists(std::string *container, std::string *name, bool &b_result) { return soap ? soap_call_nxqd__blob_exists(soap, endpoint, NULL, container, name, b_result) : SOAP_EOM; }; virtual int nxqd__delete_blob(std::string *container, std::string *name, bool &b_result) { return soap ? soap_call_nxqd__delete_blob(soap, endpoint, NULL, container, name, b_result) : SOAP_EOM; }; virtual int nxqd__get_blob_count(std::string *container, int &i_result) { return soap ? soap_call_nxqd__get_blob_count(soap, endpoint, NULL, container, i_result) : SOAP_EOM; }; virtual int nxqd__get_blob_list(std::string *container, nxqd__xsd_string_vector &list) { return soap ? soap_call_nxqd__get_blob_list(soap, endpoint, NULL, container, list) : SOAP_EOM; }; virtual int nxqd__get_manager_events(std::string *ssid, ULONG64 *period, nxqd__xsd_string_vector &list) { return soap ? soap_call_nxqd__get_manager_events(soap, endpoint, NULL, ssid, period, list) : SOAP_EOM; }; virtual int nxqd__get_container_events(std::string *ssid, ULONG64 *period, nxqd__xsd_string_vector &list) { return soap ? soap_call_nxqd__get_container_events(soap, endpoint, NULL, ssid, period, list) : SOAP_EOM; }; virtual int nxqd__rename_container(std::string *old_container, std::string *new_container, bool &b_result) { return soap ? soap_call_nxqd__rename_container(soap, endpoint, NULL, old_container, new_container, b_result) : SOAP_EOM; }; virtual int nxqd__create_container(std::string *container, bool &b_result) { return soap ? soap_call_nxqd__create_container(soap, endpoint, NULL, container, b_result) : SOAP_EOM; }; virtual int nxqd__delete_container(std::string *container, bool &b_result) { return soap ? soap_call_nxqd__delete_container(soap, endpoint, NULL, container, b_result) : SOAP_EOM; }; virtual int nxqd__container_exists(std::string *container, bool &b_result) { return soap ? soap_call_nxqd__container_exists(soap, endpoint, NULL, container, b_result) : SOAP_EOM; }; virtual int nxqd__get_container_list(nxqd__xsd_string_vector &list) { return soap ? soap_call_nxqd__get_container_list(soap, endpoint, NULL, list) : SOAP_EOM; }; }; #endif |
|
From: Tom M. <tmc...@us...> - 2006-01-17 16:59:46
|
Update of /cvsroot/nxqd/nxqd/server/src/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4456/src/test Modified Files: Makefile.in Log Message: Fixed attribute XQueries to use string() and not text() for dbxml-2.2.x Index: Makefile.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/test/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 22 Aug 2005 15:48:23 -0000 1.4 --- Makefile.in 17 Jan 2006 16:59:33 -0000 1.5 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 90,98 **** CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(container_exists_SOURCES) $(create_container_SOURCES) \ --- 90,98 ---- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(container_exists_SOURCES) $(create_container_SOURCES) \ |
|
From: Tom M. <tmc...@us...> - 2006-01-17 16:59:46
|
Update of /cvsroot/nxqd/nxqd/server/src/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4456/src/server Modified Files: Makefile.in server.cpp main.cpp Log Message: Fixed attribute XQueries to use string() and not text() for dbxml-2.2.x Index: Makefile.in =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 21 Jul 2005 04:53:03 -0000 1.2 --- Makefile.in 17 Jan 2006 16:59:32 -0000 1.3 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.9.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 62,78 **** CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(nxqd_SOURCES) --- 62,78 ---- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(nxqd_SOURCES) Index: main.cpp =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/main.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.cpp 28 Sep 2005 10:49:14 -0000 1.8 --- main.cpp 17 Jan 2006 16:59:32 -0000 1.9 *************** *** 1,2 **** --- 1,6 ---- + #ifdef __APPLE__ + // needed by uname w/in gsoap + # include <sys/stat.h> + #endif #include <syslog.h> #include <cstdlib> *************** *** 229,240 **** XmlDocument config = xml_manager.createDocument(); config.setContentAsXmlInputStream( stream ); ! XmlValue xconfig( config ); XmlValue pid_file; XmlQueryContext ctx = xml_manager.createQueryContext(); ! ! XmlQueryExpression qexp = xml_manager.prepare( "/nxqd/pid-file/@path/text()", ctx ); XmlResults r = qexp.execute( xconfig, ctx ); - if ( ! r.next( pid_file ) ) throw std::runtime_error( "No /nxqd/pid-file[@path] defined!" ); --- 233,242 ---- XmlDocument config = xml_manager.createDocument(); config.setContentAsXmlInputStream( stream ); ! XmlValue xconfig( config ); XmlValue pid_file; XmlQueryContext ctx = xml_manager.createQueryContext(); ! XmlQueryExpression qexp = xml_manager.prepare( "/nxqd/pid-file/@path/string()", ctx ); XmlResults r = qexp.execute( xconfig, ctx ); if ( ! r.next( pid_file ) ) throw std::runtime_error( "No /nxqd/pid-file[@path] defined!" ); Index: server.cpp =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/src/server/server.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** server.cpp 22 Nov 2005 03:17:37 -0000 1.47 --- server.cpp 17 Jan 2006 16:59:32 -0000 1.48 *************** *** 622,626 **** XmlValue xconfig( m_config_doc ); ! XmlQueryExpression qexp = xMgr.prepare( "/nxqd/server/@port/text()", ctx ); XmlResults r = qexp.execute( xconfig, ctx ); --- 622,626 ---- XmlValue xconfig( m_config_doc ); ! XmlQueryExpression qexp = xMgr.prepare( "/nxqd/server/@port/string()", ctx ); XmlResults r = qexp.execute( xconfig, ctx ); *************** *** 628,652 **** throw std::runtime_error( "No /nxqd/server[@port] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/@worker-threads/text()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_worker_thread_count ) ) throw std::runtime_error( "No /nxqd/server[@worker-threads] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/@max-queue-size/text()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_max_queue_size ) ) throw std::runtime_error( "No /nxqd/server[@max-queue-size] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/bdb-options/cache-size/@value/text()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_cache_size ) ) throw std::runtime_error( "No /nxqd/server/bdb-options/cache-size[@value] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/bdb-options/db-home/@path/text()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_db_home_path ) ) throw std::runtime_error( "No /nxqd/server/bdb-options/db-home[@path] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/bdb-options/file-mode/@value/text()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_file_mode ) ) --- 628,652 ---- throw std::runtime_error( "No /nxqd/server[@port] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/@worker-threads/string()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_worker_thread_count ) ) throw std::runtime_error( "No /nxqd/server[@worker-threads] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/@max-queue-size/string()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_max_queue_size ) ) throw std::runtime_error( "No /nxqd/server[@max-queue-size] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/bdb-options/cache-size/@value/string()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_cache_size ) ) throw std::runtime_error( "No /nxqd/server/bdb-options/cache-size[@value] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/bdb-options/db-home/@path/string()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_db_home_path ) ) throw std::runtime_error( "No /nxqd/server/bdb-options/db-home[@path] defined!" ); ! qexp = xMgr.prepare( "/nxqd/server/bdb-options/file-mode/@value/string()", ctx ); r = qexp.execute( xconfig, ctx ); if ( ! r.next( m_xml_value_file_mode ) ) |
|
From: Tom M. <tmc...@us...> - 2006-01-17 16:59:46
|
Update of /cvsroot/nxqd/nxqd/server/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4456/config Modified Files: config.guess install-sh depcomp ltmain.sh missing config.sub Log Message: Fixed attribute XQueries to use string() and not text() for dbxml-2.2.x Index: missing =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/config/missing,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** missing 20 Jul 2005 05:24:30 -0000 1.1 --- missing 17 Jan 2006 16:59:32 -0000 1.2 *************** *** 2,8 **** # Common stub for a few missing GNU programs while installing. ! scriptversion=2004-09-07.08 ! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. --- 2,8 ---- # Common stub for a few missing GNU programs while installing. ! scriptversion=2005-02-08.22 ! # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pi...@ir...>, 1996. *************** *** 88,97 **** Send bug reports to <bug...@gn...>." ! exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" ! exit 0 ;; --- 88,97 ---- Send bug reports to <bug...@gn...>." ! exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "missing $scriptversion (GNU Automake)" ! exit $? ;; *************** *** 289,296 **** DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` fi touch $file --- 289,300 ---- DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then ! # ... or it is the one specified with @setfilename ... ! infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ! file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` ! # ... or it is derived from the source name (dir/f.texi becomes f.info) ! test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi touch $file Index: config.guess =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/config/config.guess,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.guess 20 Jul 2005 05:24:30 -0000 1.1 --- config.guess 17 Jan 2006 16:59:32 -0000 1.2 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-02-10' # This file is free software; you can redistribute it and/or modify it *************** *** 54,58 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. --- 54,58 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. *************** *** 320,323 **** --- 320,326 ---- echo i370-ibm-openedition exit 0 ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 *************** *** 343,347 **** echo sparc-icl-nx6 exit 0 ;; ! DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; --- 346,350 ---- echo sparc-icl-nx6 exit 0 ;; ! DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; *************** *** 802,805 **** --- 805,811 ---- echo ${UNAME_MACHINE}-pc-uwin exit 0 ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin *************** *** 1195,1198 **** --- 1201,1207 ---- echo i386-pc-qnx exit 0 ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} *************** *** 1248,1252 **** I*) echo ia64-dec-vms && exit 0 ;; V*) echo vax-dec-vms && exit 0 ;; ! esac esac --- 1257,1264 ---- I*) echo ia64-dec-vms && exit 0 ;; V*) echo vax-dec-vms && exit 0 ;; ! esac ;; ! *:XENIX:*:SysV) ! echo i386-pc-xenix ! exit 0 ;; esac Index: config.sub =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/config/config.sub,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.sub 20 Jul 2005 05:24:30 -0000 1.1 --- config.sub 17 Jan 2006 16:59:32 -0000 1.2 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ! timestamp='2005-02-10' # This file is (in principle) common to ALL GNU software. *************** *** 71,75 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. --- 71,75 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. *************** *** 238,242 **** | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ --- 238,242 ---- | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ *************** *** 268,272 **** | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown --- 268,272 ---- | v850 | v850e \ | we32k \ ! | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown *************** *** 311,315 **** | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ --- 311,315 ---- | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ! | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ *************** *** 344,349 **** | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) --- 344,349 ---- | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ! | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) *************** *** 490,493 **** --- 490,497 ---- os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull *************** *** 1030,1033 **** --- 1034,1041 ---- os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell *************** *** 1298,1301 **** --- 1306,1312 ---- os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; Index: ltmain.sh =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/config/ltmain.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ltmain.sh 20 Jul 2005 05:24:30 -0000 1.1 --- ltmain.sh 17 Jan 2006 16:59:32 -0000 1.2 *************** *** 2,6 **** # NOTE: Changing this file will not affect anything until you rerun configure. # ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <go...@gn...>, 1996 --- 2,6 ---- # NOTE: Changing this file will not affect anything until you rerun configure. # ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. [...1266 lines suppressed...] ;; --- 5430,5434 ---- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in ! *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "") arg="\"$arg\"" ;; *************** *** 6398,6402 **** $echo "Try \`$modename --help' for more information about other modes." ! exit $EXIT_SUCCESS # The TAGs below are defined such that we never get into a situation --- 6469,6473 ---- $echo "Try \`$modename --help' for more information about other modes." ! exit $? # The TAGs below are defined such that we never get into a situation Index: depcomp =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/config/depcomp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** depcomp 20 Jul 2005 05:24:30 -0000 1.1 --- depcomp 17 Jan 2006 16:59:32 -0000 1.2 *************** *** 2,8 **** # depcomp - compile a program generating dependencies as side-effects ! scriptversion=2004-05-31.23 ! # Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify --- 2,8 ---- # depcomp - compile a program generating dependencies as side-effects ! scriptversion=2005-02-09.22 ! # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify *************** *** 51,59 **** Report bugs to <bug...@gn...>. EOF ! exit 0 ;; -v | --v*) echo "depcomp $scriptversion" ! exit 0 ;; esac --- 51,59 ---- Report bugs to <bug...@gn...>. EOF ! exit $? ;; -v | --v*) echo "depcomp $scriptversion" ! exit $? ;; esac *************** *** 288,304 **** if test "$libtool" = yes; then ! # Dependencies are output in .lo.d with libtool 1.4. ! # With libtool 1.5 they are output both in $dir.libs/$base.o.d ! # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the ! # latter, because the former will be cleaned when $dir.libs is ! # erased. ! tmpdepfile1="$dir.libs/$base.lo.d" ! tmpdepfile2="$dir$base.o.d" ! tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else ! tmpdepfile1="$dir$base.o.d" ! tmpdepfile2="$dir$base.d" ! tmpdepfile3="$dir$base.d" "$@" -MD fi --- 288,314 ---- if test "$libtool" = yes; then ! # With Tru64 cc, shared objects can also be used to make a ! # static library. This mecanism is used in libtool 1.4 series to ! # handle both shared and static libraries in a single compilation. ! # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. ! # ! # With libtool 1.5 this exception was removed, and libtool now ! # generates 2 separate objects for the 2 libraries. These two ! # compilations output dependencies in in $dir.libs/$base.o.d and ! # in $dir$base.o.d. We have to check for both files, because ! # one of the two compilations can be disabled. We should prefer ! # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ! # automatically cleaned when .libs/ is deleted, while ignoring ! # the former would cause a distcleancheck panic. ! tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 ! tmpdepfile2=$dir$base.o.d # libtool 1.5 ! tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 ! tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 "$@" -Wc,-MD else ! tmpdepfile1=$dir$base.o.d ! tmpdepfile2=$dir$base.d ! tmpdepfile3=$dir$base.d ! tmpdepfile4=$dir$base.d "$@" -MD fi *************** *** 307,321 **** if test $stat -eq 0; then : else ! rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi ! if test -f "$tmpdepfile1"; then ! tmpdepfile="$tmpdepfile1" ! elif test -f "$tmpdepfile2"; then ! tmpdepfile="$tmpdepfile2" ! else ! tmpdepfile="$tmpdepfile3" ! fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" --- 317,328 ---- if test $stat -eq 0; then : else ! rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" exit $stat fi ! for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ! do ! test -f "$tmpdepfile" && break ! done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" Index: install-sh =================================================================== RCS file: /cvsroot/nxqd/nxqd/server/config/install-sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install-sh 20 Jul 2005 05:24:30 -0000 1.1 --- install-sh 17 Jan 2006 16:59:32 -0000 1.2 *************** *** 2,6 **** # install - install a program, script, or datafile ! scriptversion=2004-09-10.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was --- 2,6 ---- # install - install a program, script, or datafile ! scriptversion=2005-02-02.21 # This originates from X11R5 (mit/util/scripts/install.sh), which was *************** *** 110,114 **** continue;; ! --help) echo "$usage"; exit 0;; -m) chmodcmd="$chmodprog $2" --- 110,114 ---- continue;; ! --help) echo "$usage"; exit $?;; -m) chmodcmd="$chmodprog $2" *************** *** 135,139 **** continue;; ! --version) echo "$0 $scriptversion"; exit 0;; *) # When -d is used, all remaining arguments are directories to create. --- 135,139 ---- continue;; ! --version) echo "$0 $scriptversion"; exit $?;; *) # When -d is used, all remaining arguments are directories to create. *************** *** 214,218 **** # This sed command emulates the dirname command. ! dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. --- 214,218 ---- # This sed command emulates the dirname command. ! dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` # Make sure that the destination directory exists. *************** *** 227,231 **** # Some sh's can't handle IFS=/ for some reason. IFS='%' ! set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` IFS=$oIFS --- 227,232 ---- # Some sh's can't handle IFS=/ for some reason. IFS='%' ! set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ! shift IFS=$oIFS *************** *** 296,300 **** || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ! (exit 1); exit } else --- 297,301 ---- || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ! (exit 1); exit 1 } else *************** *** 307,316 **** } } ! fi || { (exit 1); exit; } done # The final little trick to "correctly" pass the exit status to the exit trap. { ! (exit 0); exit } --- 308,317 ---- } } ! fi || { (exit 1); exit 1; } done # The final little trick to "correctly" pass the exit status to the exit trap. { ! (exit 0); exit 0 } |
1 message has been excluded from this view by a project administrator.