From: Etienne Dechamps Date: Sun, 25 Nov 2018 13:52:29 +0000 (+0000) Subject: Get rid of the Scons-based build system. X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=aa016efaf7024ebce0f3484f066643e088b1bab1;p=portaudio Get rid of the Scons-based build system. There is no reason not to use CMake at this point, and keeping this around is a maintenance burden. In fact, it was already broken at the time of this commit. A quick Google search doesn't provide any evidence that anyone actually cares about this. --- diff --git a/SConstruct b/SConstruct deleted file mode 100644 index 37e67ba..0000000 --- a/SConstruct +++ /dev/null @@ -1,197 +0,0 @@ -import sys, os.path - -def rsplit(toSplit, sub, max=-1): - """ str.rsplit seems to have been introduced in 2.4 :( """ - l = [] - i = 0 - while i != max: - try: idx = toSplit.rindex(sub) - except ValueError: break - - toSplit, splitOff = toSplit[:idx], toSplit[idx + len(sub):] - l.insert(0, splitOff) - i += 1 - - l.insert(0, toSplit) - return l - -sconsDir = os.path.join("build", "scons") -SConscript(os.path.join(sconsDir, "SConscript_common")) -Import("Platform", "Posix", "ApiVer") - -# SConscript_opts exports PortAudio options -optsDict = SConscript(os.path.join(sconsDir, "SConscript_opts")) -optionsCache = os.path.join(sconsDir, "options.cache") # Save options between runs in this cache -options = Options(optionsCache, args=ARGUMENTS) -for k in ("Installation Dirs", "Build Targets", "Host APIs", "Build Parameters", "Bindings"): - options.AddOptions(*optsDict[k]) -# Propagate options into environment -env = Environment(options=options) -# Save options for next run -options.Save(optionsCache, env) -# Generate help text for options -env.Help(options.GenerateHelpText(env)) - -buildDir = os.path.join("#", sconsDir, env["PLATFORM"]) - -# Determine parameters to build tools -if Platform in Posix: - threadCFlags = '' - if Platform != 'darwin': - threadCFlags = "-pthread " - baseLinkFlags = threadCFlags - baseCxxFlags = baseCFlags = "-Wall -pedantic -pipe " + threadCFlags - debugCxxFlags = debugCFlags = "-g" - optCxxFlags = optCFlags = "-O2" -env.Append(CCFLAGS = baseCFlags) -env.Append(CXXFLAGS = baseCxxFlags) -env.Append(LINKFLAGS = baseLinkFlags) -if env["enableDebug"]: - env.AppendUnique(CCFLAGS=debugCFlags.split()) - env.AppendUnique(CXXFLAGS=debugCxxFlags.split()) -if env["enableOptimize"]: - env.AppendUnique(CCFLAGS=optCFlags.split()) - env.AppendUnique(CXXFLAGS=optCxxFlags.split()) -if not env["enableAsserts"]: - env.AppendUnique(CPPDEFINES=["-DNDEBUG"]) -if env["customCFlags"]: - env.Append(CCFLAGS=Split(env["customCFlags"])) -if env["customCxxFlags"]: - env.Append(CXXFLAGS=Split(env["customCxxFlags"])) -if env["customLinkFlags"]: - env.Append(LINKFLAGS=Split(env["customLinkFlags"])) - -env.Append(CPPPATH=[os.path.join("#", "include"), "common"]) - -# Store all signatures in one file, otherwise .sconsign files will get installed along with our own files -env.SConsignFile(os.path.join(sconsDir, ".sconsign")) - -env.SConscriptChdir(False) -sources, sharedLib, staticLib, tests, portEnv, hostApis = env.SConscript(os.path.join("src", "SConscript"), - build_dir=buildDir, duplicate=False, exports=["env"]) - -if Platform in Posix: - prefix = env["prefix"] - includeDir = os.path.join(prefix, "include") - libDir = os.path.join(prefix, "lib") - env.Alias("install", includeDir) - env.Alias("install", libDir) - - # pkg-config - - def installPkgconfig(env, target, source): - tgt = str(target[0]) - src = str(source[0]) - f = open(src) - try: txt = f.read() - finally: f.close() - txt = txt.replace("@prefix@", prefix) - txt = txt.replace("@exec_prefix@", prefix) - txt = txt.replace("@libdir@", libDir) - txt = txt.replace("@includedir@", includeDir) - txt = txt.replace("@LIBS@", " ".join(["-l%s" % l for l in portEnv["LIBS"]])) - txt = txt.replace("@THREAD_CFLAGS@", threadCFlags) - - f = open(tgt, "w") - try: f.write(txt) - finally: f.close() - - pkgconfigTgt = "portaudio-%d.0.pc" % int(ApiVer.split(".", 1)[0]) - env.Command(os.path.join(libDir, "pkgconfig", pkgconfigTgt), - os.path.join("#", pkgconfigTgt + ".in"), installPkgconfig) - -# Default to None, since if the user disables all targets and no Default is set, all targets -# are built by default -env.Default(None) -if env["enableTests"]: - env.Default(tests) -if env["enableShared"]: - env.Default(sharedLib) - - if Platform in Posix: - def symlink(env, target, source): - trgt = str(target[0]) - src = str(source[0]) - - if os.path.islink(trgt) or os.path.exists(trgt): - os.remove(trgt) - os.symlink(os.path.basename(src), trgt) - - major, minor, micro = [int(c) for c in ApiVer.split(".")] - - soFile = "%s.%s" % (os.path.basename(str(sharedLib[0])), ApiVer) - env.InstallAs(target=os.path.join(libDir, soFile), source=sharedLib) - # Install symlinks - symTrgt = os.path.join(libDir, soFile) - env.Command(os.path.join(libDir, "libportaudio.so.%d.%d" % (major, minor)), - symTrgt, symlink) - symTrgt = rsplit(symTrgt, ".", 1)[0] - env.Command(os.path.join(libDir, "libportaudio.so.%d" % major), symTrgt, symlink) - symTrgt = rsplit(symTrgt, ".", 1)[0] - env.Command(os.path.join(libDir, "libportaudio.so"), symTrgt, symlink) - -if env["enableStatic"]: - env.Default(staticLib) - env.Install(libDir, staticLib) - -env.Install(includeDir, os.path.join("include", "portaudio.h")) - - -if env["enableCxx"]: - env.SConscriptChdir(True) - cxxEnv = env.Copy() - sharedLibs, staticLibs, headers = env.SConscript(os.path.join("bindings", "cpp", "SConscript"), - exports={"env": cxxEnv, "buildDir": buildDir}, build_dir=os.path.join(buildDir, "portaudiocpp"), duplicate=False) - if env["enableStatic"]: - env.Default(staticLibs) - env.Install(libDir, staticLibs) - if env["enableShared"]: - env.Default(sharedLibs) - env.Install(libDir, sharedLibs) - env.Install(os.path.join(includeDir, "portaudiocpp"), headers) - -# Generate portaudio_config.h header with compile-time definitions of which PA -# back-ends are available, and which includes back-end extension headers - -# Host-specific headers -hostApiHeaders = {"ALSA": "pa_linux_alsa.h", - "ASIO": "pa_asio.h", - "COREAUDIO": "pa_mac_core.h", - "JACK": "pa_jack.h", - "WMME": "pa_winwmme.h", - } - -def buildConfigH(target, source, env): - """builder for portaudio_config.h""" - global hostApiHeaders, hostApis - out = "" - for hostApi in hostApis: - out += "#define PA_HAVE_%s\n" % hostApi - - hostApiSpecificHeader = hostApiHeaders.get(hostApi, None) - if hostApiSpecificHeader: - out += "#include \"%s\"\n" % hostApiSpecificHeader - - out += "\n" - # Strip the last newline - if out and out[-1] == "\n": - out = out[:-1] - - f = file(str(target[0]), 'w') - try: f.write(out) - finally: f.close() - return 0 - -# Define the builder for the config header -env.Append(BUILDERS={"portaudioConfig": env.Builder( - action=Action(buildConfigH), target_factory=env.fs.File)}) - -confH = env.portaudioConfig(File("portaudio_config.h", "include"), - File("portaudio.h", "include")) -env.Default(confH) -env.Install(os.path.join(includeDir, "portaudio"), confH) - -for api in hostApis: - if api in hostApiHeaders: - env.Install(os.path.join(includeDir, "portaudio"), - File(hostApiHeaders[api], "include")) diff --git a/bindings/cpp/SConscript b/bindings/cpp/SConscript deleted file mode 100644 index e69b93a..0000000 --- a/bindings/cpp/SConscript +++ /dev/null @@ -1,65 +0,0 @@ -import os.path - -Import("env", "buildDir") -env.Append(CPPPATH="include") - -ApiVer = "0.0.12" -Major, Minor, Micro = [int(c) for c in ApiVer.split(".")] - -sharedLibs = [] -staticLibs = [] -Import("Platform", "Posix") -if Platform in Posix: - env["SHLIBSUFFIX"] = ".so.%d.%d.%d" % (Major, Minor, Micro) - soFile = "libportaudiocpp.so" - if Platform != 'darwin': - env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%s.%d" % (soFile, Major)) - - # Create symlinks - def symlink(env, target, source): - trgt = str(target[0]) - src = str(source[0]) - if os.path.islink(trgt) or os.path.exists(trgt): - os.remove(trgt) - os.symlink(os.path.basename(src), trgt) - lnk0 = env.Command(soFile + ".%d" % (Major), soFile + ".%d.%d.%d" % (Major, Minor, Micro), symlink) - lnk1 = env.Command(soFile, soFile + ".%d" % (Major), symlink) - sharedLibs.append(lnk0) - sharedLibs.append(lnk1) - -src = [os.path.join("source", "portaudiocpp", "%s.cxx" % f) for f in ("BlockingStream", "CallbackInterface", \ - "CallbackStream", "CFunCallbackStream","CppFunCallbackStream", "Device", - "DirectionSpecificStreamParameters", "Exception", "HostApi", "InterfaceCallbackStream", - "MemFunCallbackStream", "Stream", "StreamParameters", "System", "SystemDeviceIterator", - "SystemHostApiIterator")] -env.Append(LIBS="portaudio", LIBPATH=buildDir) -sharedLib = env.SharedLibrary("portaudiocpp", src, LIBS=["portaudio"]) -staticLib = env.Library("portaudiocpp", src, LIBS=["portaudio"]) -sharedLibs.append(sharedLib) -staticLibs.append(staticLib) - -headers = Split("""AutoSystem.hxx - BlockingStream.hxx - CallbackInterface.hxx - CallbackStream.hxx - CFunCallbackStream.hxx - CppFunCallbackStream.hxx - Device.hxx - DirectionSpecificStreamParameters.hxx - Exception.hxx - HostApi.hxx - InterfaceCallbackStream.hxx - MemFunCallbackStream.hxx - PortAudioCpp.hxx - SampleDataFormat.hxx - Stream.hxx - StreamParameters.hxx - SystemDeviceIterator.hxx - SystemHostApiIterator.hxx - System.hxx - """) -if env["PLATFORM"] == "win32": - headers.append("AsioDeviceAdapter.hxx") -headers = [File(os.path.join("include", "portaudiocpp", h)) for h in headers] - -Return("sharedLibs", "staticLibs", "headers") diff --git a/build/scons/SConscript_common b/build/scons/SConscript_common deleted file mode 100644 index eaf4e3c..0000000 --- a/build/scons/SConscript_common +++ /dev/null @@ -1,30 +0,0 @@ -import os.path, sys - -class ConfigurationError(Exception): - def __init__(self, reason): - Exception.__init__(self, "Configuration failed: %s" % reason) - -env = Environment() - -# sunos, aix, hpux, irix, sunos appear to be platforms known by SCons, assuming they're POSIX compliant -Posix = ("linux", "darwin", "sunos", "aix", "hpux", "irix", "sunos", "netbsd") -Windows = ("win32", "cygwin") - -if env["PLATFORM"] == "posix": - if sys.platform[:5] == "linux": - Platform = "linux" - elif sys.platform[:6] == "netbsd": - Platform = "netbsd" - else: - raise ConfigurationError("Unknown platform %s" % sys.platform) -else: - if not env["PLATFORM"] in ("win32", "cygwin") + Posix: - raise ConfigurationError("Unknown platform %s" % env["PLATFORM"]) - Platform = env["PLATFORM"] - -# Inspired by the versioning scheme followed by Qt, it seems sensible enough. There are three components: major, minor -# and micro. Major changes with each subtraction from the API (backward-incompatible, i.e. V19 vs. V18), minor changes -# with each addition to the API (backward-compatible), micro changes with each revision of the source code. -ApiVer = "2.0.0" - -Export("Platform", "Posix", "ConfigurationError", "ApiVer") diff --git a/build/scons/SConscript_opts b/build/scons/SConscript_opts deleted file mode 100644 index 6a4b0a9..0000000 --- a/build/scons/SConscript_opts +++ /dev/null @@ -1,91 +0,0 @@ -import os.path, sys - -def _PackageOption(pkgName, default=1): - """ Allow user to choose whether a package should be used if available. This results in a commandline option use, - where Pkgname is the name of the package with a capitalized first letter. - @param pkgName: Name of package. - @param default: The default value for this option ("yes"/"no"). - """ - return BoolOption("use%s" % pkgName[0].upper() + pkgName[1:], "use %s if available" % (pkgName), default) - -def _BoolOption(opt, explanation, default=1): - """ Allow user to enable/disable a certain option. This results in a commandline option enable