From kde-core-devel Fri Jul 25 08:04:24 2003 From: Matthias Kalle Dalheimer Date: Fri, 25 Jul 2003 08:04:24 +0000 To: kde-core-devel Subject: Fwd: meinproc doesn't correct work with --srcdir option X-MARC-Message: https://marc.info/?l=kde-core-devel&m=105912070600617 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--Boundary-00=_ISOI/Hjq/xrKUSD" --Boundary-00=_ISOI/Hjq/xrKUSD Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Who is taking care of this? Kalle =2D-=20 Matthias Kalle Dalheimer President & CEO Klar=E4lvdalens Datakonsult AB Platform-independent software solutions --Boundary-00=_ISOI/Hjq/xrKUSD Content-Type: message/rfc822; name="forwarded message" Content-Transfer-Encoding: 8bit Content-Description: Dmitry Kamenka : meinproc doesn't correct work with --srcdir option Return-path: traiden@pisem.net X-pop3-spooler: POP3MAIL 2.3.0 b 9 990908 -sim- Return-Path: Received: from mailproxy.de.uu.net (mailproxy.de.uu.net [192.76.144.34]) by binky.de.uu.net (8.9.3p2/5.5.5) with ESMTP id GAA08011 for ; Fri, 25 Jul 2003 06:11:39 +0200 (MET DST) Received: from natzephilite.webmailer.de (natzephilite.webmailer.de [192.67.198.91]) by mailproxy.de.uu.net (8.9.3p2/5.5.5) with ESMTP id GAA29532 for ; Fri, 25 Jul 2003 06:11:39 +0200 (MET DST) Received: from ktown.kde.org (kde.informatik.uni-kl.de [131.246.103.200]) by mailin.webmailer.de (8.12.9/8.12.9) with SMTP id h6P4BdDK005410 for ; Fri, 25 Jul 2003 06:11:39 +0200 (MEST) Received: (qmail 6334 invoked by uid 1055); 25 Jul 2003 04:11:38 -0000 Delivered-To: kde.org-kalle@kde.org Received: (qmail 6332 invoked from network); 25 Jul 2003 04:11:38 -0000 Received: from speedy.tutby.com (HELO tut.by) (195.209.41.194) by kde.informatik.uni-kl.de with SMTP; 25 Jul 2003 04:11:37 -0000 Received: from 194.158.215.4 (account bhp_traiden [194.158.215.4] verified) by tut.by (CommuniGate Pro SMTP 4.0.6) with ESMTP id 612907 for kalle@kde.org; Fri, 25 Jul 2003 07:11:55 +0300 From: Dmitry Kamenka To: kalle@kde.org Subject: meinproc doesn't correct work with --srcdir option Date: Fri, 25 Jul 2003 07:09:30 +0300 User-Agent: KMail/1.5.1 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_61KI/Lk0/FHrjKd" Message-Id: <200307250709.30955.traiden@pisem.net> X-Spam-Status: No, hits=1.0 required=5.5 tests=PATCH_UNIFIED_DIFF,RCVD_IN_OSIRUSOFT_COM,USER_AGENT_KMAIL version=2.54 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 2.54 (1.174.2.17-2003-05-11-exp) Status: R X-Status: N X-KMail-EncryptionState: X-KMail-SignatureState: --Boundary-00=_61KI/Lk0/FHrjKd Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline meinproc doesn't correct work with --srcdir option In file meinproc.cpp function void fillInstance(KInstance &) call before initialization of variable SRCDIR My bugfix of this problem is here --Boundary-00=_61KI/Lk0/FHrjKd Content-Type: text/x-diff; charset="us-ascii"; name="meinproc.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="meinproc.patch" diff -U 3 -dHrNa a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp --- a/kdoctools/meinproc.cpp 2003-07-22 12:06:50.000000000 +0300 +++ b/kdoctools/meinproc.cpp 2003-07-25 05:41:37.000000000 +0300 @@ -27,7 +27,6 @@ #include extern int xmlLoadExtDtdDefaultValue; -extern QString *SRCDIR; class MyPair { public: @@ -100,10 +99,6 @@ KInstance ins("meinproc"); KGlobal::locale(); - fillInstance(ins); - - SRCDIR=new QString; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if ( args->count() != 1 ) { args->usage(); @@ -111,6 +106,12 @@ } LIBXML_TEST_VERSION + + QString srcdir; + if ( args->isSet( "srcdir" ) ) { + srcdir = args->getOption("srcdir") ; + } + fillInstance(ins, srcdir); QString checkFilename = QFile::decodeName(args->arg( 0 )); QFileInfo checkFile(checkFilename); @@ -130,9 +131,6 @@ return ( 2 ); } - if ( args->isSet( "srcdir" ) ) { - *SRCDIR = args->getOption("srcdir") ; - } if ( args->isSet( "check" ) ) { char pwd_buffer[250]; QFileInfo file( QFile::decodeName(args->arg( 0 )) ); diff -U 3 -dHrNa a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp --- a/kdoctools/xslt.cpp 2003-07-17 05:44:13.000000000 +0300 +++ b/kdoctools/xslt.cpp 2003-07-25 05:13:38.000000000 +0300 @@ -26,8 +26,6 @@ #include #include -QString *SRCDIR=0L; - #if !defined( SIMPLE_XSLT ) extern HelpProtocol *slave; #define INFO( x ) if (slave) slave->infoMessage(x); @@ -268,17 +266,17 @@ return filedata; } -void fillInstance(KInstance &ins) { +void fillInstance(KInstance &ins, const QString &srcdir) { QString catalogs; - if ( !SRCDIR || SRCDIR->isEmpty() ) { + if ( srcdir.isEmpty() ) { catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog"); catalogs += ':'; catalogs += ins.dirs()->findResource("data", "ksgmltools2/docbook/xml-dtd-4.2/docbook.cat"); ins.dirs()->addResourceType("dtd", KStandardDirs::kde_default("data") + "ksgmltools2"); } else { - catalogs += (*SRCDIR) +"/customization/catalog:" + (*SRCDIR) + "/docbook/xml-dtd-4.2/docbook.cat"; - ins.dirs()->addResourceDir("dtd", (*SRCDIR)); + catalogs += srcdir +"/customization/catalog:" + srcdir + "/docbook/xml-dtd-4.2/docbook.cat"; + ins.dirs()->addResourceDir("dtd", srcdir); } xmlLoadCatalogs(catalogs.latin1()); diff -U 3 -dHrNa a/kdoctools/xslt.h b/kdoctools/xslt.h --- a/kdoctools/xslt.h 2003-07-17 05:44:13.000000000 +0300 +++ b/kdoctools/xslt.h 2003-07-25 05:18:15.000000000 +0300 @@ -6,14 +6,13 @@ QString transform(const QString &file, const QString& stylesheet); QString transform(xmlParserCtxtPtr ctxt, const QString &tss); QString splitOut(const QString &parsed, int index); -void fillInstance(KInstance &ins); +void fillInstance(KInstance &ins, const QString &srcdir = QString::null); bool saveToCache( const QString &contents, const QString &filename ); QString lookForCache( const QString &filename ); QCString fromUnicode( const QString &data ); void replaceCharsetHeader( QString &output ); extern bool warnings_exist; -extern QString *SRCDIR; /** * Compares two files and returns true if @param newer exists and is newer than --Boundary-00=_61KI/Lk0/FHrjKd-- --Boundary-00=_ISOI/Hjq/xrKUSD--