v3.0.0

Jambase

@@ -379,6 +379,11 @@ JAMBASEDATE = 2008.03.26 ;
 
 if $(NT)
 {
+	if ! [ GLOB $(PATH) : mt.exe ] {
+    	Echo "mt is NOT available!" ;
+    	WIN_UTF8 = false ;
+	}
+
 	MV				?= move /y ;
 	CP				?= copy ;
 	RM				?= del /f/q ;
@@ -414,7 +419,11 @@ if $(NT)
 		TPFX             = "" ;
 
 		if [ GLOB $(MINGW)/bin : x86_64-w64-mingw32-gcc.exe ] {
-			MINGW64 = $(MINGW) ;
+			if [ GLOB $(MINGW)/bin : gcc.exe ] {
+				MINGW64 = $(MINGW) ;
+			} else {
+				MINGW64o32 = $(MINGW) ;
+			}
         }
 
 		# This doesn't work on a 32 bit system because we're cross
@@ -423,11 +432,16 @@ if $(NT)
 		# Will using -m32 for local exe's fix this ?
 		# What is multi-lib option ???
 		if $(MINGW64) {
-			ECHO "Compiler is MingW for 64 bit target" ;
+			ECHO "Compiler is native MingW 64 bit target" ;
+			TARGET64     = true ;
+			TPFX1        = "" ;	# Some tools
+			TPFX2        = "" ;	# Rest of tools
+		} else if $(MINGW64o32) {
+			ECHO "Compiler is MingW 64 bit target on 32 bit host" ;
 			TARGET64     = true ;
 			TPFX1        = x86_64-w64-mingw32- ;	# Some tools
 			TPFX2        = x86_64-w64-mingw32- ;	# Rest of tools
-			MINGW64_LIB32 = $(MINGW)/mingw/lib32 ;
+#			MINGW64_LIB32 = $(MINGW)/mingw/lib32 ;
 		} else {
 			ECHO "Compiler is MingW for 32 bit target" ;
 			TPFX1        = "" ;	# Some tools
@@ -439,7 +453,7 @@ if $(NT)
 		AS				?= $(TPFX2)as ;
 		CC				?= $(TPFX1)gcc ;
 echo "CC = " $(CC) ;
-		CCFLAGS			?= -DNT -mwin32 -pipe ;
+		CCFLAGS			?= -DNT -mwin32 -pipe ;			# -fwrapv ??
 		C++				?= $(CC) ;
 		C++FLAGS		?= $(CCFLAGS) ;
 
@@ -448,7 +462,7 @@ echo "CC = " $(CC) ;
 #		WINLIBS			?= -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32
 #						   -lodbc32 -ladvapi32 -lodbc32 -lwsock32 -lopengl32
 #		                   -lglu32 -lshlwapi -lsetupapi ;
-		WINLIBS			?= -lshlwapi -lsetupapi -lole32 -lws2_32 -lpsapi -lversion ;
+		WINLIBS			?= -lshlwapi -lsetupapi -lole32 -lws2_32 -lpsapi -liphlpapi -lversion ;
 		GUILIBS			?= -lgdi32 -lmscms ;
 
 		LINK			?= $(TPFX1)g++ ;		# In case we link to C++ files
@@ -676,6 +690,7 @@ echo "CC = " $(CC) ;
 						oleaut32.lib
 						ws2_32.lib
 						Wbemuuid.lib
+						iphlpapi.lib
 						Version.lib
 #						Winmm.lib
 						;
@@ -981,7 +996,7 @@ else if $(UNIX)
 
 	# UNIX defaults
 
-	CCFLAGS			?= -DUNIX -D_THREAD_SAFE -pipe ;
+	CCFLAGS			?= -DUNIX -D_THREAD_SAFE -pipe ;	# -fwrapv ??
 	CCOPTFLAG		?= -O2 ;		
 	CCDEBUGFLAG		?= -g ;		
 	CCPROFFLAG		?= ;		
@@ -2770,6 +2785,10 @@ rule GUIAPP
 {
 }
 
+rule UTF8APP
+{
+}
+
 # /HdrMacroFile
 #
 # this rule is specific to FT-Jam. It is used to indicate that a given file
@@ -3432,6 +3451,12 @@ rule MainFromObjects
 	if [ geton $(_t) : GUIAPP ] = "true" {
 		GUIAPP $(_t) ;
 	}
+
+	# On MSWin10 we may want to use UTF-8 for text
+	if $(WIN_UTF8) = true {
+		UTF8APP $(_t) ;
+	}
+
 #Echo "MainFromObjects done" ;
 }
 
@@ -4443,6 +4468,22 @@ if $(NT)
 	{
 		$(CP) /b $(>) + nul $(<) > nul
 	}
+
+	# Allow MSWin10 apps to use UTF-8
+
+	actions UTF8APP
+	{
+	echo ^<?xml version="1.0" encoding="UTF-8" standalone="yes"?^>>$(<).tmp
+	echo ^<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"^>>>$(<).tmp
+  	echo ^<assemblyIdentity type="win32" name="..." version="6.0.0.0"/^>>>$(<).tmp
+  	echo ^<application xmlns="urn:schemas-microsoft-com:asm.v3"^>>>$(<).tmp
+    	echo ^<windowsSettings^>>>$(<).tmp
+      	echo ^<activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings"^>UTF-8^</activeCodePage^>>>$(<).tmp
+    	echo ^</windowsSettings^>>>$(<).tmp
+  	echo ^</application^>>>$(<).tmp
+	echo ^</assembly^>>>$(<).tmp
+		mt.exe -nologo -manifest $(<).tmp -outputresource:$(<);#1
+	}
 }
 
 if $(NT) && $(MSVCNT)

