From kde-buildsystem Sat Oct 22 09:08:39 2005 From: ralf.habacker () freenet ! de (Ralf Habacker) Date: Sat, 22 Oct 2005 09:08:39 +0000 To: kde-buildsystem Subject: KDE/kdelibs/bksys Message-Id: <200510221108.39598.ralf.habacker () freenet ! de> X-MARC-Message: https://marc.info/?l=kde-buildsystem&m=113280651111824 Am Samstag, 22. Oktober 2005 10:52 schrieb tnagyemail-mail at yahoo.fr: > It is done - env['BKS_DEBUG'] is always defined (set > to 0 when debugging is disabled). > > To know whether debugging is enabled, use the > following code: > if env['BKS_DEBUG']: do_something() > As far as I understand defines debug=... that the recent project should be build with debug informations and that BKS_DEBUG allows debugging BKSYS internal ? That mean to separate the debug option from BKS_DEBUG . Regards Ralf > > Am Samstag, 22. Oktober 2005 08:41 schrieb Thomas > > > > Nagy: > > > SVN commit 472931 by tnagy: > > > > > > Do not link against qt_debug by default, fix for > > > > dist target > > > > > M +1 -1 generic.py > > > M +2 -2 unix/detect_generic.py > > > M +14 -10 unix/detect_qt4.py > > > > > > > > > --- trunk/KDE/kdelibs/bksys/generic.py > > > > #472930:472931 > > > > > @@ -98,7 +98,7 @@ > > > if 'dist' in sys.argv: > > > > sys.path.append('bksys'+os.sep+'unix') > > > > > from detect_generic import dist > > > - dist(env) > > > + dist(env, appname, version) > > > > > > if 'distclean' in sys.argv: > > > > sys.path.append('bksys'+os.sep+'unix') > > > > > --- trunk/KDE/kdelibs/bksys/unix/detect_generic.py > > > > #472930:472931 > > > > > @@ -72,7 +72,7 @@ > > > > > > > > > > > > -def dist(env): > > > +def dist(env, appname, version=''): > > > if not version: VERSION=os.popen("cat > > > > VERSION").read().rstrip() > > > > > else: VERSION=version > > > FOLDER = appname+'-'+VERSION > > > @@ -90,7 +90,7 @@ > > > os.popen("mv "+TMPFOLD+" "+FOLDER) > > > > > > ## remove scons-local if it is unpacked > > > - os.popen("rm -rf %s/scons %s/sconsign > > > > %s/scons-local-0.96.1" % (FOLDER, > > > > > FOLDER, FOLDER)) + os.popen("rm -rf %s/scons > > > > %s/sconsign %s/scons-local-*" > > > > > % (FOLDER, FOLDER, FOLDER)) > > > > > > ## remove our object files first > > > os.popen("find %s -name \"cache\" | xargs rm > > > > -rf" % FOLDER) > > > > > --- trunk/KDE/kdelibs/bksys/unix/detect_qt4.py > > > > #472930:472931 > > > > > @@ -149,46 +149,50 @@ > > > env['LIBPATH_X11'] = > > > > ['/usr/X11R6/lib/'] > > > > > env['LIB_XRENDER'] = ['Xrender'] > > > > > > + if env.has_key('BKS_DEBUG'): > > > + if env['BKS_DEBUG']: > > > + debug='_debug' > > > + > > > > Hi Thomas, > > > > I have a question relating to BKS_DEBUG. While > > adding some debug stuff for > > win32 I stumbled about, that debug and BKS_DEBUG > > seems to have mainly the > > same meaning, but in details differs for unknown > > reasons. May be there is > > some cleanup required ? > > > > from unix/detect_unix.py > > > > p('BOLD','* debug ','debug=1 (-g) or > > debug=full (-g3, slower) else use > > environment CXXFLAGS, or -O2 by default > > > > ('BKS_DEBUG', 'debug level: full, trace, or just > > something' ), > > > > ... > > if env['ARGS'].get('debug', None): > > # additional debug setting > > env['BKS_DEBUG'] = env['ARGS'].get('debug', None) > > # set debug action depending on debug option > > env.pprint('CYAN','** Enabling debug > > for the project **') > > env['GENCXXFLAGS'] = ['-g'] > > env['GENCCFLAGS'] = ['-g'] > > env['GENLINKFLAGS'] = ['-g'] > > > > from win32\detect_qt4.py > > if env['ARGS'].get('debug', None): > > lib_addon = 'd4' > > else: > > lib_addon = '4' > > > > Regards > > Ralf > > > > > ########## QT > > > # QTLIBPATH is a special var used in the > > > > qt4 module - has to be > > > > > changed (ita) env['CPPPATH_QT'] = [ > > > > env.join(env['QTINCLUDEPATH'], > > > > > 'Qt'), env['QTINCLUDEPATH'] ] # TODO QTINCLUDEPATH > > > > (ita) env['LIBPATH_QT'] > > > > > = env['LIBPATH_X11']+[env['QTLIBPATH']] - > > > > env['LIB_QT'] > > > > > = ['QtGui_debug', 'pthread', > > 'Xext']+env['LIB_Z']+env['LIB_PNG']+env['LIB_X11']+env['LIB_SM'] > > > + > > > > > env['LIB_QT'] = ['QtGui'+debug, > > > > 'pthread', > > 'Xext']+env['LIB_Z']+env['LIB_PNG']+env['LIB_X11']+env['LIB_SM'] > > > > env['RPATH_QT'] = > > > > env['LIBPATH_X11']+[env['QTLIBPATH']] > > > > > env['CXXFLAGS_QT3SUPPORT'] = > > > > ['-DQT3_SUPPORT'] > > > > > env['CPPPATH_QT3SUPPORT'] = [ > > > > env.join(env['QTINCLUDEPATH'], > > > > > 'Qt3Support') ] - env['LIB_QT3SUPPORT'] > > > > = ['Qt3Support_debug'] > > > > > + env['LIB_QT3SUPPORT'] = > > > > ['Qt3Support'+debug] > > > > > env['RPATH_QT3SUPPORT'] = env['RPATH_QT'] > > > > > > env['CPPPATH_QTCORE'] = [ > > > > env.join(env['QTINCLUDEPATH'], 'QtCore') ] > > > > > - env['LIB_QTCORE'] = > > > > ['QtCore_debug'] > > > > > + env['LIB_QTCORE'] = > > > > ['QtCore'+debug] > > > > > env['RPATH_QTCORE'] = env['RPATH_QT'] > > > > > > env['CPPPATH_QTASSISTANT'] = [ > > > > env.join(env['QTINCLUDEPATH'], > > > > > 'QtAssistant') ] - env['LIB_QTASSISTANT'] = > > > > ['QtAssistant_debug'] > > > > > + env['LIB_QTASSISTANT'] = > > > > ['QtAssistant'+debug] > > > > > env['CPPPATH_QTDESIGNER'] = [ > > > > env.join(env['QTINCLUDEPATH'], > > > > > 'QtDesigner') ] - env['LIB_QTDESIGNER'] > > > > = ['QtDesigner_debug'] > > > > > + env['LIB_QTDESIGNER'] = > > > > ['QtDesigner'+debug] > > > > > env['CPPPATH_QTNETWORK'] = [ > > > > env.join(env['QTINCLUDEPATH'], > > > > > 'QtNetwork') ] - env['LIB_QTNETWORK'] > > > > = ['QtNetwork_debug'] > > > > > + env['LIB_QTNETWORK'] = > > > > ['QtNetwork'+debug] > > > > > env['RPATH_QTNETWORK'] = env['RPATH_QT'] > > > > > > env['CPPPATH_QTGUI'] = [ > > > > env.join(env['QTINCLUDEPATH'], 'QtGui') ] > > > > > - env['LIB_QTGUI'] = > > > > ['QtCore_debug', 'QtGui_debug'] > > > > > + env['LIB_QTGUI'] = > > > > ['QtCore'+debug, 'QtGui'+debug] > > > > > env['RPATH_QTGUI'] = env['RPATH_QT'] > > > > > > env['CPPPATH_OPENGL'] = [ > > > > env.join(env['QTINCLUDEPATH'], 'QtOpengl') > > > > > ] - env['LIB_QTOPENGL'] = > > > > ['QtOpenGL_debug'] > > > > > + env['LIB_QTOPENGL'] = > > > > ['QtOpenGL'+debug] > > > > > env['RPATH_QTOPENGL'] = env['RPATH_QT'] > > > > > > env['CPPPATH_QTSQL'] = [ > > > > env.join(env['QTINCLUDEPATH'], 'QtSql') ] > > > > > - env['LIB_QTSQL'] = > > > > ['QtSql_debug'] > > > > > + env['LIB_QTSQL'] = > > > > ['QtSql'+debug] > > > > > env['RPATH_QTSQL'] = env['RPATH_QT'] > > > > > > env['CPPPATH_QTXML'] = [ > > > > env.join(env['QTINCLUDEPATH'], 'QtXml') ] > > > > > - env['LIB_QTXML'] = > > > > ['QtXml_debug'] > > > > > + env['LIB_QTXML'] = > > > > ['QtXml'+debug] > > > > > env['RPATH_QTXML'] = env['RPATH_QT'] > > > > > > env['QTLOCALE']=env.join(datadir, 'locale') > > /* Thomas Nagy */ > > > > > > > ___________________________________________________________________________ > Appel audio GRATUIT partout dans le monde avec le nouveau Yahoo! Messenger > T?l?chargez cette version sur http://fr.messenger.yahoo.com