Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /sml/trunk/CVSNOTES
ViewVC logotype

Diff of /sml/trunk/CVSNOTES

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 20, Wed Mar 11 21:19:06 1998 UTC revision 115, Fri Jun 5 19:43:05 1998 UTC
# Line 5  Line 5 
5          rm -rf **/CM          rm -rf **/CM
6          rm -r sml.* sml-cm.* *.sml bin.*          rm -r sml.* sml-cm.* *.sml bin.*
7          cvs -d ~cvs import -m '' smlnj/src/sml-nj FLINT v980311          cvs -d ~cvs import -m '' smlnj/src/sml-nj FLINT v980311
8    
9    * from tarballs
10            # untar the distribution
11            mkdir 110.6; cd 110.6
12            scp daffy:~ftp/pub/smlnj/working/110.6/\*.gz .
13            mkdir src; cd src
14            ztar ../*.gz
15            mv bin.* ../../
16            mv config ../
17            cd ..
18            mv *-bin.* ../
19            rm *.gz
20    
21            # import this distribution into the CVS vendor branch
22            cvs -qd ~cvs import -ko -m '110.6' flint SMLNJ v110_6 | grep -v '^U '
23    
24            # find the files that got deleted and `cvs rm' them
25            cd ..; cvs -d ~cvs co -d smlnj -r SMLNJ flint; cd smlnj
26            cvs rm $(cvs -q diff -s -r v110_6 | sed -n -e 's/^Index: //p')
27            cvs commit -m 'removed deleted files'
28            cvs tag v110_6
29    
30            # check out a new copy, trying to merge the changes into the trunk
31            cd ..; cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint
32            # list the conflicts
33            find -type f | xargs grep '^>>>>'
34            <... solve the problems if any ...>
35            # check files that have been removed
36            changes=$(cvs -q diff -N -r v110_5_1 -r v110_6 | sed -n -e 's/^Index: //p')
37            cd ../110.6; for f in $changes; do if [ ! -f "$f" ]; then echo $f; fi; done
38            cd ../flint; cvs rm <..some or all of the above..>
39            # check correctness
40            link ../bin.x86-unix; config/install.sh
41            cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile
42    
43            cd ../..; cvs commit -m 'merged in 110.6 changes'
44    
45    * /softs install
46    ** original
47            cd /softs/smlnj-110
48            ztar ~/work/110-bin.x86-unix.tar.gz
49            config/install.sh
50            rm -rf bin.* src/sml-nj
51    ** upgrade
52            cvs -q update
53            cd src/compiler
54            rm -r bin.*
55            ./xrun <some sml-cm> <<EOF
56                       CMB.make();
57            EOF
58            ./xrecompile
59            rm sml*.*
60            cd ../..
61            rm -r bin lib **/CM
62            config/install.sh
63            rm bin.*/*

Legend:
Removed from v.20  
changed lines
  Added in v.115

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0