[complement-svn] SF.net SVN: complement: [1395] trunk/complement/explore
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
[complement-svn] SF.net SVN: complement: [1395] trunk/complement/explore
|
From: <com...@us...> - 2006-11-10 15:12:06
|
Revision: 1395
http://svn.sourceforge.net/complement/?rev=1395&view=rev
Author: complement
Date: 2006-11-10 07:11:44 -0800 (Fri, 10 Nov 2006)
Log Message:
-----------
add static tags; this is the same as shared, except link with static libstlport.
allow insist on C and C++ compilers names. This may make happy
Debian users, because of package may use names like g++-3.4 here.
form ALL_TAGS depends upon options from config.mak,
i.e. take into account static, dynamic variants and possible
disabling dbg and stldbg variants plus build without STLport.
configure assume WITHOUT_STLPORT by default now!
Assume gcc compilers family, if no COMPILER_NAME set.
Modified Paths:
--------------
trunk/complement/explore/Makefiles/ChangeLog
trunk/complement/explore/Makefiles/gmake/CC.mak
trunk/complement/explore/Makefiles/gmake/aCC.mak
trunk/complement/explore/Makefiles/gmake/app/gcc.mak
trunk/complement/explore/Makefiles/gmake/app/macro.mak
trunk/complement/explore/Makefiles/gmake/app/rules.mak
trunk/complement/explore/Makefiles/gmake/app/top.mak
trunk/complement/explore/Makefiles/gmake/gcc.mak
trunk/complement/explore/Makefiles/gmake/mwccnlm.mak
trunk/complement/explore/Makefiles/top.mak
trunk/complement/explore/app/utils/RTF/Makefile
trunk/complement/explore/configure
trunk/complement/explore/lib/mt/Makefile
Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/ChangeLog 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,3 +1,18 @@
+2006-11-10 Petr Ovtchenkov <pt...@is...>
+
+ * gmake/app/rules.mak, gmake/app/gcc.mak: add static tags;
+ this is the same as shared, except link with static libstlport.
+
+ * gmake/CC.mak, gmake/aCC.mak, gmake/gcc.mak, gmake/mwccnlm.mak:
+ allow insist on C and C++ compilers names. This may make happy
+ Debian users, because of package may use names like g++-3.4 here.
+
+ * top.mak: form ALL_TAGS depends upon options from config.mak,
+ i.e. take into account static, dynamic variants and possible
+ disabling dbg and stldbg variants plus build without STLport.
+ Note, that configure assume WITHOUT_STLPORT by default now!
+ Assume gcc compilers family, if no COMPILER_NAME set.
+
2006-11-03 Petr Ovtchenkov <pt...@is...>
* gmake/linux/rules-so.mak, gmake/linux/rules-install-so.mak:
Modified: trunk/complement/explore/Makefiles/gmake/CC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/CC.mak 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/gmake/CC.mak 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,16 +1,26 @@
-# Time-stamp: <04/08/23 22:49:14 ptr>
-# $Id$
+# Time-stamp: <06/11/10 15:57:24 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
+#
-
-#INCLUDES = -I$(SRCROOT)/include
INCLUDES :=
+ifndef _FORCE_CXX
CXX := CC
+else
+CXX := $_FORCE_CXX
+endif
+
+ifndef _FORCE_CC
CC := cc
-
-ifdef TARGET_OS
-CXX := ${TARGET_OS}-${CXX}
-CC := ${TARGET_OS}-${CC}
+else
+CC := $_FORCE_CC
endif
CXX_VERSION := $(shell ${CXX} -V 2>&1 | grep ${CXX} | awk '{ print $$4; }')
Modified: trunk/complement/explore/Makefiles/gmake/aCC.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/aCC.mak 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/gmake/aCC.mak 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,16 +1,26 @@
-# Time-stamp: <05/03/21 10:42:37 ptr>
-# $Id$
+# Time-stamp: <06/11/10 15:54:03 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
+#
-
-#INCLUDES = -I$(SRCROOT)/include
INCLUDES :=
+ifndef _FORCE_CXX
CXX := aCC
+else
+CXX := $_FORCE_CXX
+endif
+
+ifndef _FORCE_CC
CC := aCC
-
-ifdef TARGET_OS
-CXX := ${TARGET_OS}-${CXX}
-CC := ${TARGET_OS}-${CC}
+else
+CC := $_FORCE_CC
endif
CXX_VERSION := $(shell ${CXX} --version | grep ${CXX} | awk '{ print $$3; }')
Modified: trunk/complement/explore/Makefiles/gmake/app/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/gmake/app/gcc.mak 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,4 +1,13 @@
-# -*- Makefile -*- Time-stamp: <06/01/18 15:04:43 ptr>
+# -*- Makefile -*- Time-stamp: <06/11/10 17:28:41 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 NOT_USE_NOSTDLIB
@@ -52,9 +61,13 @@
LDSEARCH += -L${STLPORT_LIB_DIR}
release-shared: STLPORT_LIB = -lstlport
+release-static: STLPORT_LIB = -Wl,-Bstatic -lstlport -Wl,-Bdynamic
dbg-shared: STLPORT_LIB = -lstlportg
+dbg-static: STLPORT_LIB = -Wl,-Bstatic -lstlportg -Wl,-Bdynamic
stldbg-shared: STLPORT_LIB = -lstlportstlg
+stldbg-static: STLPORT_LIB = -Wl,-Bstatic -lstlportstlg -Wl,-Bdynamic
+
ifeq ($(OSNAME),cygming)
LIB_VERSION = ${LIBMAJOR}.${LIBMINOR}
release-shared : STLPORT_LIB = -lstlport.${LIB_VERSION}
Modified: trunk/complement/explore/Makefiles/gmake/app/macro.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/macro.mak 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/gmake/app/macro.mak 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,5 +1,4 @@
-# Time-stamp: <03/07/15 17:54:22 ptr>
-# $Id$
+# Time-stamp: <06/11/10 17:27:33 ptr>
PRG := $(OUTPUT_DIR)/${PRGNAME}${EXE}
PRG_DBG := $(OUTPUT_DIR_DBG)/${PRGNAME}${EXE}
Modified: trunk/complement/explore/Makefiles/gmake/app/rules.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/rules.mak 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/gmake/app/rules.mak 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <06/11/02 10:47:37 ptr>
+# -*- makefile -*- Time-stamp: <06/11/10 17:10:45 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -11,10 +11,16 @@
dbg-shared: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${PRG_DBG} $(EXTRA_POST_DBG)
+dbg-static: $(EXTRA_PRE_DBG) $(OUTPUT_DIR_DBG) ${PRG_DBG} $(EXTRA_POST_DBG)
+
release-shared: $(EXTRA_PRE) $(OUTPUT_DIR) ${PRG} $(EXTRA_POST)
+release-static: $(EXTRA_PRE) $(OUTPUT_DIR) ${PRG} $(EXTRA_POST)
+
ifndef WITHOUT_STLPORT
stldbg-shared: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${PRG_STLDBG} $(EXTRA_POST_STLDBG)
+
+stldbg-static: $(EXTRA_PRE_STLDBG) $(OUTPUT_DIR_STLDBG) ${PRG_STLDBG} $(EXTRA_POST_STLDBG)
endif
ifeq ("${_C_SOURCES_ONLY}","")
Modified: trunk/complement/explore/Makefiles/gmake/app/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/app/top.mak 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/gmake/app/top.mak 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,5 +1,13 @@
-# -*- makefile -*- Time-stamp: <04/07/25 12:44:54 ptr>
-# $Id$
+# -*- makefile -*- Time-stamp: <06/11/10 17:28:09 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}/app/macro.mak
include ${RULESBASE}/${USE_MAKE}/app/${COMPILER_NAME}.mak
Modified: trunk/complement/explore/Makefiles/gmake/gcc.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/gcc.mak 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/gmake/gcc.mak 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,7 +1,25 @@
-# Time-stamp: <05/12/08 00:11:56 ptr>
+# Time-stamp: <06/11/10 15:53:35 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 _FORCE_CXX
CXX := c++
+else
+CXX := $_FORCE_CXX
+endif
+
+ifndef _FORCE_CC
CC := gcc
+else
+CC := $_FORCE_CC
+endif
ifeq ($(OSNAME), cygming)
RC := windres
Modified: trunk/complement/explore/Makefiles/gmake/mwccnlm.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/mwccnlm.mak 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/gmake/mwccnlm.mak 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,12 +1,25 @@
-# Time-stamp: <05/06/03 21:30:03 ptr>
-# $Id$
+# 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 = -I$(SRCROOT)/include
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)
Modified: trunk/complement/explore/Makefiles/top.mak
===================================================================
--- trunk/complement/explore/Makefiles/top.mak 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/Makefiles/top.mak 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,4 +1,4 @@
-# Time-stamp: <06/11/03 18:54:08 ptr>
+# Time-stamp: <06/11/10 16:22:00 ptr>
#
# Copyright (c) 1997-1999, 2002, 2003, 2005, 2006
# Petr Ovtchenkov
@@ -20,12 +20,44 @@
# include file, generated by configure, if available
-include ${RULESBASE}/config.mak
-ifndef WITHOUT_STLPORT
-ALL_TAGS ?= release-shared dbg-shared stldbg-shared
+ifndef COMPILER_NAME
+COMPILER_NAME := gcc
+endif
+
+ifndef ALL_TAGS
+
+ifndef _NO_SHARED_BUILD
+ALL_TAGS := release-shared
else
-ALL_TAGS ?= release-shared dbg-shared
+ALL_TAGS :=
endif
+ifdef _STATIC_BUILD
+ALL_TAGS += release-static
+endif
+
+ifndef _NO_DBG_BUILD
+ifndef _NO_SHARED_BUILD
+ALL_TAGS += dbg-shared
+endif
+ifdef _STATIC_BUILD
+ALL_TAGS += dbg-static
+endif
+endif
+
+ifndef _NO_STLDBG_BUILD
+ifndef WITHOUT_STLPORT
+ifndef _NO_SHARED_BUILD
+ALL_TAGS += stldbg-shared
+endif
+ifdef _STATIC_BUILD
+ALL_TAGS += stldbg-static
+endif
+endif
+endif
+
+endif
+
all: $(OUTPUT_DIRS) $(ALL_TAGS)
ifndef WITHOUT_STLPORT
Modified: trunk/complement/explore/app/utils/RTF/Makefile
===================================================================
--- trunk/complement/explore/app/utils/RTF/Makefile 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/app/utils/RTF/Makefile 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,15 +1,10 @@
# -*- makefile -*- Time-stamp: <05/04/01 00:06:12 ptr>
-# $Id$
SRCROOT := ../../../
-COMPILER_NAME = gcc
include Makefile.inc
include ${SRCROOT}/Makefiles/top.mak
-INCLUDES += -I$(STLPORT_INCLUDE_DIR)
-
LDLIBS += -lrt -lnsl -lfl
-LDFLAGS += -L${STLPORT_LIB_DIR}
lex.yy.cc: rtf.lex
flex -+ rtf.lex
Modified: trunk/complement/explore/configure
===================================================================
--- trunk/complement/explore/configure 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/configure 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,6 +1,6 @@
#!/bin/sh
-# Time-stamp: <06/06/28 12:05:08 ptr>
+# Time-stamp: <06/11/10 15:47:21 ptr>
configmak=Makefiles/config.mak
@@ -28,9 +28,9 @@
--target=<target> target platform (cross-compiling)
--help print this help message and exit
--with-stlport=<dir> use STLport in catalog <dir>
- --without-stlport compile without STLport
+ --without-stlport compile without STLport (default)
--with-boost=<dir> use boost headers in catalog <dir>
- --with-system-boost use boost from system, don't build boost
+ --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)
@@ -44,24 +44,63 @@
with --disable-shared, static libraries will be used in any case)
--clean remove custom settings (file ${configmak})
and use default values
+ --with-cxx=<name> use <name> as C++ compiler
+ --with-cc=<name> use <name> as C compiler
+ --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
+ default is 'gcc' family
+ --without-debug don\'t build debug variant
+ --without-stldebug don\'t build STLport\'s STLP_DEBUG mode
+ --enable-static build static
+ --disable-shared don\'t build shared
+
EOF
}
+default_settings () {
+ # if [ "$boost_set" = "" ]; then
+ # write_option "${PWD}/external/boost" BOOST_DIR
+ # fi
+
+ if [ "$stlport_set" = "" ]; then
+ # write_option "${PWD}/external/STLport" STLPORT_DIR
+ write_option "1" WITHOUT_STLPORT
+ fi
+ # write_option "${PWD}/build/" BASE_INSTALL_DIR
+ if [ "$compiler_family_set" = "" ]; then
+ write_option gcc COMPILER_NAME
+ fi
+}
+
case $# in
0)
+ if [ ! -f ${configmak} ]; then
+ default_settings
+ fi
exit 0
;;
esac
-case $1 in
- --help)
- print_help
- exit 0
- ;;
-esac
+for a in $@ ; do
+ case $a in
+ --help)
+ print_help
+ exit 0
+ ;;
+ --clean)
+ rm -f ${configmak}
+ exit 0
+ ;;
+ esac
+done
rm -f ${configmak}
+touch ${configmak}
while :
do
@@ -70,20 +109,20 @@
break
;;
esac
- option=$1
+ option="$1"
shift
case $option in
- --clean)
- rm -f ${configmak}
- ;;
--target=*)
write_option "$option" TARGET_OS
+ target_set=y
;;
--with-stlport=*)
write_option "$option" STLPORT_DIR
+ stlport_set=y
;;
--without-stlport)
write_option "1" WITHOUT_STLPORT
+ stlport_set=y
;;
--with-boost=*)
write_option "$option" BOOST_DIR
@@ -99,6 +138,7 @@
;;
--with-extra-cxxflags=*)
write_option "$option" EXTRA_CXXFLAGS
+ cxxflags_set=y
;;
--with-nwsdk=*)
write_option "$option" NWSDK_DIR
@@ -107,8 +147,71 @@
write_option "$option" MWCW_BASE
;;
--use-static-gcc)
- write_option "$option" USE_STATIC_LIBGCC
+ write_option "1" USE_STATIC_LIBGCC
;;
+ --without-debug)
+ write_option "1" _NO_DBG_BUILD
+ ;;
+ --without-stldebug)
+ write_option "1" _NO_STLDBG_BUILD
+ ;;
+ --enable-static)
+ write_option "1" _STATIC_BUILD
+ ;;
+ --disable-shared)
+ write_option "1" _NO_SHARED_BUILD
+ ;;
+ --with-cxx=*)
+ write_option "$option" _FORCE_CXX
+ cxx_set=y
+ ;;
+ --with-cc=*)
+ write_option "$option" _FORCE_CC
+ cc_set=y
+ ;;
+ --use-compiler-family=*)
+ case `echo $option | sed -e 's/^[^=]*=//'` in
+ gcc|icc|aCC|CC|mwccnlm)
+ write_option "$option" COMPILER_NAME
+ ;;
+ *)
+ echo "Not supported compilers family"
+ exit -1
+ ;;
+ esac
+ compiler_family_set=y
+ ;;
esac
done
+if [ "$CXX" != "" ]; then
+ if [ "$target_set" != "" ]; then
+ echo "For cross-compilation with gcc use --target option only"
+ else
+ write_option "$CXX" _FORCE_CXX
+ fi
+ if [ "$cxx_set" != "" ]; then
+ echo "Both --with-cxx and \$CXX set, using the first"
+ fi
+ if [ "$CC" = "" ] && [ "$cc_set" = "" ]; then
+ echo "\$CXX set, but I don't see \$CC!"
+ fi
+fi
+
+if [ "$CC" != "" ]; then
+ if [ "$cxx_set" != "" ]; then
+ echo "Both --with-cc and \$CC set, using the first"
+ fi
+fi
+
+if [ "$CXXFLAGS" != "" ]; then
+ if [ "$cxxflags_set" = "" ]; then
+ write_option "$CXXFLAGS" EXTRA_CXXFLAGS
+ else
+ echo "Both --with-extra-cxxflags and \$CXXFLAGS set, using the first"
+ fi
+fi
+
+# default settings
+
+default_settings
Modified: trunk/complement/explore/lib/mt/Makefile
===================================================================
--- trunk/complement/explore/lib/mt/Makefile 2006-11-10 14:36:53 UTC (rev 1394)
+++ trunk/complement/explore/lib/mt/Makefile 2006-11-10 15:11:44 UTC (rev 1395)
@@ -1,7 +1,6 @@
-# -*- Makefile -*- Time-stamp: <05/03/25 10:25:31 ptr>
+# -*- Makefile -*- Time-stamp: <06/11/10 16:23:01 ptr>
SRCROOT := ../..
-COMPILER_NAME := gcc
include Makefile.inc
include ${SRCROOT}/Makefiles/top.mak
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
