[Sc-devel] fixed a couple of typos
andersvi at extern.uio.no
andersvi at extern.uio.no
Fri Mar 7 05:42:18 PST 2008
[andersvi at john SC3.2-fc6]$ svn log -r COMMITTED
------------------------------------------------------------------------
r7420 | andersvi | 2008-03-07 14:37:44 +0100 (fre, 07 mar 2008) | 3 lines
Removed merge-leftovers from Source/common/dtoa.a\
Fixed filename of setMainVersion.sh script to match SConstruct\
Updated system call to use newer subprocess module
------------------------------------------------------------------------
[andersvi at john SC3.2-fc6]$ svn diff -r PREV
Index: Source/common/dtoa.c
===================================================================
--- Source/common/dtoa.c (revisjon 7419)
+++ Source/common/dtoa.c (arbeidskopi)
@@ -31,7 +31,6 @@
* file.
*/
-//////>>> added for SC
#include "SC_Endian.h"
#define Honor_FLT_ROUNDS 1
@@ -46,7 +45,6 @@
//??#define NO_LONG_LONG 1
#endif
-//////<<< added for SC
Index: SConstruct
===================================================================
--- SConstruct (revisjon 7419)
+++ SConstruct (arbeidskopi)
@@ -19,6 +19,7 @@
import glob
import os
+import subprocess
import re
import types
import tarfile
@@ -29,11 +30,13 @@
PACKAGE = 'SuperCollider'
+
+
f = open('VERSION')
VERSION = f.readline()
f.close()
-os.execlp( 'sh', 'setMainVersion.sh' )
+subprocess.call(['sh', 'setMainVersion.sh'])
def short_cpu_name(cpu):
if cpu == 'Power Macintosh':
@@ -80,10 +83,13 @@
else:
DEFAULT_OPT_ARCH = None
+
+
# ======================================================================
# util
# ======================================================================
+
def make_os_env(*keys):
env = os.environ
res = {}
@@ -646,7 +652,7 @@
Source/common/SC_StringParser.cpp
Source/common/g_fmt.c
Source/common/scsynthsend.cpp
-Source/common/dtoa.o
+Source/common/dtoa.c
''')
if PLATFORM == 'darwin':
commonSources += [
@@ -654,7 +660,6 @@
]
commonEnv.Library('build/common', commonSources)
-
# ======================================================================
# Source/server
# ======================================================================
More information about the Sc-devel
mailing list