Difference between revisions of "CVS commit"
From ElphelWiki
OneArtPlease (talk | contribs) |
OneArtPlease (talk | contribs) |
||
| Line 1: | Line 1: | ||
| − | + | =1= | |
| − | |||
* add the new files to the CVS | * add the new files to the CVS | ||
cvs add | cvs add | ||
| Line 9: | Line 8: | ||
you can also use "make update" command from the top directory | you can also use "make update" command from the top directory | ||
| − | + | =2= | |
* edit src.list to add those new files, | * edit src.list to add those new files, | ||
* comment out the old unneeded ones with '#', files in the same level should go in alphabetical order. | * comment out the old unneeded ones with '#', files in the same level should go in alphabetical order. | ||
* Run ./diff_srclist_cvs script in the top directory, make sure it comes out with empty output | * Run ./diff_srclist_cvs script in the top directory, make sure it comes out with empty output | ||
| − | + | =3= | |
* modify Makefile in your installation directory so it will install the new files (and do not install old ones if you removed them!) | * modify Makefile in your installation directory so it will install the new files (and do not install old ones if you removed them!) | ||
| − | + | =4= | |
* in the case you added the new subdirectory with it's own Makefile that needs to run during build - edit subdirs.list and add you directory. Usually the new directories are added the very end (if none other depend on them) | * in the case you added the new subdirectory with it's own Makefile that needs to run during build - edit subdirs.list and add you directory. Usually the new directories are added the very end (if none other depend on them) | ||
| − | + | =5= | |
* currently there is no automatic way to verify that Makefile will not try to use non-existent (in src.list, CVS) files, so it would be nice if you run top make now, generate source archive and install it in the new directory, making sure 'make' is happy and was able to find everything it needed. If you got any problems at this stage and do not have immediate solution - just remove this directory from the subdirs.list until the issue is resolved. If you do this and if the ./diff_srclist_cvs output is empty - it is safe to commit changes to the CVS without breaking installation. | * currently there is no automatic way to verify that Makefile will not try to use non-existent (in src.list, CVS) files, so it would be nice if you run top make now, generate source archive and install it in the new directory, making sure 'make' is happy and was able to find everything it needed. If you got any problems at this stage and do not have immediate solution - just remove this directory from the subdirs.list until the issue is resolved. If you do this and if the ./diff_srclist_cvs output is empty - it is safe to commit changes to the CVS without breaking installation. | ||
| − | + | =6= | |
* commit all the changes made to the CVS (add/remove files, modified src.list, Makefile(s)) | * commit all the changes made to the CVS (add/remove files, modified src.list, Makefile(s)) | ||
cvs commit | cvs commit | ||
* provide descriptive commit messag | * provide descriptive commit messag | ||
| − | + | =7= | |
* build new source tree | * build new source tree | ||
./install_elphel_from_cvs | ./install_elphel_from_cvs | ||
Latest revision as of 00:57, 29 July 2009
1
- add the new files to the CVS
cvs add
- remove old ones that are not replaced
cvs remove
- make sure the cvs tree is up to date
cvs update -d
you can also use "make update" command from the top directory
2
- edit src.list to add those new files,
- comment out the old unneeded ones with '#', files in the same level should go in alphabetical order.
- Run ./diff_srclist_cvs script in the top directory, make sure it comes out with empty output
3
- modify Makefile in your installation directory so it will install the new files (and do not install old ones if you removed them!)
4
- in the case you added the new subdirectory with it's own Makefile that needs to run during build - edit subdirs.list and add you directory. Usually the new directories are added the very end (if none other depend on them)
5
- currently there is no automatic way to verify that Makefile will not try to use non-existent (in src.list, CVS) files, so it would be nice if you run top make now, generate source archive and install it in the new directory, making sure 'make' is happy and was able to find everything it needed. If you got any problems at this stage and do not have immediate solution - just remove this directory from the subdirs.list until the issue is resolved. If you do this and if the ./diff_srclist_cvs output is empty - it is safe to commit changes to the CVS without breaking installation.
6
- commit all the changes made to the CVS (add/remove files, modified src.list, Makefile(s))
cvs commit
- provide descriptive commit messag
7
- build new source tree
./install_elphel_from_cvs
- enter the newly created folder and then run
./install_elphel
- compare old and new target.list
diff target.list target.list.new
- commit new overwrite target.list with target.list.new if all differences are intended
- commit new target.list
