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 147, Thu Sep 17 22:42:26 1998 UTC revision 184, Sun Nov 8 21:18:20 1998 UTC
# Line 12  Line 12 
12          cvs tag $VERSION          cvs tag $VERSION
13          rm -rf tmp          rm -rf tmp
14    
15    
16  * from Zhong's dir  * from Zhong's dir
17          cd .../src/sml-nj          cd .../src/sml-nj
18          rm -rf **/CM          rm -rf **/CM
# Line 19  Line 20 
20          cvs -d ~cvs import -m '' smlnj/src/sml-nj FLINT v980311          cvs -d ~cvs import -m '' smlnj/src/sml-nj FLINT v980311
21    
22  * from tarballs  * from tarballs
23          # untar the distribution          cd ~/flint; ./bin/smlnj-newrev 110.9.1
24          version=110.8          cd trunk
         mkdir $version; cd $version  
         scp daffy:~ftp/pub/smlnj/working/$version/\*.gz .  
         mkdir src; cd src  
         ztar ../*.gz  
         mv bin.* ../../  
         mv config ../  
         cd ..  
         mv *-bin.* ../  
         rm *.gz  
   
         # import this distribution into the CVS vendor branch  
         cvs -d ~cvs import -ko -m '$version' flint SMLNJ v110_8 | grep -v '^U '  
   
         # find the files that got deleted and `cvs rm' them  
         cd ../smlnj; cvs update  
         cvs rm $(cvs -q rdiff -s -r SMLNJ -r v110_8 flint |  
                                  sed -n -e 's/^File flint\/\(.*\) is removed;.*/\1/p')  
         cvs commit -m '110.8'  
         #cvs tag v110_6  
         #cd ..; rm -rf smlnj  
   
         # check out a new copy, trying to merge the changes into the trunk  
         cd ../trunk  
         cvs update -P -d -jSMLNJ:yesterday -jSMLNJ  
         # list the conflicts  
         find -type f | xargs grep '^>>>>'  
25          <... solve the problems if any ...>          <... solve the problems if any ...>
26          # check correctness          # check correctness
27          rm -rf lib bin bin.* src/compiler/bin.*          rm -rf lib bin bin.* src/compiler/bin.*
28          link ../bin.x86-unix; config/install.sh          link ../110.9.1/bin.x86-unix; config/install.sh
29          cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile          cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile
30    
31          cd ../..; cvs commit -m 'merged in 110.6 changes'          cd ../..; cvs commit -m 'merged in 110.6 changes'
# Line 64  Line 39 
39  ** upgrade  ** upgrade
40          cvs -q update          cvs -q update
41          cd src/compiler          cd src/compiler
42          rm -r bin.*          rm -rf bin.*; ln -s ~/flint/bin.x86-unix
43          ./xrun <some sml-cm> <<EOF          ./xmakeml; rm bin.*
44            ./xrun sml.x86-linux <<EOF
45                     CMB.make();                     CMB.make();
46          EOF          EOF
47          ./xrecompile          # rm sml*.*
         rm sml*.*  
48          cd ../..          cd ../..
49          rm -r bin lib **/CM          rm -r bin lib **/CM
50          config/install.sh          config/install.sh
51          rm -rf bin.*/*          # rm -rf bin.*/*
52    
53  * diffs between release  * diffs between release
54  ** sml-nj/TopLevel/viscomp/control.sml  ** sml-nj/TopLevel/viscomp/control.sml

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

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