[Boost-commit] svn:boost r46628 - in sandbox/memory/libs/memory: . build

From: xushiweizh_at_[hidden]
Date: 2008-06-23 11:51:31

Author: xushiwei
Date: 2008-06-23 11:51:30 EDT (Mon, 23 Jun 2008)
New Revision: 46628
URL: http://svn.boost.org/trac/boost/changeset/46628

Log:
32/64 bits
Added:
   sandbox/memory/libs/memory/Makefile.li32
      - copied, changed from r46376, /sandbox/memory/libs/memory/Makefile
   sandbox/memory/libs/memory/build/build.li32   (contents, props changed)
   sandbox/memory/libs/memory/build/build.li64   (contents, props changed)
   sandbox/memory/libs/memory/memory.prj.li32   (contents, props changed)
   sandbox/memory/libs/memory/memory.prj.li64
      - copied unchanged from r46523, /sandbox/memory/libs/memory/memory.prj.li
Removed:
   sandbox/memory/libs/memory/Makefile
   sandbox/memory/libs/memory/memory.prj.li
Text files modified: 
   sandbox/memory/libs/memory/Makefile.li32 |    38 ++++++++++++++++----------------------  
   1 files changed, 16 insertions(+), 22 deletions(-)

Deleted: sandbox/memory/libs/memory/Makefile
==============================================================================
--- sandbox/memory/libs/memory/Makefile	2008-06-23 11:51:30 EDT (Mon, 23 Jun 2008)
+++ (empty file)
@@ -1,132 +0,0 @@
-#
-# Configuration Default
-#
-ifeq ($(CFG),)
-	CFG = Debug
-endif
-
-IncludeDir = -I. -I../.. 
-
-#
-# Configuration Release
-#
-ifeq ($(CFG), Release)
-	Libraries   += -lpthread
-	ProductDir   = bin/linux
-	ObjectDir    = LRelease
-	MocFile      = $(ObjectDir)/temp.moc.cpp
-	Product      = bin/linux/libboost-memory.so
-	CFlags       = $(Defines) -fPIC -D__INTEL__ -D__LINUX__ -DLINUX -DNDEBUG -O2 -D_MT -fexceptions 
-	CXXFlags     = $(CFlags) -fno-rtti 
-	CXX          = g++ -c $(IncludeDir) $(CXXFlags) -o $@
-	CompileC     = @gcc -c $(IncludeDir) $(CFlags) -o $@ $<
-	CompileCXX   = @$(CXX) $<
-	CompileMoc   = @moc $< -o $(MocFile) && $(CXX) $(MocFile) && rm -f $(MocFile)
-	Link         = @g++ $(LibDir) -W1 -shared -ldl -o $(Product) -Wl,--version-script,_export_.def
-	CheckLink    = @ldd -r $(Product)
-	LD_LIBRARY_PATH += :$(ProductDir)
-endif
-
-#
-# Configuration ReleaseCS
-#
-ifeq ($(CFG), ReleaseCS)
-	Defines	    += -DBOOST_MEMORY_NO_LOCKFREE
-	Libraries   += -lpthread
-	ProductDir   = bin/linux
-	ObjectDir    = LReleaseCS
-	MocFile      = $(ObjectDir)/temp.moc.cpp
-	Product      = bin/linux/libboost-memory-cs.so
-	CFlags       = $(Defines) -fPIC -D__INTEL__ -D__LINUX__ -DLINUX -DNDEBUG -O2 -D_MT -fexceptions 
-	CXXFlags     = $(CFlags) -fno-rtti 
-	CXX          = g++ -c $(IncludeDir) $(CXXFlags) -o $@
-	CompileC     = @gcc -c $(IncludeDir) $(CFlags) -o $@ $<
-	CompileCXX   = @$(CXX) $<
-	CompileMoc   = @moc $< -o $(MocFile) && $(CXX) $(MocFile) && rm -f $(MocFile)
-	Link         = @g++ $(LibDir) -W1 -shared -ldl -o $(Product) -Wl,--version-script,_export_.def
-	CheckLink    = @ldd -r $(Product)
-	LD_LIBRARY_PATH += :$(ProductDir)
-endif
-
-#
-# Configuration Debug
-#
-ifeq ($(CFG), Debug)
-	Libraries   += -lpthread
-	ProductDir   = bin/linuxd
-	ObjectDir    = LDebug
-	MocFile      = $(ObjectDir)/temp.moc.cpp
-	Product      = bin/linuxd/libboost-memory.so
-	CFlags       = $(Defines) -fPIC -D__INTEL__ -D__LINUX__ -DLINUX -D_DEBUG -g3 -D_MT -fexceptions 
-	CXXFlags     = $(CFlags) -fno-rtti 
-	CXX          = g++ -c $(IncludeDir) $(CXXFlags) -o $@
-	CompileC     = @gcc -c $(IncludeDir) $(CFlags) -o $@ $<
-	CompileCXX   = @$(CXX) $<
-	CompileMoc   = @moc $< -o $(MocFile) && $(CXX) $(MocFile) && rm -f $(MocFile)
-	Link         = @g++ $(LibDir) -W1 -shared -ldl -o $(Product) -Wl,--version-script,_export_.def
-	CheckLink    = @ldd -r $(Product)
-	LD_LIBRARY_PATH += :$(ProductDir)
-endif
-
-#
-# Making...
-#
-all : $(ProductDir) $(ObjectDir) StartMake $(Product) EndMake
-
-$(ProductDir) :
-	@mkdir -p $(ProductDir)
-
-ifneq ($(ProductDir),$(ObjectDir))
-$(ObjectDir) :
-	@mkdir -p $(ObjectDir)
-endif
-
-clean :
-	@rm -f $(ObjectDir)/*.o
-	@rm -f $(Product)
-
-StartMake :
-	@echo "-------------- Configuration:" $(PROJ) $(CFG) "--------------"
-ifeq ($(ForceLink),1)
-	@rm -f $(Product)
-endif
-
-EndMake :
-	@echo ">>> Success <<<"
-
-#
-# Source Files, Objects & Product
-#
-$(ObjectDir)/block_pool.o :	\
-	./src/block_pool.cpp
-	@echo "---> Compiling" $< "..."
-	$(CompileCXX)
-
-$(ObjectDir)/gc_alloc.o :	\
-	./src/gc_alloc.cpp
-	@echo "---> Compiling" $< "..."
-	$(CompileCXX)
-
-$(ObjectDir)/system_pool.o :	\
-	./src/system_pool.cpp
-	@echo "---> Compiling" $< "..."
-	$(CompileCXX)
-
-$(ObjectDir)/StdAfx.o :	\
-	./StdAfx.cpp
-	@echo "---> Compiling" $< "..."
-	$(CompileCXX)
-
-
-Objects =	\
-	$(ObjectDir)/block_pool.o	\
-	$(ObjectDir)/gc_alloc.o	\
-	$(ObjectDir)/system_pool.o	\
-	$(ObjectDir)/StdAfx.o
-
-$(Product) : $(Objects) $(Libs)
-	@echo "---> Creating" $@ "..."
-	@rm -f $@
-	$(Link) $(Objects) $(Libraries)
-	$(CheckLink)
-

Copied: sandbox/memory/libs/memory/Makefile.li32 (from r46376, /sandbox/memory/libs/memory/Makefile)
==============================================================================
--- /sandbox/memory/libs/memory/Makefile	(original)
+++ sandbox/memory/libs/memory/Makefile.li32	2008-06-23 11:51:30 EDT (Mon, 23 Jun 2008)
@@ -12,11 +12,11 @@
 #
 ifeq ($(CFG), Release)
         Libraries   += -lpthread
-	ProductDir   = bin/linux
+	ProductDir   = bin/linux/32
         ObjectDir    = LRelease
         MocFile      = $(ObjectDir)/temp.moc.cpp
-	Product      = bin/linux/libboost-memory.so
-	CFlags       = $(Defines) -fPIC -D__INTEL__ -D__LINUX__ -DLINUX -DNDEBUG -O2 -D_MT -fexceptions 
+	Product      = bin/linux/32/libboost-memory.so
+	CFlags       = $(Defines) -fPIC -D__INTEL__ -D__32BIT__ -D__LINUX__ -DLINUX -DNDEBUG -O2 -D_MT -fexceptions 
         CXXFlags     = $(CFlags) -fno-rtti 
         CXX          = g++ -c $(IncludeDir) $(CXXFlags) -o $@
         CompileC     = @gcc -c $(IncludeDir) $(CFlags) -o $@ $<
@@ -33,11 +33,11 @@
 ifeq ($(CFG), ReleaseCS)
         Defines	    += -DBOOST_MEMORY_NO_LOCKFREE
         Libraries   += -lpthread
-	ProductDir   = bin/linux
+	ProductDir   = bin/linux/32
         ObjectDir    = LReleaseCS
         MocFile      = $(ObjectDir)/temp.moc.cpp
-	Product      = bin/linux/libboost-memory-cs.so
-	CFlags       = $(Defines) -fPIC -D__INTEL__ -D__LINUX__ -DLINUX -DNDEBUG -O2 -D_MT -fexceptions 
+	Product      = bin/linux/32/libboost-memory-cs.so
+	CFlags       = $(Defines) -fPIC -D__INTEL__ -D__32BIT__ -D__LINUX__ -DLINUX -DNDEBUG -O2 -D_MT -fexceptions 
         CXXFlags     = $(CFlags) -fno-rtti 
         CXX          = g++ -c $(IncludeDir) $(CXXFlags) -o $@
         CompileC     = @gcc -c $(IncludeDir) $(CFlags) -o $@ $<
@@ -53,11 +53,11 @@
 #
 ifeq ($(CFG), Debug)
         Libraries   += -lpthread
-	ProductDir   = bin/linuxd
+	ProductDir   = bin/linuxd/32
         ObjectDir    = LDebug
         MocFile      = $(ObjectDir)/temp.moc.cpp
-	Product      = bin/linuxd/libboost-memory.so
-	CFlags       = $(Defines) -fPIC -D__INTEL__ -D__LINUX__ -DLINUX -D_DEBUG -g3 -D_MT -fexceptions 
+	Product      = bin/linuxd/32/libboost-memory.so
+	CFlags       = $(Defines) -fPIC -D__INTEL__ -D__32BIT__ -D__LINUX__ -DLINUX -D_DEBUG -g3 -D_MT -fexceptions 
         CXXFlags     = $(CFlags) -fno-rtti 
         CXX          = g++ -c $(IncludeDir) $(CXXFlags) -o $@
         CompileC     = @gcc -c $(IncludeDir) $(CFlags) -o $@ $<
@@ -97,32 +97,26 @@
 #
 # Source Files, Objects & Product
 #
-$(ObjectDir)/block_pool.o :	\
-	./src/block_pool.cpp
-	@echo "---> Compiling" $< "..."
-	$(CompileCXX)
-
 $(ObjectDir)/gc_alloc.o :	\
-	./src/gc_alloc.cpp
+	src/gc_alloc.cpp
         @echo "---> Compiling" $< "..."
         $(CompileCXX)
 
-$(ObjectDir)/system_pool.o :	\
-	./src/system_pool.cpp
+$(ObjectDir)/block_pool.o :	\
+	src/block_pool.cpp
         @echo "---> Compiling" $< "..."
         $(CompileCXX)
 
-$(ObjectDir)/StdAfx.o :	\
-	./StdAfx.cpp
+$(ObjectDir)/system_pool.o :	\
+	src/system_pool.cpp
         @echo "---> Compiling" $< "..."
         $(CompileCXX)
 
 
 Objects =	\
-	$(ObjectDir)/block_pool.o	\
         $(ObjectDir)/gc_alloc.o	\
-	$(ObjectDir)/system_pool.o	\
-	$(ObjectDir)/StdAfx.o
+	$(ObjectDir)/block_pool.o	\
+	$(ObjectDir)/system_pool.o
 
 $(Product) : $(Objects) $(Libs)
         @echo "---> Creating" $@ "..."

Added: sandbox/memory/libs/memory/build/build.li32
==============================================================================
--- (empty file)
+++ sandbox/memory/libs/memory/build/build.li32	2008-06-23 11:51:30 EDT (Mon, 23 Jun 2008)
@@ -0,0 +1,4 @@
+cd ..
+ln -s -f Makefile.li32 Makefile
+make CFG=Release
+

Added: sandbox/memory/libs/memory/build/build.li64
==============================================================================
--- (empty file)
+++ sandbox/memory/libs/memory/build/build.li64	2008-06-23 11:51:30 EDT (Mon, 23 Jun 2008)
@@ -0,0 +1,4 @@
+cd ..
+ln -s -f Makefile.li64 Makefile
+make CFG=Release
+

Deleted: sandbox/memory/libs/memory/memory.prj.li
==============================================================================
--- sandbox/memory/libs/memory/memory.prj.li	2008-06-23 11:51:30 EDT (Mon, 23 Jun 2008)
+++ (empty file)
@@ -1,29 +0,0 @@
-[Include]
-.
-../..
-
-[Config Release]
-Product		Dll bin/linux/boost-memory
-Options		Release; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
-ObjDir		LRelease
-LibDir		
-Libraries	pthread
-
-[Config ReleaseCS]
-Product		Dll bin/linux/boost-memory-cs
-Options		Release; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
-Defines		BOOST_MEMORY_NO_LOCKFREE
-ObjDir		LReleaseCS
-LibDir		
-Libraries	pthread
-
-[Config Debug]
-Product		Dll bin/linuxd/boost-memory
-Options		Debug; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
-ObjDir		LDebug
-LibDir		
-Libraries	pthread	
-
-[Source]
-memory.dsp
-

Added: sandbox/memory/libs/memory/memory.prj.li32
==============================================================================
--- (empty file)
+++ sandbox/memory/libs/memory/memory.prj.li32	2008-06-23 11:51:30 EDT (Mon, 23 Jun 2008)
@@ -0,0 +1,29 @@
+[Include]
+.
+../..
+
+[Config Release]
+Product		Dll bin/linux/32/boost-memory
+Options		Release; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
+ObjDir		LRelease
+LibDir		
+Libraries	pthread
+
+[Config ReleaseCS]
+Product		Dll bin/linux/32/boost-memory-cs
+Options		Release; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
+Defines		BOOST_MEMORY_NO_LOCKFREE
+ObjDir		LReleaseCS
+LibDir		
+Libraries	pthread
+
+[Config Debug]
+Product		Dll bin/linuxd/32/boost-memory
+Options		Debug; MultiThread; AnsiChar; NoRtti; Exception; WarningAll
+ObjDir		LDebug
+LibDir		
+Libraries	pthread	
+
+[Source]
+src/*.cpp
+