waf build system.

5 files changed, 124 insertions, 368 deletions

diff --git a/src/AS_02_TimedText.cpp b/src/AS_02_TimedText.cpp
index eece664..a9cc132 100644
--- a/src/AS_02_TimedText.cpp
+++ b/src/AS_02_TimedText.cpp
@@ -43,6 +43,7 @@ static std::string TIMED_TEXT_DEF_LABEL = "Timed Text Track";
 
 //------------------------------------------------------------------------------------------
 
+static
 const char*
 MIME2str(TimedText::MIMEType_t m)
 {
diff --git a/src/AS_DCP_TimedText.cpp b/src/AS_DCP_TimedText.cpp
index f738a59..58353a5 100644
--- a/src/AS_DCP_TimedText.cpp
+++ b/src/AS_DCP_TimedText.cpp
@@ -43,6 +43,7 @@ static std::string TIMED_TEXT_DEF_LABEL = "Timed Text Track";
 
 //------------------------------------------------------------------------------------------
 
+static
 const char*
 MIME2str(TimedText::MIMEType_t m)
 {
diff --git a/src/KM_platform.h b/src/KM_platform.h
index defcd8a..3fe8c1b 100644
--- a/src/KM_platform.h
+++ b/src/KM_platform.h
@@ -40,7 +40,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # endif
 
 # ifdef KM_WIN32
-#  define WIN32_LEAN_AND_MEAN
 #  define VC_EXTRALEAN
 #  include <windows.h>
 #  include <stdlib.h>
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 2f84f6e..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,367 +0,0 @@
-## Makefile.am -- Process this file with automake to produce Makefile.in
-#
-# $Id$
-#
-# Copyright (c) 2007-2013 John Hurst. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Allow for configure's changes to this makefile
-AM_CPPFLAGS =
-AM_LDFLAGS =
-
-if OPENBSD_HOST
-AM_CPPFLAGS += -I/var/local/include -I/usr/local/include
-AM_LDFLAGS += -L./.libs -L/var/local/lib -L/usr/local/lib
-endif
-
-if ENABLE_RANDOM_UUID
-AM_CPPFLAGS += -DCONFIG_RANDOM_UUID
-endif
-
-AM_CPPFLAGS += -g
-
-# list of all the header files that should be installed
-include_HEADERS = \
-	KM_error.h \
-	KM_fileio.h \
-	KM_log.h \
-	KM_memio.h \
-	KM_mutex.h \
-	KM_platform.h \
-	KM_prng.h \
-	KM_util.h \
-	KM_tai.h \
-	KM_xml.h \
-	AS_DCP.h
-
-if DEV_HEADERS
-include_HEADERS += \
-	S12MTimecode.h \
-	ST2095_PinkNoise.h \
-	MDD.h \
-	Metadata.h \
-	KLV.h \
-	JP2K.h \
-	MXFTypes.h \
-	MXF.h \
-	Wav.h \
-	PCMParserList.h \
-	AtmosSyncChannel_Mixer.h \
-	AtmosSyncChannel_Generator.h \
-	PCMDataProviders.h \
-	SyncCommon.h \
-	SyncEncoder.h \
-	UUIDInformation.h 
-
-
-endif
-
-if USE_AS_02
-include_HEADERS		+= AS_02.h
-endif
-
-if USE_PHDR
-include_HEADERS		+= AS_02_PHDR.h
-endif
-
-# list of the libraries to build and install
-
-lib_LTLIBRARIES = libkumu.la libasdcp.la
-
-if USE_AS_02
-lib_LTLIBRARIES		+= libas02.la
-endif
-
-if USE_PHDR
-lib_LTLIBRARIES		+= libphdr.la
-endif
-
-# sources for kumu library
-libkumu_la_SOURCES = KM_error.h KM_fileio.cpp KM_fileio.h KM_log.cpp KM_log.h \
-		KM_memio.h KM_mutex.h KM_platform.h KM_prng.cpp KM_prng.h KM_util.cpp \
-		KM_util.h KM_xml.cpp KM_xml.h KM_tai.h KM_tai.cpp
-
-# linker flags (*not* including libraries to link against) for a library
-libkumu_la_LDFLAGS = -release @VERSION@
-
-
-# sources for asdcp library that don't get added to a distribution
-nodist_libasdcp_la_SOURCES = Metadata_h.tt2 Metadata_cpp.tt2 \
-		mxfgen.pl MXF_def.pl ullist.pl ULList.xml dict.xml DMS_Crypto.xml
-# sources for asdcp library
-libasdcp_la_SOURCES = MPEG2_Parser.cpp MPEG.cpp JP2K_Codestream_Parser.cpp \
-	JP2K_Sequence_Parser.cpp JP2K.cpp PCM_Parser.cpp Wav.cpp \
-	TimedText_Parser.cpp KLV.cpp Dict.cpp MXFTypes.cpp MXF.cpp \
-	Index.cpp Metadata.cpp AS_DCP.cpp AS_DCP_MXF.cpp AS_DCP_AES.cpp \
-	h__Reader.cpp h__Writer.cpp AS_DCP_MPEG2.cpp AS_DCP_JP2K.cpp \
-	AS_DCP_PCM.cpp AS_DCP_TimedText.cpp PCMParserList.cpp \
-	Wav.h WavFileWriter.h MXF.h Metadata.h \
-	JP2K.h AS_DCP.h AS_DCP_internal.h KLV.h MPEG.h MXFTypes.h MDD.h \
-	PCMParserList.h S12MTimecode.h MDD.cpp \
-	AS_DCP_ATMOS.cpp  AS_DCP_DCData.cpp AS_DCP_DCData_internal.h \
-	DCData_ByteStream_Parser.cpp DCData_Sequence_Parser.cpp \
-	AtmosSyncChannel_Generator.cpp AtmosSyncChannel_Generator.h \
-	AtmosSyncChannel_Mixer.cpp AtmosSyncChannel_Mixer.h \
-	PCMDataProviders.cpp PCMDataProviders.h \
-	SyncEncoder.c SyncEncoder.h SyncCommon.h CRC16.c CRC16.h \
-	UUIDInformation.c UUIDInformation.h \
-	ST2095_PinkNoise.cpp
-
-
-libasdcp_la_LDFLAGS = -release @VERSION@
-# additional libraries to link against for a library
-libasdcp_la_LIBADD = libkumu.la
-libasdcp_la_CPPFLAGS = -DASDCP_PLATFORM=\"@host@\"
-
-if USE_AS_02
-# sources for as-02 library
-libas02_la_SOURCES	= \
-	AS_02.h \
-	AS_02_internal.h \
-	h__02_Reader.cpp \
-	h__02_Writer.cpp \
-	AS_02_JP2K.cpp \
-	AS_02_PCM.cpp \
-	ST2052_TextParser.cpp \
-	AS_02_TimedText.cpp
-
-libas02_la_LDFLAGS = -release @VERSION@
-libas02_la_LIBADD = libasdcp.la libkumu.la
-libas02_la_CPPFLAGS = -DASDCP_PLATFORM=\"@host@\"
-endif
-
-
-if USE_PHDR
-# sources for PHDR library
-libphdr_la_SOURCES	= \
-	AS_02_PHDR.h \
-	PHDR_Sequence_Parser.cpp \
-	AS_02_PHDR.cpp
-
-libphdr_la_LDFLAGS = -release @VERSION@
-libphdr_la_LIBADD = libasdcp.la libkumu.la
-libphdr_la_CPPFLAGS = -DASDCP_PLATFORM=\"@host@\"
-endif
-
-# Python extension
-if PYTHON_USE
-lib_LTLIBRARIES += libpyasdcp.la
-
-nodist_libpyasdcp_la_SOURCES = \
-	kumu_python.cpp \
-	kumu_python.h \
-	asdcp_python.cpp \
-	asdcp_python.h \
-	asdcp_python_descriptor.cpp \
-	asdcp_python_misc.cpp \
-	asdcp_python_writerinfo.h \
-	asdcp_wrappers.h \
-	asdcp_python_mxf.cpp \
-	asdcp_python_mxf.h \
-	asdcp_python_mxf_text.cpp \
-	asdcp_python_mxf_metadata.cpp
-
-
-libpyasdcp_la_CPPFLAGS = @PYTHON_CPPFLAGS@
-libpyasdcp_la_LDFLAGS = @PYTHON_LSPEC@  -release @VERSION@
-libpyasdcp_la_LIBADD = libkumu.la libasdcp.la
-
-if USE_AS_02
-libpyasdcp_la_LIBADD	+= libas02.la
-endif
-
-pyexecdir = @PYTHON_EXECDIR@
-pyexec_includedir = $(PYTHON_PREFIX)/include/python$(PYTHON_SHORTVERSION)
-nodist_pyexec_include_HEADERS = kumu_python.h asdcp_python.h asdcp_wrappers.h
-pyexec_LTLIBRARIES = kumu.la asdcp.la
-
-nodist_kumu_la_SOURCES = pykumu.cpp kumu_python.h
-kumu_la_CPPFLAGS = @PYTHON_CPPFLAGS@
-kumu_la_LDFLAGS = @PYTHON_LSPEC@ -avoid-version -module
-kumu_la_LIBADD = libpyasdcp.la
-
-nodist_asdcp_la_SOURCES = pyasdcp.cpp kumu_python.h asdcp_python.h asdcp_wrappers.h
-asdcp_la_CPPFLAGS = @PYTHON_CPPFLAGS@
-asdcp_la_LDFLAGS = @PYTHON_LSPEC@ -avoid-version -module
-asdcp_la_LIBADD = libpyasdcp.la
-endif
-
-# list of programs to be built and installed
-bin_PROGRAMS = \
-	asdcp-wrap \
-	asdcp-unwrap \
-	asdcp-util \
-	asdcp-info \
-	asdcp-test \
-	j2c-test \
-	blackwave \
-	pinkwave \
-	klvwalk \
-	wavesplit \
-	klvsplit \
-	kmfilegen \
-	kmrandgen \
-	kmuuidgen
-
-if USE_AS_02
-bin_PROGRAMS += \
-	as-02-wrap \
-	as-02-unwrap
-endif
-
-if USE_PHDR
-bin_PROGRAMS += \
-	phdr-wrap \
-	phdr-unwrap
-endif
-
-# sources and linkage for CLI utilities
-asdcp_test_SOURCES = asdcp-test.cpp
-asdcp_test_LDADD = libasdcp.la libkumu.la
-
-asdcp_wrap_SOURCES = asdcp-wrap.cpp
-asdcp_wrap_LDADD = libasdcp.la libkumu.la
-
-asdcp_unwrap_SOURCES = asdcp-unwrap.cpp
-asdcp_unwrap_LDADD = libasdcp.la libkumu.la
-
-asdcp_util_SOURCES = asdcp-util.cpp
-asdcp_util_LDADD = libasdcp.la libkumu.la
-
-asdcp_info_SOURCES = asdcp-info.cpp
-asdcp_info_LDADD = libasdcp.la libkumu.la
-
-kmfilegen_SOURCES = kmfilegen.cpp
-kmfilegen_LDADD = libkumu.la 
-
-kmrandgen_SOURCES = kmrandgen.cpp
-kmrandgen_LDADD = libkumu.la 
-
-kmuuidgen_SOURCES = kmuuidgen.cpp
-kmuuidgen_LDADD = libkumu.la 
-
-blackwave_SOURCES = blackwave.cpp
-blackwave_LDADD = libasdcp.la  libkumu.la
-
-pinkwave_SOURCES = pinkwave.cpp
-pinkwave_LDADD = libasdcp.la  libkumu.la
-
-klvwalk_SOURCES = klvwalk.cpp
-klvwalk_LDADD = libasdcp.la libkumu.la
-
-wavesplit_SOURCES = wavesplit.cpp
-wavesplit_LDADD = libasdcp.la libkumu.la
-
-j2c_test_SOURCES = j2c-test.cpp
-j2c_test_LDADD = libasdcp.la libkumu.la
-
-klvsplit_SOURCES = klvsplit.cpp
-klvsplit_LDADD = libasdcp.la libkumu.la
-
-if USE_AS_02
-as_02_wrap_SOURCES = as-02-wrap.cpp
-as_02_wrap_LDADD = libas02.la libasdcp.la libkumu.la
-
-as_02_unwrap_SOURCES = as-02-unwrap.cpp
-as_02_unwrap_LDADD = libas02.la libasdcp.la libkumu.la
-endif
-
-if USE_PHDR
-phdr_wrap_SOURCES = phdr-wrap.cpp
-phdr_wrap_LDADD = libphdr.la libas02.la libasdcp.la libkumu.la
-
-phdr_unwrap_SOURCES = phdr-unwrap.cpp
-phdr_unwrap_LDADD = libphdr.la libas02.la libasdcp.la libkumu.la
-endif
-
-# list of programs that need to be compiled for use in test suite
-check_PROGRAMS = asdcp-mem-test path-test \
-	fips-186-rng-test asdcp-version
-if DEV_HEADERS
-check_PROGRAMS += tt-xform
-endif
-
-# sources for a test program
-# list of libraries to link against for a test program
-asdcp_mem_test_SOURCES = asdcp-mem-test.cpp
-asdcp_mem_test_LDADD = libasdcp.la
-
-path_test_SOURCES = path-test.cpp
-path_test_LDADD = libkumu.la
-
-fips_186_rng_test_SOURCES = fips-186-rng-test.cpp
-fips_186_rng_test_LDADD = libasdcp.la
-
-asdcp_version_SOURCES = asdcp-version.cpp
-asdcp_version_LDADD = libkumu.la 
-
-if DEV_HEADERS
-nodist_tt_xform_SOURCES = tt-xform.cpp TimedText_Transform.h
-tt_xform_LDADD = libasdcp.la
-endif
-
-
-# list of test scripts to execute during "make check"
-TESTS = rng-tst.sh gen-tst.sh \
-	jp2k-tst.sh jp2k-crypt-tst.sh jp2k-stereo-tst.sh jp2k-stereo-crypt-tst.sh \
-	wav-tst.sh wav-crypt-tst.sh mpeg-tst.sh mpeg-crypt-tst.sh
-
-# environment variables to pass to above tests
-TESTS_ENVIRONMENT = BUILD_DIR="." TEST_FILES=../tests TEST_FILE_PREFIX=DCPd1-M1 \
-	CRYPT_KEY=70e0de21c98fbd455ad5b8042edb41a6 CRYPT_KEY_B=aa2d05475d568cd52cb3415e65cba76f \
-	JP2K_PREFIX=MM_2k_XYZ_
-
-# files to include in the distribution that automake doesn't automatically include
-EXTRA_DIST = fips-186-test-harness.pl $(TESTS)
-if !FREEDIST
-if DEV_HEADERS
-EXTRA_DIST += $(nodist_libasdcp_la_SOURCES) $(nodist_tt_xform_SOURCES)
-endif
-if PYTHON_USE
-EXTRA_DIST += $(nodist_pyexec_include_HEADERS) $(nodist_libpyasdcp_la_SOURCES) $(nodist_kumu_la_SOURCES) $(nodist_asdcp_la_SOURCES)
-endif
-endif
-
-# source files that are themselves built
-BUILT_SOURCES = Metadata.h Metadata.cpp MDD.h MDD.cpp
-# files to be removed with "make maintainer-clean"
-MAINTAINERCLEANFILES = Metadata.h Metadata.cpp MDD.h MDD.cpp
-
-# build commands for built sources
-# dependencies: $(srcdir)/ullist.pl $(srcdir)/ULList.xml $(srcdir)/dict.xml $(srcdir)/DMS_Crypto.xml
-MDD.h:
-	$(srcdir)/ullist.pl $(srcdir)/ULList.xml $(srcdir)/dict.xml $(srcdir)/DMS_Crypto.xml > MDD.h
-# dependencies: $(srcdir)/ullist.pl $(srcdir)/ULList.xml $(srcdir)/dict.xml $(srcdir)/DMS_Crypto.xml
-MDD.cpp:
-	$(srcdir)/ullist.pl -s $(srcdir)/ULList.xml $(srcdir)/dict.xml $(srcdir)/DMS_Crypto.xml > MDD.cpp
-# dependencies: $(srcdir)/Metadata_h.tt2 $(srcdir)/mxfgen.pl $(srcdir)/MXF_def.pl
-Metadata.h:
-	$(srcdir)/mxfgen.pl $(srcdir)/MXF_def.pl $(srcdir)/Metadata_h.tt2 > Metadata.h
-# dependencies:  Metadata.h $(srcdir)/Metadata_cpp.tt2
-Metadata.cpp:
-	$(srcdir)/mxfgen.pl $(srcdir)/MXF_def.pl $(srcdir)/Metadata_cpp.tt2 > Metadata.cpp
-
-#
-#
-#
diff --git a/src/wscript b/src/wscript
new file mode 100644
index 0000000..56b6c5b
--- /dev/null
+++ b/src/wscript
@@ -0,0 +1,122 @@
+def configure(conf):
+    conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64')
+    # Don't include the micro version number in PACKAGE_VERSION, as
+    # this ends up in MXFs and screws up DCP-o-matic's test references
+    # every time it changes
+    s = conf.env.VERSION.split('.')
+    major_minor = '%s.%s.0' % (s[0], s[1])
+    conf.env.append_value('CXXFLAGS', ['-DPACKAGE_VERSION="%s"' % major_minor])
+    if conf.options.target_windows:
+        conf.env.append_value('CXXFLAGS', ['-DASDCP_PLATFORM="win32"', '-DKM_WIN32', '-DWIN32_LEAN_AND_MEAN'])
+    else:
+        conf.env.append_value('CXXFLAGS', '-DASDCP_PLATFORM="linux"')
+
+def build(bld):
+    if bld.env.STATIC:
+        obj = bld(features='cxx cxxstlib')
+    else:
+        obj = bld(features='cxx cxxshlib')
+
+    obj.name = 'libkumu-carl'
+    obj.target = 'kumu-carl'
+    obj.uselib = 'OPENSSL BOOST_FILESYSTEM'
+    obj.includes = ['.']
+    obj.export_includes = ['.']
+    obj.source = """
+                 KM_fileio.cpp
+                 KM_log.cpp
+		 KM_util.cpp
+		 KM_xml.cpp
+                 KM_tai.cpp
+                 KM_prng.cpp
+                 """
+
+    if bld.env.STATIC:
+        obj = bld(features='cxx cxxstlib')
+    else:
+        obj = bld(features='cxx cxxshlib')
+
+    obj.name = 'libasdcp-carl'
+    obj.target = 'asdcp-carl'
+    obj.uselib = 'OPENSSL'
+    obj.use = 'libkumu-carl'
+    obj.includes = ['.']
+    obj.export_includes = ['.']
+    obj.source = """
+		 MPEG2_Parser.cpp
+                 MPEG.cpp
+                 JP2K_Codestream_Parser.cpp
+		 JP2K_Sequence_Parser.cpp
+                 JP2K.cpp
+                 PCM_Parser.cpp
+                 Wav.cpp
+		 TimedText_Parser.cpp
+                 KLV.cpp
+                 Dict.cpp
+                 MXFTypes.cpp
+                 MXF.cpp
+		 Index.cpp
+                 Metadata.cpp
+                 AS_02_JP2K.cpp
+                 AS_02_PCM.cpp
+                 AS_02_PHDR.cpp
+                 AS_02_TimedText.cpp
+                 AS_DCP.cpp
+                 AS_DCP_MXF.cpp
+                 AS_DCP_AES.cpp
+                 h__Reader.cpp
+                 h__02_Reader.cpp
+                 h__Writer.cpp
+                 h__02_Writer.cpp
+                 AS_DCP_MPEG2.cpp
+                 AS_DCP_JP2K.cpp
+                 AS_DCP_PCM.cpp
+                 AS_DCP_TimedText.cpp
+                 AS_DCP_ATMOS.cpp
+                 AS_DCP_DCData.cpp
+                 PCMParserList.cpp
+                 MDD.cpp
+                 """
+
+    headers = """
+                 KM_xml.h
+                 KM_error.h
+                 SyncEncoder.h
+                 ST2095_PinkNoise.h
+                 MXF.h
+                 Wav.h
+                 Metadata.h
+                 KM_mutex.h
+                 JP2K.h
+                 AtmosSyncChannel_Mixer.h
+                 AtmosSyncChannel_Generator.h
+                 SyncCommon.h
+                 AS_02.h
+                 AS_02_internal.h
+                 KM_tai.h
+                 KLV.h
+                 PCMParserList.h
+                 AS_DCP_internal.h
+                 KM_log.h
+                 AS_02_PHDR.h
+                 UUIDInformation.h
+                 KM_memio.h
+                 KM_prng.h
+                 KM_fileio.h
+                 MXFTypes.h
+                 AS_DCP.h
+                 KM_util.h
+                 AS_DCP_DCData_internal.h
+                 MDD.h
+                 MPEG.h
+                 WavFileWriter.h
+                 S12MTimecode.h
+                 KM_platform.h
+                 PCMDataProviders.h
+                 CRC16.h
+                 """
+
+    bld.install_files('${PREFIX}/include/libasdcp-carl', headers)
+    if bld.env.STATIC:
+        bld.install_files('${PREFIX}/lib', 'libkumu-carl.a')
+        bld.install_files('${PREFIX}/lib', 'libasdcp-carl.a')