From: Christian P. <cp...@se...> - 2004-12-24 17:41:15
|
It already happened ... marc could you please check what you commit. configure is an autogenerated= =20 script and should not be in CVS.=20 pclasses2.develop should'nt commited either. stephan: could you rollback configure to the last version ? i'll roll back pclasses2.kdevelop Am Freitag 24 Dezember 2004 18:15 schrieb Marc Duerner: > Update of /cvsroot/pclasses/pclasses2 > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7400 > > Modified Files: > configure pclasses2.kdevelop > Log Message: > 3.4.4 fixes > > > Index: pclasses2.kdevelop > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/pclasses/pclasses2/pclasses2.kdevelop,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -d -r1.2 -r1.3 > --- pclasses2.kdevelop 23 Dec 2004 04:32:14 -0000 1.2 > +++ pclasses2.kdevelop 24 Dec 2004 17:15:49 -0000 1.3 > @@ -1,84 +1,24 @@ > <?xml version =3D '1.0'?> > <kdevelop> > <general> > - <author>Christian Prochnow</author> > - <email>cp...@se...</email> > + <author>pclasses</author> > + <email>arklinux@localhost.localdomain</email> > <version>$VERSION$</version> > - <projectmanagement>KDevAutoProject</projectmanagement> > + <projectmanagement>KDevCustomProject</projectmanagement> > <primarylanguage>C++</primarylanguage> > - <keywords> > - <keyword>C++</keyword> > - <keyword>Code</keyword> > - </keywords> > - <projectdirectory>.</projectdirectory> > - <absoluteprojectpath>false</absoluteprojectpath> > - <description/> > - <ignoreparts> > - <part>Unterst=C3=BCtzung f=C3=BCr ClearCase (KDevelop)</part> > - <part>Unterst=C3=BCtzung f=C3=BCr Perforce (KDevelop)</part> > - </ignoreparts> > - <secondaryLanguages/> > + <ignoreparts/> > </general> > - <kdevautoproject> > - <general> > - <activetarget>src/net/libpclasses_net.la</activetarget> > - <useconfiguration>debug</useconfiguration> > - </general> > + <kdevcustomproject> > <run> > - <mainprogram>test/ThreadTest</mainprogram> > - <terminal>true</terminal> > + <mainprogram>pclasses2</mainprogram> > <directoryradio>executable</directoryradio> > - <runarguments> > - <PtrTest/> > - <QueueTest/> > - <StackTest/> > - <IntTypeTest/> > - <ListTest/> > - <ThreadTest/> > - </runarguments> > - <customdirectory>/</customdirectory> > - <programargs/> > - <autocompile>true</autocompile> > - <envvars/> > </run> > - <configurations> > - <optimized> > - <builddir>optimized</builddir> > - <ccompiler>kdevgccoptions</ccompiler> > - <cxxcompiler>kdevgppoptions</cxxcompiler> > - <f77compiler>kdevg77options</f77compiler> > - <cxxflags>-O2 -g0</cxxflags> > - </optimized> > - <debug> > - <configargs>--with-stl --enable-debug=3Dfull</configargs> > - <builddir>debug</builddir> > - <ccompiler>kdevgccoptions</ccompiler> > - <cxxcompiler>kdevgppoptions</cxxcompiler> > - <f77compiler>kdevg77options</f77compiler> > - <cxxflags>-O0 -g3</cxxflags> > - <envvars/> > - <topsourcedir/> > - <cppflags/> > - <ldflags/> > - <ccompilerbinary/> > - <cxxcompilerbinary/> > - <f77compilerbinary/> > - <cflags/> > - <f77flags/> > - </debug> > - </configurations> > - <make> > - <envvars> > - <envvar value=3D"1" name=3D"WANT_AUTOCONF_2_5" /> > - <envvar value=3D"1" name=3D"WANT_AUTOMAKE_1_6" /> > - </envvars> > - <abortonerror>true</abortonerror> > - <numberofjobs>1</numberofjobs> > - <dontact>false</dontact> > - <makebin/> > - <prio>0</prio> > - </make> > - </kdevautoproject> > + </kdevcustomproject> > + <kdevdebugger> > + <general> > + <dbgshell/> > + </general> > + </kdevdebugger> > <kdevdoctreeview> > <ignoretocs> > <toc>ada</toc> > @@ -86,7 +26,6 @@ > <toc>bash</toc> > <toc>bash_bugs</toc> > <toc>clanlib</toc> > - <toc>w3c-dom-level2-html</toc> > <toc>fortran_bugs_gcc</toc> > <toc>gnome1</toc> > <toc>gnustep</toc> > @@ -109,10 +48,11 @@ > <toc>ruby</toc> > <toc>ruby_bugs</toc> > <toc>sdl</toc> > - <toc>w3c-svg</toc> > <toc>sw</toc> > + <toc>w3c-dom-level2-html</toc> > + <toc>w3c-svg</toc> > <toc>w3c-uaag10</toc> > - <toc>wxwindows_bugs</toc> > + <toc>wxwidgets_bugs</toc> > </ignoretocs> > <ignoreqt_xml> > <toc>Guide to the Qt Translation Tools</toc> > @@ -124,39 +64,22 @@ > <ignoredoxygen> > <toc>KDE Libraries (Doxygen)</toc> > </ignoredoxygen> > - <projectdoc> > - <userdocDir>html/</userdocDir> > - <apidocDir>html/</apidocDir> > - </projectdoc> > - <ignorekdocs/> > - <ignoredevhelp/> > </kdevdoctreeview> > <kdevfilecreate> > <filetypes/> > <useglobaltypes> > + <type ext=3D"ui" /> > <type ext=3D"cpp" /> > <type ext=3D"h" /> > </useglobaltypes> > </kdevfilecreate> > - <kdevfileview> > - <groups> > - <group pattern=3D"*.h" name=3D"Header files" /> > - <group pattern=3D"*.cpp" name=3D"Source files" /> > - <hidenonprojectfiles>false</hidenonprojectfiles> > - <hidenonlocation>false</hidenonlocation> > - </groups> > - <tree> > - <hidepatterns>*.o,*.lo,CVS</hidepatterns> > - <hidenonprojectfiles>false</hidenonprojectfiles> > - </tree> > - </kdevfileview> > <kdevcppsupport> > <references/> > <codecompletion> > <includeGlobalFunctions>true</includeGlobalFunctions> > <includeTypes>true</includeTypes> > <includeEnums>true</includeEnums> > - <includeTypedefs>true</includeTypedefs> > + <includeTypedefs>false</includeTypedefs> > <automaticCodeCompletion>true</automaticCodeCompletion> > <automaticArgumentsHint>true</automaticArgumentsHint> > <automaticHeaderCompletion>true</automaticHeaderCompletion> > @@ -165,37 +88,6 @@ > <headerCompletionDelay>250</headerCompletionDelay> > </codecompletion> > </kdevcppsupport> > - <cppsupportpart> > - <filetemplates> > - <interfacesuffix>.h</interfacesuffix> > - <implementationsuffix>.cpp</implementationsuffix> > - </filetemplates> > - </cppsupportpart> > - <kdevdebugger> > - <general> > - <programargs/> > - <gdbpath/> > - <dbgshell>libtool</dbgshell> > - <configGdbScript/> > - <runShellScript/> > - <runGdbScript/> > - <breakonloadinglibs>true</breakonloadinglibs> > - <separatetty>false</separatetty> > - <floatingtoolbar>false</floatingtoolbar> > - </general> > - <display> > - <staticmembers>false</staticmembers> > - <demanglenames>true</demanglenames> > - <outputradix>10</outputradix> > - </display> > - </kdevdebugger> > - <kdevdocumentation> > - <projectdoc> > - <docsystem>Doxygen-Dokumentation</docsystem> > - <docurl>doc/PClasses.tag</docurl> > - <usermanualurl/> > - </projectdoc> > - </kdevdocumentation> > <kdevcvsservice> > <recursivewhenupdate>true</recursivewhenupdate> > <prunedirswhenupdate>true</prunedirswhenupdate> > @@ -203,4 +95,15 @@ > <recursivewhencommitremove>true</recursivewhencommitremove> > <revertoptions>-C</revertoptions> > </kdevcvsservice> > + <kdevfileview> > + <groups> > + <hidenonprojectfiles>false</hidenonprojectfiles> > + <hidenonlocation>false</hidenonlocation> > + </groups> > + <tree> > + <showvcsfields>false</showvcsfields> > + <hidenonprojectfiles>false</hidenonprojectfiles> > + <hidepatterns>*.o,*.lo,CVS</hidepatterns> > + </tree> > + </kdevfileview> > </kdevelop> > > Index: configure > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/pclasses/pclasses2/configure,v > retrieving revision 1.3 > retrieving revision 1.4 > diff -u -d -r1.3 -r1.4 > --- configure 23 Dec 2004 00:06:16 -0000 1.3 > +++ configure 24 Dec 2004 17:15:48 -0000 1.4 > @@ -1,6 +1,27323 @@ > -#!/bin/sh > -# This is the toc-based configure script. If you use autotools they > -# will overwrite this file, which is fine. > -# CVS users: please do not commit an autotools-generated > -# configure over this one! > -exec ./configure.toc "$@" > +#! /bin/sh > +# Guess values for system-dependent variables and create Makefiles. > +# Generated by GNU Autoconf 2.59. > +# > +# Copyright (C) 2003 Free Software Foundation, Inc. > [...27298 lines suppressed...] > + echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT > + echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT > + echo ' ' >>$ac_prefix_conf_OUT > + echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of > configure. '*'/ >>$ac_prefix_conf_OUT + > + echo 's/#undef */#undef '$ac_prefix_conf_PRE'_/' >conftest.sed > + echo 's/#define *\([A-Za-z0-9_]*\)\(.*\)/#ifndef > '$ac_prefix_conf_PRE"_\\1 \\" >>conftest.sed + echo '#define > '$ac_prefix_conf_PRE"_\\1 \\2 \\" >>conftest.sed + echo '#endif/' > >>conftest.sed > + sed -f conftest.sed $ac_prefix_conf_INP >>$ac_prefix_conf_OUT > + echo ' ' >>$ac_prefix_conf_OUT > + echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT > + echo '#endif' >>$ac_prefix_conf_OUT > + else > + { { echo "$as_me:$LINENO: error: input file $ac_prefix_conf_IN does > not exist, skip generating $ac_prefix_conf_OUT" >&5 +echo "$as_me: > error: input file $ac_prefix_conf_IN does not exist, skip generating > $ac_prefix_conf_OUT" >&2;} + { (exit 1); exit 1; }; } > + fi > + rm -f conftest.* > +fi > > > > ------------------------------------------------------- > SF email is sponsored by - The IT Product Guide > Read honest & candid reviews on hundreds of IT Products from real users. > Discover which products truly live up to the hype. Start reading now. > http://productguide.itmanagersjournal.com/ > _______________________________________________ > pclasses-cvs mailing list > pcl...@li... > https://lists.sourceforge.net/lists/listinfo/pclasses-cvs |