FastFormat 0.7.1 alpha 10

synesissoftware · Sep 25, 2015 · 3c9db14 · 3c9db14
1 parent 035d127
commit 3c9db14
Show file tree

Hide file tree

Showing 284 changed files with 144,359 additions and 1,576 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -1,7 +1,7 @@
 FastFormat - Authors
 ====================
 
-Updated:    17th August 2012
+Updated:    7th August 2015
 
 
 Authors:
@@ -13,6 +13,8 @@ Authors:
 Bug reports, fixes, questions, requests and suggestions (for which we are
 very grateful):
 
+  Cl�udio Albuquerque
+                  - for assisting with VC++ 12 & 14 support
   Gerald Dalley   - floating-pointer insertion (realised in real() inserter
                     functions, in 0.3.1 beta 4)
   Jerzy Adamowski - Widestring problems

diff --git a/build/gcc34.unix/makefile b/build/gcc34.unix/makefile
@@ -5,7 +5,7 @@
 #           compiler, on UNIX
 #
 # Created:  22nd December 2007
-# Updated:  17th August 2012
+# Updated:  25th September 2015
 #
 ############################################################################
 
@@ -26,18 +26,21 @@ endif # !STLSOFT
 
 COMP_TAG            =   gcc34
 ARCH_TAG            =   
-OS_TAG				=   
+OS_TAG              =   
 PROJ_TAG            =   fastformat
 PROJ_VER_MAJOR      =   0
 PROJ_TAG_VER        =   $(PROJ_TAG).$(PROJ_VER_MAJOR)
-COMP_ARCH_OS_TAG	=	$(COMP_TAG)$(OS_TAG)$(ARCH_TAG)
+COMP_ARCH_OS_TAG    =   $(COMP_TAG)$(OS_TAG)$(ARCH_TAG)
 
-LOKI_SFMT_VER_MAJOR	=	0
-LOKI_SFMT_TAG_VER	=	loki.safefmt.$(LOKI_SFMT_VER_MAJOR)
+LOKI_SFMT_VER_MAJOR =   0
+LOKI_SFMT_TAG_VER   =   loki.safefmt.$(LOKI_SFMT_VER_MAJOR)
 
 SHWILD_VER_MAJOR    =   0
 SHWILD_TAG_VER      =   shwild.$(SHWILD_VER_MAJOR)
 
+XCONTRACT_VER_MAJOR =   0
+XCONTRACT_TAG_VER   =   xtests.$(XCONTRACT_VER_MAJOR)
+
 XTESTS_VER_MAJOR    =   0
 XTESTS_TAG_VER      =   xtests.$(XTESTS_VER_MAJOR)
 
@@ -46,7 +49,9 @@ PROJ_MAKEFILE_NAME  =   makefile
 ########################################
 # Testing verbosity
 
-TEST_VERBOSITY		=	2
+ifndef TEST_VERBOSITY
+TEST_VERBOSITY      =   2
+endif # !TEST_VERBOSITY
 
 ########################################
 # Directories
@@ -70,11 +75,35 @@ BITBUCKET_SRC_DIR			=	$(PROJ_SRC_DIR)/bitbucket
 
 LOKI_SFMT_SRC_DIR			=	$(PROJ_SRC_DIR)/loki.safefmt
 
-SHWILD_INCLUDE_DIR			=	$(PROJ_BASE_DIR)/include
-SHWILD_SRC_DIR				=	$(PROJ_SRC_DIR)/shwild
-
-XTESTS_INCLUDE_DIR			=	$(PROJ_BASE_DIR)/include
-XTESTS_SRC_DIR				=	$(PROJ_SRC_DIR)/xtests
+SHWILD_PROJ_INCLUDE     =   
+ifdef PANTHEIOS_SHWILD_BASE_DIR
+SHWILD_INCLUDE_DIR      =   $(PANTHEIOS_SHWILD_BASE_DIR)/include
+SHWILD_SRC_DIR          =   $(PANTHEIOS_SHWILD_BASE_DIR)/src
+SHWILD_PROJ_INCLUDE     =   -I$(SHWILD_INCLUDE_DIR)
+else
+SHWILD_INCLUDE_DIR      =   $(PROJ_BASE_DIR)/include
+SHWILD_SRC_DIR          =   $(PROJ_SRC_DIR)/shwild
+endif # !PANTHEIOS_SHWILD_BASE_DIR
+
+XCONTRACT_PROJ_INCLUDE  =   
+ifdef PANTHEIOS_XCONTRACT_BASE_DIR
+XCONTRACT_INCLUDE_DIR   =   $(PANTHEIOS_XCONTRACT_BASE_DIR)/include
+XCONTRACT_SRC_DIR       =   $(PANTHEIOS_XCONTRACT_BASE_DIR)/src
+XCONTRACT_PROJ_INCLUDE  =   -I$(XCONTRACT_INCLUDE_DIR)
+else
+XCONTRACT_INCLUDE_DIR   =   $(PROJ_BASE_DIR)/include
+XCONTRACT_SRC_DIR       =   $(PROJ_SRC_DIR)/xcontract
+endif # !PANTHEIOS_XCONTRACT_BASE_DIR
+
+XTESTS_PROJ_INCLUDE     =   
+ifdef PANTHEIOS_XTESTS_BASE_DIR
+XTESTS_INCLUDE_DIR      =   $(PANTHEIOS_XTESTS_BASE_DIR)/include
+XTESTS_SRC_DIR          =   $(PANTHEIOS_XTESTS_BASE_DIR)/src
+XTESTS_PROJ_INCLUDE     =   -I$(XTESTS_INCLUDE_DIR)
+else
+XTESTS_INCLUDE_DIR      =   $(PROJ_BASE_DIR)/include
+XTESTS_SRC_DIR          =   $(PROJ_SRC_DIR)/xtests
+endif # !PANTHEIOS_XTESTS_BASE_DIR
 
 ########################################
 # tools
