From: Richard C. <r.c...@ed...> - 2013-06-27 11:06:57
|
Hi All, currently we have quite a few files which are generated by doing a maintainer build of qucs-core tracked in git. These files are actually created from the their respective .l and .y sources using Lex and YACC. Should I remove these files from the repo? The offending files are: scan_netlist.cpp parse_netlist.cpp scan_dataset.cpp parse_dataset.cpp tokens_dataset.h tokens_netlist.h parse_touchstone.cpp tokens_touchstone.h scan_touchstone.cpp parse_citi.cpp tokens_citi.h scan_citi.cpp parse_zvr.cpp scan_zvr.cpp tokens_zvr.h parse_mdl.cpp scan_mdl.cpp tokens_mdl.h parse_csv.cpp tokens_csv.h scan_csv.cpp qucsdefs.h I'm also creating a more comprehensive top level .gitignore file, should I add this to the repo, it currently contains the following: # Qucs Specific # ###################### */src/qucsator */src/converter/qucsconv */src/gperfappgen # Following files generated by lex and yacc scan_netlist.cpp parse_netlist.cpp scan_dataset.cpp parse_dataset.cpp tokens_dataset.h tokens_netlist.h parse_touchstone.cpp tokens_touchstone.h scan_touchstone.cpp parse_citi.cpp tokens_citi.h scan_citi.cpp parse_zvr.cpp scan_zvr.cpp tokens_zvr.h parse_mdl.cpp scan_mdl.cpp tokens_mdl.h parse_csv.cpp tokens_csv.h scan_csv.cpp qucsdefs.h # ADMS Specific # ################## *.adms *.implicit.xml *.interface.xml *.vams.c *.va.c *.xml.c */adms/admsXml/preprocessorLex.c */adms/admsXml/preprocessorYacc.c */adms/admsXml/preprocessorYacc.h */adms/admsXml/verilogaLex.c */adms/admsXml/verilogaYacc.c */adms/admsXml/verilogaYacc.h */adms/admsXml/admstpathYacc.c */adms/admsXml/admstpathYacc.h */adms/admsXml/.libs/ */adms/admsXml/adms.c */adms/admsXml/adms.h */adms/admsXml/adms.implicit.xml.c */adms/admsXml/admsCheck */adms/admsXml/admsXml *.analogfunction.cpp *.analogfunction.h *.core.cpp *.core.h *.defs.h # Temp Files # ############## *~ # Autotools Generated # ####################### *.in *.la *.lo configure Makefile.in Makefile stamp-h1 missing configure config.guess config.h config.sub config.h.in config.log config.status build-stamp aclocal.m4 INSTALL depcomp install-sh autom4te.cache/ aclocal.m4 auxconf/ libltdl/ # Unknown # ########### *.output # Compiled source # ################### *.com *.class *.dll *.exe *.o *.so *.mex* # Packages # ############ # it's better to unpack these files and commit the raw source # git has its own built in compression methods *.7z *.dmg *.gz *.iso *.jar *.rar *.tar *.zip # Logs and databases # ###################### *.log *.sql *.sqlite # OS generated files # ###################### .DS_Store .DS_Store? ._* .Spotlight-V100 .Trashes Icon? ehthumbs.db Thumbs.db # Code::Blocks generated files # ################################ *.layout *.depend Regards, Richard -- The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336. |
From: Frans S. <fra...@gm...> - 2013-06-27 11:15:13
|
Hi Richard, Since adms is now provided, the files you mention can be removed if you ask me. Frans On 06/27/2013 01:06 PM, Richard Crozier wrote: > Hi All, > > currently we have quite a few files which are generated by doing a > maintainer build of qucs-core tracked in git. These files are actually > created from the their respective .l and .y sources using Lex and YACC. > Should I remove these files from the repo? > > The offending files are: > > scan_netlist.cpp > parse_netlist.cpp > scan_dataset.cpp > parse_dataset.cpp > tokens_dataset.h > tokens_netlist.h > parse_touchstone.cpp > tokens_touchstone.h > scan_touchstone.cpp > parse_citi.cpp > tokens_citi.h > scan_citi.cpp > parse_zvr.cpp > scan_zvr.cpp > tokens_zvr.h > parse_mdl.cpp > scan_mdl.cpp > tokens_mdl.h > parse_csv.cpp > tokens_csv.h > scan_csv.cpp > qucsdefs.h > > I'm also creating a more comprehensive top level .gitignore file, should > I add this to the repo, it currently contains the following: > > # Qucs Specific # > ###################### > */src/qucsator > */src/converter/qucsconv > */src/gperfappgen > > # Following files generated by lex and yacc > scan_netlist.cpp > parse_netlist.cpp > scan_dataset.cpp > parse_dataset.cpp > tokens_dataset.h > tokens_netlist.h > parse_touchstone.cpp > tokens_touchstone.h > scan_touchstone.cpp > parse_citi.cpp > tokens_citi.h > scan_citi.cpp > parse_zvr.cpp > scan_zvr.cpp > tokens_zvr.h > parse_mdl.cpp > scan_mdl.cpp > tokens_mdl.h > parse_csv.cpp > tokens_csv.h > scan_csv.cpp > qucsdefs.h > > # ADMS Specific # > ################## > *.adms > *.implicit.xml > *.interface.xml > *.vams.c > *.va.c > *.xml.c > */adms/admsXml/preprocessorLex.c > */adms/admsXml/preprocessorYacc.c > */adms/admsXml/preprocessorYacc.h > */adms/admsXml/verilogaLex.c > */adms/admsXml/verilogaYacc.c > */adms/admsXml/verilogaYacc.h > */adms/admsXml/admstpathYacc.c > */adms/admsXml/admstpathYacc.h > */adms/admsXml/.libs/ > */adms/admsXml/adms.c > */adms/admsXml/adms.h > */adms/admsXml/adms.implicit.xml.c > */adms/admsXml/admsCheck > */adms/admsXml/admsXml > *.analogfunction.cpp > *.analogfunction.h > *.core.cpp > *.core.h > *.defs.h > > # Temp Files # > ############## > *~ > > # Autotools Generated # > ####################### > *.in > *.la > *.lo > configure > Makefile.in > Makefile > stamp-h1 > missing > configure > config.guess > config.h > config.sub > config.h.in > config.log > config.status > build-stamp > aclocal.m4 > INSTALL > depcomp > install-sh > autom4te.cache/ > aclocal.m4 > auxconf/ > libltdl/ > > > # Unknown # > ########### > *.output > > # Compiled source # > ################### > *.com > *.class > *.dll > *.exe > *.o > *.so > *.mex* > > # Packages # > ############ > # it's better to unpack these files and commit the raw source > # git has its own built in compression methods > *.7z > *.dmg > *.gz > *.iso > *.jar > *.rar > *.tar > *.zip > > # Logs and databases # > ###################### > *.log > *.sql > *.sqlite > > # OS generated files # > ###################### > .DS_Store > .DS_Store? > ._* > .Spotlight-V100 > .Trashes > Icon? > ehthumbs.db > Thumbs.db > > # Code::Blocks generated files # > ################################ > *.layout > *.depend > > > Regards, > Richard > |
From: Richard C. <r.c...@ed...> - 2013-06-27 11:45:18
|
Hi Frans, Well, actually these are not related to adms, but are the qucs parsers generated by Lex and Yacc for parsing the datafiles and netlist etc. However, they are created when you do a maintainer build. As far as I can tell, if I remove these files from GIt, they will be deleted for everybody when they next pull, and people will have to rerun with --enable-maintainer-mode to regenerate them. Does anyone have any objections? They can always be restored in git if something bad happens. Richard On 27/06/2013 12:15, Frans Schreuder wrote: > Hi Richard, > > Since adms is now provided, the files you mention can be removed if you > ask me. > > Frans > > -- The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336. |
From: roucaries b. <rou...@gm...> - 2013-06-27 12:26:30
|
On Thu, Jun 27, 2013 at 1:45 PM, Richard Crozier <r.c...@ed...> wrote: > > Hi Frans, > > Well, actually these are not related to adms, but are the qucs parsers > generated by Lex and Yacc for parsing the datafiles and netlist etc. > However, they are created when you do a maintainer build. > > As far as I can tell, if I remove these files from GIt, they will be > deleted for everybody when they next pull, and people will have to rerun > with --enable-maintainer-mode to regenerate them. Does anyone have any > objections? They can always be restored in git if something bad happens. Friom a debian point of view they should be recretated from source. Bastien > Richard > > > On 27/06/2013 12:15, Frans Schreuder wrote: >> Hi Richard, >> >> Since adms is now provided, the files you mention can be removed if you >> ask me. >> >> Frans >> >> > > > -- > The University of Edinburgh is a charitable body, registered in > Scotland, with registration number SC005336. > > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by Windows: > > Build for Windows Store. > > http://p.sf.net/sfu/windows-dev2dev > _______________________________________________ > Qucs-devel mailing list > Quc...@li... > https://lists.sourceforge.net/lists/listinfo/qucs-devel |
From: Richard C. <r.c...@ed...> - 2013-06-27 14:03:58
|
Hi Mike, So, the files I mentioned previously were those that were in the qucs-core/src directory, however, I did since notice that there are also generated files in the qucs-core/src/converter directory, which is presumably the one which you would like me to be careful about. These files are: parse_spice.cpp scan_spice.cpp tokens_spice.h parse_vcd.cpp scan_vcd.cpp tokens_vcd.h looking at the old svn converter directory: https://sourceforge.net/p/qucs/code/1786/tree/trunk/qucs-core/src/converter/ these files are not actually present, so I think it is safe to remove them. They are also generated when we build with maintainer-mode. Richard On 27/06/2013 14:16, mike brinson wrote: > Hello Richard > > If you remove the qucs parser files generated by Lex and Yacc one > problem may result. The current Qucsconv software needs additions > to allow developers to add additional features to cover, for example, the > complete SPICE 2g6 and 3f5 netlist languages. Embedded in Qucsconv > is special code to allow the HICUM models to be converted from SPICE > to Qucs. > I still have to add sections to Qucsconv to take account of the latest > L0 and L2 > models that I added to Qucs-0.0.17. Provided that the maintainer > build regenerates these > files you are proposing to remove it should be OK - but without > trying to regenerate/ > modify Qucsconv I cannot be sure. Much work is also needed on > Qucsconv to allow > it to convert not only SPICE 2g6 and 3f5 to Qucs but also to extend > it to other > dialects - for example pSPICE and HSPICE. This would then make Qucs > even more universal! > > I would also like to add translation routines for ICCAP files to Qucs > - I have just been informed > that this file syntax has just been released into the public domain to > allow interchange of > device measurements and parameter extraction data. > > Best wishes. > > Mike > > Mike Brinson > > mbr...@ya... > ------------------------------------------------------------------------ > *From:* Richard Crozier <r.c...@ed...> > *To:* Frans Schreuder <fra...@gm...> > *Cc:* quc...@li... > *Sent:* Thursday, 27 June 2013, 12:45 > *Subject:* Re: [Qucs-devel] git tracked generated files > > > Hi Frans, > > Well, actually these are not related to adms, but are the qucs parsers > generated by Lex and Yacc for parsing the datafiles and netlist etc. > However, they are created when you do a maintainer build. > > As far as I can tell, if I remove these files from GIt, they will be > deleted for everybody when they next pull, and people will have to rerun > with --enable-maintainer-mode to regenerate them. Does anyone have any > objections? They can always be restored in git if something bad happens. > > Richard > > > On 27/06/2013 12:15, Frans Schreuder wrote: > > Hi Richard, > > > > Since adms is now provided, the files you mention can be removed if you > > ask me. > > > > Frans > > > > > > > -- > The University of Edinburgh is a charitable body, registered in > Scotland, with registration number SC005336. > > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by Windows: > > Build for Windows Store. > > http://p.sf.net/sfu/windows-dev2dev > _______________________________________________ > Qucs-devel mailing list > Quc...@li... <mailto:Quc...@li...> > https://lists.sourceforge.net/lists/listinfo/qucs-devel > > |
From: Richard C. <r.c...@ed...> - 2013-06-27 18:18:10
|
Ok, I need some Git help from someone who know the incantations that the gods of Git ascribed on some secret stone somewhere. I have checked out the master of the repository and made commits to it. We have a new branch, post-release-0.0.17, and I want to move those commits to this branch, I tried to apply the advice here: http://stackoverflow.com/a/1773751/685984 so did git checkout post-release-0.0.17 Branch post-release-0.0.17 set up to track remote branch post-release-0.0.17 from origin. Switched to a new branch 'post-release-0.0.17' bash-4.1$ git cherry-pick master fatal: Commit 467c29575b97fe98d418b68b01d30d0aa2489cca is a merge but no -m option was given. what does the error mean, it sounds scary. How can I do what I want? Thanks, Richard p.s. I have to say I'm, well, pretty much hating the git experience, svn is nice and linear, and mercurial seems better designed. The error messages in git are obtuse in the extreme, and I'm investing a lot of time to learn to do things which I expected to be easy in git. -- The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336. |
From: Frans S. <fra...@gm...> - 2013-06-27 18:34:13
|
Hello Richard, Since this branch has been merged back to master already, it doesn't make much sense to use that branch anymore. I think it is better to make a new branch and commit your changes to that. Shall I remove the post-release-0.0.17 branch? Frans On 27-06-13 20:17, Richard Crozier wrote: > Ok, I need some Git help from someone who know the incantations that the > gods of Git ascribed on some secret stone somewhere. > > I have checked out the master of the repository and made commits to it. > We have a new branch, post-release-0.0.17, and I want to move those > commits to this branch, I tried to apply the advice here: > > http://stackoverflow.com/a/1773751/685984 > > so did > > git checkout post-release-0.0.17 > Branch post-release-0.0.17 set up to track remote branch > post-release-0.0.17 from origin. > Switched to a new branch 'post-release-0.0.17' > bash-4.1$ git cherry-pick master > fatal: Commit 467c29575b97fe98d418b68b01d30d0aa2489cca is a merge but no > -m option was given. > > what does the error mean, it sounds scary. How can I do what I want? > > Thanks, > Richard > > p.s. I have to say I'm, well, pretty much hating the git experience, svn > is nice and linear, and mercurial seems better designed. The error > messages in git are obtuse in the extreme, and I'm investing a lot of > time to learn to do things which I expected to be easy in git. > > > > > |
From: Richard C. <r.c...@ed...> - 2013-06-27 19:03:24
|
Ok thanks, I'll just commit to master. Removing the other branch gets my vote. Richard On 27/06/2013 19:34, Frans Schreuder wrote: > Hello Richard, > > Since this branch has been merged back to master already, it doesn't > make much sense to use that branch anymore. > I think it is better to make a new branch and commit your changes to that. > Shall I remove the post-release-0.0.17 branch? > > Frans > > On 27-06-13 20:17, Richard Crozier wrote: >> Ok, I need some Git help from someone who know the incantations that the >> gods of Git ascribed on some secret stone somewhere. >> >> I have checked out the master of the repository and made commits to it. >> We have a new branch, post-release-0.0.17, and I want to move those >> commits to this branch, I tried to apply the advice here: >> >> http://stackoverflow.com/a/1773751/685984 >> >> so did >> >> git checkout post-release-0.0.17 >> Branch post-release-0.0.17 set up to track remote branch >> post-release-0.0.17 from origin. >> Switched to a new branch 'post-release-0.0.17' >> bash-4.1$ git cherry-pick master >> fatal: Commit 467c29575b97fe98d418b68b01d30d0aa2489cca is a merge but no >> -m option was given. >> >> what does the error mean, it sounds scary. How can I do what I want? >> >> Thanks, >> Richard >> >> p.s. I have to say I'm, well, pretty much hating the git experience, svn >> is nice and linear, and mercurial seems better designed. The error >> messages in git are obtuse in the extreme, and I'm investing a lot of >> time to learn to do things which I expected to be easy in git. >> >> >> >> >> > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by Windows: > > Build for Windows Store. > > http://p.sf.net/sfu/windows-dev2dev > _______________________________________________ > Qucs-devel mailing list > Quc...@li... > https://lists.sourceforge.net/lists/listinfo/qucs-devel > -- The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336. |