[PD-cvs] pd SConstruct,1.1.4.9,1.1.4.10

Jamie Tittle tigital at users.sourceforge.net
Fri Jul 28 16:59:13 CEST 2006


Update of /cvsroot/pure-data/pd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31773

Modified Files:
      Tag: devel_0_39
	SConstruct 
Log Message:
additions to build app_pkg on OSX

Index: SConstruct
===================================================================
RCS file: /cvsroot/pure-data/pd/Attic/SConstruct,v
retrieving revision 1.1.4.9
retrieving revision 1.1.4.10
diff -C2 -d -r1.1.4.9 -r1.1.4.10
*** SConstruct	7 May 2006 23:44:08 -0000	1.1.4.9
--- SConstruct	28 Jul 2006 14:59:11 -0000	1.1.4.10
***************
*** 16,19 ****
--- 16,27 ----
  	BoolOption('icc', 'use intel c compiler', False))
  
+ #platform-specific options
+ 
+ if env['PLATFORM'] == 'darwin':
+ 	opt.AddOptions(
+ 		('portmidipath', 'Path to portmidi','../portmidi_osx'),
+         BoolOption('app_pkg', 'Build for inclusion in .app package', False),
+     )
+ 
  opt.Update(env)
  
***************
*** 53,74 ****
  installs.append(env.Install(prefix+'/bin', pdreceive))
  installs.append(env.Install(prefix+'/bin', pd))
! installs.append(env.Install(prefix+'/lib/pd/bin', pdgui))
  if env['PLATFORM']=='posix':
! 	installs.append(env.Install(prefix+'/lib/pd/bin', pdwatchdog))
  
  if env['desire']:
  	installs.append(env.InstallAs(prefix + '/bin/desire',              'src/desire.tk'))
! 	installs.append(env.InstallAs(prefix + '/lib/pd/bin/objective.tcl','src/objective.tcl'))
! 	installs.append(env.InstallAs(prefix + '/lib/pd/bin/pre8.5.tcl',   'src/pre8.5.tcl'))
  else:
! 	installs.append(env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk'))
! 
! for extra in extras:
! 	installs.append(env.Install(prefix+'/lib/extra/', extra))
! try:
! 	installs.append(env.Install(prefix+'/lib', pdlib))
! except:
! 	pass
  
  for header in Split("m_pd.h m_imp.h g_canvas.h"):
  	installs.append(env.Install(prefix+'/include', 'src/'+header))
--- 61,103 ----
  installs.append(env.Install(prefix+'/bin', pdreceive))
  installs.append(env.Install(prefix+'/bin', pd))
! if not env['app_pkg']:
! 	installs.append(env.Install(prefix+'/lib/pd/bin', pdgui))
! else:
! 	installs.append(env.Install(prefix+'/bin', pdgui))
  if env['PLATFORM']=='posix':
! 	if env['app_pkg']:
! 		installs.append(env.Install(prefix+'/lib/pd/bin', pdwatchdog))
! 	else:
! 		installs.append(env.Install(prefix+'/bin', pdwatchdog))
  
  if env['desire']:
  	installs.append(env.InstallAs(prefix + '/bin/desire',              'src/desire.tk'))
! 	if env['app_pkg']:
! 		installs.append(env.InstallAs(prefix + '/lib/pd/bin/objective.tcl','src/objective.tcl'))
! 		installs.append(env.InstallAs(prefix + '/lib/pd/bin/pre8.5.tcl',   'src/pre8.5.tcl'))
! 	else:
! 		installs.append(env.InstallAs(prefix + '/Scripts/objective.tcl','src/objective.tcl'))
! 		installs.append(env.InstallAs(prefix + '/Scripts/pre8.5.tcl',   'src/pre8.5.tcl'))
  else:
! 	if not env['app_pkg']:
! 		installs.append(env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk'))
! 	else:
! 		installs.append(env.InstallAs(prefix + '/bin/pd.tk','src/u_main.tk'))
  
+ if not env['app_pkg']:
+ 	for extra in extras:
+ 		installs.append(env.Install(prefix+'/lib/extra/', extra))
+ 	try:
+ 		installs.append(env.Install(prefix+'/lib', pdlib))
+ 	except:
+ 		pass
+ else:
+ 	for extra in extras:
+ 		installs.append(env.Install(prefix+'/extra/', extra))
+ 	try:
+ 		installs.append(env.Install(prefix+'/bin', pdlib))
+ 	except:
+ 		pass
+ 		
  for header in Split("m_pd.h m_imp.h g_canvas.h"):
  	installs.append(env.Install(prefix+'/include', 'src/'+header))





More information about the Pd-cvs mailing list