Jamfile

@@ -4,8 +4,8 @@
 # Overall optization state and configuration. Overrides sub-Jamfiles
 # See Jamtop and Jambase for other details.
 
-PREF_CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
-#PREF_CCFLAGS	+= $(CCDEBUGFLAG) ;		# Debugging flags
+#PREF_CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
+PREF_CCFLAGS	+= $(CCDEBUGFLAG) ;		# Debugging flags
 #PREF_CCFLAGS	+= $(CCHEAPDEBUG) ;		# Heap Debugging & Debugging flags
 #PREF_LINKFLAGS	+= $(LINKOPTFLAG) ;		# Link optimization flags
 PREF_LINKFLAGS	+= $(LINKDEBUGFLAG) ;	# Link debugging flags
@@ -14,6 +14,15 @@ PREF_LINKFLAGS	+= $(LINKDEBUGFLAG) ;	# Link debugging flags
 
 # Include all the sub-directory Jamfiles
 
+# Compile date
+Always compiledate.h ;
+if [ GLOB $(PATH) : awk awk.exe ] {
+	GenFileNND compiledate.h : "awk 'BEGIN {srand();print \"#define COMPILEDATE \" srand()}' > compiledate.h" ; 
+} else {
+	# make sure compilation fails if there is no awk and compiledate.h is needed
+	GenFileNND compiledate.h : $(RM) compiledate.h ; 
+}
+
 SubInclude numlib ;
 SubInclude plot ;
 SubInclude icc ;

Jamtop

@@ -4,6 +4,11 @@
 
 Echo "Argyll Jamtop has been read" ;
 
+# Development config.
+if [ GLOB $(TOP) : JamPrivate ] {
+	include $(TOP)/JamPrivate ;
+}
+
 # Default install base directory is same directory as Jamtop,
 # but can be overriden in the command line.
 DESTDIR ?= [ NormPaths  . ] ;
@@ -26,6 +31,9 @@ ANCHORED_PATH_VARS = DESTDIR ;
 # Tell standalone libraries that they are part of Argyll:
 DEFINES += ARGYLLCMS ;
 
+# Enable all instrument types by default
+DEFINES += ALLINSTS ;
+
 # enable serial instruments & support
 USE_SERIAL = true ;	
 
@@ -46,14 +54,18 @@ USE_VTPGLUT = false ;
 USE_PRINTER = false ;
 
 # enable CMF Measurement device and accessory support (if present)
-USE_CMFM = true ;	
+USE_CMFM = false ;	
 
 # Use ArgyllCMS version of libusb (deprecated - don't use)
 USE_LIBUSB = false ;	# [false]
 
 # Compile in graph plotting code (Not fully implemented)
 USE_PLOT = true ;		# [true] 
 
