SCM Repository
View of /sml/trunk/CVSNOTES
Parent Directory
|
Revision Log
Revision 109 -
(download)
(annotate)
Fri May 29 02:12:55 1998 UTC (24 years ago) by monnier
File size: 1486 byte(s)
Fri May 29 02:12:55 1998 UTC (24 years ago) by monnier
File size: 1486 byte(s)
merged in 110.6 changes
-*- outline -*- * from Zhong's dir cd .../src/sml-nj rm -rf **/CM rm -r sml.* sml-cm.* *.sml bin.* cvs -d ~cvs import -m '' smlnj/src/sml-nj FLINT v980311 * from tarballs # untar the distribution mkdir 110.6; cd 110.6 scp daffy:~ftp/pub/smlnj/working/110.6/\*.gz . mkdir src; cd src ztar ../110.6-*.gz mv bin.* ../../ mv config ../ cd .. mv *-bin.* ../ rm *.gz # import this distribution into the CVS vendor branch cvs -qd ~cvs import -ko -m '110.6' flint SMLNJ v110_6 | grep -v '^U ' # check out a new copy, trying to merge the changes into the trunk cd ..; cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint # list the conflicts find -type f | xargs grep '^>>>>' <... solve the problems if any ...> # check files that have been removed changes=$(cvs -q diff -N -r v110_5_1 -r v110_6 | sed -n -e 's/^Index: //p') cd ../110.6; for f in $changes; do if [ ! -f "$f" ]; then echo $f; fi; done cd ../flint; cvs rm <..some or all of the above..> # check correctness link ../bin.x86-unix; config/install.sh cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile cd ../..; cvs commit -m 'merged in 110.6 changes' * /softs install ** original cd /softs/smlnj-110 ztar ~/work/110-bin.x86-unix.tar.gz config/install.sh rm -rf bin.* src/sml-nj ** upgrade cvs -q update cd src/compiler rm -r bin.* ./xrun <some sml-cm> <<EOF CMB.make(); EOF ./xrecompile rm sml*.* cd ../.. rm -r bin lib **/CM config/install.sh rm bin.*/*
root@smlnj-gforge.cs.uchicago.edu | ViewVC Help |
Powered by ViewVC 1.0.0 |