@@ -241,6 +270,9 @@ endif # STLSOFT_1_10
 CPPC_INCLUDES_BASE=\
  \
  -I$(PROJ_INCLUDE_DIR)\
+ $(SHWILD_PROJ_INCLUDE)\
+ $(XCONTRACT_PROJ_INCLUDE)\
+ $(XTESTS_PROJ_INCLUDE)\
  $(STLSOFT_1_10_INCLUDE)\
  -I$(STLSOFT)/include\
  $(COMMON_INCLUDES)\
@@ -521,12 +553,16 @@ CORE_HEADERS=\
  \
 
 SHWILD_HEADERS=\
- $(PROJ_INCLUDE_DIR)/shwild/shwild.h\
- $(PROJ_INCLUDE_DIR)/shwild/shwild.hpp\
+ $(SHWILD_INCLUDE_DIR)/shwild/shwild.h\
+ $(SHWILD_INCLUDE_DIR)/shwild/shwild.hpp\
+ \
+
+XCONTRACT_HEADERS=\
+ $(XCONTRACT_INCLUDE_DIR)/xcontract/xcontract.h\
  \
 
 XTESTS_HEADERS=\
- $(PROJ_INCLUDE_DIR)/xtests/xtests.h\
+ $(XTESTS_INCLUDE_DIR)/xtests/xtests.h\
  \
 
 ############################################################################
@@ -1978,14 +2014,14 @@ FASTFORMAT_PREP_FILE		=	$(PROJ_INCLUDE_DIR)/fastformat/internal/dos2unix.has.bee
 $(STLSOFT_PREP_FILE):	$(STLSOFT_SENTINEL_HEADER)
 	@echo Ensuring all STLSoft C source files are in UNIX format
 	@find $(STLSOFT) -name '*.h' | while read f ; do \
-	  set -e ; sed 's/\r$$//' $$f > $$f.tmp ; mv $$f.tmp $$f ; \
+	  set -e ; LC_ALL=C sed "s/$(printf '\r')$$//" $$f > $$f.tmp ; mv $$f.tmp $$f ; \
 	done
 	@echo dos2unix.has.been.performed > $(STLSOFT_PREP_FILE)
 
 $(FASTFORMAT_PREP_FILE):	$(FASTFORMAT_SENTINEL_HEADER)
 	@echo Ensuring all fastformat - and bundled library - C source files are in UNIX format
 	@find $(PROJ_BASE_DIR) -name '*.[ch]' | while read f ; do \
-	  set -e ; sed 's/\r$$//' $$f > $$f.tmp ; mv $$f.tmp $$f ; \
+	  set -e ; LC_ALL=C sed "s/$(printf '\r')$$//" $$f > $$f.tmp ; mv $$f.tmp $$f ; \
 	done
 	@echo dos2unix.has.been.performed > $(FASTFORMAT_PREP_FILE)
 

diff --git a/build/gcc34.win32/makefile b/build/gcc34.win32/makefile
@@ -5,7 +5,7 @@
 #           compiler, on Win32
 #
 # Created:  22nd December 2007
-# Updated:  17th August 2012
+# Updated:  25th September 2015
 #
 ############################################################################
 
@@ -26,18 +26,21 @@ endif # !STLSOFT
 
 COMP_TAG            =   gcc34
 ARCH_TAG            =   
-OS_TAG				=   
+OS_TAG              =   
 PROJ_TAG            =   fastformat
 PROJ_VER_MAJOR      =   0
 PROJ_TAG_VER        =   $(PROJ_TAG).$(PROJ_VER_MAJOR)
-COMP_ARCH_OS_TAG	=	$(COMP_TAG)$(OS_TAG)$(ARCH_TAG)
+COMP_ARCH_OS_TAG    =   $(COMP_TAG)$(OS_TAG)$(ARCH_TAG)
 
-LOKI_SFMT_VER_MAJOR	=	0
-LOKI_SFMT_TAG_VER	=	loki.safefmt.$(LOKI_SFMT_VER_MAJOR)
+LOKI_SFMT_VER_MAJOR =   0
+LOKI_SFMT_TAG_VER   =   loki.safefmt.$(LOKI_SFMT_VER_MAJOR)
 
 SHWILD_VER_MAJOR    =   0
 SHWILD_TAG_VER      =   shwild.$(SHWILD_VER_MAJOR)
 
