complement-svn Mailing List for Complement (Page 18)
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
complement-svn — Complement project SVN notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(61) |
Nov
(76) |
Dec
(39) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(33) |
Feb
(41) |
Mar
(16) |
Apr
|
May
(22) |
Jun
(14) |
Jul
(64) |
Aug
(60) |
Sep
(35) |
Oct
(34) |
Nov
(10) |
Dec
(5) |
| 2008 |
Jan
(4) |
Feb
(24) |
Mar
(10) |
Apr
(30) |
May
(15) |
Jun
(50) |
Jul
(20) |
Aug
(7) |
Sep
(8) |
Oct
(10) |
Nov
|
Dec
|
|
From: <com...@us...> - 2007-03-12 18:25:17
|
Revision: 1553
http://svn.sourceforge.net/complement/?rev=1553&view=rev
Author: complement
Date: 2007-03-12 11:25:09 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
remove code for Novell NetWare; libxmt 1.10.3
Modified Paths:
--------------
trunk/complement/explore/include/config/feature.h
trunk/complement/explore/include/mt/xmt.h
trunk/complement/explore/lib/mt/ChangeLog
trunk/complement/explore/lib/mt/Makefile.inc
trunk/complement/explore/lib/mt/xmt.cc
Removed Paths:
-------------
trunk/complement/explore/include/config/_mwccnlm.h
trunk/complement/explore/include/config/_netware.h
Deleted: trunk/complement/explore/include/config/_mwccnlm.h
===================================================================
--- trunk/complement/explore/include/config/_mwccnlm.h 2007-03-09 17:48:37 UTC (rev 1552)
+++ trunk/complement/explore/include/config/_mwccnlm.h 2007-03-12 18:25:09 UTC (rev 1553)
@@ -1,27 +0,0 @@
-// -*- C++ -*- Time-stamp: <05/06/29 19:01:14 ptr>
-
-/*
- *
- * Copyright (c) 2003
- * Petr Ovchenkov
- *
- * Licensed under the Academic Free License Version 1.0
- *
- * This material is provided "as is", with absolutely no warranty expressed
- * or implied. Any use is at your own risk.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.
- *
- */
-
-#ifndef __config__mwccnlm_h
-#define __config__mwccnlm_h
-
-#ident "@(#)$Id$"
-
-
-#endif // __config__mwccnlm_h
Deleted: trunk/complement/explore/include/config/_netware.h
===================================================================
--- trunk/complement/explore/include/config/_netware.h 2007-03-09 17:48:37 UTC (rev 1552)
+++ trunk/complement/explore/include/config/_netware.h 2007-03-12 18:25:09 UTC (rev 1553)
@@ -1,30 +0,0 @@
-// -*- C++ -*- Time-stamp: <05/06/29 19:29:34 ptr>
-
-/*
- *
- * Copyright (c) 2005
- * Petr Ovtchenkov
- *
- * Licensed under the Academic Free License Version 2.1
- *
- * This material is provided "as is", with absolutely no warranty expressed
- * or implied. Any use is at your own risk.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.
- *
- */
-
-#ifndef __config__netware_h
-#define __config__netware_h
-
-#ident "@(#)$Id$"
-
-#define __FIT_NETWARE // mark target: Novell Netware
-#define __FIT_NOVELL_THREADS
-#define _LITTLE_ENDIAN // Novell NetWare run only on Intel
-
-#endif // __config__netware_h
Modified: trunk/complement/explore/include/config/feature.h
===================================================================
--- trunk/complement/explore/include/config/feature.h 2007-03-09 17:48:37 UTC (rev 1552)
+++ trunk/complement/explore/include/config/feature.h 2007-03-12 18:25:09 UTC (rev 1553)
@@ -1,23 +1,14 @@
-/* Time-stamp: <05/12/12 10:47:17 ptr> */
+/* Time-stamp: <07/03/12 20:17:03 ptr> */
/*
- * Copyright (c) 1999, 2002, 2003, 2004, 2005
+ * Copyright (c) 1999, 2002-2007
* Petr Ovtchenkov
*
* Portion Copyright (c) 1999-2001
* Parallel Graphics Ltd.
*
- * Licensed under the Academic Free License Version 2.1
+ * Licensed under the Academic Free License Version 3.0
*
- * This material is provided "as is", with absolutely no warranty expressed
- * or implied. Any use is at your own risk.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.
- *
*/
#ifndef __config_feature_h
@@ -76,13 +67,6 @@
#include <config/_windows.h>
#endif
-#ifdef N_PLAT_NLM
-# include <config/_netware.h>
-# ifdef __MWERKS__
-# include <config/_mwccnlm.h>
-# endif
-#endif
-
#ifdef __FIT_USE_DECLSPEC /* using export/import technique */
# ifdef __FIT_DLL
# define __FIT_DECLSPEC __declspec( dllexport )
Modified: trunk/complement/explore/include/mt/xmt.h
===================================================================
--- trunk/complement/explore/include/mt/xmt.h 2007-03-09 17:48:37 UTC (rev 1552)
+++ trunk/complement/explore/include/mt/xmt.h 2007-03-12 18:25:09 UTC (rev 1553)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/02/02 21:32:58 ptr>
+// -*- C++ -*- Time-stamp: <07/03/12 20:09:11 ptr>
/*
* Copyright (c) 1997-1999, 2002-2007
@@ -50,16 +50,6 @@
// # define __DLLEXPORT
#endif // __unix
-#ifdef __FIT_NOVELL_THREADS // Novell NetWare
-# if defined( _REENTRANT ) && !defined(_NOTHREADS)
-# include <nwthread.h>
-# include <nwsemaph.h>
-# include <nwproc.h>
-# elif !defined(_NOTHREADS) // !_REENTRANT
-# define _NOTHREADS
-# endif
-#endif
-
#include <cerrno>
#include <mt/time.h>
@@ -234,9 +224,6 @@
#ifdef __FIT_WIN32THREADS
InitializeCriticalSection( &_M_lock );
#endif
-#ifdef __FIT_NOVELL_THREADS
- _M_lock = OpenLocalSemaphore( 1 );
-#endif
}
~__mutex_base()
@@ -250,9 +237,6 @@
#ifdef WIN32
DeleteCriticalSection( &_M_lock );
#endif
-#ifdef __FIT_NOVELL_THREADS
- CloseLocalSemaphore( _M_lock );
-#endif
}
private:
@@ -269,12 +253,6 @@
#ifdef __FIT_WIN32THREADS
CRITICAL_SECTION _M_lock;
#endif
-#ifdef __FIT_NOVELL_THREADS
- // This is for ...LocalSemaphore() calls
- // Alternative is EnterCritSec ... ExitCritSec; but ...CritSec in Novell
- // block all threads except current
- LONG _M_lock;
-#endif
#ifndef __FIT_WIN32THREADS
private:
@@ -340,9 +318,6 @@
#ifdef __FIT_WIN32THREADS
EnterCriticalSection( &this->_M_lock );
#endif
-#ifdef __FIT_NOVELL_THREADS
- WaitOnLocalSemaphore( this->_M_lock );
-#endif
}
#if !defined( WIN32 ) || (defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0400)
@@ -357,9 +332,6 @@
#ifdef __FIT_WIN32THREADS
return TryEnterCriticalSection( &this->_M_lock ) != 0 ? 0 : -1;
#endif
-#ifdef __FIT_NOVELL_THREADS
- return ExamineLocalSemaphore( this->_M_lock ) > 0 ? WaitOnLocalSemaphore( this->_M_lock ) : -1;
-#endif
#ifdef _NOTHREADS
return 0;
#endif
@@ -377,9 +349,6 @@
#ifdef __FIT_WIN32THREADS
LeaveCriticalSection( &this->_M_lock );
#endif
-#ifdef __FIT_NOVELL_THREADS
- SignalLocalSemaphore( this->_M_lock );
-#endif
}
private:
@@ -453,9 +422,6 @@
# ifdef __FIT_UITHREADS
thread_t _c_id = thr_self();
# endif
-# ifdef __FIT_NOVELL_THREADS
- int _c_id = GetThreadID();
-# endif
if ( _c_id == _id ) {
++_count;
return;
@@ -479,9 +445,6 @@
# ifdef __FIT_UITHREADS
thread_t _c_id = thr_self();
# endif
-# ifdef __FIT_NOVELL_THREADS
- int _c_id = GetThreadID();
-# endif
if ( _c_id == _id ) {
++_count;
return 0;
@@ -522,9 +485,6 @@
# ifdef __FIT_UITHREADS
thread_t _id;
# endif
-# ifdef __FIT_NOVELL_THREADS
- int _id;
-# endif
};
#endif // __FIT_PTHREAD_SPINLOCK
@@ -536,7 +496,7 @@
// (or XSI---X/Open System Interfaces Extention) has recursive mutex option.
// Another specialization?
-#if (defined(__unix) && !defined(__FIT_XSI_THR)) || defined(__FIT_NOVELL_THREADS)
+#if (defined(__unix) && !defined(__FIT_XSI_THR))
// This specialization need for old POSIX and DCE threads,
// before XSI (X/Open System Interfaces Extention) or Unix 98.
@@ -557,9 +517,6 @@
# ifdef _PTHREADS
_id( __STATIC_CAST(pthread_t,-1) )
# endif
-# ifdef __FIT_NOVELL_THREADS
- _id( -1 )
-# endif
{ }
~__Mutex()
@@ -574,9 +531,6 @@
# ifdef __FIT_UITHREADS
thread_t _c_id = thr_self();
# endif
-# ifdef __FIT_NOVELL_THREADS
- int _c_id = GetThreadID();
-# endif
if ( _c_id == _id ) {
++_count;
return;
@@ -587,9 +541,6 @@
# ifdef __FIT_UITHREADS
mutex_lock( &_M_lock );
# endif
-# ifdef __FIT_NOVELL_THREADS
- WaitOnLocalSemaphore( this->_M_lock );
-# endif
_id = _c_id;
_count = 0;
# endif // !_NOTHREADS
@@ -613,9 +564,6 @@
# ifdef __FIT_UITHREADS
thread_t _c_id = thr_self();
# endif
-# ifdef __FIT_NOVELL_THREADS
- int _c_id = GetThreadID();
-# endif
if ( _c_id == _id ) {
++_count;
return 0;
@@ -626,9 +574,6 @@
# ifdef __FIT_UITHREADS
int res = mutex_trylock( &_M_lock );
# endif
-# ifdef __FIT_NOVELL_THREADS
- int res = ExamineLocalSemaphore( this->_M_lock ) > 0 ? WaitOnLocalSemaphore( this->_M_lock ) : -1;
-# endif
if ( res != 0 ) {
return res;
}
@@ -652,10 +597,6 @@
_id = __STATIC_CAST(pthread_t,-1);
pthread_mutex_unlock( &_M_lock );
# endif
-# ifdef __FIT_NOVELL_THREADS
- _id = -1;
- SignalLocalSemaphore( this->_M_lock );
-# endif
# endif // !_NOTHREADS
}
}
@@ -675,9 +616,6 @@
# ifdef __FIT_UITHREADS
thread_t _id;
# endif
-# ifdef __FIT_NOVELL_THREADS
- int _id;
-# endif
};
#endif // __unix && !__FIT_XSI_THR
@@ -719,10 +657,6 @@
#error Fix me!
InitializeCriticalSection( &_M_lock );
#endif
-#ifdef __FIT_NOVELL_THREADS
-#error Fix me!
- _M_lock = OpenLocalSemaphore( 1 );
-#endif
}
~__mutex_rw_base()
@@ -738,10 +672,6 @@
#error Fix me!
DeleteCriticalSection( &_M_lock );
#endif
-#ifdef __FIT_NOVELL_THREADS
-#error Fix me!
- CloseLocalSemaphore( _M_lock );
-#endif
}
private:
@@ -760,13 +690,6 @@
#error Fix me!
CRITICAL_SECTION _M_lock;
#endif
-#ifdef __FIT_NOVELL_THREADS
- // This is for ...LocalSemaphore() calls
- // Alternative is EnterCritSec ... ExitCritSec; but ...CritSec in Novell
- // block all threads except current
-#error Fix me!
- LONG _M_lock;
-#endif
};
template <bool SCOPE>
@@ -793,10 +716,6 @@
#error Fix me!
EnterCriticalSection( &this->_M_lock );
#endif
-#ifdef __FIT_NOVELL_THREADS
-#error Fix me!
- WaitOnLocalSemaphore( this->_M_lock );
-#endif
}
void wrlock()
@@ -812,10 +731,6 @@
#error Fix me!
EnterCriticalSection( &this->_M_lock );
#endif
-#ifdef __FIT_NOVELL_THREADS
-#error Fix me!
- WaitOnLocalSemaphore( this->_M_lock );
-#endif
}
#if !defined( WIN32 ) || (defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0400)
@@ -832,10 +747,6 @@
#error Fix me!
return TryEnterCriticalSection( &this->_M_lock ) != 0 ? 0 : -1;
#endif
-#ifdef __FIT_NOVELL_THREADS
-#error Fix me!
- return ExamineLocalSemaphore( this->_M_lock ) > 0 ? WaitOnLocalSemaphore( this->_M_lock ) : -1;
-#endif
#ifdef _NOTHREADS
#error Fix me!
return 0;
@@ -855,10 +766,6 @@
#error Fix me!
return TryEnterCriticalSection( &this->_M_lock ) != 0 ? 0 : -1;
#endif
-#ifdef __FIT_NOVELL_THREADS
-#error Fix me!
- return ExamineLocalSemaphore( this->_M_lock ) > 0 ? WaitOnLocalSemaphore( this->_M_lock ) : -1;
-#endif
#ifdef _NOTHREADS
#error Fix me!
return 0;
@@ -880,10 +787,6 @@
#error Fix me!
LeaveCriticalSection( &this->_M_lock );
#endif
-#ifdef __FIT_NOVELL_THREADS
-#error Fix me!
- SignalLocalSemaphore( this->_M_lock );
-#endif
}
private:
@@ -978,9 +881,6 @@
#ifdef __FIT_WIN32THREADS
explicit LockerExt( const CRITICAL_SECTION& m ) :
#endif
-#ifdef __FIT_NOVELL_THREADS
- explicit LockerExt( const LONG& m ) :
-#endif
_M_lock( m )
{
#ifdef _PTHREADS
@@ -992,9 +892,6 @@
#ifdef __FIT_WIN32THREADS
EnterCriticalSection( const_cast<CRITICAL_SECTION *>(&_M_lock) );
#endif
-#ifdef __FIT_NOVELL_THREADS
- WaitOnLocalSemaphore( const_cast<LONG&>(_M_lock) );
-#endif
}
~LockerExt()
@@ -1008,9 +905,6 @@
#ifdef __FIT_WIN32THREADS
LeaveCriticalSection( const_cast<CRITICAL_SECTION *>(&_M_lock) );
#endif
-#ifdef __FIT_NOVELL_THREADS
- SignalLocalSemaphore( const_cast<LONG&>(_M_lock) );
-#endif
}
private:
@@ -1026,13 +920,6 @@
#ifdef __FIT_WIN32THREADS
const CRITICAL_SECTION& _M_lock;
#endif
-#ifdef __FIT_NOVELL_THREADS
- // This is for ...LocalSemaphore() calls
- // Alternative is EnterCritSec ... ExitCritSec; but ...CritSec in Novell
- // block all threads except current
- const LONG& _M_lock;
-#endif
-
};
template <bool SCOPE>
@@ -1059,9 +946,6 @@
#ifdef __FIT_UITHREADS
cond_init( &_cond, 0, 0 );
#endif
-#ifdef __FIT_NOVELL_THREADS
- _cond = OpenLocalSemaphore( 0 );
-#endif
}
~__Condition()
@@ -1075,9 +959,6 @@
#ifdef __FIT_UITHREADS
cond_destroy( &_cond );
#endif
-#ifdef __FIT_NOVELL_THREADS
- CloseLocalSemaphore( _cond );
-#endif
}
bool set( bool __v, bool _broadcast = false )
@@ -1111,16 +992,6 @@
}
}
#endif
-#ifdef __FIT_NOVELL_THREADS
- if ( __v == true && tmp == false ) {
- if ( _broadcast ) {
- // Unimplemented
- // pthread_cond_broadcast( &_cond );
- } else {
- SignalLocalSemaphore( _cond );
- }
- }
-#endif
return tmp;
}
@@ -1129,7 +1000,7 @@
int try_wait()
{
-#if defined(__FIT_WIN32THREADS) || defined(__FIT_NOVELL_THREADS)
+#if defined(__FIT_WIN32THREADS)
_lock.lock();
#endif
#if defined(__FIT_UITHREADS) || defined(_PTHREADS)
@@ -1143,10 +1014,6 @@
}
return 0;
#endif
-#ifdef __FIT_NOVELL_THREADS
- _lock.unlock();
- return WaitOnLocalSemaphore( _cond );
-#endif
#if defined(__FIT_UITHREADS) || defined(_PTHREADS)
int ret = 0;
while ( !_val ) {
@@ -1161,7 +1028,7 @@
return ret;
#endif
}
-#if defined(__FIT_WIN32THREADS) || defined(__FIT_NOVELL_THREADS)
+#if defined(__FIT_WIN32THREADS)
_lock.unlock();
#endif
return 0;
@@ -1195,12 +1062,6 @@
return ret;
#endif
-#ifdef __FIT_NOVELL_THREADS
- _lock.lock();
- _val = false;
- _lock.unlock();
- return WaitOnLocalSemaphore( _cond );
-#endif
#ifdef _NOTHREADS
return 0;
#endif
@@ -1236,9 +1097,6 @@
#ifdef __FIT_UITHREADS
return _broadcast ? cond_broadcast( &_cond ) : cond_signal( &_cond );
#endif
-#ifdef __FIT_NOVELL_THREADS
- return SignalLocalSemaphore( _cond );
-#endif
#ifdef _NOTHREADS
return 0;
#endif
@@ -1254,9 +1112,6 @@
#ifdef __FIT_UITHREADS
cond_t _cond;
#endif
-#ifdef __FIT_NOVELL_THREADS
- LONG _cond;
-#endif
__Mutex<false,SCOPE> _lock;
bool _val;
@@ -1283,9 +1138,6 @@
#ifdef _PTHREADS
sem_init( &_sem, SCOPE ? 1 : 0, cnt );
#endif
-#ifdef __FIT_NOVELL_THREADS
- _sem = OpenLocalSemaphore( cnt );
-#endif
}
~__Semaphore()
@@ -1299,9 +1151,6 @@
#ifdef _PTHREADS
sem_destroy( &_sem );
#endif
-#ifdef __FIT_NOVELL_THREADS
- CloseLocalSemaphore( _sem );
-#endif
}
int wait()
@@ -1320,9 +1169,6 @@
#ifdef _PTHREADS
return sem_wait( &_sem );
#endif
-#ifdef __FIT_NOVELL_THREADS
- return WaitOnLocalSemaphore( _sem );
-#endif
}
__FIT_DECLSPEC int wait_time( const ::timespec *t ); // wait for time t, or signal
@@ -1343,9 +1189,6 @@
#ifdef _PTHREADS
return sem_trywait( &_sem );
#endif
-#ifdef __FIT_NOVELL_THREADS
- return ExamineLocalSemaphore( _sem ) > 0 ? WaitOnLocalSemaphore( _sem ) : -1;
-#endif
}
int post()
@@ -1359,9 +1202,6 @@
#ifdef _PTHREADS
return sem_post( &_sem );
#endif
-#ifdef __FIT_NOVELL_THREADS
- return SignalLocalSemaphore( _sem );
-#endif
}
int value()
@@ -1378,9 +1218,6 @@
return e == 0 ? v : -1;
#endif
-#ifdef __FIT_NOVELL_THREADS
- return ExamineLocalSemaphore( _sem );
-#endif
}
protected:
@@ -1394,9 +1231,6 @@
#ifdef _PTHREADS
sem_t _sem;
#endif
-#ifdef __FIT_NOVELL_THREADS
- LONG _sem;
-#endif
private:
__Semaphore( const __Semaphore& )
{ }
@@ -1428,13 +1262,6 @@
return -1; // not implemented
# endif
#endif
-#ifdef __FIT_NOVELL_THREADS
- time_t ct = time( 0 );
- time_t _conv = abstime->tv_sec * 1000 + abstime->tv_nsec / 1000000;
-
- unsigned ms = _conv >= ct ? _conv - ct : 1;
- return TimedWaitOnLocalSemaphore( _sem, ms );
-#endif
}
template <bool SCOPE>
@@ -1461,10 +1288,6 @@
return -1; // not implemented
# endif
#endif
-#ifdef __FIT_NOVELL_THREADS
- unsigned ms = interval->tv_sec * 1000 + interval->tv_nsec / 1000000;
- return TimedWaitOnLocalSemaphore( _sem, ms );
-#endif
}
template <bool SCOPE>
@@ -1534,10 +1357,6 @@
typedef thread_key_t thread_key_type;
typedef thread_t thread_id_type;
#endif
-#ifdef __FIT_NOVELL_THREADS
- typedef void * thread_key_type;
- typedef int thread_id_type;
-#endif
enum {
// thread mode flags
@@ -1562,13 +1381,6 @@
suspended = CREATE_SUSPENDED,
daemon = detached,
#endif
-#ifdef __FIT_NOVELL_THREADS
- bound = 0,
- detached = 0x2,
- new_lwp = 0,
- suspended = 0,
- daemon = detached,
-#endif
// state flags
goodbit = 0x00,
badbit = 0x01
@@ -1675,9 +1487,6 @@
#ifdef __FIT_WIN32THREADS
unsigned long _thr_id;
#endif
-#ifdef __FIT_NOVELL_THREADS
- __Condition<false> _thr_join;
-#endif
entrance_type _entrance;
void *_param;
size_t _param_sz;
@@ -1692,15 +1501,12 @@
#ifdef __FIT_WIN32THREADS
friend unsigned long __stdcall _xcall( void *p );
#endif
-#ifdef __FIT_NOVELL_THREADS
- friend void _xcall( void * );
-#endif
};
template <bool SCOPE>
int __Condition<SCOPE>::try_wait_time( const ::timespec *abstime )
{
-#if defined(__FIT_WIN32THREADS) || defined(__FIT_NOVELL_THREADS)
+#if defined(__FIT_WIN32THREADS)
MT_LOCK( _lock );
#endif
#if defined(__FIT_UITHREADS) || defined(_PTHREADS)
@@ -1743,17 +1549,11 @@
return ret;
#endif // _PTHREADS || __FIT_UITHREADS
-#ifdef __FIT_NOVELL_THREADS
- time_t ct = time( 0 );
- unsigned ms = abstime->tv_sec >= ct ? (abstime->tv_sec - ct) * 1000 + abstime->tv_nsec / 1000000 : 1;
- MT_UNLOCK( _lock );
- return TimedWaitOnLocalSemaphore( _cond, ms );
-#endif
#ifdef _NOTHREADS
return 0;
#endif
}
-#if defined(__FIT_WIN32THREADS) || defined(__FIT_NOVELL_THREADS)
+#if defined(__FIT_WIN32THREADS)
MT_UNLOCK( _lock );
#endif
return 0;
@@ -1762,7 +1562,7 @@
template <bool SCOPE>
int __Condition<SCOPE>::try_wait_delay( const ::timespec *interval )
{
-#if defined(__FIT_WIN32THREADS) || defined(__FIT_NOVELL_THREADS)
+#if defined(__FIT_WIN32THREADS)
MT_LOCK( _lock );
#endif
#if defined(__FIT_UITHREADS) || defined(_PTHREADS)
@@ -1809,17 +1609,13 @@
return ret;
#endif // _PTHREADS || __FIT_UITHREADS
-#ifdef __FIT_NOVELL_THREADS
- MT_UNLOCK( _lock );
- return TimedWaitOnLocalSemaphore( _cond, interval->tv_sec * 1000 + interval->tv_nsec / 1000000 );
-#endif
#ifdef _NOTHREADS
return 0;
#endif
}
-#if defined(__FIT_WIN32THREADS) || defined(__FIT_NOVELL_THREADS)
+#if defined(__FIT_WIN32THREADS)
MT_UNLOCK( _lock );
#endif
return 0;
@@ -1870,14 +1666,6 @@
return ret;
#endif
-#ifdef __FIT_NOVELL_THREADS
- MT_LOCK( _lock );
- _val = false;
- time_t ct = time( 0 );
- unsigned ms = abstime->tv_sec >= ct ? (abstime->tv_sec - ct) * 1000 + abstime->tv_nsec / 1000000 : 1;
- MT_UNLOCK( _lock );
- return TimedWaitOnLocalSemaphore( _cond, ms );
-#endif
#ifdef _NOTHREADS
return 0;
#endif
@@ -1909,13 +1697,6 @@
return this->wait_time( &ct );
#endif
-#ifdef __FIT_NOVELL_THREADS
- MT_LOCK( _lock );
- _val = false;
- unsigned ms = interval->tv_sec * 1000 + interval->tv_nsec / 1000000;
- MT_UNLOCK( _lock );
- return TimedWaitOnLocalSemaphore( _cond, ms );
-#endif
#ifdef _NOTHREADS
return 0;
#endif
Modified: trunk/complement/explore/lib/mt/ChangeLog
===================================================================
--- trunk/complement/explore/lib/mt/ChangeLog 2007-03-09 17:48:37 UTC (rev 1552)
+++ trunk/complement/explore/lib/mt/ChangeLog 2007-03-12 18:25:09 UTC (rev 1553)
@@ -1,3 +1,9 @@
+2007-03-12 Petr Ovtchenkov <pt...@is...>
+
+ * xmt.h, xmt.cc: code for Novell NetWare removed.
+
+ * libxmt: version 1.10.3
+
2007-02-08 Petr Ovtchenkov <pt...@is...>
* shm.h: process-shared barrier may be allocated in shared
Modified: trunk/complement/explore/lib/mt/Makefile.inc
===================================================================
--- trunk/complement/explore/lib/mt/Makefile.inc 2007-03-09 17:48:37 UTC (rev 1552)
+++ trunk/complement/explore/lib/mt/Makefile.inc 2007-03-12 18:25:09 UTC (rev 1553)
@@ -1,8 +1,8 @@
-# -*- Makefile -*- Time-stamp: <07/02/02 20:56:56 ptr>
+# -*- Makefile -*- Time-stamp: <07/03/12 20:14:01 ptr>
LIBNAME = xmt
MAJOR = 1
MINOR = 10
-PATCH = 2
+PATCH = 3
SRC_CC = xmt.cc thr_mgr.cc time.cc uid.cc shm.cc
SRC_C = fl.c
Modified: trunk/complement/explore/lib/mt/xmt.cc
===================================================================
--- trunk/complement/explore/lib/mt/xmt.cc 2007-03-09 17:48:37 UTC (rev 1552)
+++ trunk/complement/explore/lib/mt/xmt.cc 2007-03-12 18:25:09 UTC (rev 1553)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/02/02 21:34:56 ptr>
+// -*- C++ -*- Time-stamp: <07/03/12 20:14:35 ptr>
/*
* Copyright (c) 1997-1999, 2002-2007
@@ -32,10 +32,6 @@
#include <memory>
#include <functional>
#include <cerrno>
-#ifdef __FIT_NETWARE
-# include <nwerrno.h>
-# include <nwadv.h>
-#endif
#include <string>
#ifdef __linux
@@ -86,16 +82,11 @@
static pid_t _pid = syscall( SYS_getpid );
static pid_t _ppid = syscall( SYS_getppid );
-#ifdef __FIT_NOVELL_THREADS
-xmt::Thread::thread_key_type _mt_key = 0;
-#else // !__FIT_NOVELL_THREADS
xmt::Thread::thread_key_type _mt_key = __STATIC_CAST(xmt::Thread::thread_key_type,-1);
# ifndef __FIT_WIN32THREADS
void *_uw_save = 0;
# endif
-#endif // !__FIT_NOVELL_THREADS
-
#ifdef _PTHREADS
xmt::Mutex _F_lock;
# define _F_locklock xmt::detail::_F_lock.lock();
@@ -106,7 +97,7 @@
# error "Unimplemented"
#endif
-#if defined(__FIT_WIN32THREADS) || defined(__FIT_NOVELL_THREADS)
+#if defined(__FIT_WIN32THREADS)
# define _F_locklock
# define _F_lockunlock
#endif
@@ -244,10 +235,6 @@
# endif // !(__FreeBSD__ || __OpenBSD__)
#endif // __FIT_UITHREADS || _PTHREADS
-#ifdef __FIT_NOVELL_THREADS
-const Thread::thread_id_type Thread::bad_thread_id = EFAILURE;
-#endif // __FIT_NOVELL_THREADS
-
Thread::thread_key_type& Thread::_mt_key( detail::_mt_key );
__FIT_DECLSPEC
@@ -266,9 +253,6 @@
#ifdef __FIT_WIN32THREADS
_uw_alloc_type *user_words = static_cast<_uw_alloc_type *>(TlsGetValue( _mt_key ));
#endif
-#ifdef __FIT_NOVELL_THREADS
- _uw_alloc_type *user_words = *static_cast<_uw_alloc_type **>(GetThreadDataAreaPtr());
-#endif // __FIT_NOVELL_THREADS
alloc.deallocate( user_words, uw_alloc_size );
user_words = 0;
uw_alloc_size = 0;
@@ -300,9 +284,6 @@
#ifdef __FIT_WIN32THREADS
TlsSetValue( _mt_key, user_words );
#endif
-#ifdef __FIT_NOVELL_THREADS
- SaveThreadDataAreaPtr( user_words );
-#endif
} else {
#ifdef __FIT_UITHREADS
thr_getspecific( _mt_key, &(static_cast<void *>(user_words)) );
@@ -313,9 +294,6 @@
#ifdef __FIT_WIN32THREADS
user_words = static_cast<_uw_alloc_type *>(TlsGetValue( _mt_key ));
#endif
-#ifdef __FIT_NOVELL_THREADS
- user_words = *static_cast<_uw_alloc_type **>(GetThreadDataAreaPtr());
-#endif
if ( (__idx + 1) * sizeof( _uw_alloc_type ) > uw_alloc_size ) {
size_t tmp = sizeof( _uw_alloc_type ) * (__idx + 1);
#if !defined(_STLP_VERSION) && defined(_MSC_VER)
@@ -337,9 +315,6 @@
#ifdef __FIT_WIN32THREADS
TlsSetValue( _mt_key, user_words );
#endif
-#ifdef __FIT_NOVELL_THREADS
- *static_cast<_uw_alloc_type **>(GetThreadDataAreaPtr()) = user_words;
-#endif
}
}
@@ -403,8 +378,6 @@
return (_id != bad_thread_id) && (_id == pthread_self());
#elif defined(__FIT_UITHREADS)
return (_id != bad_thread_id) && (_id == thr_self());
-#elif defined(__FIT_NOVELL_THREADS)
- return (_id != bad_thread_id) && (_id == GetThreadID());
#elif defined(__FIT_WIN32THREADS)
return (_id != bad_thread_id) && (_id == GetCurrentThread());
#else
@@ -452,15 +425,6 @@
}
#endif // __FIT_UITHREADS || PTHREADS
-#ifdef __FIT_NOVELL_THREADS
- rt.iword = 0;
- if ( !_not_run() ) {
- _thr_join.wait();
- // Locker lk( _llock );
- _rip_id = bad_thread_id;
- }
-#endif // __FIT_NOVELL_THREADS
-
return rt;
}
@@ -487,9 +451,6 @@
#ifdef __FIT_UITHREADS
return thr_suspend( _id );
#endif
-#ifdef __FIT_NOVELL_THREADS
- return SuspendThread( _id );
-#endif
}
return -1;
@@ -518,9 +479,6 @@
#ifdef __FIT_UITHREADS
return thr_continue( _id );
#endif
-#ifdef __FIT_NOVELL_THREADS
- return ResumeThread( _id );
-#endif
}
return -1;
@@ -563,9 +521,6 @@
#ifdef __FIT_WIN32THREADS
ExitThread( code );
#endif
-#ifdef __FIT_NOVELL_THREADS
- ExitThread( EXIT_THREAD, code );
-#endif
}
#ifdef __FIT_UITHREADS
@@ -786,17 +741,6 @@
_rip_id = _id = CreateThread( 0, 0, _xcall, this, (_flags & suspended), &_thr_id );
err = GetLastError();
#endif
-#ifdef __FIT_NOVELL_THREADS
- _id = BeginThread( _xcall, 0, 65536, this );
- if ( _id == bad_thread_id ) {
- err = errno; // not ::errno, due to #define errno *__get_errno_ptr()
- if ( (_flags & detached) == 0 ) {
- _thr_join.signal();
- }
- } else {
- _rip_id = _id;
- }
-#endif
if ( err != 0 ) {
if ( psz > sizeof(void *) ) { // clear allocated here
@@ -957,11 +901,7 @@
#if defined( __SUNPRO_CC ) && defined( __i386 )
Thread::_exit( ret.iword );
#endif
-#ifdef __FIT_NOVELL_THREADS
- if ( (me->_flags & detached) == 0 ) {
- me->_thr_join.signal();
- }
-#endif // __FIT_NOVELL_THREADS || __FIT_WIN32THREADS
+
return ret.pword;
}
#ifdef _WIN32
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-09 17:48:39
|
Revision: 1552
http://svn.sourceforge.net/complement/?rev=1552&view=rev
Author: complement
Date: 2007-03-09 09:48:37 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
ups, test for problem found. invesigating
Modified Paths:
--------------
trunk/complement/explore/test/stem/unit_test.cc
Modified: trunk/complement/explore/test/stem/unit_test.cc
===================================================================
--- trunk/complement/explore/test/stem/unit_test.cc 2007-03-08 20:55:48 UTC (rev 1551)
+++ trunk/complement/explore/test/stem/unit_test.cc 2007-03-09 17:48:37 UTC (rev 1552)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/02/07 13:05:32 ptr>
+// -*- C++ -*- Time-stamp: <07/03/09 20:43:27 ptr>
/*
* Copyright (c) 2002, 2003, 2006
@@ -58,6 +58,8 @@
void echo_net();
void peer();
void boring_manager();
+ void net_echo();
+ void net_echo2();
static xmt::Thread::ret_code thr1( void * );
static xmt::Thread::ret_code thr1new( void * );
@@ -295,6 +297,7 @@
const char fname[] = "/tmp/stem_test.shm";
xmt::shm_alloc<0> seg;
xmt::allocator_shm<xmt::__Condition<true>,0> shm_cnd;
+xmt::allocator_shm<xmt::__Barrier<true>,0> shm_b;
void stem_test::shm_init()
{
@@ -635,6 +638,242 @@
shm_cnd.deallocate( &fcnd, 1 );
}
+// -----------------
+
+#define EV_STU_MESS 0x801
+#define EV_STU_ECHO 0x802
+
+class TestObj :
+ public stem::EventHandler
+{
+ public:
+ TestObj()
+ { }
+
+ void reset()
+ { cnd.set( false ); }
+
+ void wait()
+ { cnd.try_wait(); }
+
+ const std::string& msg() const
+ { return m; }
+
+ void mess( const stem::Event& );
+ void echo( const stem::Event& );
+
+ private:
+ xmt::Condition cnd;
+ std::string m;
+
+ DECLARE_RESPONSE_TABLE( TestObj, stem::EventHandler );
+};
+
+void TestObj::mess( const stem::Event& ev )
+{
+ // cerr << "hi!\n";
+ m = ev.value();
+ cnd.set( true );
+}
+
+void TestObj::echo( const stem::Event& ev )
+{
+ m = ev.value();
+ cnd.set( true );
+}
+
+DEFINE_RESPONSE_TABLE( TestObj )
+ EV_EDS( ST_NULL, EV_STU_MESS, mess )
+ EV_EDS( ST_NULL, EV_STU_ECHO, echo )
+END_RESPONSE_TABLE
+
+class EchoSrv :
+ public stem::EventHandler
+{
+ public:
+ EchoSrv();
+ EchoSrv( stem::addr_type id );
+ EchoSrv( stem::addr_type id, const char * );
+
+ void echo( const stem::Event& );
+
+ private:
+ DECLARE_RESPONSE_TABLE( EchoSrv, stem::EventHandler );
+};
+
+EchoSrv::EchoSrv()
+{
+}
+
+EchoSrv::EchoSrv( stem::addr_type id ) :
+ stem::EventHandler( id )
+{
+}
+
+EchoSrv::EchoSrv( stem::addr_type id, const char *info ) :
+ stem::EventHandler( id, info )
+{
+}
+
+// Unconditionally echo message
+
+void EchoSrv::echo( const stem::Event& ev )
+{
+ cerr << __FILE__ << ":" << __LINE__ << endl;
+ ev.dest( ev.src() );
+ Forward( ev );
+}
+
+DEFINE_RESPONSE_TABLE( EchoSrv )
+ EV_EDS( ST_NULL, EV_STU_ECHO, echo )
+END_RESPONSE_TABLE
+
+void stem_test::net_echo()
+{
+ try {
+ xmt::__Barrier<true>& b = *new ( shm_b.allocate( 1 ) ) xmt::__Barrier<true>();
+ xmt::__Condition<true>& c = *new ( shm_cnd.allocate( 1 ) ) xmt::__Condition<true>();
+
+ c.set( false );
+
+ try {
+ xmt::fork();
+
+ // server part
+ {
+ std::sockmgr_stream_MP<stem::NetTransport> srv( 6890 );
+ EchoSrv echosrv( 0, "Echo service");
+
+ BOOST_REQUIRE( srv.good() );
+ c.set( true ); // ok, server listen
+
+ b.wait(); // server may go away
+
+ srv.close();
+ srv.wait();
+ }
+
+ exit( 0 );
+ }
+ catch ( xmt::fork_in_parent& child ) {
+ // client part
+
+ stem::NetTransportMgr client;
+
+ c.try_wait(); // wait server start
+
+ stem::addr_type a = client.open( "localhost", 6890 );
+
+ BOOST_REQUIRE( client.good() );
+ BOOST_REQUIRE( a != stem::badaddr );
+
+ TestObj t1;
+
+ t1.reset();
+
+ stem::Event ev( EV_STU_ECHO );
+ ev.dest( a );
+
+ ev.value() = "echo";
+ t1.Send( ev );
+
+ t1.wait();
+
+ BOOST_CHECK( t1.msg() == "echo" );
+
+ client.close();
+ client.join();
+
+ b.wait(); // server may go away
+
+ int stat;
+ BOOST_CHECK( waitpid( child.pid(), &stat, 0 ) == child.pid() );
+ }
+
+ (&c)->~__Condition<true>();
+ shm_cnd.deallocate( &c, 1 );
+ (&b)->~__Barrier<true>();
+ shm_b.deallocate( &b, 1 );
+ }
+ catch ( xmt::shm_bad_alloc& err ) {
+ BOOST_CHECK_MESSAGE( false, "error report: " << err.what() );
+ }
+}
+
+void stem_test::net_echo2()
+{
+ try {
+ xmt::__Barrier<true>& b = *new ( shm_b.allocate( 1 ) ) xmt::__Barrier<true>();
+ xmt::__Condition<true>& c = *new ( shm_cnd.allocate( 1 ) ) xmt::__Condition<true>();
+
+ c.set( false );
+
+ try {
+ xmt::fork();
+
+ // server part
+ {
+ std::sockmgr_stream_MP<stem::NetTransport> srv( 6890 );
+ EchoSrv echosrv( 0, "Echo service");
+
+ BOOST_REQUIRE( srv.good() );
+ c.set( true ); // ok, server listen
+
+ b.wait(); // server may go away
+
+ srv.close();
+ srv.wait();
+ }
+
+ exit( 0 );
+ }
+ catch ( xmt::fork_in_parent& child ) {
+ // client part
+
+ stem::NetTransportMgr client;
+
+ c.try_wait(); // wait server start
+
+ stem::addr_type a = client.open( "localhost", 6890 );
+
+ BOOST_REQUIRE( client.good() );
+ BOOST_REQUIRE( a != stem::badaddr );
+
+ TestObj t1;
+
+ t1.reset();
+
+ stem::Event ev( EV_STU_ECHO );
+ ev.dest( a );
+
+ ev.value() = "echo";
+ t1.Send( ev );
+
+ t1.wait();
+
+ BOOST_CHECK( t1.msg() == "echo" );
+
+ client.close();
+ client.join();
+
+ b.wait(); // server may go away
+
+ int stat;
+ BOOST_CHECK( waitpid( child.pid(), &stat, 0 ) == child.pid() );
+ }
+
+ (&c)->~__Condition<true>();
+ shm_cnd.deallocate( &c, 1 );
+ (&b)->~__Barrier<true>();
+ shm_b.deallocate( &b, 1 );
+ }
+ catch ( xmt::shm_bad_alloc& err ) {
+ BOOST_CHECK_MESSAGE( false, "error report: " << err.what() );
+ }
+}
+
+// -----------------
+
struct stem_test_suite :
public test_suite
{
@@ -658,6 +897,8 @@
test_case *echo_net_tc = BOOST_CLASS_TEST_CASE( &stem_test::echo_net, instance );
test_case *peer_tc = BOOST_CLASS_TEST_CASE( &stem_test::peer, instance );
test_case *boring_manager_tc = BOOST_CLASS_TEST_CASE( &stem_test::boring_manager, instance );
+ test_case *net_echo_tc = BOOST_CLASS_TEST_CASE( &stem_test::net_echo, instance );
+ // test_case *net_echo2_tc = BOOST_CLASS_TEST_CASE( &stem_test::net_echo2, instance );
test_case *shm_finit_tc = BOOST_CLASS_TEST_CASE( &stem_test::shm_finit, instance );
basic2_tc->depends_on( basic1_tc );
@@ -674,6 +915,10 @@
peer_tc->depends_on( shm_init_tc );
boring_manager_tc->depends_on( peer_tc );
boring_manager_tc->depends_on( shm_init_tc );
+ net_echo_tc->depends_on( shm_init_tc );
+ net_echo_tc->depends_on( echo_net_tc );
+ // net_echo2_tc->depends_on( shm_init_tc );
+ // net_echo2_tc->depends_on( net_echo_tc );
shm_finit_tc->depends_on( shm_init_tc );
add( basic1_tc );
@@ -688,6 +933,8 @@
add( echo_net_tc );
add( peer_tc );
add( boring_manager_tc );
+ add( net_echo_tc );
+ // add( net_echo2_tc );
add( shm_finit_tc );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-08 20:55:52
|
Revision: 1551
http://svn.sourceforge.net/complement/?rev=1551&view=rev
Author: complement
Date: 2007-03-08 12:55:48 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
make.mak: removed, make except GNU make can't work due to top.mak;
USE_MAKE went to top.mak;
top.mak: use single extern.mak, intead of gmake/OSNAME/extern.mak
gmake/OSNAME/extern.mak: removed;
gmake/...: add copyright notice in many files;
gmake/app/macro.mak: removed, code went to gmake/app/top.mak;
gmake/app/top.mak: code from gmake/app/macro.mak;
gmake/app/gcc.mak: remove bashism;
gmake/lib/gcc.mak: ditto.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/app/CC.mak
trunk/complement/explore/Makefiles/gmake/app/aCC.mak
trunk/complement/explore/Makefiles/gmake/app/gcc.mak
trunk/complement/explore/Makefiles/gmake/app/icc.mak
trunk/complement/explore/Makefiles/gmake/app/top.mak
trunk/complement/explore/Makefiles/gmake/darwin/sys.mak
trunk/complement/explore/Makefiles/gmake/darwin/targetsys.mak
trunk/complement/explore/Makefiles/gmake/freebsd/sys.mak
trunk/complement/explore/Makefiles/gmake/freebsd/targetsys.mak
trunk/complement/explore/Makefiles/gmake/icc.mak
trunk/complement/explore/Makefiles/gmake/lib/CC.mak
trunk/complement/explore/Makefiles/gmake/lib/aCC.mak
trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
trunk/complement/explore/Makefiles/gmake/lib/icc.mak
trunk/complement/explore/Makefiles/gmake/lib/rules-a.mak
trunk/complement/explore/Makefiles/gmake/lib/vc6.mak
trunk/complement/explore/Makefiles/gmake/linux/targetsys.mak
trunk/complement/explore/Makefiles/gmake/sunos/sys.mak
trunk/complement/explore/Makefiles/gmake/sunos/targetsys.mak
trunk/complement/explore/Makefiles/gmake/sysid.mak
trunk/complement/explore/Makefiles/gmake/vc6.mak
trunk/complement/explore/Makefiles/top.mak
Added Paths:
-----------
trunk/complement/explore/Makefiles/extern.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/app/clean.mak
trunk/complement/explore/Makefiles/gmake/app/macro.mak
trunk/complement/explore/Makefiles/gmake/cygming/extern.mak
trunk/complement/explore/Makefiles/gmake/darwin/extern.mak
trunk/complement/explore/Makefiles/gmake/freebsd/extern.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/extern.mak
trunk/complement/explore/Makefiles/gmake/lib/mwccnlm.mak
trunk/complement/explore/Makefiles/gmake/linux/extern.mak
trunk/complement/explore/Makefiles/gmake/openbsd/extern.mak
trunk/complement/explore/Makefiles/gmake/sunos/extern.mak
trunk/complement/explore/Makefiles/gmake/windows/extern.mak
trunk/complement/explore/Makefiles/make.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,3 +1,23 @@
+2007-03-08 Petr Ovtchenkov <pt...@is...>
+
+ * make.mak: removed, make except GNU make can't work due to top.mak;
+ USE_MAKE went to top.mak;
+
+ * top.mak: use single extern.mak, intead of gmake/OSNAME/extern.mak
+
+ * gmake/OSNAME/extern.mak: removed;
+
+ * gmake/...: add copyright notice in many files;
+
+ * gmake/app/macro.mak: removed, code went to gmake/app/top.mak;
+
+ * gmake/app/top.mak: code from gmake/app/macro.mak;
+
+ * gmake/app/gcc.mak: remove bashism;
+
+ * gmake/lib/gcc.mak: ditto.
+
+
2007-02-28 Petr Ovtchenkov <pt...@is...>
* gmake/OSNAME, gmake/lib: group similar platforms into 'unix';
Added: trunk/complement/explore/Makefiles/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/extern.mak (rev 0)
+++ trunk/complement/explore/Makefiles/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -0,0 +1,40 @@
+# Time-stamp: <07/03/08 22:41:26 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+# Complement project:
+
+CoMT_DIR ?= ${SRCROOT}
+
+CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
+CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
+CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
+CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
+CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
+CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
+
+CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
+
+# boost (http://www.boost.org, http://boost.sourceforge.net)
+
+ifdef BOOST_DIR
+BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
+endif
+
+# STLport library
+
+ifndef WITHOUT_STLPORT
+STLPORT_DIR ?= ${HOME}/STLport.lab/STLport
+endif
+
+ifdef STLPORT_DIR
+STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
+STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
+endif
Modified: trunk/complement/explore/Makefiles/gmake/app/CC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/CC.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/CC.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,2 +1,10 @@
-# -*- Makefile -*- Time-stamp: <04/08/23 23:07:09 ptr>
-# $Id$
+# -*- Makefile -*- Time-stamp: <07/03/08 21:53:08 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
Modified: trunk/complement/explore/Makefiles/gmake/app/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/aCC.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/aCC.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,3 +1,10 @@
-# -*- Makefile -*- Time-stamp: <05/03/24 11:29:23 ptr>
-# $Id$
-
+# -*- Makefile -*- Time-stamp: <07/03/08 21:55:22 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
Deleted: trunk/complement/explore/Makefiles/gmake/app/clean.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/clean.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/clean.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,35 +0,0 @@
-# -*- makefile -*- Time-stamp: <06/11/17 00:29:39 ptr>
-#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
-# Petr Ovtchenkov
-#
-# Portion Copyright (c) 1999-2001
-# Parallel Graphics Ltd.
-#
-# Licensed under the Academic Free License version 3.0
-#
-
-define prog_clean
-clean::
- @rm -f $${$(1)_PRG} $${$(1)_PRG_DBG} $${$(1)_PRG_STLDBG}
-
-uninstall::
- @rm -f $$(INSTALL_BIN_DIR)/$$($(1)_PRG) $$(INSTALL_BIN_DIR_DBG)/$$($(1)_PRG_DBG) $$(INSTALL_BIN_DIR_STLDBG)/$$($(1)_PRG_STLDBG)
-endef
-
-clean::
-ifdef PRGNAME
- @-rm -f ${PRG} ${PRG_DBG} ${PRG_STLDBG}
-endif
-
-$(foreach prg,$(PRGNAMES),$(eval $(call prog_clean,$(prg))))
-
-distclean::
- @-rm -f $(DEPENDS_COLLECTION)
- @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null
-
-uninstall::
-ifdef PRGNAME
- @-rm -f $(INSTALL_BIN_DIR)/$(PRG) $(INSTALL_BIN_DIR_DBG)/$(PRG_DBG) $(INSTALL_BIN_DIR_STLDBG)/$(PRG_STLDBG)
-endif
- @-rmdir -p $(INSTALL_BIN_DIR) $(INSTALL_BIN_DIR_DBG) $(INSTALL_BIN_DIR_STLDBG) 2>/dev/null
Modified: trunk/complement/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,6 +1,6 @@
-# -*- Makefile -*- Time-stamp: <06/11/10 17:28:41 ptr>
+# -*- Makefile -*- Time-stamp: <07/03/08 21:23:42 ptr>
#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
# Petr Ovtchenkov
#
# Portion Copyright (c) 1999-2001
@@ -106,12 +106,12 @@
# ifeq ($(CXX_VERSION_MAJOR),3)
ifeq ($(OSNAME),linux)
-START_OBJ := $(shell for o in crt{1,i,begin}.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crt{end,n}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),openbsd)
-START_OBJ := $(shell for o in crt{0,begin}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt0.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
END_OBJ := $(shell for o in crtend.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
@@ -123,8 +123,8 @@
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -l${PTHR} -lc -lm
endif
ifeq ($(OSNAME),netbsd)
-START_OBJ := $(shell for o in crt{1,i,begin}.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crt{end,n}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),sunos)
Modified: trunk/complement/explore/Makefiles/gmake/app/icc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/icc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/icc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,3 +1,10 @@
-# -*- Makefile -*- Time-stamp: <04/07/25 13:26:49 ptr>
-# $Id$
-
+# -*- Makefile -*- Time-stamp: <07/03/08 21:55:41 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
Deleted: trunk/complement/explore/Makefiles/gmake/app/macro.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/macro.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/macro.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,34 +0,0 @@
-# Time-stamp: <06/11/16 23:37:38 ptr>
-#
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
-# Petr Ovtchenkov
-#
-# Portion Copyright (c) 1999-2001
-# Parallel Graphics Ltd.
-#
-# Licensed under the Academic Free License version 3.0
-#
-
-ifdef PRGNAME
-PRG := $(OUTPUT_DIR)/${PRGNAME}${EXE}
-PRG_DBG := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
-PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/${PRGNAME}${EXE}
-endif
-
-ALLPRGS = ${PRG}
-ALLPRGS_DBG = ${PRG_DBG}
-ALLPRGS_STLDBG = ${PRG_STLDBG}
-
-define prog_prog
-$(1)_PRG := $(OUTPUT_DIR)/$(1)${EXE}
-$(1)_PRG_DBG := $(OUTPUT_DIR_DBG)/$(1)${EXE}
-$(1)_PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/$(1)${EXE}
-
-ALLPRGS += $${$(1)_PRG}
-ALLPRGS_DBG += $${$(1)_PRG_DBG}
-ALLPRGS_STLDBG += $${$(1)_PRG_STLDBG}
-endef
-
-$(foreach prg,$(PRGNAMES),$(eval $(call prog_prog,$(prg))))
-
-LDFLAGS += ${LDSEARCH}
Modified: trunk/complement/explore/Makefiles/gmake/app/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/top.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/app/top.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/10 17:28:09 ptr>
+# -*- makefile -*- Time-stamp: <07/03/08 21:59:26 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -9,8 +9,55 @@
# Licensed under the Academic Free License version 3.0
#
-include ${RULESBASE}/${USE_MAKE}/app/macro.mak
+ifdef PRGNAME
+PRG := $(OUTPUT_DIR)/${PRGNAME}${EXE}
+PRG_DBG := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
+PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/${PRGNAME}${EXE}
+endif
+
+ALLPRGS = ${PRG}
+ALLPRGS_DBG = ${PRG_DBG}
+ALLPRGS_STLDBG = ${PRG_STLDBG}
+
+define prog_prog
+$(1)_PRG := $(OUTPUT_DIR)/$(1)${EXE}
+$(1)_PRG_DBG := $(OUTPUT_DIR_DBG)/$(1)${EXE}
+$(1)_PRG_STLDBG := $(OUTPUT_DIR_STLDBG)/$(1)${EXE}
+
+ALLPRGS += $${$(1)_PRG}
+ALLPRGS_DBG += $${$(1)_PRG_DBG}
+ALLPRGS_STLDBG += $${$(1)_PRG_STLDBG}
+endef
+
+$(foreach prg,$(PRGNAMES),$(eval $(call prog_prog,$(prg))))
+
+LDFLAGS += ${LDSEARCH}
+
include ${RULESBASE}/${USE_MAKE}/app/${COMPILER_NAME}.mak
include ${RULESBASE}/${USE_MAKE}/app/rules.mak
include ${RULESBASE}/${USE_MAKE}/app/rules-install.mak
-include ${RULESBASE}/${USE_MAKE}/app/clean.mak
+
+define prog_clean
+clean::
+ @rm -f $${$(1)_PRG} $${$(1)_PRG_DBG} $${$(1)_PRG_STLDBG}
+
+uninstall::
+ @rm -f $$(INSTALL_BIN_DIR)/$$($(1)_PRG) $$(INSTALL_BIN_DIR_DBG)/$$($(1)_PRG_DBG) $$(INSTALL_BIN_DIR_STLDBG)/$$($(1)_PRG_STLDBG)
+endef
+
+clean::
+ifdef PRGNAME
+ @-rm -f ${PRG} ${PRG_DBG} ${PRG_STLDBG}
+endif
+
+$(foreach prg,$(PRGNAMES),$(eval $(call prog_clean,$(prg))))
+
+distclean::
+ @-rm -f $(DEPENDS_COLLECTION)
+ @-rmdir -p ${OUTPUT_DIR} ${OUTPUT_DIR_DBG} ${OUTPUT_DIR_STLDBG} 2>/dev/null
+
+uninstall::
+ifdef PRGNAME
+ @-rm -f $(INSTALL_BIN_DIR)/$(PRG) $(INSTALL_BIN_DIR_DBG)/$(PRG_DBG) $(INSTALL_BIN_DIR_STLDBG)/$(PRG_STLDBG)
+endif
+ @-rmdir -p $(INSTALL_BIN_DIR) $(INSTALL_BIN_DIR_DBG) $(INSTALL_BIN_DIR_STLDBG) 2>/dev/null
Deleted: trunk/complement/explore/Makefiles/gmake/cygming/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/cygming/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/cygming/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/31 14:20:16 ptr>
-# $Id$
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= e:/STLlab/STLport
-CoMT_DIR ?= ${SRCROOT}
-
Deleted: trunk/complement/explore/Makefiles/gmake/darwin/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/darwin/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/15 17:46:28 ptr>
-# $Id$
-
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /mnt/STLport-R451_dev
-CoMT_DIR ?= ${SRCROOT}
Modified: trunk/complement/explore/Makefiles/gmake/darwin/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/sys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/darwin/sys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:13:00 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:46:12 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
INSTALL := /usr/bin/install
Modified: trunk/complement/explore/Makefiles/gmake/darwin/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/targetsys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/darwin/targetsys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:04:30 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:46:37 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := dylib
Deleted: trunk/complement/explore/Makefiles/gmake/freebsd/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/15 17:46:28 ptr>
-# $Id$
-
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /mnt/STLport-R451_dev
-CoMT_DIR ?= ${SRCROOT}
Modified: trunk/complement/explore/Makefiles/gmake/freebsd/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/sys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/sys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:10:10 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:50:00 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
INSTALL := /usr/bin/install
Modified: trunk/complement/explore/Makefiles/gmake/freebsd/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/targetsys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/targetsys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:09:21 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:50:23 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := so
Deleted: trunk/complement/explore/Makefiles/gmake/hp-ux/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,16 +0,0 @@
-# Time-stamp: <03/07/15 17:46:28 ptr>
-# $Id$
-
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
Modified: trunk/complement/explore/Makefiles/gmake/icc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/icc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/icc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <03/11/30 11:46:14 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:41:21 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
#INCLUDES :=
Modified: trunk/complement/explore/Makefiles/gmake/lib/CC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/CC.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/CC.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# -*- makefile -*- Time-stamp: <04/08/23 23:07:35 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/03/08 21:39:22 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
OPT += -xcode=pic32
Modified: trunk/complement/explore/Makefiles/gmake/lib/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/aCC.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/aCC.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# -*- makefile -*- Time-stamp: <05/03/24 11:33:35 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/03/08 21:38:16 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
dbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_DBGxx) ${LDSEARCH}
stldbg-shared: LDFLAGS += -shared -Wl,-C20 -Wl,-dynamic -Wl,+h$(SO_NAME_STLDBGxx) ${LDSEARCH}
Modified: trunk/complement/explore/Makefiles/gmake/lib/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/gcc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,13 @@
-# -*- makefile -*- Time-stamp: <06/01/18 15:05:04 ptr>
+# -*- makefile -*- Time-stamp: <07/03/08 21:26:20 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
# Oh, the commented below work for gmake 3.78.1 and above,
# but phrase without tag not work for it. Since gmake 3.79
@@ -103,9 +112,9 @@
# Include whole language support archive (libsupc++.a) into libstlport:
# all C++ issues are in libstlport now.
ifeq ($(OSNAME),linux)
-START_OBJ := $(shell for o in crt{i,beginS}.o; do ${CXX} -print-file-name=$$o; done)
-#START_A_OBJ := $(shell for o in crt{i,beginT}.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crt{endS,n}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
+#START_A_OBJ := $(shell for o in crti.o crtbeginT.o; do ${CXX} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),openbsd)
@@ -121,8 +130,8 @@
STDLIBS := ${STLPORT_LIB} ${_LGCC_S} -l${PTHR} -lc -lm
endif
ifeq ($(OSNAME),netbsd)
-START_OBJ := $(shell for o in crt{i,beginS}.o; do ${CXX} -print-file-name=$$o; done)
-END_OBJ := $(shell for o in crt{endS,n}.o; do ${CXX} -print-file-name=$$o; done)
+START_OBJ := $(shell for o in crti.o crtbeginS.o; do ${CXX} -print-file-name=$$o; done)
+END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
endif
ifeq ($(OSNAME),sunos)
Modified: trunk/complement/explore/Makefiles/gmake/lib/icc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/icc.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/icc.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,7 +1,14 @@
-# -*- makefile -*- Time-stamp: <03/11/30 11:41:22 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/03/08 21:37:08 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-
# Oh, the commented below work for gmake 3.78.1 and above,
# but phrase without tag not work for it. Since gmake 3.79
# tag with assignment fail, but work assignment for all tags
Deleted: trunk/complement/explore/Makefiles/gmake/lib/mwccnlm.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/mwccnlm.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/mwccnlm.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,3 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/05/06 17:29:15 ptr>
-# $Id$
-
Modified: trunk/complement/explore/Makefiles/gmake/lib/rules-a.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/rules-a.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/rules-a.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,13 @@
-# -*- makefile -*- Time-stamp: <04/07/25 16:54:59 ptr>
+# -*- makefile -*- Time-stamp: <07/03/08 21:34:05 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
# Static libraries tags
Modified: trunk/complement/explore/Makefiles/gmake/lib/vc6.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/vc6.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/lib/vc6.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,7 +1,14 @@
-# -*- makefile -*- Time-stamp: <03/10/27 18:30:31 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <07/03/08 21:35:57 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-
# Oh, the commented below work for gmake 3.78.1 and above,
# but phrase without tag not work for it. Since gmake 3.79
# tag with assignment fail, but work assignment for all tags
Deleted: trunk/complement/explore/Makefiles/gmake/linux/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/linux/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,26 +0,0 @@
-# Time-stamp: <05/09/02 00:48:09 ptr>
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /export/home/ptr/STLport.lab/STLport
-CoMT_DIR ?= ${SRCROOT}
Modified: trunk/complement/explore/Makefiles/gmake/linux/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/targetsys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/linux/targetsys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 20:59:42 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:52:04 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := so
Deleted: trunk/complement/explore/Makefiles/gmake/openbsd/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/openbsd/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/openbsd/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <04/03/16 17:06:58 ptr>
-# $Id$
-
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/$(TARGET_NAME)lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /mnt/STLport-R451_dev
-CoMT_DIR ?= ${SRCROOT}
Deleted: trunk/complement/explore/Makefiles/gmake/sunos/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/sunos/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/15 17:46:28 ptr>
-# $Id$
-
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR_DBG}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR_STLDBG}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/${TARGET_NAME}lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= /export/home/ptr/STLport.lab/STLport
-CoMT_DIR ?= ${SRCROOT}
Modified: trunk/complement/explore/Makefiles/gmake/sunos/sys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/sys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/sunos/sys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:10:32 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:48:24 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
INSTALL := /usr/ucb/install
Modified: trunk/complement/explore/Makefiles/gmake/sunos/targetsys.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/targetsys.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/sunos/targetsys.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <05/09/09 21:08:34 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:48:37 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
SO := so
Modified: trunk/complement/explore/Makefiles/gmake/sysid.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,13 @@
-# Time-stamp: <05/12/14 20:48:55 ptr>
+# Time-stamp: <07/03/08 21:43:48 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
ifndef BUILD_DATE
Modified: trunk/complement/explore/Makefiles/gmake/vc6.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/vc6.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/vc6.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,5 +1,13 @@
-# Time-stamp: <03/10/29 21:09:09 ptr>
-# $Id$
+# Time-stamp: <07/03/08 21:41:52 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
#INCLUDES = -I$(SRCROOT)/include
#INCLUDES :=
Deleted: trunk/complement/explore/Makefiles/gmake/windows/extern.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/extern.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/gmake/windows/extern.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,63 +0,0 @@
-# Time-stamp: <03/07/31 14:20:16 ptr>
-# $Id$
-
-# This is Complement project (really not extern):
-
-CoMT_LIB_DIR ?= ${INSTALL_LIB_DIR}
-CoMT_LIB_DIR_DBG ?= ${INSTALL_LIB_DIR_DBG}
-CoMT_LIB_DIR_STLDBG ?= ${INSTALL_LIB_DIR_STLDBG}
-CoMT_BIN_DIR ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_DBG ?= ${INSTALL_BIN_DIR}
-CoMT_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR}
-
-CoMT_INCLUDE_DIR ?= ${CoMT_DIR}/include
-
-# This file reflect versions of third-party libraries that
-# used in projects
-
-# STLport library
-#STLPORT_LIB_DIR ?= /usr/local/lib
-#STLPORT_INCLUDE_DIR ?= /usr/local/include/stlport
-#STLPORT_VER ?= 4.5
-STLPORT_LIB_DIR ?= $(STLPORT_DIR)/lib
-STLPORT_INCLUDE_DIR ?= $(STLPORT_DIR)/stlport
-STLPORT_VER ?= 4.5.5
-
-# PostgreSQL library version:
-
-PG_INCLUDE ?= $(PG_DIR)/include
-PG_LIB ?= $(PG_DIR)/lib
-PG_LIB_VER_MAJOR = 2
-PG_LIB_VER_MINOR = 1
-
-# Readline libraries version:
-
-RL_INCLUDE ?= /usr/local/include/readline
-RL_LIB ?= /usr/local/lib
-RL_LIB_VER_MAJOR = 4
-RL_LIB_VER_MINOR = 2
-
-# gSOAP (http://gsoap2.sourceforge.net)
-
-gSOAP_INCLUDE_DIR ?= ${gSOAP_DIR}/include
-gSOAP_LIB_DIR ?= ${gSOAP_DIR}/lib
-gSOAP_BIN_DIR ?= ${gSOAP_DIR}/bin
-
-# boost (http://www.boost.org, http://boost.sourceforge.net)
-BOOST_INCLUDE_DIR ?= ${BOOST_DIR}
-
-# This file reflect versions of third-party libraries that
-# used in projects, with make-depend style
-
-ifeq ($(OSNAME),sunos)
-PG_DIR ?= /opt/PGpgsql
-endif
-ifeq ($(OSNAME),linux)
-PG_DIR ?= /usr/local/pgsql
-endif
-
-gSOAP_DIR ?= /opt/gSOAP-2.2.3
-BOOST_DIR ?= ${SRCROOT}/../extern/boost
-STLPORT_DIR ?= e:/STLlab/STLport
-CoMT_DIR ?= ${SRCROOT}
-
Deleted: trunk/complement/explore/Makefiles/make.mak
===================================================================
--- trunk/complement/explore/Makefiles/make.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/make.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +0,0 @@
-# Time-stamp: <03/07/03 17:14:26 ptr>
-# $Id$
-
-USE_MAKE := gmake
Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak 2007-03-06 14:30:52 UTC (rev 1550)
+++ trunk/complement/explore/Makefiles/top.mak 2007-03-08 20:55:48 UTC (rev 1551)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/10 16:22:00 ptr>
+# Time-stamp: <07/03/08 22:57:35 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -21,6 +21,7 @@
-include ${RULESBASE}/config.mak
ifndef COMPILER_NAME
+# gcc is default compiler, others specify explicitly;
COMPILER_NAME := gcc
endif
@@ -73,7 +74,8 @@
endif
# define what make clone we use
-include ${RULESBASE}/make.mak
+USE_MAKE := gmake
+
ifndef OSNAME
# identify OS and build date
include ${RULESBASE}/$(USE_MAKE)/sysid.mak
@@ -86,10 +88,10 @@
include ${RULESBASE}/$(USE_MAKE)/$(COMPILER_NAME).mak
# rules to make dirs for targets
include ${RULESBASE}/$(USE_MAKE)/targetdirs.mak
-# extern libraries
-include ${RULESBASE}/$(USE_MAKE)/$(OSNAME)/extern.mak
+# Extern projects for everyday usage and settings for ones
+include ${RULESBASE}/extern.mak
-# os-specific local rules
+# os-specific local rules (or other project-specific definitions)
-include specific.mak
# derive common targets (*.o, *.d),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 14:30:54
|
Revision: 1550
http://svn.sourceforge.net/complement/?rev=1550&view=rev
Author: complement
Date: 2007-03-06 06:30:52 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
clean
Removed Paths:
-------------
tags/complement-20061031/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 14:30:34
|
Revision: 1549
http://svn.sourceforge.net/complement/?rev=1549&view=rev
Author: complement
Date: 2007-03-06 06:30:32 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
clean
Removed Paths:
-------------
tags/complement-20061120/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 14:30:15
|
Revision: 1548
http://svn.sourceforge.net/complement/?rev=1548&view=rev
Author: complement
Date: 2007-03-06 06:30:13 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
clean
Removed Paths:
-------------
tags/complement-20061204/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 14:29:54
|
Revision: 1547
http://svn.sourceforge.net/complement/?rev=1547&view=rev
Author: complement
Date: 2007-03-06 06:29:49 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
clean
Removed Paths:
-------------
tags/complement-20061214/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 14:29:21
|
Revision: 1546
http://svn.sourceforge.net/complement/?rev=1546&view=rev
Author: complement
Date: 2007-03-06 06:29:17 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
clean
Removed Paths:
-------------
tags/complement-20070206/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 13:54:36
|
Revision: 1545
http://svn.sourceforge.net/complement/?rev=1545&view=rev
Author: complement
Date: 2007-03-06 05:54:33 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
clean
Removed Paths:
-------------
tags/complement-20070215/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 13:45:59
|
Revision: 1544
http://svn.sourceforge.net/complement/?rev=1544&view=rev
Author: complement
Date: 2007-03-06 05:45:57 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
clean
Removed Paths:
-------------
tags/complement-20070228/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 13:42:11
|
Revision: 1543
http://svn.sourceforge.net/complement/?rev=1543&view=rev
Author: complement
Date: 2007-03-06 05:41:59 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
snapshot 2007-03-06
Added Paths:
-----------
tags/complement-20070306/
Copied: tags/complement-20070306 (from rev 1542, trunk/complement)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 13:27:41
|
Revision: 1542
http://svn.sourceforge.net/complement/?rev=1542&view=rev
Author: complement
Date: 2007-03-06 05:27:35 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
float limits
Modified Paths:
--------------
trunk/complement/explore/inquiry/shades/float/Makefile
trunk/complement/explore/inquiry/shades/float/float.cc
Modified: trunk/complement/explore/inquiry/shades/float/Makefile
===================================================================
--- trunk/complement/explore/inquiry/shades/float/Makefile 2007-03-06 13:27:00 UTC (rev 1541)
+++ trunk/complement/explore/inquiry/shades/float/Makefile 2007-03-06 13:27:35 UTC (rev 1542)
@@ -1,5 +1,4 @@
# -*- Makefile -*- Time-stamp: <03/07/09 18:08:47 ptr>
-# $Id$
SRCROOT := ../../..
COMPILER_NAME := gcc
@@ -7,20 +6,4 @@
include Makefile.inc
include ${SRCROOT}/Makefiles/top.mak
-
-INCLUDES += -I$(STLPORT_INCLUDE_DIR)
-
-release-shared: LDSEARCH = -L${STLPORT_LIB_DIR}
-stldbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR}
-dbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR}
-
-ifeq ($(OSNAME),sunos)
-release-shared : LDLIBS = -lstlport -lrt
-stldbg-shared : LDLIBS = -lstlportstlg -lrt
-dbg-shared : LDLIBS = -lstlportg -lrt
-else
-release-shared : LDLIBS = -lstlport
-stldbg-shared : LDLIBS = -lstlportstlg
-dbg-shared : LDLIBS = -lstlportg
-endif
-
+LDFLAGS += -Wl,--rpath=${STLPORT_LIB_DIR}
Modified: trunk/complement/explore/inquiry/shades/float/float.cc
===================================================================
--- trunk/complement/explore/inquiry/shades/float/float.cc 2007-03-06 13:27:00 UTC (rev 1541)
+++ trunk/complement/explore/inquiry/shades/float/float.cc 2007-03-06 13:27:35 UTC (rev 1542)
@@ -1,11 +1,19 @@
#include <iostream>
#include <iomanip>
#include <cmath>
+#include <limits>
using namespace std;
int main()
{
cout << setprecision(19) << log(FLT_MAX) << ", " << float(M_LN2*FLT_MAX_EXP) << endl;
+
+ cout << numeric_limits<double>::min_exponent << " " << DBL_MIN_EXP << " " << numeric_limits<double>::min_exponent10 << endl;
+ cout << numeric_limits<double>::digits << " " << numeric_limits<double>::digits10 << endl;
+ cout << numeric_limits<double>::max_exponent << " " << DBL_MAX_EXP << " " << numeric_limits<double>::max_exponent10 << endl;
+ cout << numeric_limits<long double>::digits << " " << numeric_limits<long double>::digits10 << endl;
+ cout << numeric_limits<long double>::max_exponent << " " << numeric_limits<long double>::max_exponent10 << endl;
+
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-03-06 13:27:08
|
Revision: 1541
http://svn.sourceforge.net/complement/?rev=1541&view=rev
Author: complement
Date: 2007-03-06 05:27:00 -0800 (Tue, 06 Mar 2007)
Log Message:
-----------
signed/unsigned bit expantion
Modified Paths:
--------------
trunk/complement/explore/inquiry/shades/sign/char.c
Modified: trunk/complement/explore/inquiry/shades/sign/char.c
===================================================================
--- trunk/complement/explore/inquiry/shades/sign/char.c 2007-02-28 17:21:00 UTC (rev 1540)
+++ trunk/complement/explore/inquiry/shades/sign/char.c 2007-03-06 13:27:00 UTC (rev 1541)
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <stdint.h>
int main()
{
@@ -7,8 +8,29 @@
unsigned int ui1 = (unsigned)c1;
unsigned ui2 = (unsigned)c2;
+ /* unsigned ui3 = ~((1 << (sizeof(unsigned) * 8 - 1)) >> 3); */
+ unsigned ui3 = ~((1U << 31U) >> 3U);
+ uint64_t ui4 = ~((1ULL << 63ULL) >> 3ULL);
+ union {
+ uint64_t i64;
+ struct {
+ uint32_t lo;
+ uint32_t hi;
+ } i32;
+ } ui5;
- printf( "%x\n", ui1 );
+ ui5.i64 = ui4;
+ printf( "%x %x %llx %x\n", ui1, ui3, ui4, ui5.i32.hi );
+
+ ui4 = ((~0ULL) / 2ULL) >> 52ULL;
+
+ printf( "%llx\n", ui4 );
+ ui4 = ~0ULL >> 53;
+ printf( "%llx\n", ui4 );
+ ui4 = ~0ULL & (~0ULL << 53);
+ printf( "%llx\n", ui4 );
+
+
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-28 17:22:02
|
Revision: 1540
http://svn.sourceforge.net/complement/?rev=1540&view=rev
Author: complement
Date: 2007-02-28 09:21:00 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
group POSIX-like behaviour into 'unix'
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
Added Paths:
-----------
trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2007-02-28 17:15:33 UTC (rev 1539)
+++ trunk/complement/explore/Makefiles/ChangeLog 2007-02-28 17:21:00 UTC (rev 1540)
@@ -1,3 +1,9 @@
+2007-02-28 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/OSNAME, gmake/lib: group similar platforms into 'unix';
+ in OSNAME now only really platform-specific defs---mainly for windows,
+ but sumtimes darwin.
+
2006-11-17 Petr Ovtchenkov <pt...@is...>
* gmake/app/rules.mak, rules-install.mak, macro.mak, clean.mak:
Deleted: trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
+++ trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak 2007-02-28 17:21:00 UTC (rev 1540)
@@ -1,22 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/27 18:15:05 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUT}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBG}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBG}
-
-${SO_NAME_OUT}: $(OBJ) $(RES) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ) $(RES) $(LDLIBS)
-
-${SO_NAME_OUT_DBG}: $(OBJ_DBG) $(RES_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ_DBG) $(RES_DBG) $(LDLIBS)
-
-${SO_NAME_OUT_STLDBG}: $(OBJ_STLDBG) $(RES_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ_STLDBG) $(RES_STLDBG) $(LDLIBS)
-
Copied: trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak (from rev 1535, trunk/complement/explore/Makefiles/gmake/cygming/rules-so.mak)
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-02-28 17:21:00 UTC (rev 1540)
@@ -0,0 +1,97 @@
+# -*- makefile -*- Time-stamp: <03/10/27 18:15:05 ptr>
+# $Id$
+
+# Shared libraries tags
+
+PHONY += release-shared dbg-shared stldbg-shared
+
+release-shared: $(OUTPUT_DIR) ${SO_NAME_OUT}
+
+dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBG}
+
+stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBG}
+
+ifeq (bcc, $(COMPILER_NAME))
+# Borland linker
+${SO_NAME_OUT}: $(OBJ) $(RES) $(LIBSDEP)
+ $(LINK.cc) $(subst /,\,$(START_OBJ) $(OBJ) $(END_OBJ), $(LINK_OUTPUT_OPTION), , $(LDLIBS), , $(RES))
+${SO_NAME_OUT_DBG}: $(OBJ_DBG) $(RES_DBG) $(LIBSDEP)
+ $(LINK.cc) $(subst /,\,$(START_OBJ) $(OBJ_DBG) $(END_OBJ), $(LINK_OUTPUT_OPTION), , $(LDLIBS), , $(RES_DBG))
+${SO_NAME_OUT_STLDBG}: $(OBJ_STLDBG) $(RES_STLDBG) $(LIBSDEP)
+ $(LINK.cc) $(subst /,\,$(START_OBJ) $(OBJ_STLDBG) $(END_OBJ), $(LINK_OUTPUT_OPTION), , $(LDLIBS), , $(RES_STLDBG))
+else
+ifeq (dmc, $(COMPILER_NAME))
+# Digital Mars linker
+# This linker generate the dll file even if link fail so we also use a
+# dependency on the lib file.
+
+$(SO_NAME_OUT): $(LIB_NAME_OUT)
+ $(LINK.cc) $(subst /,\,$(OBJ),$(LINK_OUTPUT_OPTION),$(MAP_OUTPUT_OPTION),$(LDLIBS),$(DEF_OPTION),$(RES))
+$(LIB_NAME_OUT): $(OBJ) $(RES) $(LIBSDEP)
+ @echo LIBRARY "$(SO_NAME_BASE).dll" > $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo DESCRIPTION 'STLport DLL for Digital Mars C/C++'>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo EXETYPE NT>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo SUBSYSTEM WINDOWS>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo CODE SHARED EXECUTE>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo DATA READWRITE>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo.>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo EXPORTS>> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?cin@std@@3V?$$basic_istream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?cout@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?cerr@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?clog@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?wcin@std@@3V?$$basic_istream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?wcout@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?wcerr@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+ @echo "?wclog@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR)/$(SO_NAME_BASE).def
+
+$(SO_NAME_OUT_DBG): $(LIB_NAME_OUT_DBG)
+ $(LINK.cc) $(subst /,\,$(OBJ_DBG), $(LINK_OUTPUT_OPTION), $(MAP_OUTPUT_OPTION), $(LDLIBS), $(DEF_OPTION_DBG), $(RES_DBG))
+$(LIB_NAME_OUT_DBG): $(OBJ_DBG) $(RES_DBG) $(LIBSDEP)
+ @echo LIBRARY "$(SO_NAME_DBG_BASE).dll" > $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo DESCRIPTION 'STLport DLL for Digital Mars C/C++'>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo EXETYPE NT>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo SUBSYSTEM WINDOWS>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo CODE SHARED EXECUTE>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo DATA READWRITE>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo.>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo EXPORTS>> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?cin@std@@3V?$$basic_istream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?cout@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?cerr@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?clog@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?wcin@std@@3V?$$basic_istream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?wcout@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?wcerr@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+ @echo "?wclog@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_DBG)/$(SO_NAME_DBG_BASE).def
+
+$(SO_NAME_OUT_STLDBG): $(LIB_NAME_OUT_STLDBG)
+ $(LINK.cc) $(subst /,\,$(OBJ_STLDBG), $(LINK_OUTPUT_OPTION), $(MAP_OUTPUT_OPTION), $(LDLIBS), $(DEF_OPTION_STLDBG), $(RES_STLDBG))
+$(LIB_NAME_OUT_STLDBG): $(OBJ_STLDBG) $(RES_STLDBG) $(LIBSDEP)
+ @echo LIBRARY "$(SO_NAME_STLDBG_BASE).dll" > $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo DESCRIPTION 'STLport DLL for Digital Mars C/C++'>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo EXETYPE NT>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo SUBSYSTEM WINDOWS>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo CODE SHARED EXECUTE>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo DATA READWRITE>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo.>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo EXPORTS>> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?cin@std@@3V?$$basic_istream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?cout@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?cerr@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?clog@std@@3V?$$basic_ostream@std@DV?$$char_traits@std@D@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?wcin@std@@3V?$$basic_istream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?wcout@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?wcerr@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+ @echo "?wclog@std@@3V?$$basic_ostream@std@_YV?$$char_traits@std@_Y@1@@1@A">> $(OUTPUT_DIR_STLDBG)/$(SO_NAME_STLDBG_BASE).def
+
+else
+# GNU linker
+${SO_NAME_OUT}: $(OBJ) $(RES) $(LIBSDEP)
+ $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ) $(RES) $(LDLIBS)
+${SO_NAME_OUT_DBG}: $(OBJ_DBG) $(RES_DBG) $(LIBSDEP)
+ $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ_DBG) $(RES_DBG) $(LDLIBS)
+${SO_NAME_OUT_STLDBG}: $(OBJ_STLDBG) $(RES_STLDBG) $(LIBSDEP)
+ $(LINK.cc) $(LINK_OUTPUT_OPTION) $(OBJ_STLDBG) $(RES_STLDBG) $(LDLIBS)
+endif
+endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-28 17:15:51
|
Revision: 1539
http://svn.sourceforge.net/complement/?rev=1539&view=rev
Author: complement
Date: 2007-02-28 09:15:33 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
group POSIX-like behaviour into 'unix'
Modified Paths:
--------------
trunk/complement/explore/Makefiles/gmake/darwin/lib.mak
trunk/complement/explore/Makefiles/gmake/lib/top.mak
trunk/complement/explore/Makefiles/gmake/unix/lib.mak
trunk/complement/explore/Makefiles/gmake/windows/lib.mak
trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak
Added Paths:
-----------
trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/unix/rules-so.mak
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/cygming/lib.mak
trunk/complement/explore/Makefiles/gmake/cygming/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/darwin/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/darwin/rules-so.mak
trunk/complement/explore/Makefiles/gmake/freebsd/lib.mak
trunk/complement/explore/Makefiles/gmake/freebsd/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/freebsd/rules-so.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/lib.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/hp-ux/rules-so.mak
trunk/complement/explore/Makefiles/gmake/linux/lib.mak
trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
trunk/complement/explore/Makefiles/gmake/openbsd/lib.mak
trunk/complement/explore/Makefiles/gmake/openbsd/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/openbsd/rules-so.mak
trunk/complement/explore/Makefiles/gmake/sunos/lib.mak
trunk/complement/explore/Makefiles/gmake/sunos/rules-install-so.mak
trunk/complement/explore/Makefiles/gmake/sunos/rules-so.mak
trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
Deleted: trunk/complement/explore/Makefiles/gmake/cygming/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/cygming/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/cygming/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,44 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/15 18:23:04 ptr>
-# $Id$
-
-RELEASE_SUFFIX := r
-DBG_SUFFIX := d
-STLDBG_SUFFIX := stl${DBG_SUFFIX}
-
-# Shared libraries:
-SO_NAME_BASE := ${LIBNAME}_${RELEASE_SUFFIX}${MAJOR}${MINOR}
-SO_NAME := ${SO_NAME_BASE}.$(SO)
-LIB_NAME := ${SO_NAME_BASE}.$(LIB)
-EXP_NAME := ${SO_NAME_BASE}.$(EXP)
-
-SO_NAME_OUT := $(OUTPUT_DIR)/${SO_NAME}
-LIB_NAME_OUT := $(OUTPUT_DIR)/${LIB_NAME}
-EXP_NAME_OUT := $(OUTPUT_DIR)/${EXP_NAME}
-
-SO_NAME_DBG_BASE := ${LIBNAME}_${DBG_SUFFIX}${MAJOR}${MINOR}
-SO_NAME_DBG := ${SO_NAME_DBG_BASE}.$(SO)
-LIB_NAME_DBG := ${SO_NAME_DBG_BASE}.$(LIB)
-EXP_NAME_DBG := ${SO_NAME_DBG_BASE}.$(EXP)
-
-SO_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}
-LIB_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${LIB_NAME_DBG}
-EXP_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${EXP_NAME_DBG}
-
-SO_NAME_STLDBG_BASE := ${LIBNAME}_${STLDBG_SUFFIX}${MAJOR}${MINOR}
-SO_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(SO)
-LIB_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(LIB)
-EXP_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(EXP)
-
-SO_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}
-LIB_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${LIB_NAME_STLDBG}
-EXP_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${EXP_NAME_STLDBG}
-
-# Static libraries:
-A_NAME := ${SO_NAME_BASE}_static.$(ARCH)
-A_NAME_OUT := $(OUTPUT_DIR_A)/$(A_NAME)
-
-A_NAME_DBG := ${SO_NAME_DBG_BASE}_static.$(ARCH)
-A_NAME_OUT_DBG := $(OUTPUT_DIR_A_DBG)/$(A_NAME_DBG)
-
-A_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}_static.$(ARCH)
-A_NAME_OUT_STLDBG := $(OUTPUT_DIR_A_STLDBG)/$(A_NAME_STLDBG)
Deleted: trunk/complement/explore/Makefiles/gmake/cygming/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/cygming/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/cygming/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,26 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/15 18:26:22 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-static: all-static install-release-static install-dbg-static install-stldbg-static
-install-shared: all-shared install-release-shared install-dbg-shared install-stldbg-shared
-
-install-release-shared: release-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR)
- $(INSTALL_SO) ${SO_NAME_OUT} $(INSTALL_BIN_DIR)
- $(INSTALL_SO) ${LIB_NAME_OUT} $(INSTALL_LIB_DIR)
-# $(INSTALL_SO) ${EXP_NAME_OUT} $(INSTALL_LIB_DIR)
-
-install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_DBG)
- $(INSTALL_SO) ${SO_NAME_OUT_DBG} $(INSTALL_BIN_DIR)
- $(INSTALL_SO) ${LIB_NAME_OUT_DBG} $(INSTALL_LIB_DIR_DBG)
-# $(INSTALL_SO) ${EXP_NAME_OUT_DBG} $(INSTALL_LIB_DIR_DBG)
-
-install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_STLDBG)
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBG} $(INSTALL_BIN_DIR)
- $(INSTALL_SO) ${LIB_NAME_OUT_STLDBG} $(INSTALL_LIB_DIR_STLDBG)
-# $(INSTALL_SO) ${EXP_NAME_OUT_STLDBG} $(INSTALL_LIB_DIR_STLDBG)
-
Modified: trunk/complement/explore/Makefiles/gmake/darwin/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/darwin/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +1,61 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <06/11/02 10:37:02 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
+DBG_SUFFIX ?= g
+STLDBG_SUFFIX ?= stl${DBG_SUFFIX}
+# Shared libraries:
+
+SO_NAME := lib${LIBNAME}.$(SO)
+SO_NAMEx := lib${LIBNAME}.${MAJOR}.$(SO)
+SO_NAMExx := lib${LIBNAME}.${MAJOR}.${MINOR}.$(SO)
+SO_NAMExxx := lib${LIBNAME}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
+
+SO_NAME_OUT := $(OUTPUT_DIR)/${SO_NAME}
+SO_NAME_OUTx := $(OUTPUT_DIR)/${SO_NAMEx}
+SO_NAME_OUTxx := $(OUTPUT_DIR)/${SO_NAMExx}
+SO_NAME_OUTxxx := $(OUTPUT_DIR)/${SO_NAMExxx}
+
+SO_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(SO)
+SO_NAME_DBGx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.$(SO)
+SO_NAME_DBGxx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.${MINOR}.$(SO)
+SO_NAME_DBGxxx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
+
+SO_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}
+SO_NAME_OUT_DBGx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}
+SO_NAME_OUT_DBGxx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxx}
+SO_NAME_OUT_DBGxxx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxxx}
+
+ifndef WITHOUT_STLPORT
+SO_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(SO)
+SO_NAME_STLDBGx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.$(SO)
+SO_NAME_STLDBGxx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.${MINOR}.$(SO)
+SO_NAME_STLDBGxxx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
+
+SO_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}
+SO_NAME_OUT_STLDBGx := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}
+SO_NAME_OUT_STLDBGxx := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxx}
+SO_NAME_OUT_STLDBGxxx := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGxxx}
+# WITHOUT_STLPORT
+endif
+
+# Static libraries:
+
+A_NAME := lib${LIBNAME}.$(ARCH)
+A_NAME_OUT := $(OUTPUT_DIR_A)/$(A_NAME)
+
+A_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(ARCH)
+A_NAME_OUT_DBG := $(OUTPUT_DIR_A_DBG)/$(A_NAME_DBG)
+
+ifndef WITHOUT_STLPORT
+A_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(ARCH)
+A_NAME_OUT_STLDBG := $(OUTPUT_DIR_A_STLDBG)/$(A_NAME_STLDBG)
+endif
Deleted: trunk/complement/explore/Makefiles/gmake/darwin/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/darwin/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,64 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/10 13:22:04 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/darwin/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/darwin/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/darwin/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:42:07 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Deleted: trunk/complement/explore/Makefiles/gmake/freebsd/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/freebsd/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,64 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/10 13:22:04 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/freebsd/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/freebsd/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/freebsd/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:42:07 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Deleted: trunk/complement/explore/Makefiles/gmake/hp-ux/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/hp-ux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,65 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/02 18:39:22 ptr>
-# $Id$
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/hp-ux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/hp-ux/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/hp-ux/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:40:25 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Modified: trunk/complement/explore/Makefiles/gmake/lib/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/lib/top.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/lib/top.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,12 +1,37 @@
# -*- makefile -*- Time-stamp: <03/10/10 16:15:53 ptr>
-# $Id$
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
LDFLAGS ?=
+ifneq ("$(findstring $(OSNAME),darwin windows)","")
include ${RULESBASE}/${USE_MAKE}/${OSNAME}/lib.mak
+else
+include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
+endif
+
include ${RULESBASE}/${USE_MAKE}/lib/${COMPILER_NAME}.mak
+
+ifneq ("$(findstring $(OSNAME),windows)","")
include ${RULESBASE}/${USE_MAKE}/${OSNAME}/rules-so.mak
+else
+include ${RULESBASE}/${USE_MAKE}/unix/rules-so.mak
+endif
+
include ${RULESBASE}/${USE_MAKE}/lib/rules-a.mak
+
+ifneq ("$(findstring $(OSNAME),windows)","")
include ${RULESBASE}/${USE_MAKE}/${OSNAME}/rules-install-so.mak
+else
+include ${RULESBASE}/${USE_MAKE}/unix/rules-install-so.mak
+endif
+
include ${RULESBASE}/${USE_MAKE}/lib/rules-install-a.mak
include ${RULESBASE}/${USE_MAKE}/lib/clean.mak
Deleted: trunk/complement/explore/Makefiles/gmake/linux/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/linux/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,141 +0,0 @@
-# -*- makefile -*- Time-stamp: <07/02/07 14:58:53 ptr>
-#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
-# Petr Ovtchenkov
-#
-# Portion Copyright (c) 1999-2001
-# Parallel Graphics Ltd.
-#
-# Licensed under the Academic Free License version 3.0
-#
-
-ifndef INSTALL_TAGS
-
-ifndef _NO_SHARED_BUILD
-INSTALL_TAGS := install-release-shared
-else
-INSTALL_TAGS :=
-endif
-
-ifdef _STATIC_BUILD
-INSTALL_TAGS += install-release-static
-endif
-
-ifndef _NO_DBG_BUILD
-ifndef _NO_SHARED_BUILD
-INSTALL_TAGS += install-dbg-shared
-endif
-ifdef _STATIC_BUILD
-INSTALL_TAGS += install-dbg-static
-endif
-endif
-
-ifndef _NO_STLDBG_BUILD
-ifndef WITHOUT_STLPORT
-ifndef _NO_SHARED_BUILD
-INSTALL_TAGS += install-stldbg-shared
-endif
-ifdef _STATIC_BUILD
-INSTALL_TAGS += install-stldbg-static
-endif
-endif
-endif
-
-endif
-
-
-ifndef INSTALL_STRIP_TAGS
-
-ifndef _NO_SHARED_BUILD
-INSTALL_STRIP_TAGS := install-strip-shared
-else
-INSTALL_STRIP_TAGS :=
-endif
-
-ifdef _STATIC_BUILD
-INSTALL_STRIP_TAGS += install-release-static
-endif
-
-ifndef _NO_DBG_BUILD
-ifndef _NO_SHARED_BUILD
-INSTALL_STRIP_TAGS += install-dbg-shared
-endif
-ifdef _STATIC_BUILD
-INSTALL_STRIP_TAGS += install-dbg-static
-endif
-endif
-
-ifndef _NO_STLDBG_BUILD
-ifndef WITHOUT_STLPORT
-ifndef _NO_SHARED_BUILD
-INSTALL_STRIP_TAGS += install-stldbg-shared
-endif
-ifdef _STATIC_BUILD
-INSTALL_STRIP_TAGS += install-stldbg-static
-endif
-endif
-endif
-
-endif
-
-
-PHONY += install install-strip $(INSTALL_TAGS) $(INSTALL_STRIP_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-strip: $(INSTALL_STRIP_TAGS)
-
-# Workaround for GNU make 3.80; see comments in rules-so.mak
-define do_install_so_links
-$${INSTALL_LIB_DIR$(1)}/$${SO_NAME$(1)xxx}: $${SO_NAME_OUT$(1)xxx}
- $$(INSTALL_SO) $${SO_NAME_OUT$(1)xxx} $$(INSTALL_LIB_DIR$(1))
- @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
- @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
- @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
-endef
-
-# Workaround for GNU make 3.80; see comments in rules-so.mak
-define do_install_so_links_wk
-# expand to nothing, if equal
-ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_STLDBG}/${SO_NAME_STLDBGxxx})
-# expand to nothing, if WITHOUT_STLPORT
-ifndef WITHOUT_STLPORT
-$(call do_install_so_links,$(1))
-endif
-endif
-endef
-
-# Workaround for GNU make 3.80; see comments in rules-so.mak
-define do_install_so_links_wk2
-# expand to nothing, if equal
-ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_DBG}/${SO_NAME_DBGxxx})
-$(call do_install_so_links,$(1))
-endif
-endef
-
-
-$(eval $(call do_install_so_links,))
-# ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_DBG}/${SO_NAME_DBGxxx})
-# $(eval $(call do_install_so_links,_DBG))
-$(eval $(call do_install_so_links_wk2,_DBG))
-# endif
-# ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_STLDBG}/${SO_NAME_STLDBGxxx})
-# ifndef WITHOUT_STLPORT
-$(eval $(call do_install_so_links_wk,_STLDBG))
-# endif
-# endif
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
- ${POST_INSTALL}
-
-install-strip-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
- ${STRIP} ${_SO_STRIP_OPTION} $(INSTALL_LIB_DIR)/${SO_NAMExxx}
- ${POST_INSTALL}
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}
- ${POST_INSTALL_DBG}
-
-ifndef WITHOUT_STLPORT
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG) $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}
- ${POST_INSTALL_STLDBG}
-endif
Deleted: trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,72 +0,0 @@
-# -*- makefile -*- Time-stamp: <06/12/12 09:43:02 ptr>
-#
-# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
-# Petr Ovtchenkov
-#
-# Portion Copyright (c) 1999-2001
-# Parallel Graphics Ltd.
-#
-# Licensed under the Academic Free License version 3.0
-#
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(EXTRA_PRE) $(OUTPUT_DIR) ${SO_NAME_OUTxxx} $(EXTRA_POST)
-
-dbg-shared: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx} $(EXTRA_POST_DBG)
-
-ifndef WITHOUT_STLPORT
-stldbg-shared: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx} $(EXTRA_POST_STLDBG)
-endif
-
-define do_so_links_1
-if [ -h $(1)/$(2) ]; then \
- if [ `readlink $(1)/$(2)` != "$(3)" ]; then \
- rm $(1)/$(2); \
- ln -s $(3) $(1)/$(2); \
- fi; \
-else \
- ln -s $(3) $(1)/$(2); \
-fi;
-endef
-
-# Workaround for GNU make 3.80: it fail on 'eval' within 'if'
-# directive after some level of complexity, i.e. after complex
-# rules it fails on code:
-#
-# $(eval $(call do_so_links,cc,))
-# $(eval $(call do_so_links,cc,_DBG))
-# ifndef WITHOUT_STLPORT
-# $(eval $(call do_so_links,cc,_STLDBG))
-# endif
-#
-# Put 'if' logic into defined macro looks as workaround.
-#
-# The GNU make 3.81 free from this problem, but it new...
-
-define do_so_links
-$${SO_NAME_OUT$(1)xxx}: $$(OBJ$(1)) $$(LIBSDEP)
-ifeq ("${_C_SOURCES_ONLY}","")
- $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$(OBJ$(1)) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
-else
- $$(LINK.c) $$(LINK_OUTPUT_OPTION) $$(OBJ$(1)) $$(LDLIBS)
-endif
- @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
- @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
- @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
-endef
-
-define do_so_links_wk
-# expand to nothing, if WITHOUT_STLPORT
-ifndef WITHOUT_STLPORT
-$(call do_so_links,$(1))
-endif
-endef
-
-$(eval $(call do_so_links,))
-$(eval $(call do_so_links,_DBG))
-# ifndef WITHOUT_STLPORT
-$(eval $(call do_so_links_wk,_STLDBG))
-# endif
Deleted: trunk/complement/explore/Makefiles/gmake/openbsd/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/openbsd/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/openbsd/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/openbsd/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/openbsd/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/openbsd/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,73 +0,0 @@
-# -*- makefile -*- Time-stamp: <04/03/16 17:22:33 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- @if [ ! -d $(INSTALL_LIB_DIR) ] ; then \
- mkdir -p $(INSTALL_LIB_DIR) ; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- @if [ ! -d $(INSTALL_LIB_DIR_DBG) ] ; then \
- mkdir -p $(INSTALL_LIB_DIR_DBG) ; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- @if [ ! -d $(INSTALL_LIB_DIR_STLDBG) ] ; then \
- mkdir -p $(INSTALL_LIB_DIR_STLDBG) ; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/openbsd/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/openbsd/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/openbsd/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:41:36 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Deleted: trunk/complement/explore/Makefiles/gmake/sunos/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/sunos/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,5 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/19 12:26:05 ptr>
-# $Id$
-
-include ${RULESBASE}/${USE_MAKE}/unix/lib.mak
-
Deleted: trunk/complement/explore/Makefiles/gmake/sunos/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/sunos/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,64 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/07/10 13:22:04 ptr>
-
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
-
-PHONY += install $(INSTALL_TAGS)
-
-install: $(INSTALL_TAGS)
-
-install-release-shared: release-shared $(INSTALL_LIB_DIR)
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAME} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAME}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMEx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMEx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR)/${SO_NAMExx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR)/${SO_NAMExxx} ] ; then \
- rm $(INSTALL_LIB_DIR)/${SO_NAMExxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUTxxx} $(INSTALL_LIB_DIR)
- (cd $(INSTALL_LIB_DIR) && \
- { ln -s ${SO_NAMExxx} ${SO_NAMExx}; \
- ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- ln -s ${SO_NAMEx} ${SO_NAME}; } )
-
-install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG)
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_DBGxxx} $(INSTALL_LIB_DIR_DBG)
- (cd $(INSTALL_LIB_DIR_DBG) && \
- { ln -s ${SO_NAME_DBGxxx} ${SO_NAME_DBGxx}; \
- ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG}; } )
-
-install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG)
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBG}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGx}; \
- fi
- @if [ -h $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxx}; \
- fi
- @if [ -f $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx} ] ; then \
- rm $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}; \
- fi
- $(INSTALL_SO) ${SO_NAME_OUT_STLDBGxxx} $(INSTALL_LIB_DIR_STLDBG)
- (cd $(INSTALL_LIB_DIR_STLDBG) && \
- { ln -s ${SO_NAME_STLDBGxxx} ${SO_NAME_STLDBGxx}; \
- ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG}; } )
Deleted: trunk/complement/explore/Makefiles/gmake/sunos/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sunos/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/sunos/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,33 +0,0 @@
-# -*- makefile -*- Time-stamp: <05/03/28 23:42:45 ptr>
-# $Id$
-
-# Shared libraries tags
-
-PHONY += release-shared dbg-shared stldbg-shared
-
-release-shared: $(OUTPUT_DIR) ${SO_NAME_OUTxxx}
-
-dbg-shared: $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx}
-
-stldbg-shared: $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx}
-
-${SO_NAME_OUTxxx}: $(OBJ) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR); \
- rm -f ${SO_NAMExx}; ln -s $(SO_NAMExxx) ${SO_NAMExx}; \
- rm -f ${SO_NAMEx}; ln -s ${SO_NAMExx} ${SO_NAMEx}; \
- rm -f ${SO_NAME}; ln -s ${SO_NAMEx} ${SO_NAME})
-
-${SO_NAME_OUT_DBGxxx}: $(OBJ_DBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_DBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_DBG); \
- rm -f ${SO_NAME_DBGxx}; ln -s $(SO_NAME_DBGxxx) ${SO_NAME_DBGxx}; \
- rm -f ${SO_NAME_DBGx}; ln -s ${SO_NAME_DBGxx} ${SO_NAME_DBGx}; \
- rm -f ${SO_NAME_DBG}; ln -s ${SO_NAME_DBGx} ${SO_NAME_DBG})
-
-${SO_NAME_OUT_STLDBGxxx}: $(OBJ_STLDBG) $(LIBSDEP)
- $(LINK.cc) $(LINK_OUTPUT_OPTION) ${START_OBJ} $(OBJ_STLDBG) $(LDLIBS) ${STDLIBS} ${END_OBJ}
- (cd $(OUTPUT_DIR_STLDBG); \
- rm -f ${SO_NAME_STLDBGxx}; ln -s $(SO_NAME_STLDBGxxx) ${SO_NAME_STLDBGxx}; \
- rm -f ${SO_NAME_STLDBGx}; ln -s ${SO_NAME_STLDBGxx} ${SO_NAME_STLDBGx}; \
- rm -f ${SO_NAME_STLDBG}; ln -s ${SO_NAME_STLDBGx} ${SO_NAME_STLDBG})
Modified: trunk/complement/explore/Makefiles/gmake/unix/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/unix/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -14,34 +14,20 @@
# Shared libraries:
-ifeq ($(OSNAME),darwin)
SO_NAME := lib${LIBNAME}.$(SO)
-SO_NAMEx := lib${LIBNAME}.${MAJOR}.$(SO)
-SO_NAMExx := lib${LIBNAME}.${MAJOR}.${MINOR}.$(SO)
-SO_NAMExxx := lib${LIBNAME}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
-else
-SO_NAME := lib${LIBNAME}.$(SO)
SO_NAMEx := ${SO_NAME}.${MAJOR}
SO_NAMExx := ${SO_NAMEx}.${MINOR}
SO_NAMExxx := ${SO_NAMExx}.${PATCH}
-endif
SO_NAME_OUT := $(OUTPUT_DIR)/${SO_NAME}
SO_NAME_OUTx := $(OUTPUT_DIR)/${SO_NAMEx}
SO_NAME_OUTxx := $(OUTPUT_DIR)/${SO_NAMExx}
SO_NAME_OUTxxx := $(OUTPUT_DIR)/${SO_NAMExxx}
-ifeq ($(OSNAME),darwin)
SO_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(SO)
-SO_NAME_DBGx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.$(SO)
-SO_NAME_DBGxx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.${MINOR}.$(SO)
-SO_NAME_DBGxxx := lib${LIBNAME}${DBG_SUFFIX}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
-else
-SO_NAME_DBG := lib${LIBNAME}${DBG_SUFFIX}.$(SO)
SO_NAME_DBGx := ${SO_NAME_DBG}.${MAJOR}
SO_NAME_DBGxx := ${SO_NAME_DBGx}.${MINOR}
SO_NAME_DBGxxx := ${SO_NAME_DBGxx}.${PATCH}
-endif
SO_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}
SO_NAME_OUT_DBGx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGx}
@@ -49,18 +35,10 @@
SO_NAME_OUT_DBGxxx := $(OUTPUT_DIR_DBG)/${SO_NAME_DBGxxx}
ifndef WITHOUT_STLPORT
-
-ifeq ($(OSNAME),darwin)
SO_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(SO)
-SO_NAME_STLDBGx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.$(SO)
-SO_NAME_STLDBGxx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.${MINOR}.$(SO)
-SO_NAME_STLDBGxxx := lib${LIBNAME}${STLDBG_SUFFIX}.${MAJOR}.${MINOR}.${PATCH}.$(SO)
-else
-SO_NAME_STLDBG := lib${LIBNAME}${STLDBG_SUFFIX}.$(SO)
SO_NAME_STLDBGx := ${SO_NAME_STLDBG}.${MAJOR}
SO_NAME_STLDBGxx := ${SO_NAME_STLDBGx}.${MINOR}
SO_NAME_STLDBGxxx := ${SO_NAME_STLDBGxx}.${PATCH}
-endif
SO_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}
SO_NAME_OUT_STLDBGx := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBGx}
Copied: trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak (from rev 1535, trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak)
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -0,0 +1,141 @@
+# -*- makefile -*- Time-stamp: <07/02/07 14:58:53 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+ifndef INSTALL_TAGS
+
+ifndef _NO_SHARED_BUILD
+INSTALL_TAGS := install-release-shared
+else
+INSTALL_TAGS :=
+endif
+
+ifdef _STATIC_BUILD
+INSTALL_TAGS += install-release-static
+endif
+
+ifndef _NO_DBG_BUILD
+ifndef _NO_SHARED_BUILD
+INSTALL_TAGS += install-dbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_TAGS += install-dbg-static
+endif
+endif
+
+ifndef _NO_STLDBG_BUILD
+ifndef WITHOUT_STLPORT
+ifndef _NO_SHARED_BUILD
+INSTALL_TAGS += install-stldbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_TAGS += install-stldbg-static
+endif
+endif
+endif
+
+endif
+
+
+ifndef INSTALL_STRIP_TAGS
+
+ifndef _NO_SHARED_BUILD
+INSTALL_STRIP_TAGS := install-strip-shared
+else
+INSTALL_STRIP_TAGS :=
+endif
+
+ifdef _STATIC_BUILD
+INSTALL_STRIP_TAGS += install-release-static
+endif
+
+ifndef _NO_DBG_BUILD
+ifndef _NO_SHARED_BUILD
+INSTALL_STRIP_TAGS += install-dbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_STRIP_TAGS += install-dbg-static
+endif
+endif
+
+ifndef _NO_STLDBG_BUILD
+ifndef WITHOUT_STLPORT
+ifndef _NO_SHARED_BUILD
+INSTALL_STRIP_TAGS += install-stldbg-shared
+endif
+ifdef _STATIC_BUILD
+INSTALL_STRIP_TAGS += install-stldbg-static
+endif
+endif
+endif
+
+endif
+
+
+PHONY += install install-strip $(INSTALL_TAGS) $(INSTALL_STRIP_TAGS)
+
+install: $(INSTALL_TAGS)
+
+install-strip: $(INSTALL_STRIP_TAGS)
+
+# Workaround for GNU make 3.80; see comments in rules-so.mak
+define do_install_so_links
+$${INSTALL_LIB_DIR$(1)}/$${SO_NAME$(1)xxx}: $${SO_NAME_OUT$(1)xxx}
+ $$(INSTALL_SO) $${SO_NAME_OUT$(1)xxx} $$(INSTALL_LIB_DIR$(1))
+ @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
+ @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
+ @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
+endef
+
+# Workaround for GNU make 3.80; see comments in rules-so.mak
+define do_install_so_links_wk
+# expand to nothing, if equal
+ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_STLDBG}/${SO_NAME_STLDBGxxx})
+# expand to nothing, if WITHOUT_STLPORT
+ifndef WITHOUT_STLPORT
+$(call do_install_so_links,$(1))
+endif
+endif
+endef
+
+# Workaround for GNU make 3.80; see comments in rules-so.mak
+define do_install_so_links_wk2
+# expand to nothing, if equal
+ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_DBG}/${SO_NAME_DBGxxx})
+$(call do_install_so_links,$(1))
+endif
+endef
+
+
+$(eval $(call do_install_so_links,))
+# ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_DBG}/${SO_NAME_DBGxxx})
+# $(eval $(call do_install_so_links,_DBG))
+$(eval $(call do_install_so_links_wk2,_DBG))
+# endif
+# ifneq (${INSTALL_LIB_DIR}/${SO_NAMExxx},${INSTALL_LIB_DIR_STLDBG}/${SO_NAME_STLDBGxxx})
+# ifndef WITHOUT_STLPORT
+$(eval $(call do_install_so_links_wk,_STLDBG))
+# endif
+# endif
+
+install-release-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
+ ${POST_INSTALL}
+
+install-strip-shared: release-shared $(INSTALL_LIB_DIR) $(INSTALL_LIB_DIR)/${SO_NAMExxx}
+ ${STRIP} ${_SO_STRIP_OPTION} $(INSTALL_LIB_DIR)/${SO_NAMExxx}
+ ${POST_INSTALL}
+
+install-dbg-shared: dbg-shared $(INSTALL_LIB_DIR_DBG) $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBGxxx}
+ ${POST_INSTALL_DBG}
+
+ifndef WITHOUT_STLPORT
+install-stldbg-shared: stldbg-shared $(INSTALL_LIB_DIR_STLDBG) $(INSTALL_LIB_DIR_STLDBG)/${SO_NAME_STLDBGxxx}
+ ${POST_INSTALL_STLDBG}
+endif
Copied: trunk/complement/explore/Makefiles/gmake/unix/rules-so.mak (from rev 1535, trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak)
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/rules-so.mak (rev 0)
+++ trunk/complement/explore/Makefiles/gmake/unix/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -0,0 +1,72 @@
+# -*- makefile -*- Time-stamp: <06/12/12 09:43:02 ptr>
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
+
+# Shared libraries tags
+
+PHONY += release-shared dbg-shared stldbg-shared
+
+release-shared: $(EXTRA_PRE) $(OUTPUT_DIR) ${SO_NAME_OUTxxx} $(EXTRA_POST)
+
+dbg-shared: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${SO_NAME_OUT_DBGxxx} $(EXTRA_POST_DBG)
+
+ifndef WITHOUT_STLPORT
+stldbg-shared: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${SO_NAME_OUT_STLDBGxxx} $(EXTRA_POST_STLDBG)
+endif
+
+define do_so_links_1
+if [ -h $(1)/$(2) ]; then \
+ if [ `readlink $(1)/$(2)` != "$(3)" ]; then \
+ rm $(1)/$(2); \
+ ln -s $(3) $(1)/$(2); \
+ fi; \
+else \
+ ln -s $(3) $(1)/$(2); \
+fi;
+endef
+
+# Workaround for GNU make 3.80: it fail on 'eval' within 'if'
+# directive after some level of complexity, i.e. after complex
+# rules it fails on code:
+#
+# $(eval $(call do_so_links,cc,))
+# $(eval $(call do_so_links,cc,_DBG))
+# ifndef WITHOUT_STLPORT
+# $(eval $(call do_so_links,cc,_STLDBG))
+# endif
+#
+# Put 'if' logic into defined macro looks as workaround.
+#
+# The GNU make 3.81 free from this problem, but it new...
+
+define do_so_links
+$${SO_NAME_OUT$(1)xxx}: $$(OBJ$(1)) $$(LIBSDEP)
+ifeq ("${_C_SOURCES_ONLY}","")
+ $$(LINK.cc) $$(LINK_OUTPUT_OPTION) $${START_OBJ} $$(OBJ$(1)) $$(LDLIBS) $${STDLIBS} $${END_OBJ}
+else
+ $$(LINK.c) $$(LINK_OUTPUT_OPTION) $$(OBJ$(1)) $$(LDLIBS)
+endif
+ @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx})
+ @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx})
+ @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x})
+endef
+
+define do_so_links_wk
+# expand to nothing, if WITHOUT_STLPORT
+ifndef WITHOUT_STLPORT
+$(call do_so_links,$(1))
+endif
+endef
+
+$(eval $(call do_so_links,))
+$(eval $(call do_so_links,_DBG))
+# ifndef WITHOUT_STLPORT
+$(eval $(call do_so_links_wk,_STLDBG))
+# endif
Modified: trunk/complement/explore/Makefiles/gmake/windows/lib.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/lib.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/windows/lib.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,4 +1,52 @@
# -*- makefile -*- Time-stamp: <03/07/15 18:23:04 ptr>
-# $Id$
+#
+# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
+# Petr Ovtchenkov
+#
+# Portion Copyright (c) 1999-2001
+# Parallel Graphics Ltd.
+#
+# Licensed under the Academic Free License version 3.0
+#
-include ../Makefiles/gmake/cygming/lib.mak
+RELEASE_SUFFIX := r
+DBG_SUFFIX := d
+STLDBG_SUFFIX := stl${DBG_SUFFIX}
+
+# Shared libraries:
+SO_NAME_BASE := ${LIBNAME}_${RELEASE_SUFFIX}${MAJOR}${MINOR}
+SO_NAME := ${SO_NAME_BASE}.$(SO)
+LIB_NAME := ${SO_NAME_BASE}.$(LIB)
+EXP_NAME := ${SO_NAME_BASE}.$(EXP)
+
+SO_NAME_OUT := $(OUTPUT_DIR)/${SO_NAME}
+LIB_NAME_OUT := $(OUTPUT_DIR)/${LIB_NAME}
+EXP_NAME_OUT := $(OUTPUT_DIR)/${EXP_NAME}
+
+SO_NAME_DBG_BASE := ${LIBNAME}_${DBG_SUFFIX}${MAJOR}${MINOR}
+SO_NAME_DBG := ${SO_NAME_DBG_BASE}.$(SO)
+LIB_NAME_DBG := ${SO_NAME_DBG_BASE}.$(LIB)
+EXP_NAME_DBG := ${SO_NAME_DBG_BASE}.$(EXP)
+
+SO_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${SO_NAME_DBG}
+LIB_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${LIB_NAME_DBG}
+EXP_NAME_OUT_DBG := $(OUTPUT_DIR_DBG)/${EXP_NAME_DBG}
+
+SO_NAME_STLDBG_BASE := ${LIBNAME}_${STLDBG_SUFFIX}${MAJOR}${MINOR}
+SO_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(SO)
+LIB_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(LIB)
+EXP_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}.$(EXP)
+
+SO_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${SO_NAME_STLDBG}
+LIB_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${LIB_NAME_STLDBG}
+EXP_NAME_OUT_STLDBG := $(OUTPUT_DIR_STLDBG)/${EXP_NAME_STLDBG}
+
+# Static libraries:
+A_NAME := ${SO_NAME_BASE}_static.$(ARCH)
+A_NAME_OUT := $(OUTPUT_DIR_A)/$(A_NAME)
+
+A_NAME_DBG := ${SO_NAME_DBG_BASE}_static.$(ARCH)
+A_NAME_OUT_DBG := $(OUTPUT_DIR_A_DBG)/$(A_NAME_DBG)
+
+A_NAME_STLDBG := ${SO_NAME_STLDBG_BASE}_static.$(ARCH)
+A_NAME_OUT_STLDBG := $(OUTPUT_DIR_A_STLDBG)/$(A_NAME_STLDBG)
Modified: trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-install-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,29 +1,21 @@
# -*- makefile -*- Time-stamp: <03/07/15 18:26:22 ptr>
+# $Id$
-INSTALL_TAGS ?= install-release-shared install-dbg-shared install-stldbg-shared
+INSTALL_TAGS ?= install-shared
PHONY += install $(INSTALL_TAGS)
install: $(INSTALL_TAGS)
-install-static: all-static install-release-static install-dbg-static install-stldbg-static
-install-shared: all-shared install-release-shared install-dbg-shared install-stldbg-shared
-
-install-release-shared: release-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR)
- @if not exist $(subst /,\,$(INSTALL_BIN_DIR)/) mkdir $(subst /,\,$(INSTALL_BIN_DIR)/)
- @if not exist $(subst /,\,$(INSTALL_LIB_DIR)/) mkdir $(subst /,\,$(INSTALL_LIB_DIR)/)
+install-release-shared: release-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR)
$(INSTALL_SO) $(subst /,\,$(SO_NAME_OUT)) $(subst /,\,$(INSTALL_BIN_DIR)/)
$(INSTALL_SO) $(subst /,\,$(LIB_NAME_OUT)) $(subst /,\,$(INSTALL_LIB_DIR)/)
-install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_DBG)
- @if not exist $(subst /,\,$(INSTALL_BIN_DIR)/) mkdir $(subst /,\,$(INSTALL_BIN_DIR)/)
- @if not exist $(subst /,\,$(INSTALL_LIB_DIR_DBG)/) mkdir $(subst /,\,$(INSTALL_LIB_DIR_DBG)/)
+install-dbg-shared: dbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_DBG)
$(INSTALL_SO) $(subst /,\,$(SO_NAME_OUT_DBG)) $(subst /,\,$(INSTALL_BIN_DIR)/)
$(INSTALL_SO) $(subst /,\,$(LIB_NAME_OUT_DBG)) $(subst /,\,$(INSTALL_LIB_DIR_DBG)/)
-install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_STLDBG)
- @if not exist $(subst /,\,$(INSTALL_BIN_DIR)/) mkdir $(subst /,\,$(INSTALL_BIN_DIR)/)
- @if not exist $(subst /,\,$(INSTALL_LIB_DIR_STLDBG)/) mkdir $(subst /,\,$(INSTALL_LIB_DIR_STLDBG)/)
+install-stldbg-shared: stldbg-shared $(INSTALL_BIN_DIR) $(INSTALL_LIB_DIR_STLDBG)
$(INSTALL_SO) $(subst /,\,$(SO_NAME_OUT_STLDBG)) $(subst /,\,$(INSTALL_BIN_DIR)/)
$(INSTALL_SO) $(subst /,\,$(LIB_NAME_OUT_STLDBG)) $(subst /,\,$(INSTALL_LIB_DIR_STLDBG)/)
Deleted: trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-02-28 12:55:50 UTC (rev 1538)
+++ trunk/complement/explore/Makefiles/gmake/windows/rules-so.mak 2007-02-28 17:15:33 UTC (rev 1539)
@@ -1,4 +0,0 @@
-# -*- makefile -*- Time-stamp: <03/10/27 18:15:05 ptr>
-# $Id$
-
-include ../Makefiles/gmake/cygming/rules-so.mak
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-28 12:55:54
|
Revision: 1538
http://svn.sourceforge.net/complement/?rev=1538&view=rev
Author: complement
Date: 2007-02-28 04:55:50 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
even PHONY target should be distingueshed from real file name (catalog in this case)
Modified Paths:
--------------
trunk/complement/explore/test/stem/Makefile
Modified: trunk/complement/explore/test/stem/Makefile
===================================================================
--- trunk/complement/explore/test/stem/Makefile 2007-02-28 08:43:18 UTC (rev 1537)
+++ trunk/complement/explore/test/stem/Makefile 2007-02-28 12:55:50 UTC (rev 1538)
@@ -3,7 +3,7 @@
SRCROOT := ../..
COMPILER_NAME := gcc
-EXTRA_POST := dl
+EXTRA_POST := dl-rel
EXTRA_POST_DBG := dl-dbg
EXTRA_POST_STLDBG := dl-stldbg
@@ -29,9 +29,9 @@
# dbg-shared: DEFS += -DDEBUG
-PHONY += dl dl-dbg dl-stldbg
+PHONY += dl-rel dl-dbg dl-stldbg
-dl:
+dl-rel:
${MAKE} -C dl release-shared
dl-dbg:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-28 08:43:19
|
Revision: 1537
http://svn.sourceforge.net/complement/?rev=1537&view=rev
Author: complement
Date: 2007-02-28 00:43:18 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
snapshot 2007-02-28
Added Paths:
-----------
tags/complement-20070228/
Copied: tags/complement-20070228 (from rev 1536, trunk/complement)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-28 08:23:44
|
Revision: 1536
http://svn.sourceforge.net/complement/?rev=1536&view=rev
Author: complement
Date: 2007-02-28 00:23:43 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
fstream-like interface to unique temporary file;
file generated from template with mkstemp [POSIX 1003.1-2001]
Modified Paths:
--------------
trunk/complement/explore/lib/misc/ChangeLog
Added Paths:
-----------
trunk/complement/explore/include/misc/tfstream
trunk/complement/explore/inquiry/shades/mkstemp/
trunk/complement/explore/inquiry/shades/mkstemp/Makefile
trunk/complement/explore/inquiry/shades/mkstemp/Makefile.inc
trunk/complement/explore/inquiry/shades/mkstemp/test.c
Added: trunk/complement/explore/include/misc/tfstream
===================================================================
--- trunk/complement/explore/include/misc/tfstream (rev 0)
+++ trunk/complement/explore/include/misc/tfstream 2007-02-28 08:23:43 UTC (rev 1536)
@@ -0,0 +1,89 @@
+// -*- C++ -*- Time-stamp: <07/02/28 00:53:40 ptr>
+
+/*
+ *
+ * Copyright (c) 2007
+ * Petr Ovtchenkov
+ *
+ * Licensed under the Academic Free License version 3.0
+ *
+ */
+
+#ifndef __misc_tfstream
+#define __misc_tfstream
+
+#include <fstream>
+#include <string>
+#include <cstdlib>
+
+namespace misc {
+
+template <class _CharT, class _Traits>
+class basic_tfstream :
+ public std::basic_iostream<_CharT, _Traits>
+{
+ public:
+ typedef _CharT char_type;
+ typedef typename _Traits::int_type int_type;
+ typedef typename _Traits::pos_type pos_type;
+ typedef typename _Traits::off_type off_type;
+ typedef _Traits traits_type;
+
+ public:
+ basic_tfstream() :
+ std::basic_ios<_CharT, _Traits>(),
+ std::basic_iostream<_CharT, _Traits>(0),
+ _M_buf()
+ { this->init(&_M_buf); }
+
+ explicit basic_tfstream( const char *__s ) :
+ std::basic_ios<_CharT, _Traits>(),
+ std::basic_iostream<_CharT, _Traits>(0),
+ _M_buf()
+ {
+ this->init(&_M_buf);
+ _name = __s;
+ _name += "XXXXXX";
+ int fd = ::mkstemp( const_cast<char *>(_name.c_str()) );
+ if ( fd < 0 || !_M_buf.open( fd ) ) {
+ this->setstate(std::ios_base::failbit);
+ }
+ }
+
+ void open( const char *__s )
+ {
+ _name = __s;
+ _name += "XXXXXX";
+ int fd = ::mkstemp( const_cast<char *>(_name.c_str()) );
+ if ( fd < 0 || !_M_buf.open( fd ) ) {
+ this->setstate(std::ios_base::failbit);
+ }
+ }
+
+ const char *name() const
+ { return _name.c_str(); }
+
+ std::basic_filebuf<_CharT, _Traits>* rdbuf() const
+ { return const_cast<std::basic_filebuf<_CharT, _Traits> *>(&_M_buf); }
+
+ bool is_open()
+ { return this->rdbuf()->is_open(); }
+
+ void close()
+ {
+ if (!this->rdbuf()->close()) {
+ this->setstate(std::ios_base::failbit);
+ }
+ }
+
+ private:
+ std::string _name;
+ std::basic_filebuf<_CharT, _Traits> _M_buf;
+};
+
+typedef basic_tfstream<char, std::char_traits<char> > tfstream;
+typedef basic_tfstream<wchar_t, std::char_traits<wchar_t> > wtfstream;
+
+} // namespace misc
+
+#endif // __misc_tfstream
Property changes on: trunk/complement/explore/inquiry/shades/mkstemp
___________________________________________________________________
Name: svn:ignore
+ obj
Added: trunk/complement/explore/inquiry/shades/mkstemp/Makefile
===================================================================
--- trunk/complement/explore/inquiry/shades/mkstemp/Makefile (rev 0)
+++ trunk/complement/explore/inquiry/shades/mkstemp/Makefile 2007-02-28 08:23:43 UTC (rev 1536)
@@ -0,0 +1,10 @@
+# -*- Makefile -*- Time-stamp: <06/11/13 23:03:45 ptr>
+
+SRCROOT := ../../..
+
+include Makefile.inc
+include ${SRCROOT}/Makefiles/top.mak
+
+ifndef WITHOUT_STLPORT
+LDFLAGS += -Wl,-rpath=${STLPORT_LIB_DIR}
+endif
Added: trunk/complement/explore/inquiry/shades/mkstemp/Makefile.inc
===================================================================
--- trunk/complement/explore/inquiry/shades/mkstemp/Makefile.inc (rev 0)
+++ trunk/complement/explore/inquiry/shades/mkstemp/Makefile.inc 2007-02-28 08:23:43 UTC (rev 1536)
@@ -0,0 +1,4 @@
+# -*- makefile -*- Time-stamp: <04/01/12 15:37:40 ptr>
+
+PRGNAME = test
+SRC_C = test.c
Added: trunk/complement/explore/inquiry/shades/mkstemp/test.c
===================================================================
--- trunk/complement/explore/inquiry/shades/mkstemp/test.c (rev 0)
+++ trunk/complement/explore/inquiry/shades/mkstemp/test.c 2007-02-28 08:23:43 UTC (rev 1536)
@@ -0,0 +1,20 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+
+int main()
+{
+ char buf[1024];
+ int fd;
+
+ strcpy( buf, "/tmp/qXXXXXX" );
+ printf( "%s\n", buf );
+
+ fd = mkstemp( buf );
+
+ printf( "%s\n", buf );
+ close( fd );
+ /* unlink( buf ); */
+
+ return 0;
+}
Modified: trunk/complement/explore/lib/misc/ChangeLog
===================================================================
--- trunk/complement/explore/lib/misc/ChangeLog 2007-02-27 14:55:33 UTC (rev 1535)
+++ trunk/complement/explore/lib/misc/ChangeLog 2007-02-28 08:23:43 UTC (rev 1536)
@@ -1,3 +1,10 @@
+2007-02-28 Petr Ovtchenkov <pt...@is...>
+
+ * tfstream: fstream-like interface to unique temporary file;
+ file generated from template with mkstemp [POSIX 1003.1-2001];
+ template only, library not required; current implementation work
+ only with STLport with extentions enabled.
+
2006-05-24 Petr Ovtchenkov <pt...@is...>
* args.cc: explicitly add stdexcept header.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-27 14:55:38
|
Revision: 1535
http://svn.sourceforge.net/complement/?rev=1535&view=rev
Author: complement
Date: 2007-02-27 06:55:33 -0800 (Tue, 27 Feb 2007)
Log Message:
-----------
oh, it work now
Modified Paths:
--------------
trunk/complement/explore/inquiry/shades/autotools/Makefile.am
trunk/complement/explore/inquiry/shades/autotools/configure.ac
Added Paths:
-----------
trunk/complement/explore/inquiry/shades/autotools/AUTHORS
trunk/complement/explore/inquiry/shades/autotools/COPYING
trunk/complement/explore/inquiry/shades/autotools/INSTALL
trunk/complement/explore/inquiry/shades/autotools/NEWS
trunk/complement/explore/inquiry/shades/autotools/README
trunk/complement/explore/inquiry/shades/autotools/ext/
trunk/complement/explore/inquiry/shades/autotools/ext/compile
trunk/complement/explore/inquiry/shades/autotools/ext/config.guess
trunk/complement/explore/inquiry/shades/autotools/ext/config.sub
trunk/complement/explore/inquiry/shades/autotools/ext/depcomp
trunk/complement/explore/inquiry/shades/autotools/ext/install-sh
trunk/complement/explore/inquiry/shades/autotools/ext/ltmain.sh
trunk/complement/explore/inquiry/shades/autotools/ext/missing
trunk/complement/explore/inquiry/shades/autotools/ext/mkinstalldirs
Added: trunk/complement/explore/inquiry/shades/autotools/AUTHORS
===================================================================
Added: trunk/complement/explore/inquiry/shades/autotools/COPYING
===================================================================
Added: trunk/complement/explore/inquiry/shades/autotools/INSTALL
===================================================================
Modified: trunk/complement/explore/inquiry/shades/autotools/Makefile.am
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/Makefile.am 2007-02-27 10:28:33 UTC (rev 1534)
+++ trunk/complement/explore/inquiry/shades/autotools/Makefile.am 2007-02-27 14:55:33 UTC (rev 1535)
@@ -2,5 +2,5 @@
cxxtest_SOURCES = main.cc
AM_CXXFLAGS = -pthread
-AM_CPPFLAGS = -I/usr/include/stlport
+AM_CPPFLAGS = -I${HOME}/STLport.labs/STLport/stlport
cxxtest_LDADD = -lstlport
Added: trunk/complement/explore/inquiry/shades/autotools/NEWS
===================================================================
Added: trunk/complement/explore/inquiry/shades/autotools/README
===================================================================
Modified: trunk/complement/explore/inquiry/shades/autotools/configure.ac
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/configure.ac 2007-02-27 10:28:33 UTC (rev 1534)
+++ trunk/complement/explore/inquiry/shades/autotools/configure.ac 2007-02-27 14:55:33 UTC (rev 1535)
@@ -1,23 +1,22 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script
+AC_INIT([Test Autotools],[1],[no...@no...],[cxxtest])
+AC_PREREQ(2.60a)
+AC_CONFIG_AUX_DIR(ext)
+AM_INIT_AUTOMAKE
+AC_COPYRIGHT(All portions of this software are copylefted (c))
+
+# AC_LANG([C++])
+AC_PROG_CXX
+AC_PROG_RANLIB
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
-AC_PREREQ(2.59)
-AC_INIT(TestCXXProject, 1.0.0)
-AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([main.cc])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([Makefile])
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-
-# Checks for libraries.
ACX_PTHREAD
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-
-# Checks for library functions.
AC_OUTPUT
Added: trunk/complement/explore/inquiry/shades/autotools/ext/compile
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/ext/compile (rev 0)
+++ trunk/complement/explore/inquiry/shades/autotools/ext/compile 2007-02-27 14:55:33 UTC (rev 1535)
@@ -0,0 +1,99 @@
+#! /bin/sh
+
+# Wrapper for compilers which do not understand `-c -o'.
+
+# Copyright 1999, 2000 Free Software Foundation, Inc.
+# Written by Tom Tromey <tr...@cy...>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Usage:
+# compile PROGRAM [ARGS]...
+# `-o FOO.o' is removed from the args passed to the actual compile.
+
+prog=$1
+shift
+
+ofile=
+cfile=
+args=
+while test $# -gt 0; do
+ case "$1" in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we do something ugly here.
+ ofile=$2
+ shift
+ case "$ofile" in
+ *.o | *.obj)
+ ;;
+ *)
+ args="$args -o $ofile"
+ ofile=
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ args="$args $1"
+ ;;
+ *)
+ args="$args $1"
+ ;;
+ esac
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$prog" $args
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+while true; do
+ if mkdir $lockdir > /dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir $lockdir; exit 1" 1 2 15
+
+# Run the compile.
+"$prog" $args
+status=$?
+
+if test -f "$cofile"; then
+ mv "$cofile" "$ofile"
+fi
+
+rmdir $lockdir
+exit $status
Property changes on: trunk/complement/explore/inquiry/shades/autotools/ext/compile
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/complement/explore/inquiry/shades/autotools/ext/config.guess
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/ext/config.guess (rev 0)
+++ trunk/complement/explore/inquiry/shades/autotools/ext/config.guess 2007-02-27 14:55:33 UTC (rev 1535)
@@ -0,0 +1,1495 @@
+#! /bin/sh
+# 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-12-23'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner <pe...@bo...>.
+# Please send patches to <con...@gn...>. Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub. If it succeeds, it prints the system name on stdout, and
+# exits with 0. Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <con...@gn...>."
+
+version="\
+GNU config.guess ($timestamp)
+
+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.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit ;;
+ --version | -v )
+ echo "$version" ; exit ;;
+ --help | --h* | -h )
+ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+ * )
+ break ;;
+ esac
+done
+
+if test $# != 0; then
+ echo "$me: too many arguments$help" >&2
+ exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int x;" > $dummy.c ;
+ for c in cc gcc c89 c99 ; do
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ CC_FOR_BUILD="$c"; break ;
+ fi ;
+ done ;
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found ;
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (gh...@no... 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
+ eval $set_cc_for_build
+ cat << EOF > $dummy.c
+ #include <features.h>
+ #ifdef __UCLIBC__
+ # ifdef __UCLIBC_CONFIG_VERSION__
+ LIBC=uclibc __UCLIBC_CONFIG_VERSION__
+ # else
+ LIBC=uclibc
+ # endif
+ #else
+ LIBC=gnu
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
+fi
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # compatibility and a consistent mechanism for selecting the
+ # object file format.
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+ # to ELF recently, or will in the future.
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ELF__ >/dev/null
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
+ # The OS release
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ ;;
+ esac
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
+ # A Pn.n version is a patched version.
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+ exit ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-unknown-sysv4
+ exit ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
+ exit ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+ exit ;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # ak...@wp... (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+ fi
+ exit ;;
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+ exit ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit ;;
+ 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 ;;
+ esac ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ exit ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ exit ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ case "`/bin/arch`" in
+ sun3)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ ;;
+ sun4)
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+ exit ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+ exit ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
+ # to the lowercase version "mint" (or "freemint"). Finally
+ # the system name "TOS" denotes a system which is actually not
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+ exit ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+ exit ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+ exit ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+ exit ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+ exit ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
+ echo mips-mips-riscos${UNAME_RELEASE}
+ exit ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+ exit ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+ exit ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+ exit ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+ exit ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+ exit ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+ exit ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
+ then
+ echo m88k-dg-dgux${UNAME_RELEASE}
+ else
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+ exit ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+ exit ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+ exit ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+ exit ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ exit ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i*86:AIX:*:*)
+ echo i386-ibm-aix
+ exit ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <sys/systemcfg.h>
+
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
+EOF
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+ *:AIX:*:[45])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+ exit ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+ exit ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ exit ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+ exit ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+ exit ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+ exit ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+ exit ;;
+ 9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+ esac ;;
+ esac
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
+EOF
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
+ esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ exit ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+ exit ;;
+ 3050*:HI-UX:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
+ echo unknown-hitachi-hiuxwe2
+ exit ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+ exit ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+ exit ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+ exit ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+ exit ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+ exit ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+ exit ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+ exit ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+ exit ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+ exit ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*T3E:*:*:*)
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
+ i*:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+ x86:Interix*:[345]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ exit ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i586-pc-interix
+ exit ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-${LIBC}
+ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-${LIBC}
+ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-${LIBC}
+ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mipsel
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-${LIBC}
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-${LIBC}
+ exit ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-${LIBC}
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
+ esac
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-${LIBC}
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ exit ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-${LIBC}
+ exit ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+ # problems with other programs or directories called `ld' in the path.
+ # Set LC_ALL=C to ensure ld outputs messages in English.
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ | sed -ne '/supported targets:/!d
+ s/[ ][ ]*/ /g
+ s/.*supported targets: *//
+ s/ .*//
+ p'`
+ case "$ld_supported_targets" in
+ elf32-i386)
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
+ exit ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
+ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
+ exit ;;
+ esac
+ # This should get integrated into the C code below, but now we hack
+ if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ # if __GLIBC__ >= 2
+ LIBC=gnu
+ # else
+ LIBC=gnulibc1
+ # endif
+ # else
+ LIBC=gnulibc1
+ # endif
+ #else
+ #if defined(__INTEL_COMPILER) || defined(__PGI)
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
+ echo i386-sequent-sysv4
+ exit ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit ;;
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ fi
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ exit ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+ && UNAME_MACHINE=i686
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ && UNAME_MACHINE=i686
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+ exit ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
+ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+ exit ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ echo m68010-convergent-sysv
+ exit ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+ exit ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit ;;
+ TSUNAMI:LynxOS:2.*:*)
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+ exit ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+ exit ;;
+ RM*:SINIX-*:*:*)
+ echo mips-sni-sysv4
+ exit ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ echo ${UNAME_MACHINE}-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+ fi
+ exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Ric...@cc...>
+ echo i586-unisys-sysv4
+ exit ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <he...@op...>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+ exit ;;
+ *:*:*:FTX*)
+ # From se...@sw....
+ echo i860-stratus-sysv4
+ exit ;;
+ i*86:VOS:*:*)
+ # From Pau...@st....
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit ;;
+ *:VOS:*:*)
+ # From Pau...@st....
+ echo hppa1.1-stratus-vos
+ exit ;;
+ mc68*:A/UX:*:*)
+ echo m68k-apple-aux${UNAME_RELEASE}
+ exit ;;
+ news*:NEWS-OS:6*:*)
+ echo mips-sony-newsos6
+ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+ exit ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-5:SUPER-UX:*:*)
+ echo sx5-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit ;;
+ *:Rhapsody:*:*)
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+ UNAME_PROCESSOR=i386
+ UNAME_MACHINE=pc
+ fi
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ exit ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+ exit ;;
+ BS2000:POSIX*:*:*)
+ echo bs2000-siemens-sysv
+ exit ;;
+ DS/*:UNIX_System_V:*:*)
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ exit ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+ if test "$cputype" = "386"; then
+ UNAME_MACHINE=i386
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+ exit ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+ exit ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
+ exit ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+ exit ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
+ exit ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
+ exit ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
+ exit ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
+ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+ printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+ printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+# include <sys/param.h>
+# if defined (BSD)
+# if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+# else
+# if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# endif
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# else
+ printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+ exit ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit ;;
+ c34*)
+ echo c34-convex-bsd
+ exit ;;
+ c38*)
+ echo c38-convex-bsd
+ exit ;;
+ c4*)
+ echo c4-convex-bsd
+ exit ;;
+ esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <con...@gn...> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
Property changes on: trunk/complement/explore/inquiry/shades/autotools/ext/config.guess
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/complement/explore/inquiry/shades/autotools/ext/config.sub
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/ext/config.sub (rev 0)
+++ trunk/complement/explore/inquiry/shades/autotools/ext/config.sub 2007-02-27 14:55:33 UTC (rev 1535)
@@ -0,0 +1,1627 @@
+#! /bin/sh
+# 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-12-23'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <con...@gn...>. Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <con...@gn...>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit ;;
+ --version | -v )
+ echo "$version" ; exit ;;
+ --help | --h* | -h )
+ echo "$usage"; exit ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help"
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+ exit ;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple | -axis | -knuth | -cray)
+ os=
+ basic_machine=$1
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+ ;;
+ -scout)
+ ;;
+ -wrs)
+ os=-vxworks
+ basic_machine=$1
+ ;;
+ -chorusos*)
+ os=-chorusos
+ basic_machine=$1
+ ;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -udk*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e...
[truncated message content] |
|
From: <com...@us...> - 2007-02-27 10:28:34
|
Revision: 1534
http://svn.sourceforge.net/complement/?rev=1534&view=rev
Author: complement
Date: 2007-02-27 02:28:33 -0800 (Tue, 27 Feb 2007)
Log Message:
-----------
autotools sample
Added Paths:
-----------
trunk/complement/explore/inquiry/shades/autotools/
trunk/complement/explore/inquiry/shades/autotools/Makefile.am
trunk/complement/explore/inquiry/shades/autotools/build.sh
trunk/complement/explore/inquiry/shades/autotools/configure.ac
trunk/complement/explore/inquiry/shades/autotools/main.cc
trunk/complement/explore/inquiry/shades/autotools/my.h
trunk/complement/explore/inquiry/shades/autotools/other.cc
Added: trunk/complement/explore/inquiry/shades/autotools/Makefile.am
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/Makefile.am (rev 0)
+++ trunk/complement/explore/inquiry/shades/autotools/Makefile.am 2007-02-27 10:28:33 UTC (rev 1534)
@@ -0,0 +1,6 @@
+bin_PROGRAMS = cxxtest
+
+cxxtest_SOURCES = main.cc
+AM_CXXFLAGS = -pthread
+AM_CPPFLAGS = -I/usr/include/stlport
+cxxtest_LDADD = -lstlport
Added: trunk/complement/explore/inquiry/shades/autotools/build.sh
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/build.sh (rev 0)
+++ trunk/complement/explore/inquiry/shades/autotools/build.sh 2007-02-27 10:28:33 UTC (rev 1534)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+c++ -pthread -g -c -I${HOME}/STLport.lab/STLport/stlport -o main.o main.cc
+# c++ -pthread -g -c -I${HOME}/STLport.lab/STLport/stlport -o other.o other.cc
+gcc -pthread -g -L${HOME}/STLport.lab/STLport/lib -Wl,--rpath=${HOME}/STLport.lab/STLport/lib -o cxxtest main.o -lstlport
+# gcc -pthread -g -L${HOME}/STLport.lab/STLport/lib -Wl,--rpath=${HOME}/STLport.lab/STLport/lib -o cxxtest main.o other.o -lstlport
+# c++ -pthread -g -I${HOME}/STLport.lab/STLport/stlport -L${HOME}/STLport.lab/STLport/lib -Wl,--rpath=${HOME}/STLport.lab/STLport/lib -o cxxtest main.o other.o -lstlport
Property changes on: trunk/complement/explore/inquiry/shades/autotools/build.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/complement/explore/inquiry/shades/autotools/configure.ac
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/configure.ac (rev 0)
+++ trunk/complement/explore/inquiry/shades/autotools/configure.ac 2007-02-27 10:28:33 UTC (rev 1534)
@@ -0,0 +1,23 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.59)
+AC_INIT(TestCXXProject, 1.0.0)
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR([main.cc])
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_FILES([Makefile])
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+
+# Checks for libraries.
+ACX_PTHREAD
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_OUTPUT
Added: trunk/complement/explore/inquiry/shades/autotools/main.cc
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/main.cc (rev 0)
+++ trunk/complement/explore/inquiry/shades/autotools/main.cc 2007-02-27 10:28:33 UTC (rev 1534)
@@ -0,0 +1,14 @@
+#include <iostream>
+// #include "my.h"
+
+extern int other();
+
+int main(void)
+{
+ // A<int> a;
+ // a.use_it() += 1;
+ // int v1 = a.use_it();
+ // int v2 = other();
+ std::cout << "Hello, world! " << /* v1 << " " << v2 << */ std::endl;
+ return 0;
+}
Added: trunk/complement/explore/inquiry/shades/autotools/my.h
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/my.h (rev 0)
+++ trunk/complement/explore/inquiry/shades/autotools/my.h 2007-02-27 10:28:33 UTC (rev 1534)
@@ -0,0 +1,27 @@
+#ifndef __MY_H
+#define __MY_H
+
+template <class T>
+class A
+{
+ public:
+ A();
+
+ T& use_it();
+
+ private:
+ static T val;
+};
+
+template <class T>
+A<T>::A()
+{ }
+
+template <class T>
+T& A<T>::use_it()
+{ return val; }
+
+template <class T>
+T A<T>::val = 0;
+
+#endif // __MY_H
Added: trunk/complement/explore/inquiry/shades/autotools/other.cc
===================================================================
--- trunk/complement/explore/inquiry/shades/autotools/other.cc (rev 0)
+++ trunk/complement/explore/inquiry/shades/autotools/other.cc 2007-02-27 10:28:33 UTC (rev 1534)
@@ -0,0 +1,10 @@
+#include "my.h"
+
+int other()
+{
+ A<int> a;
+ a.use_it() += 1;
+
+ return a.use_it();
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-26 16:38:40
|
Revision: 1533
http://svn.sourceforge.net/complement/?rev=1533&view=rev
Author: complement
Date: 2007-02-26 08:38:34 -0800 (Mon, 26 Feb 2007)
Log Message:
-----------
add long reading test
Modified Paths:
--------------
trunk/complement/explore/test/sockios/sockios_test.cc
trunk/complement/explore/test/sockios/sockios_test.h
trunk/complement/explore/test/sockios/sockios_test_suite.cc
Modified: trunk/complement/explore/test/sockios/sockios_test.cc
===================================================================
--- trunk/complement/explore/test/sockios/sockios_test.cc 2007-02-21 17:57:04 UTC (rev 1532)
+++ trunk/complement/explore/test/sockios/sockios_test.cc 2007-02-26 16:38:34 UTC (rev 1533)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/02/07 11:32:06 ptr>
+// -*- C++ -*- Time-stamp: <07/02/26 17:18:51 ptr>
/*
*
@@ -622,3 +622,76 @@
BOOST_CHECK_MESSAGE( false, "error report: " << err.what() );
}
}
+
+/* ************************************************************ */
+
+class LongBlockReader // dummy variant
+{
+ public:
+ LongBlockReader( std::sockstream& );
+
+ void connect( std::sockstream& );
+ void close();
+
+ static xmt::Condition cnd;
+};
+
+xmt::Condition LongBlockReader::cnd;
+
+LongBlockReader::LongBlockReader( std::sockstream& s )
+{
+ BOOST_REQUIRE( s.good() );
+}
+
+void LongBlockReader::connect( std::sockstream& s )
+{
+ char buf[1024];
+ int count = 0;
+
+ for ( int i = 0; i < 1024 * 1024; ++i ) {
+ s.read( buf, 1024 );
+ }
+ cnd.set( true );
+}
+
+void LongBlockReader::close()
+{
+ // pr_lock.lock();
+ // BOOST_MESSAGE( "Server: client close connection" );
+ // pr_lock.unlock();
+}
+
+void sockios_test::long_block_read()
+{
+ LongBlockReader::cnd.set( false );
+
+ sockmgr_stream_MP<LongBlockReader> srv( ::port );
+
+ BOOST_REQUIRE( srv.good() );
+
+ sockstream s;
+
+ s.open( "localhost", ::port );
+
+ BOOST_REQUIRE( s.good() );
+
+ char buf[1024];
+
+ for ( int i = 0; i < 1024 * 1024; ++i ) {
+ s.write( buf, 1024 );
+ }
+ s.flush();
+
+ BOOST_CHECK( s.good() );
+
+ s.close();
+ LongBlockReader::cnd.try_wait();
+
+ srv.close();
+ srv.wait();
+
+ // try {
+ // }
+ // catch () {
+ // }
+}
Modified: trunk/complement/explore/test/sockios/sockios_test.h
===================================================================
--- trunk/complement/explore/test/sockios/sockios_test.h 2007-02-21 17:57:04 UTC (rev 1532)
+++ trunk/complement/explore/test/sockios/sockios_test.h 2007-02-26 16:38:34 UTC (rev 1533)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/02/13 10:23:29 ptr>
+// -*- C++ -*- Time-stamp: <07/02/26 15:09:26 ptr>
/*
*
@@ -37,6 +37,7 @@
void sigpipe();
void read0();
void read0_srv();
+ void long_block_read();
void srv2_fork();
};
Modified: trunk/complement/explore/test/sockios/sockios_test_suite.cc
===================================================================
--- trunk/complement/explore/test/sockios/sockios_test_suite.cc 2007-02-21 17:57:04 UTC (rev 1532)
+++ trunk/complement/explore/test/sockios/sockios_test_suite.cc 2007-02-26 16:38:34 UTC (rev 1533)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/02/07 11:00:07 ptr>
+// -*- C++ -*- Time-stamp: <07/02/26 15:33:23 ptr>
/*
*
@@ -47,6 +47,7 @@
test_case *read0_tc = BOOST_CLASS_TEST_CASE( &sockios_test::read0, instance );
test_case *read0_srv_tc = BOOST_CLASS_TEST_CASE( &sockios_test::read0_srv, instance );
+ test_case *long_block_read_tc = BOOST_CLASS_TEST_CASE( &sockios_test::long_block_read, instance );
long_msg_tc->depends_on( init_tc );
long_msg_tc->depends_on( ctor_dtor_tc );
@@ -54,6 +55,7 @@
sigpipe_tc->depends_on( init_tc );
read0_tc->depends_on( sigpipe_tc );
read0_srv_tc->depends_on( sigpipe_tc );
+ long_block_read_tc->depends_on( init_tc );
finit_tc->depends_on( init_tc );
add( init_tc );
@@ -62,5 +64,6 @@
add( sigpipe_tc );
add( read0_tc, 0, 5 );
add( read0_srv_tc );
+ add( long_block_read_tc );
add( finit_tc );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-21 17:57:08
|
Revision: 1532
http://svn.sourceforge.net/complement/?rev=1532&view=rev
Author: complement
Date: 2007-02-21 09:57:04 -0800 (Wed, 21 Feb 2007)
Log Message:
-----------
more funcs
Modified Paths:
--------------
trunk/complement/explore/inquiry/shades/juniper/str_interposer.c
Modified: trunk/complement/explore/inquiry/shades/juniper/str_interposer.c
===================================================================
--- trunk/complement/explore/inquiry/shades/juniper/str_interposer.c 2007-02-21 13:03:16 UTC (rev 1531)
+++ trunk/complement/explore/inquiry/shades/juniper/str_interposer.c 2007-02-21 17:57:04 UTC (rev 1532)
@@ -2,18 +2,19 @@
*
*/
-/* Example of a library interposer: interpose on
- * malloc().
- * Build and use this interposer as following:
- * cc -o malloc_interposer.so -G -Kpic malloc_interposer.c
- * setenv LD_PRELOAD $cwd/malloc_interposer.so
+/* library interposer: interpose on
+ * str...().
+ * export LD_PRELOAD=$cwd/libtest.so.0.0
* run the app
- * unsetenv LD_PRELOAD
+ * unset LD_PRELOAD
*/
#include <stdio.h>
#include <dlfcn.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
#if 0
void *malloc(size_t size)
{
@@ -30,7 +31,7 @@
{
static void * (*func)();
- if(!func)
+ if (!func)
func = (void *(*)()) dlsym(RTLD_NEXT, "strcpy");
printf( "strcpy: '%s'\n", s2 );
@@ -42,7 +43,7 @@
{
static void * (*func)();
- if(!func)
+ if (!func)
func = (void *(*)()) dlsym(RTLD_NEXT, "strdup");
printf( "strdup: '%s'\n", s1 );
@@ -55,7 +56,7 @@
static void * (*func)();
char *r;
- if(!func)
+ if (!func)
func = (void *(*)()) dlsym(RTLD_NEXT, "strncat");
r = func( s1, s2, n );
@@ -68,7 +69,7 @@
{
static void * (*func)();
- if(!func)
+ if (!func)
func = (void *(*)()) dlsym(RTLD_NEXT, "strtok");
printf( "strtok: '%s'\n", s1 );
@@ -76,3 +77,50 @@
return func( s1, s2 );
}
+ssize_t sendto(int socket, const void *message, size_t length, int flags, const struct sockaddr *dest_addr, socklen_t dest_len)
+{
+ static ssize_t (*func)();
+ int i;
+
+ if (!func)
+ func = (ssize_t (*)()) dlsym(RTLD_NEXT, "sendto");
+
+ printf( "sendto: (%d) '", length );
+ for ( i = 0; i < length; ++i ) {
+ printf( "%c", (const char *)message + i );
+ }
+ printf( "'\n" );
+ return func( socket, message, length, flags, dest_addr, dest_len );
+}
+
+ssize_t recvfrom(int socket, void *buffer, size_t length, int flags, struct sockaddr *address, socklen_t *address_len)
+{
+ static ssize_t (*func)();
+ int i;
+ ssize_t s;
+
+ if (!func)
+ func = (ssize_t (*)()) dlsym(RTLD_NEXT, "recvfrom");
+
+ s = func( socket, buffer, length, flags, address, address_len );
+ printf( "recvfrom: (%d) '", length );
+ for ( i = 0; i < length; ++i ) {
+ printf( "%c", (const char *)buffer + i );
+ }
+ printf( "'\n" );
+ return s;
+}
+
+int connect(int socket, const struct sockaddr *address, socklen_t address_len)
+{
+ static int (*func)();
+
+ if (!func)
+ func = (int (*)()) dlsym(RTLD_NEXT, "connect");
+
+ printf( "connect: " );
+ printf( "%x", *(((unsigned *)&((struct sockaddr_in *)address)->sin_addr)) );
+ printf( ":%d\n", ntohs(((struct sockaddr_in *)address)->sin_port) );
+
+ return func( socket, address, address_len );
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-21 13:03:19
|
Revision: 1531
http://svn.sourceforge.net/complement/?rev=1531&view=rev
Author: complement
Date: 2007-02-21 05:03:16 -0800 (Wed, 21 Feb 2007)
Log Message:
-----------
juniper investigations
Added Paths:
-----------
trunk/complement/explore/inquiry/shades/juniper/
trunk/complement/explore/inquiry/shades/juniper/Makefile
trunk/complement/explore/inquiry/shades/juniper/Makefile.inc
trunk/complement/explore/inquiry/shades/juniper/str_interposer.c
Property changes on: trunk/complement/explore/inquiry/shades/juniper
___________________________________________________________________
Name: svn:ignore
+ obj
Added: trunk/complement/explore/inquiry/shades/juniper/Makefile
===================================================================
--- trunk/complement/explore/inquiry/shades/juniper/Makefile (rev 0)
+++ trunk/complement/explore/inquiry/shades/juniper/Makefile 2007-02-21 13:03:16 UTC (rev 1531)
@@ -0,0 +1,13 @@
+# -*- Makefile -*- Time-stamp: <04/01/09 16:53:50 ptr>
+# $Id: Makefile 1356 2006-11-01 13:34:19Z complement $
+
+SRCROOT := ../../..
+COMPILER_NAME := gcc
+
+include Makefile.inc
+include ${SRCROOT}/Makefiles/top.mak
+
+DEFS += -D_GNU_SOURCE
+
+LDFLAGS += -ldl
+
Added: trunk/complement/explore/inquiry/shades/juniper/Makefile.inc
===================================================================
--- trunk/complement/explore/inquiry/shades/juniper/Makefile.inc (rev 0)
+++ trunk/complement/explore/inquiry/shades/juniper/Makefile.inc 2007-02-21 13:03:16 UTC (rev 1531)
@@ -0,0 +1,7 @@
+# -*- makefile -*- Time-stamp: <04/01/12 15:37:40 ptr>
+
+LIBNAME = test
+MAJOR = 0
+MINOR = 0
+PATCH = 0
+SRC_C = str_interposer.c
Added: trunk/complement/explore/inquiry/shades/juniper/str_interposer.c
===================================================================
--- trunk/complement/explore/inquiry/shades/juniper/str_interposer.c (rev 0)
+++ trunk/complement/explore/inquiry/shades/juniper/str_interposer.c 2007-02-21 13:03:16 UTC (rev 1531)
@@ -0,0 +1,78 @@
+/* Example from: http://developers.sun.com/solaris/articles/lib_interposers_code.html
+ *
+ */
+
+/* Example of a library interposer: interpose on
+ * malloc().
+ * Build and use this interposer as following:
+ * cc -o malloc_interposer.so -G -Kpic malloc_interposer.c
+ * setenv LD_PRELOAD $cwd/malloc_interposer.so
+ * run the app
+ * unsetenv LD_PRELOAD
+ */
+
+#include <stdio.h>
+#include <dlfcn.h>
+
+#if 0
+void *malloc(size_t size)
+{
+ static void * (*func)();
+
+ if(!func)
+ func = (void *(*)()) dlsym(RTLD_NEXT, "malloc");
+ printf("malloc(%d) is called\n", size);
+ return(func(size));
+}
+#endif
+
+char *strcpy( char *s1, const char *s2 )
+{
+ static void * (*func)();
+
+ if(!func)
+ func = (void *(*)()) dlsym(RTLD_NEXT, "strcpy");
+
+ printf( "strcpy: '%s'\n", s2 );
+
+ return func( s1, s2 );
+}
+
+char *strdup(const char *s1)
+{
+ static void * (*func)();
+
+ if(!func)
+ func = (void *(*)()) dlsym(RTLD_NEXT, "strdup");
+
+ printf( "strdup: '%s'\n", s1 );
+
+ return func( s1 );
+}
+
+char *strncat(char *s1, const char *s2, size_t n)
+{
+ static void * (*func)();
+ char *r;
+
+ if(!func)
+ func = (void *(*)()) dlsym(RTLD_NEXT, "strncat");
+
+ r = func( s1, s2, n );
+ printf( "strncat: '%s'\n", r );
+
+ return r;
+}
+
+char *strtok(char *s1, const char *s2)
+{
+ static void * (*func)();
+
+ if(!func)
+ func = (void *(*)()) dlsym(RTLD_NEXT, "strtok");
+
+ printf( "strtok: '%s'\n", s1 );
+
+ return func( s1, s2 );
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-19 11:41:44
|
Revision: 1530
http://svn.sourceforge.net/complement/?rev=1530&view=rev
Author: complement
Date: 2007-02-19 03:41:40 -0800 (Mon, 19 Feb 2007)
Log Message:
-----------
test for reuse of name of named object in shared memory segment
Modified Paths:
--------------
trunk/complement/explore/test/mt/mt_test.cc
trunk/complement/explore/test/mt/mt_test.h
trunk/complement/explore/test/mt/mt_test_suite.cc
Modified: trunk/complement/explore/test/mt/mt_test.cc
===================================================================
--- trunk/complement/explore/test/mt/mt_test.cc 2007-02-19 09:52:36 UTC (rev 1529)
+++ trunk/complement/explore/test/mt/mt_test.cc 2007-02-19 11:41:40 UTC (rev 1530)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/02/12 11:01:56 ptr>
+// -*- C++ -*- Time-stamp: <07/02/19 14:36:01 ptr>
/*
* Copyright (c) 2006, 2007
@@ -783,6 +783,92 @@
}
/* ******************************************************
+ */
+
+void mt_test::shm_named_obj_more()
+{
+ enum {
+ ObjName = 1
+ };
+
+ try {
+ xmt::shm_name_mgr<1>& nm = seg1.name_mgr();
+
+ xmt::allocator_shm<xmt::__Condition<true>,1> shm;
+
+ xmt::__Condition<true>& fcnd = *new ( shm.allocate( 1 ) ) xmt::__Condition<true>();
+ nm.named( fcnd, ObjName );
+ fcnd.set( false );
+
+ try {
+ xmt::fork();
+
+ xmt::shm_name_mgr<1>& nm_ch = seg1.name_mgr();
+ xmt::allocator_shm<xmt::__Condition<true>,1> shm_ch;
+ xmt::__Condition<true>& fcnd_ch = nm_ch.named<xmt::__Condition<true> >( ObjName );
+ fcnd_ch.set( true );
+ nm_ch.release<xmt::__Condition<true> >( ObjName );
+
+ exit( 0 );
+ }
+ catch ( xmt::fork_in_parent& child ) {
+ fcnd.try_wait();
+ int stat;
+ BOOST_CHECK( waitpid( child.pid(), &stat, 0 ) == child.pid() );
+ }
+ nm.release<xmt::__Condition<true> >( ObjName ); // fcnd should be destroyed here
+
+ xmt::__Condition<true>& fcnd1 = *new ( shm.allocate( 1 ) ) xmt::__Condition<true>();
+ nm.named( fcnd1, ObjName ); // ObjName should be free here
+ fcnd1.set( false );
+
+ try {
+ xmt::fork();
+
+ xmt::shm_name_mgr<1>& nm_ch = seg1.name_mgr();
+ xmt::allocator_shm<xmt::__Condition<true>,1> shm_ch;
+ xmt::__Condition<true>& fcnd_ch = nm_ch.named<xmt::__Condition<true> >( ObjName );
+ fcnd_ch.set( true );
+ nm_ch.release<xmt::__Condition<true> >( ObjName );
+
+ exit( 0 );
+ }
+ catch ( xmt::fork_in_parent& child ) {
+ fcnd1.try_wait();
+ int stat;
+ BOOST_CHECK( waitpid( child.pid(), &stat, 0 ) == child.pid() );
+ }
+ nm.release<xmt::__Condition<true> >( ObjName ); // fcnd should be destroyed here
+
+ xmt::allocator_shm<xmt::__Barrier<true>,1> shm_b;
+ xmt::__Barrier<true>& b = *new ( shm_b.allocate( 1 ) ) xmt::__Barrier<true>();
+
+ nm.named( b, ObjName ); // ObjName should be free here
+
+ try {
+ xmt::fork();
+
+ xmt::shm_name_mgr<1>& nm_ch = seg1.name_mgr();
+ xmt::allocator_shm<xmt::__Barrier<true>,1> shm_ch;
+ xmt::__Barrier<true>& b_ch = nm_ch.named<xmt::__Barrier<true> >( ObjName );
+ b_ch.wait();
+ nm_ch.release<xmt::__Barrier<true> >( ObjName );
+
+ exit( 0 );
+ }
+ catch ( xmt::fork_in_parent& child ) {
+ b.wait();
+ int stat;
+ BOOST_CHECK( waitpid( child.pid(), &stat, 0 ) == child.pid() );
+ }
+ nm.release<xmt::__Barrier<true> >( ObjName ); // barrier should be destroyed here
+ }
+ catch ( xmt::shm_bad_alloc& err ) {
+ BOOST_CHECK_MESSAGE( false, "error report: " << err.what() );
+ }
+}
+
+/* ******************************************************
* Thread pool (aka ThreadMgr) test.
*
* Start 200 threads under ThreadMgr; check that all threads
Modified: trunk/complement/explore/test/mt/mt_test.h
===================================================================
--- trunk/complement/explore/test/mt/mt_test.h 2007-02-19 09:52:36 UTC (rev 1529)
+++ trunk/complement/explore/test/mt/mt_test.h 2007-02-19 11:41:40 UTC (rev 1530)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/02/09 15:56:27 ptr>
+// -*- C++ -*- Time-stamp: <07/02/19 13:21:37 ptr>
/*
* Copyright (c) 2006, 2007
@@ -33,6 +33,8 @@
void shm_init();
void shm_finit();
+ void shm_named_obj_more();
+
private:
// static xmt::Thread::ret_code thread_entry_call( void * );
// static int x;
Modified: trunk/complement/explore/test/mt/mt_test_suite.cc
===================================================================
--- trunk/complement/explore/test/mt/mt_test_suite.cc 2007-02-19 09:52:36 UTC (rev 1529)
+++ trunk/complement/explore/test/mt/mt_test_suite.cc 2007-02-19 11:41:40 UTC (rev 1530)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/02/12 11:24:11 ptr>
+// -*- C++ -*- Time-stamp: <07/02/19 13:43:38 ptr>
/*
* Copyright (c) 2006, 2007
@@ -35,6 +35,7 @@
test_case *shm_alloc_tc = BOOST_CLASS_TEST_CASE( &mt_test::shm_alloc, instance );
test_case *fork_shm_tc = BOOST_CLASS_TEST_CASE( &mt_test::fork_shm, instance );
test_case *shm_nm_obj_tc = BOOST_CLASS_TEST_CASE( &mt_test::shm_named_obj, instance );
+ test_case *shm_nm_obj_more_tc = BOOST_CLASS_TEST_CASE( &mt_test::shm_named_obj_more, instance );
test_case *thr_mgr_tc = BOOST_CLASS_TEST_CASE( &mt_test::thr_mgr, instance );
@@ -56,6 +57,7 @@
shm_nm_obj_tc->depends_on( fork_shm_tc );
shm_init_tc->depends_on( shm_alloc_tc );
+ shm_nm_obj_more_tc->depends_on( shm_init_tc );
shm_finit_tc->depends_on( shm_init_tc );
add( barrier_tc, 0, 2 );
@@ -78,5 +80,6 @@
add( thr_mgr_tc );
add( shm_init_tc );
+ add( shm_nm_obj_more_tc );
add( shm_finit_tc );
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-02-19 09:52:40
|
Revision: 1529
http://svn.sourceforge.net/complement/?rev=1529&view=rev
Author: complement
Date: 2007-02-19 01:52:36 -0800 (Mon, 19 Feb 2007)
Log Message:
-----------
remove Netware and Metrowerk CodeWarrior compiler (for Netware)
Modified Paths:
--------------
trunk/complement/explore/Makefiles/gmake/sysid.mak
trunk/complement/explore/configure
Removed Paths:
-------------
trunk/complement/explore/Makefiles/gmake/mwccnlm.mak
trunk/complement/explore/Makefiles/gmake/netware/
Deleted: trunk/complement/explore/Makefiles/gmake/mwccnlm.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/mwccnlm.mak 2007-02-15 12:38:53 UTC (rev 1528)
+++ trunk/complement/explore/Makefiles/gmake/mwccnlm.mak 2007-02-19 09:52:36 UTC (rev 1529)
@@ -1,89 +0,0 @@
-# Time-stamp: <06/11/10 15:56:39 ptr>
-#
-# Copyright (c) 2005, 2006
-# Petr Ovtchenkov
-#
-# Licensed under the Academic Free License version 3.0
-#
-
-INCLUDES :=
-
-ifndef _FORCE_CXX
-CXX := mwccnlm
-else
-CXX := $_FORCE_CXX
-endif
-
-ifndef _FORCE_CC
-CC := mwccnlm
-else
-CC := $_FORCE_CC
-endif
-
-LINK.cc = mwldnlm $(LDFLAGS) $(TARGET_ARCH)
-
-ifeq ($(OSNAME), cygming)
-RC := windres
-endif
-
-CXX_VERSION := $(shell ${CXX} -version | grep Version | awk '{ print $$2; }')
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }')
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
-CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
-
-DEFS ?=
-OPT ?=
-
-OUTPUT_OPTION = -o $@
-LINK_OUTPUT_OPTION = ${OUTPUT_OPTION}
-CPPFLAGS = $(DEFS) -gccinc -I. $(INCLUDES) -ir "$(NWSDK_DIR)" -ir "$(MWCW_NOVELL)" -prefix Headers/nlm_prefix.h
-
-ifeq ($(OSNAME), cygming)
-release-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=r -DBUILD_INFOS="-O2" --output-format coff
-dbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=d -DBUILD_INFOS="-g" --output-format coff
-stldbg-shared : RCFLAGS = --include-dir=${STLPORT_INCLUDE_DIR} -DCOMP=gcc -DBUILD=stld -DBUILD_INFOS="-g -D_STLP_DEBUG" --output-format coff
-RC_OUTPUT_OPTION = -o $@
-COMPILE.rc = $(RC) $(RCFLAGS)
-endif
-
-CFLAGS = -lang c -msgstyle gcc -ext o -nostdinc -flag longlong_prepeval $(OPT)
-CXXFLAGS = -lang c++ -msgstyle gcc -ext o -iso_templates on -bool on -Cpp_exceptions on -wchar_t on -nostdinc -flag longlong_prepeval $(OPT)
-
-ifdef EXTRA_CXXFLAGS
-CXXFLAGS += ${EXTRA_CXXFLAGS}
-endif
-
-CDEPFLAGS = -M
-CCDEPFLAGS = -M
-
-# STLport DEBUG mode specific defines
-stldbg-static : DEFS += -D_STLP_DEBUG
-stldbg-shared : DEFS += -D_STLP_DEBUG
-stldbg-static-dep : DEFS += -D_STLP_DEBUG
-stldbg-shared-dep : DEFS += -D_STLP_DEBUG
-
-# optimization and debug compiler flags
-release-static : OPT += -O4
-release-shared : OPT += -O4
-
-dbg-static : OPT += -g
-dbg-shared : OPT += -g
-#dbg-static-dep : OPT += -g
-#dbg-shared-dep : OPT += -g
-
-stldbg-static : OPT += -g
-stldbg-shared : OPT += -g
-#stldbg-static-dep : OPT += -g
-#stldbg-shared-dep : OPT += -g
-
-# dependency output parser (dependencies collector)
-
-DP_OUTPUT_DIR = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR)/\1.o $@ : |g' > $@; \
- [ -s $@ ] || rm -f $@
-
-DP_OUTPUT_DIR_DBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_DBG)/\1.o $@ : |g' > $@; \
- [ -s $@ ] || rm -f $@
-
-DP_OUTPUT_DIR_STLDBG = | sed 's|\($*\)\.o[ :]*|$(OUTPUT_DIR_STLDBG)/\1.o $@ : |g' > $@; \
- [ -s $@ ] || rm -f $@
-
Modified: trunk/complement/explore/Makefiles/gmake/sysid.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-02-15 12:38:53 UTC (rev 1528)
+++ trunk/complement/explore/Makefiles/gmake/sysid.mak 2007-02-19 09:52:36 UTC (rev 1529)
@@ -2,11 +2,6 @@
ifndef BUILD_DATE
-ifeq (mwccnlm,$(COMPILER_NAME))
-# this is really cross
-TARGET_OS := netware
-endif
-
ifndef TARGET_OS
OSNAME := $(shell uname -s | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
@@ -31,18 +26,10 @@
endif
else
-ifndef (mwccnlm,$(COMPILER_NAME))
OSNAME := $(shell echo ${TARGET_OS} | sed 's/^[a-z0-9_]\+-[a-z0-9]\+-\([a-z]\+\).*/\1/' | sed 's/^[a-z0-9_]\+-\([a-z]\+\).*/\1/' )
OSREL := $(shell echo ${TARGET_OS} | sed 's/^[[:alnum:]_]\+-[a-z0-9]\+-[a-z]\+\([a-zA-Z.0-9]*\).*/\1/' | sed 's/^[a-z0-9_]\+-[a-z]\+\([a-zA-Z.0-9]*\).*/\1/' )
M_ARCH := $(shell echo ${TARGET_OS} | sed 's/^\([a-z0-9_]\+\)-.*/\1/' )
P_ARCH := unknown
-else
-OSNAME := netware
-OSREL := 5
-M_ARCH := i386
-P_ARCH := unknown
-endif
-
# TARGET_OS
endif
Modified: trunk/complement/explore/configure
===================================================================
--- trunk/complement/explore/configure 2007-02-15 12:38:53 UTC (rev 1528)
+++ trunk/complement/explore/configure 2007-02-19 09:52:36 UTC (rev 1529)
@@ -33,10 +33,6 @@
--with-system-boost use boost installed on this system
--with-msvc=<dir> use MS VC from this catalog
--with-mssdk=<dir> use MS SDK from this catalog
- --with-mwcw=<dir> Metrowerks CodeWarrior compiler catalog (useful for mw* compilers)
- i.e. something like "c:/Program Files/Metrowerks/CodeWarrior"
- --with-nwsdk=<dir> use Novell NDK/SDK from this catalog (useful for *-*-netware target)
- i.e. something like "c:/Novell/ndk/nwsdk"
--with-extra-cxxflags=<options>
pass extra options to C++ compiler
--use-static-gcc use static gcc libs instead of shared libgcc_s (useful for gcc compiler,
@@ -49,7 +45,6 @@
--use-compiler-family=<name> use compiler family; one of:
gcc GNU compilers
icc Intel compilers
- mwccnlm Metrowerks CodeWarrior for Novell Netware
aCC HP\'s aCC compilers
CC SunPro\'s CC compilers
@@ -140,12 +135,6 @@
write_option "$option" EXTRA_CXXFLAGS
cxxflags_set=y
;;
- --with-nwsdk=*)
- write_option "$option" NWSDK_DIR
- ;;
- --with-mwcw=*)
- write_option "$option" MWCW_BASE
- ;;
--use-static-gcc)
write_option "1" USE_STATIC_LIBGCC
;;
@@ -171,7 +160,7 @@
;;
--use-compiler-family=*)
case `echo $option | sed -e 's/^[^=]*=//'` in
- gcc|icc|aCC|CC|mwccnlm)
+ gcc|icc|aCC|CC)
write_option "$option" COMPILER_NAME
;;
*)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
