Attachment #2885 for bug #2950

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2950
Collapse All | Expand All




	
	## Global cache directory
	## Put all project files in it so a rm -rf cache will clean up the config
	if not 'CACHEDIR' in env:
		env['CACHEDIR'] = os.getcwd()+'/cache/'
	if not os.path.isdir(env['CACHEDIR']):
		os.mkdir(env['CACHEDIR'])

	
	# Special trick for installing rpms ...
	env['DESTDIR']=''
	if 'install' in env['TARGS'] and 'DESTDIR' in os.environ:
		env['DESTDIR']=os.environ['DESTDIR']+'/'
		print CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR']


	import SCons.Util

	# configure the environment if needed
	if 'configure' in env['TARGS'] or not 'ISCONFIGURED' in env:
		# be paranoid, unset existing variables
		if 'KDECXXFLAGS' in env:
			env.__delitem__('KDECXXFLAGS')
		if 'KDECCFLAGS' in env:
			env.__delitem__('KDECCFLAGS')
		if 'KDELINKFLAGS' in env:
			env.__delitem__('KDELINKFLAGS')
		if 'PREFIX' in env:
			env.__delitem__('PREFIX')
		if 'EXTRAINCLUDES' in env:
			env.__delitem__('EXTRAINCLUDES')
		if 'ISCONFIGURED' in env:
			env.__delitem__('ISCONFIGURED')

		if env['ARGS'].get('debug', None):

			else:
				env['KDECXXFLAGS'] = ['-DDEBUG', '-g']
		else:
			if 'CXXFLAGS' in os.environ:
				# user-defined flags (gentooers will be elighted)
				env['KDECXXFLAGS'] = SCons.Util.CLVar( os.environ['CXXFLAGS'] )
				env.Append( KDECXXFLAGS = ['-DNDEBUG', '-DNO_DEBUG'] )
			else:
				env.Append(KDECXXFLAGS = ['-O2', '-DNDEBUG', '-DNO_DEBUG'])

		if 'CFLAGS' in os.environ:
			env['KDECCFLAGS'] = SCons.Util.CLVar( os.environ['CFLAGS'] )

		## FreeBSD settings (contributed by will at freebsd dot org)
		if os.uname()[0] == "FreeBSD":
		        if 'PTHREAD_LIBS' in os.environ:
		                env.AppendUnique( KDELINKFLAGS = SCons.Util.CLVar( os.environ['PTHREAD_LIBS'] ) )
		        else:
		                syspf = os.popen('/sbin/sysctl kern.osreldate')

		if env['ARGS'].get('prefix', None):
			env['PREFIX'] = env['ARGS'].get('prefix', None)
			print CYAN+'** set the installation prefix for the project : ' + env['PREFIX'] +' **'+ NORMAL
		elif 'PREFIX' in env:
			env.__delitem__('PREFIX')

		# User-specified include paths
		env['EXTRAINCLUDES'] = env['ARGS'].get('extraincludes', None)
		if env['ARGS'].get('extraincludes', None):
			print CYAN+'** set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' **'+ NORMAL
		elif 'EXTRAINCLUDES' in env:
			env.__delitem__('EXTRAINCLUDES')

		env['ISCONFIGURED']=1

		# And finally save the options in the cache
		opts.Save(cachefile, env)

	if 'KDECXXFLAGS' in env:
                env.AppendUnique( CPPFLAGS = env['KDECXXFLAGS'] )

	if 'KDECCFLAGS' in env:
		env.AppendUnique( CCFLAGS = env['KDECCFLAGS'] )

	if 'KDELINKFLAGS' in env:
		env.AppendUnique( LINKFLAGS = env['KDELINKFLAGS'] )

	if 'EXTRAINCLUDES' in env:
		incpaths = []
		for dir in str(env['EXTRAINCLUDES']).split(':'):
			incpaths.append( dir )




		if os.path.isfile(uiname):
			continue

		hname = splitext(cpp.name)[0] + ".h"
		h = SCons.Node.FS.find_file(hname, (cpp.get_dir(),) )

		if h:

	shared_obj.src_builder.append('Transfiles')

	## find the files to moc, dcop, and link against kde and qt
	env.AppendUnique(PROGEMITTER=[mocscan], SHLIBEMITTER=[mocscan], LIBEMITTER =[mocscan])

	###########################################
	## Handy helpers for building kde programs

				kcfg_files.append(bs)
			elif ext == '.skel':
                                skel_files.append(bs)
			else:
                                other_files.append(bs)
		return src


Return to bug 2950

Lines 37-43 ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ Link Here

