Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| SHA1 Hash: | 953d293c32ddf612958d8dd4e819e1a8bcf2af27 |
|---|---|
| Date: | 2010-06-23 05:27:39 |
| User: | benoit |
| Edited Comment: | Fix makemake.tcl to generate main.mk as committed previously. <i>Moved onto the "benoit" branch because it fails to build.</i> |
| Original Comment: | Fix makemake.tcl to generate main.mk as committed previously |
Tags And Properties
- bgcolor=#ffc0d0 propagates to descendants added by [208b8bb048] on 2010-06-23 11:32:36
- branch=benoit propagates to descendants added by [208b8bb048] on 2010-06-23 11:32:36
- comment=Fix makemake.tcl to generate main.mk as committed previously. <i>Moved onto the "benoit" branch because it fails to build.</i> added by [208b8bb048] on 2010-06-23 11:32:36
- date=2010-06-23 05:27:39 added by [208b8bb048] on 2010-06-23 11:32:36
- sym-benoit propagates to descendants added by [208b8bb048] on 2010-06-23 11:32:36
- sym-trunk cancelled by [208b8bb048] on 2010-06-23 11:32:36
Changes
Changes to src/makemake.tcl
95 # 95 # 96 96 97 XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) 97 XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR) 98 98 99 } 99 } 100 puts -nonewline "SRC =" 100 puts -nonewline "SRC =" 101 foreach s [lsort $src] { 101 foreach s [lsort $src] { 102 puts -nonewline " \\\n \$(SRCDIR)/$s.c" | 102 puts -nonewline " \\\n \$(SRCDIR)\$(DIRSEP)$s.c" 103 } 103 } 104 puts "\n" 104 puts "\n" 105 puts -nonewline "TRANS_SRC =" 105 puts -nonewline "TRANS_SRC =" 106 foreach s [lsort $src] { 106 foreach s [lsort $src] { 107 puts -nonewline " \\\n ${s}_.c" 107 puts -nonewline " \\\n ${s}_.c" 108 } 108 } 109 puts "\n" 109 puts "\n" 110 puts -nonewline "OBJ =" 110 puts -nonewline "OBJ =" 111 foreach s [lsort $src] { 111 foreach s [lsort $src] { 112 puts -nonewline " \\\n \$(OBJDIR)/$s.o" | 112 puts -nonewline " \\\n \$(OBJDIR)\$(DIRSEP)$s.o" 113 } 113 } 114 puts "\n" 114 puts "\n" 115 puts "APPNAME = $name\$(E)" 115 puts "APPNAME = $name\$(E)" 116 puts "\n" 116 puts "\n" 117 117 118 puts { 118 puts { 119 all: $(OBJDIR) $(APPNAME) 119 all: $(OBJDIR) $(APPNAME) ................................................................................................................................................................................ 120 120 121 install: $(APPNAME) 121 install: $(APPNAME) 122 mv $(APPNAME) $(INSTALLDIR) 122 mv $(APPNAME) $(INSTALLDIR) 123 123 124 $(OBJDIR): 124 $(OBJDIR): 125 -mkdir $(OBJDIR) 125 -mkdir $(OBJDIR) 126 126 127 translate: $(SRCDIR)/translate.c | 127 translate: $(SRCDIR)$(DIRSEP)translate.c 128 $(BCC) -o translate $(SRCDIR)/translate.c | 128 $(BCC) -o translate $(SRCDIR)$(DIRSEP)translate.c 129 129 130 makeheaders: $(SRCDIR)/makeheaders.c | 130 makeheaders: $(SRCDIR)$(DIRSEP)makeheaders.c 131 $(BCC) -o makeheaders $(SRCDIR)/makeheaders.c | 131 $(BCC) -o makeheaders $(SRCDIR)$(DIRSEP)makeheaders.c 132 132 133 mkindex: $(SRCDIR)/mkindex.c | 133 mkindex: $(SRCDIR)$(DIRSEP)mkindex.c 134 $(BCC) -o mkindex $(SRCDIR)/mkindex.c | 134 $(BCC) -o mkindex $(SRCDIR)$(DIRSEP)mkindex.c 135 135 136 # WARNING. DANGER. Running the testsuite modifies the repository the 136 # WARNING. DANGER. Running the testsuite modifies the repository the 137 # build is done from, i.e. the checkout belongs to. Do not sync/push 137 # build is done from, i.e. the checkout belongs to. Do not sync/push 138 # the repository after running the tests. 138 # the repository after running the tests. 139 test: $(APPNAME) 139 test: $(APPNAME) 140 $(TCLSH) test/tester.tcl $(APPNAME) | 140 $(TCLSH) test$(DIRSEP)tester.tcl $(APPNAME) 141 141 142 VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest | 142 VERSION.h: $(SRCDIR)$(DIRSEP)..$(DIRSEP)manifest.uuid $(SRCDIR)$(DIRSEP)..$ > 143 ifeq ($(OPERATING_SYSTEM),windows) > 144 awk "{ printf \"#define MANIFEST_UUID \\\"%%s\\\"\n\", $$1}" \ > 145 $(SRCDIR)$(DIRSEP)..$(DIRSEP)manifest.uuid >VERSION.h > 146 awk "{ printf \"#define MANIFEST_VERSION \\\"[%%.10s]\\\"\n\", $$1}" \ > 147 $(SRCDIR)$(DIRSEP)..$(DIRSEP)manifest.uuid >>VERSION.h > 148 awk "$$1==\"D\"{printf \"#define MANIFEST_DATE \\\"%%s %%s\\\"\n\",\ > 149 substr($$2,1,10),substr($$2,12)}" \ > 150 $(SRCDIR)$(DIRSEP)..$(DIRSEP)manifest >>VERSION.h > 151 else 143 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' \ 152 awk '{ printf "#define MANIFEST_UUID \"%s\"\n", $$1}' \ 144 $(SRCDIR)/../manifest.uuid >VERSION.h | 153 $(SRCDIR)$(DIRSEP)..$(DIRSEP)manifest.uuid >VERSION.h 145 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' \ 154 awk '{ printf "#define MANIFEST_VERSION \"[%.10s]\"\n", $$1}' \ 146 $(SRCDIR)/../manifest.uuid >>VERSION.h | 155 $(SRCDIR)$(DIRSEP)..$(DIRSEP)manifest.uuid >>VERSION.h 147 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\ 156 awk '$$1=="D"{printf "#define MANIFEST_DATE \"%s %s\"\n",\ 148 substr($$2,1,10),substr($$2,12)}' \ 157 substr($$2,1,10),substr($$2,12)}' \ 149 $(SRCDIR)/../manifest >>VERSION.h | 158 $(SRCDIR)$(DIRSEP)..$(DIRSEP)manifest >>VERSION.h > 159 endif 150 160 151 $(APPNAME): headers $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR)/th_l | 161 $(APPNAME): headers $(OBJ) $(OBJDIR)$(DIRSEP)sqlite3.o $(OBJDIR)$(DIRSEP)th. 152 $(TCC) -o $(APPNAME) $(OBJ) $(OBJDIR)/sqlite3.o $(OBJDIR)/th.o $(OBJDIR) | 162 $(TCC) -o $(APPNAME) $(OBJ) $(OBJDIR)$(DIRSEP)sqlite3.o $(OBJDIR)$(DIRSE 153 163 154 # This rule prevents make from using its default rules to try build 164 # This rule prevents make from using its default rules to try build 155 # an executable named "manifest" out of the file named "manifest.c" 165 # an executable named "manifest" out of the file named "manifest.c" 156 # 166 # 157 $(SRCDIR)/../manifest: | 167 $(SRCDIR)$(DIRSEP)..$(DIRSEP)manifest: 158 # noop 168 # noop 159 169 160 clean: 170 clean: > 171 ifeq ($(OPERATING_SYSTEM),windows) 161 rm -f $(OBJDIR)/*.o *_.c $(APPNAME) VERSION.h | 172 del $(OBJDIR)$(DIRSEP)*.o *_.c $(APPNAME) VERSION.h > 173 del translate makeheaders mkindex page_index.h headers} > 174 set hfiles {} > 175 foreach s [lsort $src] {lappend hfiles $s.h} > 176 puts "\tdel $hfiles\n" > 177 puts { > 178 else > 179 rm -f $(OBJDIR)$(DIRSEP)*.o *_.c $(APPNAME) VERSION.h > 180 rm -f translate makeheaders mkindex page_index.h headers} > 181 > 182 set hfiles {} > 183 foreach s [lsort $src] {lappend hfiles $s.h} > 184 puts "\trm -f $hfiles\n" > 185 puts { > 186 endif > 187 > 188 cleanall: > 189 ifeq ($(OPERATING_SYSTEM),windows) > 190 del $(OBJDIR)$(DIRSEP)*.o *_.c $(APPNAME) translate$(E) makeheaders$(E) > 191 del translate makeheaders mkindex page_index.h headers} > 192 set hfiles {} > 193 foreach s [lsort $src] {lappend hfiles $s.h} > 194 puts "\tdel $hfiles\n" > 195 puts { > 196 else > 197 rm -f $(OBJDIR)$(DIRSEP)*.o *_.c $(APPNAME) translate$(E) makeheaders$(E 162 rm -f translate makeheaders mkindex page_index.h headers} 198 rm -f translate makeheaders mkindex page_index.h headers} 163 199 164 set hfiles {} 200 set hfiles {} 165 foreach s [lsort $src] {lappend hfiles $s.h} 201 foreach s [lsort $src] {lappend hfiles $s.h} 166 puts "\trm -f $hfiles\n" 202 puts "\trm -f $hfiles\n" > 203 puts { > 204 endif} 167 205 168 set mhargs {} 206 set mhargs {} 169 foreach s [lsort $src] { 207 foreach s [lsort $src] { 170 append mhargs " ${s}_.c:$s.h" 208 append mhargs " ${s}_.c:$s.h" 171 set extra_h($s) {} 209 set extra_h($s) {} 172 } 210 } 173 append mhargs " \$(SRCDIR)/sqlite3.h" | 211 append mhargs " \$(SRCDIR)\$(DIRSEP)sqlite3.h" 174 append mhargs " \$(SRCDIR)/th.h" | 212 append mhargs " \$(SRCDIR)\$(DIRSEP)th.h" 175 append mhargs " VERSION.h" 213 append mhargs " VERSION.h" 176 puts "page_index.h: \$(TRANS_SRC) mkindex" 214 puts "page_index.h: \$(TRANS_SRC) mkindex" 177 puts "\t./mkindex \$(TRANS_SRC) >$@" | 215 puts "\t.\$(DIRSEP)mkindex \$(TRANS_SRC) >$@" 178 puts "headers:\tpage_index.h makeheaders VERSION.h" 216 puts "headers:\tpage_index.h makeheaders VERSION.h" 179 puts "\t./makeheaders $mhargs" | 217 puts "\t.\$(DIRSEP)makeheaders $mhargs" 180 puts "\ttouch headers" 218 puts "\ttouch headers" 181 puts "headers: Makefile" 219 puts "headers: Makefile" 182 puts "Makefile:" 220 puts "Makefile:" 183 set extra_h(main) page_index.h 221 set extra_h(main) page_index.h 184 222 185 foreach s [lsort $src] { 223 foreach s [lsort $src] { 186 puts "${s}_.c:\t\$(SRCDIR)/$s.c translate" | 224 puts "${s}_.c:\t\$(SRCDIR)\$(DIRSEP)$s.c translate" 187 puts "\t./translate \$(SRCDIR)/$s.c >${s}_.c\n" | 225 puts "\t.\$(DIRSEP)translate \$(SRCDIR)\$(DIRSEP)$s.c >${s}_.c\n" 188 puts "\$(OBJDIR)/$s.o:\t${s}_.c $s.h $extra_h($s) \$(SRCDIR)/config.h" | 226 puts "\$(OBJDIR)\$(DIRSEP)$s.o:\t${s}_.c $s.h $extra_h($s) \$(SRCDIR)\$(DIRSEP 189 puts "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c ${s}_.c\n" | 227 puts "\t\$(XTCC) -o \$(OBJDIR)\$(DIRSEP)$s.o -c ${s}_.c\n" 190 puts "$s.h:\theaders" 228 puts "$s.h:\theaders" 191 # puts "\t./makeheaders $mhargs\n\ttouch headers\n" | 229 # puts "\t.\$(DIRSEP)makeheaders $mhargs\n\ttouch headers\n" 192 # puts "\t./makeheaders ${s}_.c:${s}.h\n" | 230 # puts "\t.\$(DIRSEP)makeheaders ${s}_.c:${s}.h\n" 193 } 231 } 194 232 195 233 196 puts "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c" | 234 puts "\$(OBJDIR)\$(DIRSEP)sqlite3.o:\t\$(SRCDIR)\$(DIRSEP)sqlite3.c" 197 set opt {-DSQLITE_OMIT_LOAD_EXTENSION=1} 235 set opt {-DSQLITE_OMIT_LOAD_EXTENSION=1} 198 append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4" 236 append opt " -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4" 199 #append opt " -DSQLITE_ENABLE_FTS3=1" 237 #append opt " -DSQLITE_ENABLE_FTS3=1" 200 append opt " -Dlocaltime=fossil_localtime" 238 append opt " -Dlocaltime=fossil_localtime" 201 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0" 239 append opt " -DSQLITE_ENABLE_LOCKING_STYLE=0" 202 puts "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" | 240 puts "\t\$(XTCC) $opt -c \$(SRCDIR)\$(DIRSEP)sqlite3.c -o \$(OBJDIR)\$(DIRSEP)sq 203 241 204 puts "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c" | 242 puts "\$(OBJDIR)\$(DIRSEP)th.o:\t\$(SRCDIR)\$(DIRSEP)th.c" 205 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" | 243 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)\$(DIRSEP)th.c -o \$(OBJDIR)\$(DIRSEP 206 244 207 puts "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c" | 245 puts "\$(OBJDIR)\$(DIRSEP)th_lang.o:\t\$(SRCDIR)\$(DIRSEP)th_lang.c" 208 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n" | 246 puts "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)\$(DIRSEP)th_lang.c -o \$(OBJDIR)\$(D