+XCONTRACT_VER_MAJOR =   0
+XCONTRACT_TAG_VER   =   xtests.$(XCONTRACT_VER_MAJOR)
+
 XTESTS_VER_MAJOR    =   0
 XTESTS_TAG_VER      =   xtests.$(XTESTS_VER_MAJOR)
 
@@ -46,7 +49,9 @@ PROJ_MAKEFILE_NAME  =   makefile
 ########################################
 # Testing verbosity
 
-TEST_VERBOSITY		=	2
+ifndef TEST_VERBOSITY
+TEST_VERBOSITY      =   2
+endif # !TEST_VERBOSITY
 
 ########################################
 # Directories
@@ -70,11 +75,35 @@ BITBUCKET_SRC_DIR			=	$(PROJ_SRC_DIR)\bitbucket
 
 LOKI_SFMT_SRC_DIR			=	$(PROJ_SRC_DIR)\loki.safefmt
 
-SHWILD_INCLUDE_DIR			=	$(PROJ_BASE_DIR)\include
-SHWILD_SRC_DIR				=	$(PROJ_SRC_DIR)\shwild
-
-XTESTS_INCLUDE_DIR			=	$(PROJ_BASE_DIR)\include
-XTESTS_SRC_DIR				=	$(PROJ_SRC_DIR)\xtests
+SHWILD_PROJ_INCLUDE     =   
+ifdef PANTHEIOS_SHWILD_BASE_DIR
+SHWILD_INCLUDE_DIR      =   $(PANTHEIOS_SHWILD_BASE_DIR)\include
+SHWILD_SRC_DIR          =   $(PANTHEIOS_SHWILD_BASE_DIR)\src
+SHWILD_PROJ_INCLUDE     =   -I$(SHWILD_INCLUDE_DIR)
+else
+SHWILD_INCLUDE_DIR      =   $(PROJ_BASE_DIR)\include
+SHWILD_SRC_DIR          =   $(PROJ_SRC_DIR)\shwild
+endif # !PANTHEIOS_SHWILD_BASE_DIR
+
+XCONTRACT_PROJ_INCLUDE  =   
+ifdef PANTHEIOS_XCONTRACT_BASE_DIR
+XCONTRACT_INCLUDE_DIR   =   $(PANTHEIOS_XCONTRACT_BASE_DIR)\include
+XCONTRACT_SRC_DIR       =   $(PANTHEIOS_XCONTRACT_BASE_DIR)\src
+XCONTRACT_PROJ_INCLUDE  =   -I$(XCONTRACT_INCLUDE_DIR)
+else
+XCONTRACT_INCLUDE_DIR   =   $(PROJ_BASE_DIR)\include
+XCONTRACT_SRC_DIR       =   $(PROJ_SRC_DIR)\xcontract
+endif # !PANTHEIOS_XCONTRACT_BASE_DIR
+
+XTESTS_PROJ_INCLUDE     =   
+ifdef PANTHEIOS_XTESTS_BASE_DIR
+XTESTS_INCLUDE_DIR      =   $(PANTHEIOS_XTESTS_BASE_DIR)\include
+XTESTS_SRC_DIR          =   $(PANTHEIOS_XTESTS_BASE_DIR)\src
+XTESTS_PROJ_INCLUDE     =   -I$(XTESTS_INCLUDE_DIR)
+else
+XTESTS_INCLUDE_DIR      =   $(PROJ_BASE_DIR)\include
+XTESTS_SRC_DIR          =   $(PROJ_SRC_DIR)\xtests
+endif # !PANTHEIOS_XTESTS_BASE_DIR
 
 ########################################
 # tools
@@ -237,6 +266,9 @@ endif # STLSOFT_1_10
 CPPC_INCLUDES_BASE=\
  \
  -I$(PROJ_INCLUDE_DIR)\
+ $(SHWILD_PROJ_INCLUDE)\
+ $(XCONTRACT_PROJ_INCLUDE)\
+ $(XTESTS_PROJ_INCLUDE)\
  $(STLSOFT_1_10_INCLUDE)\
  -I$(STLSOFT)\include\
  $(COMMON_INCLUDES)\
@@ -513,12 +545,16 @@ CORE_HEADERS=\
  \
 
 SHWILD_HEADERS=\
- $(PROJ_INCLUDE_DIR)\shwild\shwild.h\
- $(PROJ_INCLUDE_DIR)\shwild\shwild.hpp\
+ $(SHWILD_INCLUDE_DIR)\shwild\shwild.h\
+ $(SHWILD_INCLUDE_DIR)\shwild\shwild.hpp\
+ \
+
+XCONTRACT_HEADERS=\
+ $(XCONTRACT_INCLUDE_DIR)\xcontract\xcontract.h\
  \
 
 XTESTS_HEADERS=\
- $(PROJ_INCLUDE_DIR)\xtests\xtests.h\
+ $(XTESTS_INCLUDE_DIR)\xtests\xtests.h\
  \
 
 ############################################################################