Index: chgen/aareadme =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/aareadme,v retrieving revision 1.2.4.6 diff -r1.2.4.6 aareadme 0a1,75 > aareadme in /usr/proj3/case/gen/ver_11/chgen - RJL 2k0329 > Here is final result of make attempts. After modifying > chgen/src/Makefile (updating BIN-DIR to be local at ../src) > and vwerifying that Makefile is the same as jkarner's, > I got an executable that is identical in size to jkarner's > genmerge version. Both paths are defined and compared below: > ----------------- > File /usr/proj3/case/gen/ver_11/chgen/bin/alpha/chgen11: > 1261568 May 12 1999 > > In genmerge, file > /usr/proj3/case/99s523/genmerge/chgenv11/chgen/executables/alpha/chgen11: > 1261568 Mar 29 01:47 > > FUrther study is needed to recreate the process of bootstrapping genv11 > (separating the schema parsing step which generates TT and TA in .msdat, > from the pr_util generation step that reads from TT and TA). > (see JKarner's commment 99/5/11 below.) > ======================================== > RJL initial version 2k0328: > > I did 'cvs co -r genv11 chgen' today, > which retrieved a regular or non-branch version of chgen > (because chgen/Tag contains Ngenv11). > > cvs history -aT does not contain many compound [branch?] tags - > e.g. these two are the most recent, by jkarner in May 99: > > [gen10_rassman:genlog-branch] > [genv11:genlog-branch] > > I tried building genv11 with: > 'make -f src/Makefile.ver_8.alpha chgen' > This failed to link. > JKarner may have checked in his version the wrong way - > - fearing conflicts with palee's > inappropriate (and untagged) mainline updates. (see jkarner's > first parag. below re: bootstrapping). > .. > .. > /usr/ucb/ld: > Unresolved: > gen_pr_log > pr_init > pr_load > pr_dump > *** Exit 1 > Stop. > ---------------------------------------------------- > I did change the Makefile.ver_8.alpha as follows ($BIN-DIR update to loca to locall) > --------------- > jupiter.cs.uml.edu(172)> pwd > /usr/proj3/case/gen/ver_11/chgen/src > jupiter.cs.uml.edu(173)> cvs diff Makefile.ver_8.alpha > Index: Makefile.ver_8.alpha > ================================================================ > RCS file: /usr/proj3/case/gen/base/Master/chgen/src/Makefile.ver_8.alpha,v > retrieving revision 1.1.1Makefile.ver_8.alpha > 21c21,23 > < BIN-DIR = /usr/proj3/case/gen/ver_8/bin > --- > > #Commented because Not APpropriate in worksp328 > > # BIN-DIR = /usr/proj3/case/gen/ver_8/bin > > BIN-DIR = ../bin # relative path in user's checked-out tree. > 70,71c72,73 > < chmod -f 700 ${IFILES} ${HFILES} > < rm -f ${IFILES} ${HFILES} > --- > > # chmod -f 700 ${IFILES} ${HFILES} ${HFILES} > jupiter.cs.uml.edu(174)> > ========================================================== > > The following aareadme parags were checked out of cvs - > their path is out of date - RJL > --------------------------------------------------------------------------- Index: chgen/bin/alpha/aareadme =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/bin/alpha/aareadme,v retrieving revision 1.1.1.1 diff -r1.1.1.1 aareadme 0a1,6 > RJL Update 2k0929 > > I made a few changes to src files then reran make > Purpose: (1) #define pr_add(a,b,c) gendefines(a,#b,c) > (2) Rename routine pr_add gen_pr_add. > ---------------------------------------------------------- Index: chgen/src/Makefile =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/src/Makefile,v retrieving revision 1.6.4.2 diff -r1.6.4.2 Makefile 8d7 < BIN-DIR = ../executables/${HOSTTYPE} 12d10 < 20a19 > BIN-DIR = ../bin/${HOSTTYPE} Index: chgen/src/Makefile.ver_8.alpha =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/src/Makefile.ver_8.alpha,v retrieving revision 1.1.1.1 diff -r1.1.1.1 Makefile.ver_8.alpha 21c21,23 < BIN-DIR = /usr/proj3/case/gen/ver_8/bin --- > #Commented because Not APpropriate in workspaces!-RJL 2k0328 > # BIN-DIR = /usr/proj3/case/gen/ver_8/bin > BIN-DIR = ../bin # relative path in user's checked-out tree. 70,71c72,73 < chmod -f 700 ${IFILES} ${HFILES} < rm -f ${IFILES} ${HFILES} --- > # chmod -f 700 ${IFILES} ${HFILES} > # rm -f ${IFILES} ${HFILES} Index: chgen/src/aareadme =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/src/aareadme,v retrieving revision 1.2 diff -r1.2 aareadme 2a3,9 > Update 2k0329 RJL: > ---------------------------------- > I updated gen_defines.c to make pr_add call gen_pr_add again. > THen I reran make and rebuilt bde. > Result; btidx duplicate declares TBFixed in bde/pr_util (and genv11?) > ------------------------------- > 18c25,26 < THIS NOTE IS OBSOLETE: NOTE ADDED 95/1/5 by RJL: --- > THE NOTE BELOW IS OBSOLETE: see genmerge in 99s523 - RJL > ADDED 95/1/5 by RJL: Index: chgen/src/chgen_release_date.c =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/src/Attic/chgen_release_date.c,v retrieving revision 1.1.1.1.2.3 diff -r1.1.1.1.2.3 chgen_release_date.c 1,2c1 < char * CHGEN_RELEASE_DATE() {return "Thurs May 6 22:00:00 EDT 1999";} < static char rcsid[] = "$Id: chgen_release_date.c,v 1.1.1.1.2.3 1999/05/07 01:25:19 jkarner Exp $"; --- > char * CHGEN_RELEASE_DATE() {return "Tue Mar 28 23:55:49 EST 2000";} Index: chgen/src/gen_defines.c =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/src/gen_defines.c,v retrieving revision 1.7.4.3 diff -r1.7.4.3 gen_defines.c 155c155,156 < /*if (cli_ansi) --- > /* WHY DELETED BY GENMERGE? MAYBE IT CONFLICTED WITH BOOTSTRAP_ RJL */ > /* if (cli_ansi) 159c160,161 < */ --- > */ > /* un-commented #define pr_add gen_pr_add below by maldred 22nov95 -RJL */ 167,170c169 < /* define pr_add here also to fix compile time but for bde. */ < /* maldred 22-Nov-95 */ < /*fprintf(schh_fp, "#define pr_add(view,tbl_abbr,tbl_ptr) gen_pr_add(view, #tbl_abbr, tbl_ptr)\n");*/ < fprintf(schh_fp, "#define hcg_declare(tbl) *tbl, *tbl%scurr, *tbl%stemp, *tbl%send, *tbl%selt, *tbl%scurr2, *tbl%stemp2;\n", --- > fprintf(schh_fp, "#define hcg_declare(tbl) *tbl, *tbl%scurr, *tbl%stemp, *tbl%send, *tbl%selt, *tbl%scurr2, *tbl%stemp2;\n", 172a172,178 > > /* define pr_add here also to fix compile time bug for bde. */ > /* maldred 22-Nov-95 */ > /* un-commented - and moved outside #ifdef Main - RJL 2k0329 */ > fprintf(schh_fp, "#define pr_add(view,tbl_abbr,tbl_ptr) gen_pr_add(view, #t > bl_abbr, tbl_ptr)\n"); /* commentBrackets removed again - RJL 2k0329 */ > Index: chgen/src/gen_pr_add.c =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/src/gen_pr_add.c,v retrieving revision 1.4.4.2 diff -r1.4.4.2 gen_pr_add.c 77c77,78 < void pr_add (viewname, tbl_abbrv, tbl_ptr)\n\ --- > /*RJL 2k0329: added prefix gen_: TBD: #define pr_add gen_pr_add(p1, #p2, p3) */ > void gen_pr_add (viewname, tbl_abbrv, tbl_ptr)\n\ Index: chgen/src/gen_structures.c =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/src/gen_structures.c,v retrieving revision 1.4.4.2 diff -r1.4.4.2 gen_structures.c 128a129,135 > /* Trial with ignore the rest - > maldred has duplicate fix with extern XXbtidx here, > defs in gen_utils.c - RJL 2k0929 > */ > > return; /* rjl 2k0329 */ > 141c148,149 < fprintf(schh_fp,"int %sbtidx; \n",tt_curr->TTabbr); --- > fprintf(schh_fp,"int %sbtidx; \n",tt_curr->TTabbr); > Index: chgen/src/lut.c =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/src/Attic/lut.c,v retrieving revision 1.2.2.1 diff -r1.2.2.1 lut.c 16a17,18 > #include > #include 18d19 < #include "chgen_externs.h" 43d43 < static char rcsid[] = "$Id: lut.c,v 1.2.2.1 1999/05/04 17:00:09 jkarner Exp $"; Index: chgen/src/lut.h =================================================================== RCS file: /usr/proj3/case/gen/base/Master/chgen/src/Attic/lut.h,v retrieving revision 1.2.2.1 diff -r1.2.2.1 lut.h 1,6c1,2 < #ifndef LUT_H < #define LUT_H < < /* rcs revision information */ < /* $Id: lut.h,v 1.2.2.1 1999/05/04 17:00:33 jkarner Exp $ */ < --- > > 14c10 < typedef unsigned char bool; --- > #define bool unsigned char 79,80c75 < < #endif --- >