[Javanetsim-cvs] IceScan Makefile.am, 1.2, 1.3 TODO, 1.16, 1.17 configure.ac, 1.1, 1.2 configure, 1
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] IceScan Makefile.am, 1.2, 1.3 TODO, 1.16, 1.17 configure.ac, 1.1, 1.2 configure, 1.1, 1.2 icedbs.h, 1.8, 1.9 Makefile.in, 1.2, 1.3 config.status, 1.1, 1.2
|
From: Alexander B. <da...@us...> - 2006-12-21 13:59:58
|
Update of /cvsroot/javanetsim/IceScan In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7653 Modified Files: Makefile.am TODO configure.ac configure icedbs.h Makefile.in config.status Log Message: no message Index: configure =================================================================== RCS file: /cvsroot/javanetsim/IceScan/configure,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure 21 Dec 2006 13:11:46 -0000 1.1 --- configure 21 Dec 2006 13:59:50 -0000 1.2 *************** *** 1338,1342 **** cat >>confdefs.h <<\_ACEOF ! #define ICESCAN_DATE "21 December 2006" _ACEOF --- 1338,1342 ---- cat >>confdefs.h <<\_ACEOF ! #define ICESCAN_DATE '21 December 2006" _ACEOF *************** *** 1347,1350 **** --- 1347,1351 ---- + am__api_version="1.9" ac_aux_dir= Index: icedbs.h =================================================================== RCS file: /cvsroot/javanetsim/IceScan/icedbs.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** icedbs.h 19 Dec 2006 21:09:04 -0000 1.8 --- icedbs.h 21 Dec 2006 13:59:50 -0000 1.9 *************** *** 2,9 **** #define ICEDBS_H ! #include <iostream> ! #include <fstream> ! #include <map> ! #include <string> class ice_service_name_database{ --- 2,6 ---- #define ICEDBS_H ! #include "icesockets/sock_files.h" class ice_service_name_database{ *************** *** 17,21 **** std::ifstream in; ! in.open(db_fname); if(!in){ --- 14,18 ---- std::ifstream in; ! in.open(find_icefile_path(db_fname).c_str()); if(!in){ *************** *** 40,44 **** if(v.size()<4){ - //DBGOUTPUT(tmpbuf); continue; } --- 37,40 ---- *************** *** 77,81 **** std::ifstream in; ! in.open(db_fname); if(!in){ --- 73,77 ---- std::ifstream in; ! in.open(find_icefile_path(db_fname).c_str()); if(!in){ Index: config.status =================================================================== RCS file: /cvsroot/javanetsim/IceScan/config.status,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.status 21 Dec 2006 13:11:46 -0000 1.1 --- config.status 21 Dec 2006 13:59:50 -0000 1.2 *************** *** 854,858 **** ${ac_dA}ICESCAN_VERSION${ac_dB}ICESCAN_VERSION${ac_dC}"0.0.6"${ac_dD} ${ac_dA}ICESCAN_NAME${ac_dB}ICESCAN_NAME${ac_dC}icescan${ac_dD} ! ${ac_dA}ICESCAN_DATE${ac_dB}ICESCAN_DATE${ac_dC}"21 December 2006"${ac_dD} ${ac_dA}ICESCAN_WEBSITE${ac_dB}ICESCAN_WEBSITE${ac_dC}"http://javanetsim.cvs.sourceforge.net/javanetsim/IceScan/"${ac_dD} ${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"icescan"${ac_dD} --- 854,858 ---- ${ac_dA}ICESCAN_VERSION${ac_dB}ICESCAN_VERSION${ac_dC}"0.0.6"${ac_dD} ${ac_dA}ICESCAN_NAME${ac_dB}ICESCAN_NAME${ac_dC}icescan${ac_dD} ! ${ac_dA}ICESCAN_DATE${ac_dB}ICESCAN_DATE${ac_dC}'21 December 2006"${ac_dD} ${ac_dA}ICESCAN_WEBSITE${ac_dB}ICESCAN_WEBSITE${ac_dC}"http://javanetsim.cvs.sourceforge.net/javanetsim/IceScan/"${ac_dD} ${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"icescan"${ac_dD} *************** *** 940,944 **** ${ac_uA}ICESCAN_VERSION${ac_uB}ICESCAN_VERSION${ac_uC}"0.0.6"${ac_uD} ${ac_uA}ICESCAN_NAME${ac_uB}ICESCAN_NAME${ac_uC}icescan${ac_uD} ! ${ac_uA}ICESCAN_DATE${ac_uB}ICESCAN_DATE${ac_uC}"21 December 2006"${ac_uD} ${ac_uA}ICESCAN_WEBSITE${ac_uB}ICESCAN_WEBSITE${ac_uC}"http://javanetsim.cvs.sourceforge.net/javanetsim/IceScan/"${ac_uD} ${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"icescan"${ac_uD} --- 940,944 ---- ${ac_uA}ICESCAN_VERSION${ac_uB}ICESCAN_VERSION${ac_uC}"0.0.6"${ac_uD} ${ac_uA}ICESCAN_NAME${ac_uB}ICESCAN_NAME${ac_uC}icescan${ac_uD} ! ${ac_uA}ICESCAN_DATE${ac_uB}ICESCAN_DATE${ac_uC}'21 December 2006"${ac_uD} ${ac_uA}ICESCAN_WEBSITE${ac_uB}ICESCAN_WEBSITE${ac_uC}"http://javanetsim.cvs.sourceforge.net/javanetsim/IceScan/"${ac_uD} ${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"icescan"${ac_uD} Index: Makefile.in =================================================================== RCS file: /cvsroot/javanetsim/IceScan/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 21 Dec 2006 13:17:57 -0000 1.2 --- Makefile.in 21 Dec 2006 13:59:50 -0000 1.3 *************** *** 105,109 **** CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ ! CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ --- 105,109 ---- CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ ! CXXFLAGS = -DICESCAN_DATADIR=\"$(icescandir)\" CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ *************** *** 178,182 **** icescan_SOURCES = icescan.cc icescan_DATA = services ieee-oui.txt README INSTALL COPYING AUTHORS ChangeLog INSTALL.conf - @DEFS@ = -DICESCAN_DATADIR=$(icescandir) @DEFS@ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am --- 178,181 ---- Index: configure.ac =================================================================== RCS file: /cvsroot/javanetsim/IceScan/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure.ac 21 Dec 2006 13:11:46 -0000 1.1 --- configure.ac 21 Dec 2006 13:59:50 -0000 1.2 *************** *** 7,13 **** AC_DEFINE(ICESCAN_VERSION, AC_PACKAGE_VERSION, [version]) AC_DEFINE(ICESCAN_NAME, AC_PACKAGE_NAME, [name]) ! AC_DEFINE(ICESCAN_DATE, "21 December 2006", [releasedate]) AC_DEFINE(ICESCAN_WEBSITE, "http://javanetsim.cvs.sourceforge.net/javanetsim/IceScan/", [website]) AM_INIT_AUTOMAKE([1.9 foreign]) --- 7,14 ---- AC_DEFINE(ICESCAN_VERSION, AC_PACKAGE_VERSION, [version]) AC_DEFINE(ICESCAN_NAME, AC_PACKAGE_NAME, [name]) ! AC_DEFINE(ICESCAN_DATE, '21 December 2006", [releasedate]) AC_DEFINE(ICESCAN_WEBSITE, "http://javanetsim.cvs.sourceforge.net/javanetsim/IceScan/", [website]) + AM_INIT_AUTOMAKE([1.9 foreign]) Index: Makefile.am =================================================================== RCS file: /cvsroot/javanetsim/IceScan/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 21 Dec 2006 13:17:57 -0000 1.2 --- Makefile.am 21 Dec 2006 13:59:50 -0000 1.3 *************** *** 3,6 **** icescan_SOURCES = icescan.cc icescan_DATA = services ieee-oui.txt README INSTALL COPYING AUTHORS ChangeLog INSTALL.conf ! @DEFS@ = -DICESCAN_DATADIR=$(icescandir) @DEFS@ --- 3,6 ---- icescan_SOURCES = icescan.cc icescan_DATA = services ieee-oui.txt README INSTALL COPYING AUTHORS ChangeLog INSTALL.conf ! CXXFLAGS=-DICESCAN_DATADIR=\"$(icescandir)\" Index: TODO =================================================================== RCS file: /cvsroot/javanetsim/IceScan/TODO,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** TODO 19 Dec 2006 21:09:04 -0000 1.16 --- TODO 21 Dec 2006 13:59:50 -0000 1.17 *************** *** 6,9 **** --- 6,10 ---- + add multiple targets handling; + + --data-dir option for directory handling the databases -- Discovering -- |
