[Planeshift-cvs] CVS: planeshift/src/common/util Jamfile,NONE,1.1 log.h,1.4,1.5

[Matze B. <mat...@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/util
In directory sc8-pr-cvs1:/tmp/cvs-serv17643/src/common/util

Modified Files:
	log.h 
Added Files:
	Jamfile 
Log Message:
Added a jam based build system. The old system is now deprecetad and should
be romeved soon (it's still there for now).

If you want to return to the old build type:
 ./autgen.sh automake

For the new jam build there's 1 little problem: jam 2.4 contains a bug which
makes it fail if 2 files in the project have the same name. This bug will be
fixed in jam 2.5 until this is released you can grab psjam-2.5rc1.
Installation works like hits:

wget http://planeshift.sourceforge.net/psjam-2.5rc1.tar.gz

tar -xzvf psjam-2.5rc1.tar.gz
cd psjam-2.5rc1
make
su 			# type root password
./jam0 install
exit




--- NEW FILE: Jamfile ---
SubDir TOP src common util ;

DontInstall psutil ;
Library psutil :
	[ FWildcard *.cpp *.h ]
;


Index: log.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/util/log.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** log.h	11 Feb 2003 17:25:04 -0000	1.4
--- log.h	3 Mar 2003 23:09:19 -0000	1.5
***************
*** 94,132 ****
  
  #define Error1(a) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a)
  #define Error2(a,b) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b)
  #define Error3(a,b,c) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b, c)
  #define Error4(a,b,c,d) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b, c, d)
  #define Error5(a,b,c,d,e) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b, c, d, e)
  #define Error6(a,b,c,d,e,f) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b, c, d, e, f)
  
  #define Bug1(a) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_BUG, a)
  #define Bug2(a,b) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__ ,\
      CS_REPORTER_SEVERITY_BUG, a, b)
  #define Bug3(a,b,c) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_BUG, a, b, c)
  #define Bug4(a,b,c,d) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_BUG, a, b, c, d)
  #define Bug5(a,b,c,d,e) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__ \
      CS_REPORTER_SEVERITY_BUG, a, b, c, d, e),
  #define Bug6(a,b,c,d,e,f) \
!     pslog::LogMessage (__FILE__, __LINE__, __PRETTY_FUNCTION__, \
      CS_REPORTER_SEVERITY_BUG, a, b, c, d, e, f)
        
--- 94,132 ----
  
  #define Error1(a) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a)
  #define Error2(a,b) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b)
  #define Error3(a,b,c) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b, c)
  #define Error4(a,b,c,d) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b, c, d)
  #define Error5(a,b,c,d,e) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b, c, d, e)
  #define Error6(a,b,c,d,e,f) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_ERROR, a, b, c, d, e, f)
  
  #define Bug1(a) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_BUG, a)
  #define Bug2(a,b) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION ,\
      CS_REPORTER_SEVERITY_BUG, a, b)
  #define Bug3(a,b,c) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_BUG, a, b, c)
  #define Bug4(a,b,c,d) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_BUG, a, b, c, d)
  #define Bug5(a,b,c,d,e) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION \
      CS_REPORTER_SEVERITY_BUG, a, b, c, d, e),
  #define Bug6(a,b,c,d,e,f) \
!     pslog::LogMessage (__FILE__, __LINE__, __FUNCTION__, \
      CS_REPORTER_SEVERITY_BUG, a, b, c, d, e, f)