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/NOTES/CVSNOTES
ViewVC logotype

Diff of /sml/trunk/NOTES/CVSNOTES

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

revision 20, Wed Mar 11 21:19:06 1998 UTC revision 119, Fri Jun 5 22:03:51 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            cd ..; rm -rf smlnj
30    
31            # check out a new copy, trying to merge the changes into the trunk
32            cvs co -ko -P -jSMLNJ:yesterday -jSMLNJ flint; cd flint
33            # list the conflicts
34            find -type f | xargs grep '^>>>>'
35            <... solve the problems if any ...>
36            # check correctness
37            link ../bin.x86-unix; config/install.sh
38            cd src/compiler; link ../../../bin.x86-unix; ./xrecompile; ./xrecompile
39    
40            cd ../..; cvs commit -m 'merged in 110.6 changes'
41    
42    * /softs install
43    ** original
44            cd /softs/smlnj-110
45            ztar ~/work/110-bin.x86-unix.tar.gz
46            config/install.sh
47            rm -rf bin.* src/sml-nj
48    ** upgrade
49            cvs -q update
50            cd src/compiler
51            rm -r bin.*
52            ./xrun <some sml-cm> <<EOF
53                       CMB.make();
54            EOF
55            ./xrecompile
56            rm sml*.*
57            cd ../..
58            rm -r bin lib **/CM
59            config/install.sh
60            rm -rf bin.*/*
61    
62    * diffs between release
63    ** sml-nj/TopLevel/viscomp/control.sml
64    -      val checkFlint     = ref false
65    -      val checkDatatypes = ref false
66    -      val checkKinds     = ref false
67    +      val checkFlint     = ref true
68    +      val checkDatatypes = ref true
69    +      val checkKinds     = ref true
70    ** runtime/gc/import-heap.c
71    --- import-heap.c       1998/01/18 01:00:25     1.1.1.2
72    +++ import-heap.c       1998/03/22 22:26:22     1.2
73    @@ -168,7 +168,7 @@
74           /* read the ML heap */
75            ReadHeap (&inBuf, &heapHdr, msp, externs);
76           /* GC message are on by default for interactive images */
77    -       GCMessages = TRUE;
78    +       /* GCMessages = TRUE; */
79         }
80         else {  /* EXPORT_FN_IMAGE */
81            ml_val_t        funct, cmdName, args;
82    ** sml-nj/TopLevel/interact/evalloop.sml
83    --- evalloop.sml        1998/04/03 00:06:01     1.1.1.4
84    +++ evalloop.sml        1998/04/03 00:11:31
85    @@ -173,7 +173,7 @@
86                   handle EndOfFile => (say "\n")
87                       | Interrupt => (say "\nInterrupt\n";
88                                   flush(); loop())
89    -                  | EM.Error => (flush(); loop())
90    +                  (* | EM.Error => (flush(); loop()) *)
91                       | C.Compile "syntax error" => (flush(); loop())
92                       | C.Compile s =>
93                          (say(concat["\nuncaught exception Compile: \"",

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

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