(-)a/admin/generic.py (-18 / +18 lines)
37		37
38	## Global cache directory	38	## Global cache directory
39	## Put all project files in it so a rm -rf cache will clean up the config	39	## Put all project files in it so a rm -rf cache will clean up the config
40	if not env.has_key('CACHEDIR'):	40	if not 'CACHEDIR' in env:
41	env['CACHEDIR'] = os.getcwd()+'/cache/'	41	env['CACHEDIR'] = os.getcwd()+'/cache/'
42	if not os.path.isdir(env['CACHEDIR']):	42	if not os.path.isdir(env['CACHEDIR']):
43	os.mkdir(env['CACHEDIR'])	43	os.mkdir(env['CACHEDIR'])
Lines 51-57 ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ Link Here
51		51
52	# Special trick for installing rpms ...	52	# Special trick for installing rpms ...
53	env['DESTDIR']=''	53	env['DESTDIR']=''
54	if 'install' in env['TARGS'] and os.environ.has_key('DESTDIR'):	54	if 'install' in env['TARGS'] and 'DESTDIR' in os.environ:
55	env['DESTDIR']=os.environ['DESTDIR']+'/'	55	env['DESTDIR']=os.environ['DESTDIR']+'/'
56	print CYAN+' Enabling DESTDIR for the project ' + NORMAL + env['DESTDIR']	56	print CYAN+' Enabling DESTDIR for the project ' + NORMAL + env['DESTDIR']
57		57
Lines 75-93 ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ Link Here
75	import SCons.Util	75	import SCons.Util
76		76
77	# configure the environment if needed	77	# configure the environment if needed
78	if 'configure' in env['TARGS'] or not env.has_key('ISCONFIGURED'):	78	if 'configure' in env['TARGS'] or not 'ISCONFIGURED' in env:
79	# be paranoid, unset existing variables	79	# be paranoid, unset existing variables
80	if env.has_key('KDECXXFLAGS'):	80	if 'KDECXXFLAGS' in env:
81	env.__delitem__('KDECXXFLAGS')	81	env.__delitem__('KDECXXFLAGS')
82	if env.has_key('KDECCFLAGS'):	82	if 'KDECCFLAGS' in env:
83	env.__delitem__('KDECCFLAGS')	83	env.__delitem__('KDECCFLAGS')
84	if env.has_key('KDELINKFLAGS'):	84	if 'KDELINKFLAGS' in env:
85	env.__delitem__('KDELINKFLAGS')	85	env.__delitem__('KDELINKFLAGS')
86	if env.has_key('PREFIX'):	86	if 'PREFIX' in env:
87	env.__delitem__('PREFIX')	87	env.__delitem__('PREFIX')
88	if env.has_key('EXTRAINCLUDES'):	88	if 'EXTRAINCLUDES' in env:
89	env.__delitem__('EXTRAINCLUDES')	89	env.__delitem__('EXTRAINCLUDES')
90	if env.has_key('ISCONFIGURED'):	90	if 'ISCONFIGURED' in env:
91	env.__delitem__('ISCONFIGURED')	91	env.__delitem__('ISCONFIGURED')
92		92
93	if env['ARGS'].get('debug', None):	93	if env['ARGS'].get('debug', None):
Lines 98-116 ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ Link Here
98	else:	98	else:
99	env['KDECXXFLAGS'] = ['-DDEBUG', '-g']	99	env['KDECXXFLAGS'] = ['-DDEBUG', '-g']
100	else:	100	else:
101	if os.environ.has_key('CXXFLAGS'):	101	if 'CXXFLAGS' in os.environ:
102	# user-defined flags (gentooers will be elighted)	102	# user-defined flags (gentooers will be elighted)
103	env['KDECXXFLAGS'] = SCons.Util.CLVar( os.environ['CXXFLAGS'] )	103	env['KDECXXFLAGS'] = SCons.Util.CLVar( os.environ['CXXFLAGS'] )
104	env.Append( KDECXXFLAGS = ['-DNDEBUG', '-DNO_DEBUG'] )	104	env.Append( KDECXXFLAGS = ['-DNDEBUG', '-DNO_DEBUG'] )
105	else:	105	else:
106	env.Append(KDECXXFLAGS = ['-O2', '-DNDEBUG', '-DNO_DEBUG'])	106	env.Append(KDECXXFLAGS = ['-O2', '-DNDEBUG', '-DNO_DEBUG'])
107		107
108	if os.environ.has_key('CFLAGS'):	108	if 'CFLAGS' in os.environ:
109	env['KDECCFLAGS'] = SCons.Util.CLVar( os.environ['CFLAGS'] )	109	env['KDECCFLAGS'] = SCons.Util.CLVar( os.environ['CFLAGS'] )
110		110
111	## FreeBSD settings (contributed by will at freebsd dot org)	111	## FreeBSD settings (contributed by will at freebsd dot org)
112	if os.uname()[0] == "FreeBSD":	112	if os.uname()[0] == "FreeBSD":
113	if os.environ.has_key('PTHREAD_LIBS'):	113	if 'PTHREAD_LIBS' in os.environ:
114	env.AppendUnique( KDELINKFLAGS = SCons.Util.CLVar( os.environ['PTHREAD_LIBS'] ) )	114	env.AppendUnique( KDELINKFLAGS = SCons.Util.CLVar( os.environ['PTHREAD_LIBS'] ) )
115	else:	115	else:
116	syspf = os.popen('/sbin/sysctl kern.osreldate')	116	syspf = os.popen('/sbin/sysctl kern.osreldate')
Lines 129-142 ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ Link Here
129	if env['ARGS'].get('prefix', None):	129	if env['ARGS'].get('prefix', None):
130	env['PREFIX'] = env['ARGS'].get('prefix', None)	130	env['PREFIX'] = env['ARGS'].get('prefix', None)
131	print CYAN+' set the installation prefix for the project : ' + env['PREFIX'] +' '+ NORMAL	131	print CYAN+' set the installation prefix for the project : ' + env['PREFIX'] +' '+ NORMAL
132	elif env.has_key('PREFIX'):	132	elif 'PREFIX' in env:
133	env.__delitem__('PREFIX')	133	env.__delitem__('PREFIX')
134		134
135	# User-specified include paths	135	# User-specified include paths
136	env['EXTRAINCLUDES'] = env['ARGS'].get('extraincludes', None)	136	env['EXTRAINCLUDES'] = env['ARGS'].get('extraincludes', None)
137	if env['ARGS'].get('extraincludes', None):	137	if env['ARGS'].get('extraincludes', None):
138	print CYAN+' set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' '+ NORMAL	138	print CYAN+' set extra include paths for the project : ' + env['EXTRAINCLUDES'] +' '+ NORMAL
139	elif env.has_key('EXTRAINCLUDES'):	139	elif 'EXTRAINCLUDES' in env:
140	env.__delitem__('EXTRAINCLUDES')	140	env.__delitem__('EXTRAINCLUDES')
141		141
142	env['ISCONFIGURED']=1	142	env['ISCONFIGURED']=1
Lines 144-159 ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ Link Here
144	# And finally save the options in the cache	144	# And finally save the options in the cache
145	opts.Save(cachefile, env)	145	opts.Save(cachefile, env)
146		146
147	if env.has_key('KDECXXFLAGS'):	147	if 'KDECXXFLAGS' in env:
148	env.AppendUnique( CPPFLAGS = env['KDECXXFLAGS'] )	148	env.AppendUnique( CPPFLAGS = env['KDECXXFLAGS'] )
149		149
150	if env.has_key('KDECCFLAGS'):	150	if 'KDECCFLAGS' in env:
151	env.AppendUnique( CCFLAGS = env['KDECCFLAGS'] )	151	env.AppendUnique( CCFLAGS = env['KDECCFLAGS'] )
152		152
153	if env.has_key('KDELINKFLAGS'):	153	if 'KDELINKFLAGS' in env:
154	env.AppendUnique( LINKFLAGS = env['KDELINKFLAGS'] )	154	env.AppendUnique( LINKFLAGS = env['KDELINKFLAGS'] )
155		155
156	if env.has_key('EXTRAINCLUDES'):	156	if 'EXTRAINCLUDES' in env:
157	incpaths = []	157	incpaths = []
158	for dir in str(env['EXTRAINCLUDES']).split(':'):	158	for dir in str(env['EXTRAINCLUDES']).split(':'):
159	incpaths.append( dir )	159	incpaths.append( dir )

