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 119, Fri Jun 5 22:03:51 1998 UTC revision 147, Thu Sep 17 22:42:26 1998 UTC
# Line 1  Line 1 
1  -*- outline -*-  -*- outline -*-
2    
3    * from Lal's deltas
4            cvs -d ~cvs co -d smlnj -r SMLNJ flint; cd smlnj/src
5            mkdir tmp; cd tmp
6            ncftp 'daffy:/pub/smlnj/tmp/george/110.7.1/*'
7            cd ..
8            for tarball in tmp/*.tar.gz; do gtar zxUvpf $tarball; done
9            sed -n -e ':loop' -e '/\\$/N' -e '/\\$/b loop' -e '/=/p' tmp/GO.sh >tmp/GO
10            . tmp/GO
11            cvs commit -m "  $VERSION"
12            cvs tag $VERSION
13            rm -rf tmp
14    
15  * from Zhong's dir  * from Zhong's dir
16          cd .../src/sml-nj          cd .../src/sml-nj
17          rm -rf **/CM          rm -rf **/CM
# Line 8  Line 20 
20    
21  * from tarballs  * from tarballs
22          # untar the distribution          # untar the distribution
23          mkdir 110.6; cd 110.6          version=110.8
24          scp daffy:~ftp/pub/smlnj/working/110.6/\*.gz .          mkdir $version; cd $version
25            scp daffy:~ftp/pub/smlnj/working/$version/\*.gz .
26          mkdir src; cd src          mkdir src; cd src
27          ztar ../*.gz          ztar ../*.gz
28          mv bin.* ../../          mv bin.* ../../
# Line 19  Line 32 
32          rm *.gz          rm *.gz
33    
34          # import this distribution into the CVS vendor branch          # import this distribution into the CVS vendor branch
35          cvs -qd ~cvs import -ko -m '110.6' flint SMLNJ v110_6 | grep -v '^U '          cvs -d ~cvs import -ko -m '$version' flint SMLNJ v110_8 | grep -v '^U '
36    
37          # find the files that got deleted and `cvs rm' them          # find the files that got deleted and `cvs rm' them
38          cd ..; cvs -d ~cvs co -d smlnj -r SMLNJ flint; cd smlnj          cd ../smlnj; cvs update
39          cvs rm $(cvs -q diff -s -r v110_6 | sed -n -e 's/^Index: //p')          cvs rm $(cvs -q rdiff -s -r SMLNJ -r v110_8 flint |
40          cvs commit -m 'removed deleted files'                                   sed -n -e 's/^File flint\/\(.*\) is removed;.*/\1/p')
41          cvs tag v110_6          cvs commit -m '110.8'
42          cd ..; rm -rf smlnj          #cvs tag v110_6
43            #cd ..; rm -rf smlnj
44    
45          # check out a new copy, trying to merge the changes into the trunk          # check out a new copy, trying to merge the changes into the trunk
46          cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint          cd ../trunk
47            cvs update -P -d -jSMLNJ:yesterday -jSMLNJ
48          # list the conflicts          # list the conflicts
49          find -type f | xargs grep '^>>>>'          find -type f | xargs grep '^>>>>'
50          <... solve the problems if any ...>          <... solve the problems if any ...>
51          # check correctness          # check correctness
52            rm -rf lib bin bin.* src/compiler/bin.*
53          link ../bin.x86-unix; config/install.sh          link ../bin.x86-unix; config/install.sh
54          cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile          cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile
55    

Legend:
Removed from v.119  
changed lines
  Added in v.147

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