+# Enable UTF-8 code pages on MSWindows V 1903 or later,
+# to make executable language handling consistent across MSWin/OS X/Linux
+WIN_UTF8 = true ;		# [true]
+
 if $(USE_LIBUSB) = true {
 
 	# Use libusb1 rather than libusb0 & libusb0-win32 (deprecated)

Readme.txt

@@ -2,7 +2,7 @@
 Argyll CMS README file - Version 2.3.1
 --------------------------------------
 
-Date: 27th June 2022
+Date: 15th September 2023
 Author: Graeme Gill
 
 Introduction
@@ -26,7 +26,7 @@ provided for each major tool, and a general guide to using the tools for
 typical color management tasks is also available. A mailing list provides
 support for more advanced usage.
 
-This is Version 2.3.1, a bug fix update to the last release V2.3.0.
+This is Version 3.0.0, a feature and bug fix update to the last release V2.3.1.
 The first public release of icclib was in November 1998,
 and of Argyll was in October 2000. Code development commenced in 1995. See
 Changes Summary for an overview of changes since the last release. Changes

adirs

@@ -1,4 +1,7 @@
 .
+doc
+ref
+h
 numlib
 usb
 plot
@@ -19,9 +22,6 @@ ucmm
 jcnf
 yajl
 lib
-h
-ref
-doc
 zlib
 tiff
 jpeg

afiles

@@ -11,13 +11,9 @@ Makefile
 License.txt
 License2.txt
 License3.txt
-ttbd.txt
 log.txt
-notes.txt
 makeall.bat
 install.bat
 makeall.sh
-ziparch.sh
 makeinstall.sh
 makepackagebin.sh
-makeoemdnldbin.sh

ccast/Jamfile

@@ -37,6 +37,6 @@ LINKLIBS = ./libccast $(SSLLIB) ../yajl/libyajl ../numlib/libnum ../spectro/libc
 
 # Test harness
 #Main cctest : cctest.c ;
-Main filt : filt.c ;
-MainVariant dpat : dpat.c : : STANDALONE_TEST ;
+#Main filt : filt.c ;
+#MainVariant dpat : dpat.c : : STANDALONE_TEST ;
 

ccast/afiles

@@ -14,24 +14,27 @@ cctest.c
 filt.c
 dpat.c
 cast_channel.proto
+chan/cast_channel.pb-c.c
+chan/cast_channel.pb-c.h
+chan/protobuf-c.c
+chan/protobuf-c.h
 axTLS/Jamfile
 axTLS/Readme.txt
 axTLS/aes.c
 axTLS/asn1.c
+axTLS/axTLS_config.h
+axTLS/axTLS_version.h
 axTLS/bigint.c
 axTLS/bigint.h
 axTLS/bigint_impl.h
 axTLS/cert.h
-axTLS/axTLS_config.h
 axTLS/crypto.h
 axTLS/crypto_misc.c
 axTLS/crypto_misc.h
-axTLS/gen_cert.c
 axTLS/hmac.c
 axTLS/loader.c
 axTLS/md2.c
 axTLS/md5.c
-axTLS/openssl.c
 axTLS/os_int.h
 axTLS/os_port.c
 axTLS/os_port.h
@@ -40,14 +43,12 @@ axTLS/private_key.h
 axTLS/rc4.c
 axTLS/rsa.c
 axTLS/sha1.c
+axTLS/sha256.c
+axTLS/sha384.c
+axTLS/sha512.c
 axTLS/ssl.h
 axTLS/tls1.c
 axTLS/tls1.h
 axTLS/tls1_clnt.c
 axTLS/tls1_svr.c
-axTLS/axTLS_version.h
 axTLS/x509.c
-chan/cast_channel.pb-c.c
-chan/cast_channel.pb-c.h
-chan/protobuf-c.c
-chan/protobuf-c.h

ccast/axTLS/Jamfile

@@ -1,6 +1,6 @@
 
-PREF_CCFLAGS 	= $(CCOPTFLAG) ;		# Turn optimisation on
-#PREF_CCFLAGS	= $(CCDEBUGFLAG) ;		# Debugging flags
+#PREF_CCFLAGS 	= $(CCOPTFLAG) ;		# Turn optimisation on
+PREF_CCFLAGS	= $(CCDEBUGFLAG) ;		# Debugging flags
 PREF_LINKFLAGS	= $(LINKDEBUGFLAG) ;
 
 if $(NT) {
@@ -19,17 +19,17 @@ LIBSRCS =
 	asn1.c
 	bigint.c
 	crypto_misc.c
-	gen_cert.c
 	hmac.c
 	loader.c
-	md2.c
 	md5.c
-	openssl.c
 	os_port.c
 	p12.c
 	rc4.c
 	rsa.c
 	sha1.c
+	sha256.c
+	sha384.c
+	sha512.c
 	tls1.c
 	tls1_clnt.c
 	tls1_svr.c

ccast/axTLS/aes.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Cameron Rich
+ * Copyright (c) 2007-2016, Cameron Rich
  * 
  * All rights reserved.
  * 
@@ -38,9 +38,6 @@
 #include "os_port.h"
 #include "crypto.h"
 
-/* all commented out in skeleton mode */
-#ifndef CONFIG_SSL_SKELETON_MODE
-
 #define rot1(x) (((x) << 24) | ((x) >> 8))
 #define rot2(x) (((x) << 16) | ((x) >> 16))
 #define rot3(x) (((x) <<  8) | ((x) >> 24))
@@ -453,5 +450,3 @@ static void AES_decrypt(const AES_CTX *ctx, uint32_t *data)
             data[row-1] = tmp[row-1] ^ *(--k);
     }
 }
-
-#endif