Lines 271-277 Link Here

(-)trinity-kstreamripper-14.0.4/admin/kde.py.orig (-3 / +3 lines)
271	if os.path.isfile(uiname):	271	if os.path.isfile(uiname):
272	continue	272	continue
273		273
274	hname = splitext(cpp.name)[0] + ".h"	274	hname = splitext(cpp.name)[0] + ".h"
275	h = SCons.Node.FS.find_file(hname, (cpp.get_dir(),) )	275	h = SCons.Node.FS.find_file(hname, (cpp.get_dir(),) )
276		276
277	if h:	277	if h:
Lines 530-536 Link Here
530	shared_obj.src_builder.append('Transfiles')	530	shared_obj.src_builder.append('Transfiles')
531		531
532	## find the files to moc, dcop, and link against kde and qt	532	## find the files to moc, dcop, and link against kde and qt
533	env.AppendUnique(PROGEMITTER=[mocscan], SHLIBEMITTER=[mocscan], LIBEMITTER =[mocscan])	533	env.AppendUnique(PROGEMITTER=[mocscan], SHLIBEMITTER=[mocscan], LIBEMITTER =[mocscan])
534		534
535	###########################################	535	###########################################
536	## Handy helpers for building kde programs	536	## Handy helpers for building kde programs
Lines 568-574 Link Here
568	kcfg_files.append(bs)	568	kcfg_files.append(bs)
569	elif ext == '.skel':	569	elif ext == '.skel':
570	skel_files.append(bs)	570	skel_files.append(bs)
571	else:	571	else:
572	other_files.append(bs)	572	other_files.append(bs)
573	return src	573	return src
574		574