[complement-svn] SF.net SVN: complement: [1529] trunk/complement/explore

[<com...@us...>]

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.