Fossil SCM
Fixed the builtin files generation broken by the previous checkin (moving makemake.tcl changed resolution of builtin file names) and disabled the glob -nocomplain flag which allowed that to silently fail. Moved src/sqlcompattest.c to tools/.
Commit
7271f223557195a378fc862e8608491d2dd16f340cee6ccdc4ed2d1f8174555c
Parent
a13ab011f40894d…
7 files changed
+1
-1
+63
-1
-41
+19
-3
+63
-1
+125
-1
M
auto.def
+1
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -186,11 +186,11 @@ | ||
| 186 | 186 | # passes MINIMUM_SQLITE_VERSION set at the top of this file to sqlcompttest.c |
| 187 | 187 | # |
| 188 | 188 | set cmdline {} |
| 189 | 189 | lappend cmdline {*}[get-define CCACHE] |
| 190 | 190 | lappend cmdline {*}[get-define CC] {*}[get-define CFLAGS] |
| 191 | - lappend cmdline $::autosetup(dir)/../src/sqlcompattest.c -o conftest__ | |
| 191 | + lappend cmdline $::autosetup(dir)/../tools/sqlcompattest.c -o conftest__ | |
| 192 | 192 | lappend cmdline {*}[get-define LDFLAGS] |
| 193 | 193 | lappend cmdline {*}[get-define LIBS] |
| 194 | 194 | set sqlite-version [string cat "-D MINIMUM_SQLITE_VERSION=" [get-define MINIMUM_SQLITE_VERSION]] |
| 195 | 195 | lappend cmdline {*}[set sqlite-version] |
| 196 | 196 | set ok 1 |
| 197 | 197 |
| --- auto.def | |
| +++ auto.def | |
| @@ -186,11 +186,11 @@ | |
| 186 | # passes MINIMUM_SQLITE_VERSION set at the top of this file to sqlcompttest.c |
| 187 | # |
| 188 | set cmdline {} |
| 189 | lappend cmdline {*}[get-define CCACHE] |
| 190 | lappend cmdline {*}[get-define CC] {*}[get-define CFLAGS] |
| 191 | lappend cmdline $::autosetup(dir)/../src/sqlcompattest.c -o conftest__ |
| 192 | lappend cmdline {*}[get-define LDFLAGS] |
| 193 | lappend cmdline {*}[get-define LIBS] |
| 194 | set sqlite-version [string cat "-D MINIMUM_SQLITE_VERSION=" [get-define MINIMUM_SQLITE_VERSION]] |
| 195 | lappend cmdline {*}[set sqlite-version] |
| 196 | set ok 1 |
| 197 |
| --- auto.def | |
| +++ auto.def | |
| @@ -186,11 +186,11 @@ | |
| 186 | # passes MINIMUM_SQLITE_VERSION set at the top of this file to sqlcompttest.c |
| 187 | # |
| 188 | set cmdline {} |
| 189 | lappend cmdline {*}[get-define CCACHE] |
| 190 | lappend cmdline {*}[get-define CC] {*}[get-define CFLAGS] |
| 191 | lappend cmdline $::autosetup(dir)/../tools/sqlcompattest.c -o conftest__ |
| 192 | lappend cmdline {*}[get-define LDFLAGS] |
| 193 | lappend cmdline {*}[get-define LIBS] |
| 194 | set sqlite-version [string cat "-D MINIMUM_SQLITE_VERSION=" [get-define MINIMUM_SQLITE_VERSION]] |
| 195 | lappend cmdline {*}[set sqlite-version] |
| 196 | set ok 1 |
| 197 |
+63
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -208,11 +208,73 @@ | ||
| 208 | 208 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 209 | 209 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 210 | 210 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 211 | 211 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 212 | 212 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 213 | - $(SRCDIR)/../skins/xekri/header.txt | |
| 213 | + $(SRCDIR)/../skins/xekri/header.txt \ | |
| 214 | + $(SRCDIR)/accordion.js \ | |
| 215 | + $(SRCDIR)/alerts/bflat2.wav \ | |
| 216 | + $(SRCDIR)/alerts/bflat3.wav \ | |
| 217 | + $(SRCDIR)/alerts/bloop.wav \ | |
| 218 | + $(SRCDIR)/alerts/plunk.wav \ | |
| 219 | + $(SRCDIR)/ci_edit.js \ | |
| 220 | + $(SRCDIR)/copybtn.js \ | |
| 221 | + $(SRCDIR)/default.css \ | |
| 222 | + $(SRCDIR)/diff.js \ | |
| 223 | + $(SRCDIR)/diff.tcl \ | |
| 224 | + $(SRCDIR)/forum.js \ | |
| 225 | + $(SRCDIR)/fossil.bootstrap.js \ | |
| 226 | + $(SRCDIR)/fossil.confirmer.js \ | |
| 227 | + $(SRCDIR)/fossil.copybutton.js \ | |
| 228 | + $(SRCDIR)/fossil.diff.js \ | |
| 229 | + $(SRCDIR)/fossil.dom.js \ | |
| 230 | + $(SRCDIR)/fossil.fetch.js \ | |
| 231 | + $(SRCDIR)/fossil.numbered-lines.js \ | |
| 232 | + $(SRCDIR)/fossil.page.brlist.js \ | |
| 233 | + $(SRCDIR)/fossil.page.chat.js \ | |
| 234 | + $(SRCDIR)/fossil.page.fileedit.js \ | |
| 235 | + $(SRCDIR)/fossil.page.forumpost.js \ | |
| 236 | + $(SRCDIR)/fossil.page.pikchrshow.js \ | |
| 237 | + $(SRCDIR)/fossil.page.whistory.js \ | |
| 238 | + $(SRCDIR)/fossil.page.wikiedit.js \ | |
| 239 | + $(SRCDIR)/fossil.pikchr.js \ | |
| 240 | + $(SRCDIR)/fossil.popupwidget.js \ | |
| 241 | + $(SRCDIR)/fossil.storage.js \ | |
| 242 | + $(SRCDIR)/fossil.tabs.js \ | |
| 243 | + $(SRCDIR)/fossil.wikiedit-wysiwyg.js \ | |
| 244 | + $(SRCDIR)/graph.js \ | |
| 245 | + $(SRCDIR)/hbmenu.js \ | |
| 246 | + $(SRCDIR)/href.js \ | |
| 247 | + $(SRCDIR)/login.js \ | |
| 248 | + $(SRCDIR)/markdown.md \ | |
| 249 | + $(SRCDIR)/menu.js \ | |
| 250 | + $(SRCDIR)/scroll.js \ | |
| 251 | + $(SRCDIR)/skin.js \ | |
| 252 | + $(SRCDIR)/sorttable.js \ | |
| 253 | + $(SRCDIR)/sounds/0.wav \ | |
| 254 | + $(SRCDIR)/sounds/1.wav \ | |
| 255 | + $(SRCDIR)/sounds/2.wav \ | |
| 256 | + $(SRCDIR)/sounds/3.wav \ | |
| 257 | + $(SRCDIR)/sounds/4.wav \ | |
| 258 | + $(SRCDIR)/sounds/5.wav \ | |
| 259 | + $(SRCDIR)/sounds/6.wav \ | |
| 260 | + $(SRCDIR)/sounds/7.wav \ | |
| 261 | + $(SRCDIR)/sounds/8.wav \ | |
| 262 | + $(SRCDIR)/sounds/9.wav \ | |
| 263 | + $(SRCDIR)/sounds/a.wav \ | |
| 264 | + $(SRCDIR)/sounds/b.wav \ | |
| 265 | + $(SRCDIR)/sounds/c.wav \ | |
| 266 | + $(SRCDIR)/sounds/d.wav \ | |
| 267 | + $(SRCDIR)/sounds/e.wav \ | |
| 268 | + $(SRCDIR)/sounds/f.wav \ | |
| 269 | + $(SRCDIR)/style.admin_log.css \ | |
| 270 | + $(SRCDIR)/style.chat.css \ | |
| 271 | + $(SRCDIR)/style.fileedit.css \ | |
| 272 | + $(SRCDIR)/style.wikiedit.css \ | |
| 273 | + $(SRCDIR)/tree.js \ | |
| 274 | + $(SRCDIR)/useredit.js \ | |
| 275 | + $(SRCDIR)/wiki.wiki | |
| 214 | 276 | |
| 215 | 277 | TRANS_SRC = \ |
| 216 | 278 | $(OBJDIR)/add_.c \ |
| 217 | 279 | $(OBJDIR)/ajax_.c \ |
| 218 | 280 | $(OBJDIR)/alerts_.c \ |
| 219 | 281 | |
| 220 | 282 | DELETED src/sqlcompattest.c |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -208,11 +208,73 @@ | |
| 208 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 209 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 210 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 211 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 212 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 213 | $(SRCDIR)/../skins/xekri/header.txt |
| 214 | |
| 215 | TRANS_SRC = \ |
| 216 | $(OBJDIR)/add_.c \ |
| 217 | $(OBJDIR)/ajax_.c \ |
| 218 | $(OBJDIR)/alerts_.c \ |
| 219 | |
| 220 | ELETED src/sqlcompattest.c |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -208,11 +208,73 @@ | |
| 208 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 209 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 210 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 211 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 212 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 213 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 214 | $(SRCDIR)/accordion.js \ |
| 215 | $(SRCDIR)/alerts/bflat2.wav \ |
| 216 | $(SRCDIR)/alerts/bflat3.wav \ |
| 217 | $(SRCDIR)/alerts/bloop.wav \ |
| 218 | $(SRCDIR)/alerts/plunk.wav \ |
| 219 | $(SRCDIR)/ci_edit.js \ |
| 220 | $(SRCDIR)/copybtn.js \ |
| 221 | $(SRCDIR)/default.css \ |
| 222 | $(SRCDIR)/diff.js \ |
| 223 | $(SRCDIR)/diff.tcl \ |
| 224 | $(SRCDIR)/forum.js \ |
| 225 | $(SRCDIR)/fossil.bootstrap.js \ |
| 226 | $(SRCDIR)/fossil.confirmer.js \ |
| 227 | $(SRCDIR)/fossil.copybutton.js \ |
| 228 | $(SRCDIR)/fossil.diff.js \ |
| 229 | $(SRCDIR)/fossil.dom.js \ |
| 230 | $(SRCDIR)/fossil.fetch.js \ |
| 231 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 232 | $(SRCDIR)/fossil.page.brlist.js \ |
| 233 | $(SRCDIR)/fossil.page.chat.js \ |
| 234 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 235 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 236 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 237 | $(SRCDIR)/fossil.page.whistory.js \ |
| 238 | $(SRCDIR)/fossil.page.wikiedit.js \ |
| 239 | $(SRCDIR)/fossil.pikchr.js \ |
| 240 | $(SRCDIR)/fossil.popupwidget.js \ |
| 241 | $(SRCDIR)/fossil.storage.js \ |
| 242 | $(SRCDIR)/fossil.tabs.js \ |
| 243 | $(SRCDIR)/fossil.wikiedit-wysiwyg.js \ |
| 244 | $(SRCDIR)/graph.js \ |
| 245 | $(SRCDIR)/hbmenu.js \ |
| 246 | $(SRCDIR)/href.js \ |
| 247 | $(SRCDIR)/login.js \ |
| 248 | $(SRCDIR)/markdown.md \ |
| 249 | $(SRCDIR)/menu.js \ |
| 250 | $(SRCDIR)/scroll.js \ |
| 251 | $(SRCDIR)/skin.js \ |
| 252 | $(SRCDIR)/sorttable.js \ |
| 253 | $(SRCDIR)/sounds/0.wav \ |
| 254 | $(SRCDIR)/sounds/1.wav \ |
| 255 | $(SRCDIR)/sounds/2.wav \ |
| 256 | $(SRCDIR)/sounds/3.wav \ |
| 257 | $(SRCDIR)/sounds/4.wav \ |
| 258 | $(SRCDIR)/sounds/5.wav \ |
| 259 | $(SRCDIR)/sounds/6.wav \ |
| 260 | $(SRCDIR)/sounds/7.wav \ |
| 261 | $(SRCDIR)/sounds/8.wav \ |
| 262 | $(SRCDIR)/sounds/9.wav \ |
| 263 | $(SRCDIR)/sounds/a.wav \ |
| 264 | $(SRCDIR)/sounds/b.wav \ |
| 265 | $(SRCDIR)/sounds/c.wav \ |
| 266 | $(SRCDIR)/sounds/d.wav \ |
| 267 | $(SRCDIR)/sounds/e.wav \ |
| 268 | $(SRCDIR)/sounds/f.wav \ |
| 269 | $(SRCDIR)/style.admin_log.css \ |
| 270 | $(SRCDIR)/style.chat.css \ |
| 271 | $(SRCDIR)/style.fileedit.css \ |
| 272 | $(SRCDIR)/style.wikiedit.css \ |
| 273 | $(SRCDIR)/tree.js \ |
| 274 | $(SRCDIR)/useredit.js \ |
| 275 | $(SRCDIR)/wiki.wiki |
| 276 | |
| 277 | TRANS_SRC = \ |
| 278 | $(OBJDIR)/add_.c \ |
| 279 | $(OBJDIR)/ajax_.c \ |
| 280 | $(OBJDIR)/alerts_.c \ |
| 281 | |
| 282 | ELETED src/sqlcompattest.c |
D
src/sqlcompattest.c
-41
| --- a/src/sqlcompattest.c | ||
| +++ b/src/sqlcompattest.c | ||
| @@ -1,41 +0,0 @@ | ||
| 1 | -/* | |
| 2 | -** Copyright (c) 201/* | |
| 3 | -** Copyright (c) 2019 D. Richard Hipp | |
| 4 | -** | |
| 5 | -** This program is free software; you can redistribute it and/or | |
| 6 | -** modify it under the terms of the Simplified BSD License (also | |
| 7 | -** known as the "2-Clause License" or "FreeBSD License".) | |
| 8 | -** | |
| 9 | -** This program is distributed in the hope that it will be useful, | |
| 10 | -** but without any warranty; without even the implied warranty of | |
| 11 | -** merchantability or fitness for a particular purpose. | |
| 12 | -** | |
| 13 | -** Author contact information: | |
| 14 | -** [email protected] | |
| 15 | -** http://www.hwaci.com/drh/ | |
| 16 | -** | |
| 17 | -********************d Hipp | |
| 18 | -** | |
| 19 | -** This program is free software; you can redistribute it and/or | |
| 20 | -** modify it u. It is called from | |
| 21 | -** auto.died BSD License (also | |
| 22 | -** known as the "2-Clause License" or "FreeBSD License".) | |
| 23 | -** | |
| 24 | -** This program is distributed in the hope that it will be useful, | |
| 25 | -** but without any warranty; without even the implied warope that it will be useful, | |
| 26 | -** but without any warranty; without eveThis must be compiled with -D MINIMUM_SQLITE_VERSION set in auto.deflied warope that it will be useful, | |
| 27 | -** but without any warranty; without eve#include <string | |
| 28 | -#if !defined(MINIMUM_SQLITE_VERSION) | |
| 29 | -#error "Must set -DMINIMUM_SQLITE_VERSION=nn.nn.nn in auto.def" | |
| 30 | -#endif | |
| 31 | - | |
| 32 | -#define QUOTE(VAL) #VAL | |
| 33 | -#define STR(MACRO_VAL) QUOTE(MACRO_VAL) | |
| 34 | - | |
| 35 | - char zMinimumVersionNumber[8]="nn.nn.nn"; | |
| 36 | - strncpy((char *)&zMinimumVersionNumber,STR(MINIMUM_SQLITE_VERSION),sizeof(zMinimumVersionNumber)); | |
| 37 | - | |
| 38 | - long major, minor, release, version; | |
| 39 | - sscanf(zMinimumVersionNumber, "%li.%li.%li", &major, &minor, &release); | |
| 40 | - version=(major*1000000)+(minor*1000)+release; | |
| 41 | -versionsystem%s or later, consider remov |
| --- a/src/sqlcompattest.c | |
| +++ b/src/sqlcompattest.c | |
| @@ -1,41 +0,0 @@ | |
| 1 | /* |
| 2 | ** Copyright (c) 201/* |
| 3 | ** Copyright (c) 2019 D. Richard Hipp |
| 4 | ** |
| 5 | ** This program is free software; you can redistribute it and/or |
| 6 | ** modify it under the terms of the Simplified BSD License (also |
| 7 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 8 | ** |
| 9 | ** This program is distributed in the hope that it will be useful, |
| 10 | ** but without any warranty; without even the implied warranty of |
| 11 | ** merchantability or fitness for a particular purpose. |
| 12 | ** |
| 13 | ** Author contact information: |
| 14 | ** [email protected] |
| 15 | ** http://www.hwaci.com/drh/ |
| 16 | ** |
| 17 | ********************d Hipp |
| 18 | ** |
| 19 | ** This program is free software; you can redistribute it and/or |
| 20 | ** modify it u. It is called from |
| 21 | ** auto.died BSD License (also |
| 22 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 23 | ** |
| 24 | ** This program is distributed in the hope that it will be useful, |
| 25 | ** but without any warranty; without even the implied warope that it will be useful, |
| 26 | ** but without any warranty; without eveThis must be compiled with -D MINIMUM_SQLITE_VERSION set in auto.deflied warope that it will be useful, |
| 27 | ** but without any warranty; without eve#include <string |
| 28 | #if !defined(MINIMUM_SQLITE_VERSION) |
| 29 | #error "Must set -DMINIMUM_SQLITE_VERSION=nn.nn.nn in auto.def" |
| 30 | #endif |
| 31 | |
| 32 | #define QUOTE(VAL) #VAL |
| 33 | #define STR(MACRO_VAL) QUOTE(MACRO_VAL) |
| 34 | |
| 35 | char zMinimumVersionNumber[8]="nn.nn.nn"; |
| 36 | strncpy((char *)&zMinimumVersionNumber,STR(MINIMUM_SQLITE_VERSION),sizeof(zMinimumVersionNumber)); |
| 37 | |
| 38 | long major, minor, release, version; |
| 39 | sscanf(zMinimumVersionNumber, "%li.%li.%li", &major, &minor, &release); |
| 40 | version=(major*1000000)+(minor*1000)+release; |
| 41 | versionsystem%s or later, consider remov |
| --- a/src/sqlcompattest.c | |
| +++ b/src/sqlcompattest.c | |
| @@ -1,41 +0,0 @@ | |
+19
-3
| --- tools/makemake.tcl | ||
| +++ tools/makemake.tcl | ||
| @@ -1,8 +1,10 @@ | ||
| 1 | 1 | #!/usr/bin/tclsh |
| 2 | 2 | # |
| 3 | 3 | # ### Run this Tcl script EVERY time you modify it in any way! ### |
| 4 | +# ### It must be run from the directory it lives in so that ### | |
| 5 | +# ### directories resolve properly! ### | |
| 4 | 6 | # |
| 5 | 7 | # This Tcl script generates make files for various platforms. The makefiles |
| 6 | 8 | # then need to be committed. |
| 7 | 9 | # |
| 8 | 10 | # If you modify this file then: |
| @@ -27,18 +29,25 @@ | ||
| 27 | 29 | # to change. After modification, go to step 1 above. |
| 28 | 30 | # |
| 29 | 31 | # Delete unused source files in the "src" variable, then go to step 1 above. |
| 30 | 32 | # |
| 31 | 33 | ############################################################################# |
| 34 | + | |
| 35 | +# $srcDir is used to set the target source dir in several places. Not | |
| 36 | +# all code-generation bits use $srcDir and instead hard-code, so | |
| 37 | +# replacing it only here (should it ever changes) is not sufficient. | |
| 38 | +# | |
| 39 | +set srcDir ../src | |
| 32 | 40 | |
| 33 | 41 | # Basenames of all source files that get preprocessed using |
| 34 | 42 | # "translate" and "makeheaders". To add new C-language source files to the |
| 35 | 43 | # project, simply add the basename to this list and rerun this script. |
| 36 | 44 | # |
| 37 | 45 | # Set the separate extra_files variable further down for how to add non-C |
| 38 | 46 | # files, such as string and BLOB resources. |
| 39 | 47 | # |
| 48 | + | |
| 40 | 49 | set src { |
| 41 | 50 | add |
| 42 | 51 | ajax |
| 43 | 52 | alerts |
| 44 | 53 | allrepo |
| @@ -187,11 +196,12 @@ | ||
| 187 | 196 | zip |
| 188 | 197 | http_ssl |
| 189 | 198 | } |
| 190 | 199 | |
| 191 | 200 | # Additional resource files that get built into the executable. |
| 192 | -# | |
| 201 | +# These paths are all resolved from the src/ directory, so must | |
| 202 | +# be relative to that. | |
| 193 | 203 | set extra_files { |
| 194 | 204 | diff.tcl |
| 195 | 205 | markdown.md |
| 196 | 206 | wiki.wiki |
| 197 | 207 | *.js |
| @@ -284,22 +294,28 @@ | ||
| 284 | 294 | } |
| 285 | 295 | |
| 286 | 296 | # Expand any wildcards in "extra_files" |
| 287 | 297 | set new_extra_files {} |
| 288 | 298 | foreach file $extra_files { |
| 289 | - foreach x [glob -nocomplain $file] { | |
| 299 | + # we need $file to resolve from $srcDir, but simply prepending | |
| 300 | + # $srcDir to each name breaks how the names are stringified and | |
| 301 | + # looked up from C. | |
| 302 | + set cwd [pwd] | |
| 303 | + cd $srcDir | |
| 304 | + foreach x [glob $file] { # -nocomplain flag? | |
| 290 | 305 | lappend new_extra_files $x |
| 291 | 306 | } |
| 307 | + cd $cwd | |
| 292 | 308 | } |
| 293 | 309 | set extra_files $new_extra_files |
| 294 | 310 | |
| 295 | 311 | ############################################################################## |
| 296 | 312 | ############################################################################## |
| 297 | 313 | ############################################################################## |
| 298 | 314 | # Start by generating the "main.mk" makefile used for all unix systems. |
| 299 | 315 | # |
| 300 | -set mainMk ../src/main.mk | |
| 316 | +set mainMk $srcDir/main.mk | |
| 301 | 317 | puts "building $mainMk" |
| 302 | 318 | set output_file [open $mainMk w] |
| 303 | 319 | fconfigure $output_file -translation binary |
| 304 | 320 | |
| 305 | 321 | writeln {# |
| 306 | 322 | |
| 307 | 323 | ADDED tools/sqlcompattest.c |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -1,8 +1,10 @@ | |
| 1 | #!/usr/bin/tclsh |
| 2 | # |
| 3 | # ### Run this Tcl script EVERY time you modify it in any way! ### |
| 4 | # |
| 5 | # This Tcl script generates make files for various platforms. The makefiles |
| 6 | # then need to be committed. |
| 7 | # |
| 8 | # If you modify this file then: |
| @@ -27,18 +29,25 @@ | |
| 27 | # to change. After modification, go to step 1 above. |
| 28 | # |
| 29 | # Delete unused source files in the "src" variable, then go to step 1 above. |
| 30 | # |
| 31 | ############################################################################# |
| 32 | |
| 33 | # Basenames of all source files that get preprocessed using |
| 34 | # "translate" and "makeheaders". To add new C-language source files to the |
| 35 | # project, simply add the basename to this list and rerun this script. |
| 36 | # |
| 37 | # Set the separate extra_files variable further down for how to add non-C |
| 38 | # files, such as string and BLOB resources. |
| 39 | # |
| 40 | set src { |
| 41 | add |
| 42 | ajax |
| 43 | alerts |
| 44 | allrepo |
| @@ -187,11 +196,12 @@ | |
| 187 | zip |
| 188 | http_ssl |
| 189 | } |
| 190 | |
| 191 | # Additional resource files that get built into the executable. |
| 192 | # |
| 193 | set extra_files { |
| 194 | diff.tcl |
| 195 | markdown.md |
| 196 | wiki.wiki |
| 197 | *.js |
| @@ -284,22 +294,28 @@ | |
| 284 | } |
| 285 | |
| 286 | # Expand any wildcards in "extra_files" |
| 287 | set new_extra_files {} |
| 288 | foreach file $extra_files { |
| 289 | foreach x [glob -nocomplain $file] { |
| 290 | lappend new_extra_files $x |
| 291 | } |
| 292 | } |
| 293 | set extra_files $new_extra_files |
| 294 | |
| 295 | ############################################################################## |
| 296 | ############################################################################## |
| 297 | ############################################################################## |
| 298 | # Start by generating the "main.mk" makefile used for all unix systems. |
| 299 | # |
| 300 | set mainMk ../src/main.mk |
| 301 | puts "building $mainMk" |
| 302 | set output_file [open $mainMk w] |
| 303 | fconfigure $output_file -translation binary |
| 304 | |
| 305 | writeln {# |
| 306 | |
| 307 | DDED tools/sqlcompattest.c |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -1,8 +1,10 @@ | |
| 1 | #!/usr/bin/tclsh |
| 2 | # |
| 3 | # ### Run this Tcl script EVERY time you modify it in any way! ### |
| 4 | # ### It must be run from the directory it lives in so that ### |
| 5 | # ### directories resolve properly! ### |
| 6 | # |
| 7 | # This Tcl script generates make files for various platforms. The makefiles |
| 8 | # then need to be committed. |
| 9 | # |
| 10 | # If you modify this file then: |
| @@ -27,18 +29,25 @@ | |
| 29 | # to change. After modification, go to step 1 above. |
| 30 | # |
| 31 | # Delete unused source files in the "src" variable, then go to step 1 above. |
| 32 | # |
| 33 | ############################################################################# |
| 34 | |
| 35 | # $srcDir is used to set the target source dir in several places. Not |
| 36 | # all code-generation bits use $srcDir and instead hard-code, so |
| 37 | # replacing it only here (should it ever changes) is not sufficient. |
| 38 | # |
| 39 | set srcDir ../src |
| 40 | |
| 41 | # Basenames of all source files that get preprocessed using |
| 42 | # "translate" and "makeheaders". To add new C-language source files to the |
| 43 | # project, simply add the basename to this list and rerun this script. |
| 44 | # |
| 45 | # Set the separate extra_files variable further down for how to add non-C |
| 46 | # files, such as string and BLOB resources. |
| 47 | # |
| 48 | |
| 49 | set src { |
| 50 | add |
| 51 | ajax |
| 52 | alerts |
| 53 | allrepo |
| @@ -187,11 +196,12 @@ | |
| 196 | zip |
| 197 | http_ssl |
| 198 | } |
| 199 | |
| 200 | # Additional resource files that get built into the executable. |
| 201 | # These paths are all resolved from the src/ directory, so must |
| 202 | # be relative to that. |
| 203 | set extra_files { |
| 204 | diff.tcl |
| 205 | markdown.md |
| 206 | wiki.wiki |
| 207 | *.js |
| @@ -284,22 +294,28 @@ | |
| 294 | } |
| 295 | |
| 296 | # Expand any wildcards in "extra_files" |
| 297 | set new_extra_files {} |
| 298 | foreach file $extra_files { |
| 299 | # we need $file to resolve from $srcDir, but simply prepending |
| 300 | # $srcDir to each name breaks how the names are stringified and |
| 301 | # looked up from C. |
| 302 | set cwd [pwd] |
| 303 | cd $srcDir |
| 304 | foreach x [glob $file] { # -nocomplain flag? |
| 305 | lappend new_extra_files $x |
| 306 | } |
| 307 | cd $cwd |
| 308 | } |
| 309 | set extra_files $new_extra_files |
| 310 | |
| 311 | ############################################################################## |
| 312 | ############################################################################## |
| 313 | ############################################################################## |
| 314 | # Start by generating the "main.mk" makefile used for all unix systems. |
| 315 | # |
| 316 | set mainMk $srcDir/main.mk |
| 317 | puts "building $mainMk" |
| 318 | set output_file [open $mainMk w] |
| 319 | fconfigure $output_file -translation binary |
| 320 | |
| 321 | writeln {# |
| 322 | |
| 323 | DDED tools/sqlcompattest.c |
No diff available
+63
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -617,11 +617,73 @@ | ||
| 617 | 617 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 618 | 618 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 619 | 619 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 620 | 620 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 621 | 621 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 622 | - $(SRCDIR)/../skins/xekri/header.txt | |
| 622 | + $(SRCDIR)/../skins/xekri/header.txt \ | |
| 623 | + $(SRCDIR)/accordion.js \ | |
| 624 | + $(SRCDIR)/alerts/bflat2.wav \ | |
| 625 | + $(SRCDIR)/alerts/bflat3.wav \ | |
| 626 | + $(SRCDIR)/alerts/bloop.wav \ | |
| 627 | + $(SRCDIR)/alerts/plunk.wav \ | |
| 628 | + $(SRCDIR)/ci_edit.js \ | |
| 629 | + $(SRCDIR)/copybtn.js \ | |
| 630 | + $(SRCDIR)/default.css \ | |
| 631 | + $(SRCDIR)/diff.js \ | |
| 632 | + $(SRCDIR)/diff.tcl \ | |
| 633 | + $(SRCDIR)/forum.js \ | |
| 634 | + $(SRCDIR)/fossil.bootstrap.js \ | |
| 635 | + $(SRCDIR)/fossil.confirmer.js \ | |
| 636 | + $(SRCDIR)/fossil.copybutton.js \ | |
| 637 | + $(SRCDIR)/fossil.diff.js \ | |
| 638 | + $(SRCDIR)/fossil.dom.js \ | |
| 639 | + $(SRCDIR)/fossil.fetch.js \ | |
| 640 | + $(SRCDIR)/fossil.numbered-lines.js \ | |
| 641 | + $(SRCDIR)/fossil.page.brlist.js \ | |
| 642 | + $(SRCDIR)/fossil.page.chat.js \ | |
| 643 | + $(SRCDIR)/fossil.page.fileedit.js \ | |
| 644 | + $(SRCDIR)/fossil.page.forumpost.js \ | |
| 645 | + $(SRCDIR)/fossil.page.pikchrshow.js \ | |
| 646 | + $(SRCDIR)/fossil.page.whistory.js \ | |
| 647 | + $(SRCDIR)/fossil.page.wikiedit.js \ | |
| 648 | + $(SRCDIR)/fossil.pikchr.js \ | |
| 649 | + $(SRCDIR)/fossil.popupwidget.js \ | |
| 650 | + $(SRCDIR)/fossil.storage.js \ | |
| 651 | + $(SRCDIR)/fossil.tabs.js \ | |
| 652 | + $(SRCDIR)/fossil.wikiedit-wysiwyg.js \ | |
| 653 | + $(SRCDIR)/graph.js \ | |
| 654 | + $(SRCDIR)/hbmenu.js \ | |
| 655 | + $(SRCDIR)/href.js \ | |
| 656 | + $(SRCDIR)/login.js \ | |
| 657 | + $(SRCDIR)/markdown.md \ | |
| 658 | + $(SRCDIR)/menu.js \ | |
| 659 | + $(SRCDIR)/scroll.js \ | |
| 660 | + $(SRCDIR)/skin.js \ | |
| 661 | + $(SRCDIR)/sorttable.js \ | |
| 662 | + $(SRCDIR)/sounds/0.wav \ | |
| 663 | + $(SRCDIR)/sounds/1.wav \ | |
| 664 | + $(SRCDIR)/sounds/2.wav \ | |
| 665 | + $(SRCDIR)/sounds/3.wav \ | |
| 666 | + $(SRCDIR)/sounds/4.wav \ | |
| 667 | + $(SRCDIR)/sounds/5.wav \ | |
| 668 | + $(SRCDIR)/sounds/6.wav \ | |
| 669 | + $(SRCDIR)/sounds/7.wav \ | |
| 670 | + $(SRCDIR)/sounds/8.wav \ | |
| 671 | + $(SRCDIR)/sounds/9.wav \ | |
| 672 | + $(SRCDIR)/sounds/a.wav \ | |
| 673 | + $(SRCDIR)/sounds/b.wav \ | |
| 674 | + $(SRCDIR)/sounds/c.wav \ | |
| 675 | + $(SRCDIR)/sounds/d.wav \ | |
| 676 | + $(SRCDIR)/sounds/e.wav \ | |
| 677 | + $(SRCDIR)/sounds/f.wav \ | |
| 678 | + $(SRCDIR)/style.admin_log.css \ | |
| 679 | + $(SRCDIR)/style.chat.css \ | |
| 680 | + $(SRCDIR)/style.fileedit.css \ | |
| 681 | + $(SRCDIR)/style.wikiedit.css \ | |
| 682 | + $(SRCDIR)/tree.js \ | |
| 683 | + $(SRCDIR)/useredit.js \ | |
| 684 | + $(SRCDIR)/wiki.wiki | |
| 623 | 685 | |
| 624 | 686 | TRANS_SRC = \ |
| 625 | 687 | $(OBJDIR)/add_.c \ |
| 626 | 688 | $(OBJDIR)/ajax_.c \ |
| 627 | 689 | $(OBJDIR)/alerts_.c \ |
| 628 | 690 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -617,11 +617,73 @@ | |
| 617 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 618 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 619 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 620 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 621 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 622 | $(SRCDIR)/../skins/xekri/header.txt |
| 623 | |
| 624 | TRANS_SRC = \ |
| 625 | $(OBJDIR)/add_.c \ |
| 626 | $(OBJDIR)/ajax_.c \ |
| 627 | $(OBJDIR)/alerts_.c \ |
| 628 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -617,11 +617,73 @@ | |
| 617 | $(SRCDIR)/../skins/plain_gray/footer.txt \ |
| 618 | $(SRCDIR)/../skins/plain_gray/header.txt \ |
| 619 | $(SRCDIR)/../skins/xekri/css.txt \ |
| 620 | $(SRCDIR)/../skins/xekri/details.txt \ |
| 621 | $(SRCDIR)/../skins/xekri/footer.txt \ |
| 622 | $(SRCDIR)/../skins/xekri/header.txt \ |
| 623 | $(SRCDIR)/accordion.js \ |
| 624 | $(SRCDIR)/alerts/bflat2.wav \ |
| 625 | $(SRCDIR)/alerts/bflat3.wav \ |
| 626 | $(SRCDIR)/alerts/bloop.wav \ |
| 627 | $(SRCDIR)/alerts/plunk.wav \ |
| 628 | $(SRCDIR)/ci_edit.js \ |
| 629 | $(SRCDIR)/copybtn.js \ |
| 630 | $(SRCDIR)/default.css \ |
| 631 | $(SRCDIR)/diff.js \ |
| 632 | $(SRCDIR)/diff.tcl \ |
| 633 | $(SRCDIR)/forum.js \ |
| 634 | $(SRCDIR)/fossil.bootstrap.js \ |
| 635 | $(SRCDIR)/fossil.confirmer.js \ |
| 636 | $(SRCDIR)/fossil.copybutton.js \ |
| 637 | $(SRCDIR)/fossil.diff.js \ |
| 638 | $(SRCDIR)/fossil.dom.js \ |
| 639 | $(SRCDIR)/fossil.fetch.js \ |
| 640 | $(SRCDIR)/fossil.numbered-lines.js \ |
| 641 | $(SRCDIR)/fossil.page.brlist.js \ |
| 642 | $(SRCDIR)/fossil.page.chat.js \ |
| 643 | $(SRCDIR)/fossil.page.fileedit.js \ |
| 644 | $(SRCDIR)/fossil.page.forumpost.js \ |
| 645 | $(SRCDIR)/fossil.page.pikchrshow.js \ |
| 646 | $(SRCDIR)/fossil.page.whistory.js \ |
| 647 | $(SRCDIR)/fossil.page.wikiedit.js \ |
| 648 | $(SRCDIR)/fossil.pikchr.js \ |
| 649 | $(SRCDIR)/fossil.popupwidget.js \ |
| 650 | $(SRCDIR)/fossil.storage.js \ |
| 651 | $(SRCDIR)/fossil.tabs.js \ |
| 652 | $(SRCDIR)/fossil.wikiedit-wysiwyg.js \ |
| 653 | $(SRCDIR)/graph.js \ |
| 654 | $(SRCDIR)/hbmenu.js \ |
| 655 | $(SRCDIR)/href.js \ |
| 656 | $(SRCDIR)/login.js \ |
| 657 | $(SRCDIR)/markdown.md \ |
| 658 | $(SRCDIR)/menu.js \ |
| 659 | $(SRCDIR)/scroll.js \ |
| 660 | $(SRCDIR)/skin.js \ |
| 661 | $(SRCDIR)/sorttable.js \ |
| 662 | $(SRCDIR)/sounds/0.wav \ |
| 663 | $(SRCDIR)/sounds/1.wav \ |
| 664 | $(SRCDIR)/sounds/2.wav \ |
| 665 | $(SRCDIR)/sounds/3.wav \ |
| 666 | $(SRCDIR)/sounds/4.wav \ |
| 667 | $(SRCDIR)/sounds/5.wav \ |
| 668 | $(SRCDIR)/sounds/6.wav \ |
| 669 | $(SRCDIR)/sounds/7.wav \ |
| 670 | $(SRCDIR)/sounds/8.wav \ |
| 671 | $(SRCDIR)/sounds/9.wav \ |
| 672 | $(SRCDIR)/sounds/a.wav \ |
| 673 | $(SRCDIR)/sounds/b.wav \ |
| 674 | $(SRCDIR)/sounds/c.wav \ |
| 675 | $(SRCDIR)/sounds/d.wav \ |
| 676 | $(SRCDIR)/sounds/e.wav \ |
| 677 | $(SRCDIR)/sounds/f.wav \ |
| 678 | $(SRCDIR)/style.admin_log.css \ |
| 679 | $(SRCDIR)/style.chat.css \ |
| 680 | $(SRCDIR)/style.fileedit.css \ |
| 681 | $(SRCDIR)/style.wikiedit.css \ |
| 682 | $(SRCDIR)/tree.js \ |
| 683 | $(SRCDIR)/useredit.js \ |
| 684 | $(SRCDIR)/wiki.wiki |
| 685 | |
| 686 | TRANS_SRC = \ |
| 687 | $(OBJDIR)/add_.c \ |
| 688 | $(OBJDIR)/ajax_.c \ |
| 689 | $(OBJDIR)/alerts_.c \ |
| 690 |
+125
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -559,11 +559,73 @@ | ||
| 559 | 559 | "$(SRCDIR)\..\skins\plain_gray\footer.txt" \ |
| 560 | 560 | "$(SRCDIR)\..\skins\plain_gray\header.txt" \ |
| 561 | 561 | "$(SRCDIR)\..\skins\xekri\css.txt" \ |
| 562 | 562 | "$(SRCDIR)\..\skins\xekri\details.txt" \ |
| 563 | 563 | "$(SRCDIR)\..\skins\xekri\footer.txt" \ |
| 564 | - "$(SRCDIR)\..\skins\xekri\header.txt" | |
| 564 | + "$(SRCDIR)\..\skins\xekri\header.txt" \ | |
| 565 | + "$(SRCDIR)\accordion.js" \ | |
| 566 | + "$(SRCDIR)\alerts\bflat2.wav" \ | |
| 567 | + "$(SRCDIR)\alerts\bflat3.wav" \ | |
| 568 | + "$(SRCDIR)\alerts\bloop.wav" \ | |
| 569 | + "$(SRCDIR)\alerts\plunk.wav" \ | |
| 570 | + "$(SRCDIR)\ci_edit.js" \ | |
| 571 | + "$(SRCDIR)\copybtn.js" \ | |
| 572 | + "$(SRCDIR)\default.css" \ | |
| 573 | + "$(SRCDIR)\diff.js" \ | |
| 574 | + "$(SRCDIR)\diff.tcl" \ | |
| 575 | + "$(SRCDIR)\forum.js" \ | |
| 576 | + "$(SRCDIR)\fossil.bootstrap.js" \ | |
| 577 | + "$(SRCDIR)\fossil.confirmer.js" \ | |
| 578 | + "$(SRCDIR)\fossil.copybutton.js" \ | |
| 579 | + "$(SRCDIR)\fossil.diff.js" \ | |
| 580 | + "$(SRCDIR)\fossil.dom.js" \ | |
| 581 | + "$(SRCDIR)\fossil.fetch.js" \ | |
| 582 | + "$(SRCDIR)\fossil.numbered-lines.js" \ | |
| 583 | + "$(SRCDIR)\fossil.page.brlist.js" \ | |
| 584 | + "$(SRCDIR)\fossil.page.chat.js" \ | |
| 585 | + "$(SRCDIR)\fossil.page.fileedit.js" \ | |
| 586 | + "$(SRCDIR)\fossil.page.forumpost.js" \ | |
| 587 | + "$(SRCDIR)\fossil.page.pikchrshow.js" \ | |
| 588 | + "$(SRCDIR)\fossil.page.whistory.js" \ | |
| 589 | + "$(SRCDIR)\fossil.page.wikiedit.js" \ | |
| 590 | + "$(SRCDIR)\fossil.pikchr.js" \ | |
| 591 | + "$(SRCDIR)\fossil.popupwidget.js" \ | |
| 592 | + "$(SRCDIR)\fossil.storage.js" \ | |
| 593 | + "$(SRCDIR)\fossil.tabs.js" \ | |
| 594 | + "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \ | |
| 595 | + "$(SRCDIR)\graph.js" \ | |
| 596 | + "$(SRCDIR)\hbmenu.js" \ | |
| 597 | + "$(SRCDIR)\href.js" \ | |
| 598 | + "$(SRCDIR)\login.js" \ | |
| 599 | + "$(SRCDIR)\markdown.md" \ | |
| 600 | + "$(SRCDIR)\menu.js" \ | |
| 601 | + "$(SRCDIR)\scroll.js" \ | |
| 602 | + "$(SRCDIR)\skin.js" \ | |
| 603 | + "$(SRCDIR)\sorttable.js" \ | |
| 604 | + "$(SRCDIR)\sounds\0.wav" \ | |
| 605 | + "$(SRCDIR)\sounds\1.wav" \ | |
| 606 | + "$(SRCDIR)\sounds\2.wav" \ | |
| 607 | + "$(SRCDIR)\sounds\3.wav" \ | |
| 608 | + "$(SRCDIR)\sounds\4.wav" \ | |
| 609 | + "$(SRCDIR)\sounds\5.wav" \ | |
| 610 | + "$(SRCDIR)\sounds\6.wav" \ | |
| 611 | + "$(SRCDIR)\sounds\7.wav" \ | |
| 612 | + "$(SRCDIR)\sounds\8.wav" \ | |
| 613 | + "$(SRCDIR)\sounds\9.wav" \ | |
| 614 | + "$(SRCDIR)\sounds\a.wav" \ | |
| 615 | + "$(SRCDIR)\sounds\b.wav" \ | |
| 616 | + "$(SRCDIR)\sounds\c.wav" \ | |
| 617 | + "$(SRCDIR)\sounds\d.wav" \ | |
| 618 | + "$(SRCDIR)\sounds\e.wav" \ | |
| 619 | + "$(SRCDIR)\sounds\f.wav" \ | |
| 620 | + "$(SRCDIR)\style.admin_log.css" \ | |
| 621 | + "$(SRCDIR)\style.chat.css" \ | |
| 622 | + "$(SRCDIR)\style.fileedit.css" \ | |
| 623 | + "$(SRCDIR)\style.wikiedit.css" \ | |
| 624 | + "$(SRCDIR)\tree.js" \ | |
| 625 | + "$(SRCDIR)\useredit.js" \ | |
| 626 | + "$(SRCDIR)\wiki.wiki" | |
| 565 | 627 | |
| 566 | 628 | OBJ = "$(OX)\add$O" \ |
| 567 | 629 | "$(OX)\ajax$O" \ |
| 568 | 630 | "$(OX)\alerts$O" \ |
| 569 | 631 | "$(OX)\allrepo$O" \ |
| @@ -1107,10 +1169,72 @@ | ||
| 1107 | 1169 | echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@ |
| 1108 | 1170 | echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@ |
| 1109 | 1171 | echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@ |
| 1110 | 1172 | echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@ |
| 1111 | 1173 | echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@ |
| 1174 | + echo "$(SRCDIR)\accordion.js" >> $@ | |
| 1175 | + echo "$(SRCDIR)\alerts/bflat2.wav" >> $@ | |
| 1176 | + echo "$(SRCDIR)\alerts/bflat3.wav" >> $@ | |
| 1177 | + echo "$(SRCDIR)\alerts/bloop.wav" >> $@ | |
| 1178 | + echo "$(SRCDIR)\alerts/plunk.wav" >> $@ | |
| 1179 | + echo "$(SRCDIR)\ci_edit.js" >> $@ | |
| 1180 | + echo "$(SRCDIR)\copybtn.js" >> $@ | |
| 1181 | + echo "$(SRCDIR)\default.css" >> $@ | |
| 1182 | + echo "$(SRCDIR)\diff.js" >> $@ | |
| 1183 | + echo "$(SRCDIR)\diff.tcl" >> $@ | |
| 1184 | + echo "$(SRCDIR)\forum.js" >> $@ | |
| 1185 | + echo "$(SRCDIR)\fossil.bootstrap.js" >> $@ | |
| 1186 | + echo "$(SRCDIR)\fossil.confirmer.js" >> $@ | |
| 1187 | + echo "$(SRCDIR)\fossil.copybutton.js" >> $@ | |
| 1188 | + echo "$(SRCDIR)\fossil.diff.js" >> $@ | |
| 1189 | + echo "$(SRCDIR)\fossil.dom.js" >> $@ | |
| 1190 | + echo "$(SRCDIR)\fossil.fetch.js" >> $@ | |
| 1191 | + echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@ | |
| 1192 | + echo "$(SRCDIR)\fossil.page.brlist.js" >> $@ | |
| 1193 | + echo "$(SRCDIR)\fossil.page.chat.js" >> $@ | |
| 1194 | + echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@ | |
| 1195 | + echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@ | |
| 1196 | + echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@ | |
| 1197 | + echo "$(SRCDIR)\fossil.page.whistory.js" >> $@ | |
| 1198 | + echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@ | |
| 1199 | + echo "$(SRCDIR)\fossil.pikchr.js" >> $@ | |
| 1200 | + echo "$(SRCDIR)\fossil.popupwidget.js" >> $@ | |
| 1201 | + echo "$(SRCDIR)\fossil.storage.js" >> $@ | |
| 1202 | + echo "$(SRCDIR)\fossil.tabs.js" >> $@ | |
| 1203 | + echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@ | |
| 1204 | + echo "$(SRCDIR)\graph.js" >> $@ | |
| 1205 | + echo "$(SRCDIR)\hbmenu.js" >> $@ | |
| 1206 | + echo "$(SRCDIR)\href.js" >> $@ | |
| 1207 | + echo "$(SRCDIR)\login.js" >> $@ | |
| 1208 | + echo "$(SRCDIR)\markdown.md" >> $@ | |
| 1209 | + echo "$(SRCDIR)\menu.js" >> $@ | |
| 1210 | + echo "$(SRCDIR)\scroll.js" >> $@ | |
| 1211 | + echo "$(SRCDIR)\skin.js" >> $@ | |
| 1212 | + echo "$(SRCDIR)\sorttable.js" >> $@ | |
| 1213 | + echo "$(SRCDIR)\sounds/0.wav" >> $@ | |
| 1214 | + echo "$(SRCDIR)\sounds/1.wav" >> $@ | |
| 1215 | + echo "$(SRCDIR)\sounds/2.wav" >> $@ | |
| 1216 | + echo "$(SRCDIR)\sounds/3.wav" >> $@ | |
| 1217 | + echo "$(SRCDIR)\sounds/4.wav" >> $@ | |
| 1218 | + echo "$(SRCDIR)\sounds/5.wav" >> $@ | |
| 1219 | + echo "$(SRCDIR)\sounds/6.wav" >> $@ | |
| 1220 | + echo "$(SRCDIR)\sounds/7.wav" >> $@ | |
| 1221 | + echo "$(SRCDIR)\sounds/8.wav" >> $@ | |
| 1222 | + echo "$(SRCDIR)\sounds/9.wav" >> $@ | |
| 1223 | + echo "$(SRCDIR)\sounds/a.wav" >> $@ | |
| 1224 | + echo "$(SRCDIR)\sounds/b.wav" >> $@ | |
| 1225 | + echo "$(SRCDIR)\sounds/c.wav" >> $@ | |
| 1226 | + echo "$(SRCDIR)\sounds/d.wav" >> $@ | |
| 1227 | + echo "$(SRCDIR)\sounds/e.wav" >> $@ | |
| 1228 | + echo "$(SRCDIR)\sounds/f.wav" >> $@ | |
| 1229 | + echo "$(SRCDIR)\style.admin_log.css" >> $@ | |
| 1230 | + echo "$(SRCDIR)\style.chat.css" >> $@ | |
| 1231 | + echo "$(SRCDIR)\style.fileedit.css" >> $@ | |
| 1232 | + echo "$(SRCDIR)\style.wikiedit.css" >> $@ | |
| 1233 | + echo "$(SRCDIR)\tree.js" >> $@ | |
| 1234 | + echo "$(SRCDIR)\useredit.js" >> $@ | |
| 1235 | + echo "$(SRCDIR)\wiki.wiki" >> $@ | |
| 1112 | 1236 | |
| 1113 | 1237 | "$(OX)\add$O" : "$(OX)\add_.c" "$(OX)\add.h" |
| 1114 | 1238 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add_.c" |
| 1115 | 1239 | |
| 1116 | 1240 | "$(OX)\add_.c" : "$(SRCDIR)\add.c" |
| 1117 | 1241 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -559,11 +559,73 @@ | |
| 559 | "$(SRCDIR)\..\skins\plain_gray\footer.txt" \ |
| 560 | "$(SRCDIR)\..\skins\plain_gray\header.txt" \ |
| 561 | "$(SRCDIR)\..\skins\xekri\css.txt" \ |
| 562 | "$(SRCDIR)\..\skins\xekri\details.txt" \ |
| 563 | "$(SRCDIR)\..\skins\xekri\footer.txt" \ |
| 564 | "$(SRCDIR)\..\skins\xekri\header.txt" |
| 565 | |
| 566 | OBJ = "$(OX)\add$O" \ |
| 567 | "$(OX)\ajax$O" \ |
| 568 | "$(OX)\alerts$O" \ |
| 569 | "$(OX)\allrepo$O" \ |
| @@ -1107,10 +1169,72 @@ | |
| 1107 | echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@ |
| 1108 | echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@ |
| 1109 | echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@ |
| 1110 | echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@ |
| 1111 | echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@ |
| 1112 | |
| 1113 | "$(OX)\add$O" : "$(OX)\add_.c" "$(OX)\add.h" |
| 1114 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add_.c" |
| 1115 | |
| 1116 | "$(OX)\add_.c" : "$(SRCDIR)\add.c" |
| 1117 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -559,11 +559,73 @@ | |
| 559 | "$(SRCDIR)\..\skins\plain_gray\footer.txt" \ |
| 560 | "$(SRCDIR)\..\skins\plain_gray\header.txt" \ |
| 561 | "$(SRCDIR)\..\skins\xekri\css.txt" \ |
| 562 | "$(SRCDIR)\..\skins\xekri\details.txt" \ |
| 563 | "$(SRCDIR)\..\skins\xekri\footer.txt" \ |
| 564 | "$(SRCDIR)\..\skins\xekri\header.txt" \ |
| 565 | "$(SRCDIR)\accordion.js" \ |
| 566 | "$(SRCDIR)\alerts\bflat2.wav" \ |
| 567 | "$(SRCDIR)\alerts\bflat3.wav" \ |
| 568 | "$(SRCDIR)\alerts\bloop.wav" \ |
| 569 | "$(SRCDIR)\alerts\plunk.wav" \ |
| 570 | "$(SRCDIR)\ci_edit.js" \ |
| 571 | "$(SRCDIR)\copybtn.js" \ |
| 572 | "$(SRCDIR)\default.css" \ |
| 573 | "$(SRCDIR)\diff.js" \ |
| 574 | "$(SRCDIR)\diff.tcl" \ |
| 575 | "$(SRCDIR)\forum.js" \ |
| 576 | "$(SRCDIR)\fossil.bootstrap.js" \ |
| 577 | "$(SRCDIR)\fossil.confirmer.js" \ |
| 578 | "$(SRCDIR)\fossil.copybutton.js" \ |
| 579 | "$(SRCDIR)\fossil.diff.js" \ |
| 580 | "$(SRCDIR)\fossil.dom.js" \ |
| 581 | "$(SRCDIR)\fossil.fetch.js" \ |
| 582 | "$(SRCDIR)\fossil.numbered-lines.js" \ |
| 583 | "$(SRCDIR)\fossil.page.brlist.js" \ |
| 584 | "$(SRCDIR)\fossil.page.chat.js" \ |
| 585 | "$(SRCDIR)\fossil.page.fileedit.js" \ |
| 586 | "$(SRCDIR)\fossil.page.forumpost.js" \ |
| 587 | "$(SRCDIR)\fossil.page.pikchrshow.js" \ |
| 588 | "$(SRCDIR)\fossil.page.whistory.js" \ |
| 589 | "$(SRCDIR)\fossil.page.wikiedit.js" \ |
| 590 | "$(SRCDIR)\fossil.pikchr.js" \ |
| 591 | "$(SRCDIR)\fossil.popupwidget.js" \ |
| 592 | "$(SRCDIR)\fossil.storage.js" \ |
| 593 | "$(SRCDIR)\fossil.tabs.js" \ |
| 594 | "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" \ |
| 595 | "$(SRCDIR)\graph.js" \ |
| 596 | "$(SRCDIR)\hbmenu.js" \ |
| 597 | "$(SRCDIR)\href.js" \ |
| 598 | "$(SRCDIR)\login.js" \ |
| 599 | "$(SRCDIR)\markdown.md" \ |
| 600 | "$(SRCDIR)\menu.js" \ |
| 601 | "$(SRCDIR)\scroll.js" \ |
| 602 | "$(SRCDIR)\skin.js" \ |
| 603 | "$(SRCDIR)\sorttable.js" \ |
| 604 | "$(SRCDIR)\sounds\0.wav" \ |
| 605 | "$(SRCDIR)\sounds\1.wav" \ |
| 606 | "$(SRCDIR)\sounds\2.wav" \ |
| 607 | "$(SRCDIR)\sounds\3.wav" \ |
| 608 | "$(SRCDIR)\sounds\4.wav" \ |
| 609 | "$(SRCDIR)\sounds\5.wav" \ |
| 610 | "$(SRCDIR)\sounds\6.wav" \ |
| 611 | "$(SRCDIR)\sounds\7.wav" \ |
| 612 | "$(SRCDIR)\sounds\8.wav" \ |
| 613 | "$(SRCDIR)\sounds\9.wav" \ |
| 614 | "$(SRCDIR)\sounds\a.wav" \ |
| 615 | "$(SRCDIR)\sounds\b.wav" \ |
| 616 | "$(SRCDIR)\sounds\c.wav" \ |
| 617 | "$(SRCDIR)\sounds\d.wav" \ |
| 618 | "$(SRCDIR)\sounds\e.wav" \ |
| 619 | "$(SRCDIR)\sounds\f.wav" \ |
| 620 | "$(SRCDIR)\style.admin_log.css" \ |
| 621 | "$(SRCDIR)\style.chat.css" \ |
| 622 | "$(SRCDIR)\style.fileedit.css" \ |
| 623 | "$(SRCDIR)\style.wikiedit.css" \ |
| 624 | "$(SRCDIR)\tree.js" \ |
| 625 | "$(SRCDIR)\useredit.js" \ |
| 626 | "$(SRCDIR)\wiki.wiki" |
| 627 | |
| 628 | OBJ = "$(OX)\add$O" \ |
| 629 | "$(OX)\ajax$O" \ |
| 630 | "$(OX)\alerts$O" \ |
| 631 | "$(OX)\allrepo$O" \ |
| @@ -1107,10 +1169,72 @@ | |
| 1169 | echo "$(SRCDIR)\../skins/plain_gray/header.txt" >> $@ |
| 1170 | echo "$(SRCDIR)\../skins/xekri/css.txt" >> $@ |
| 1171 | echo "$(SRCDIR)\../skins/xekri/details.txt" >> $@ |
| 1172 | echo "$(SRCDIR)\../skins/xekri/footer.txt" >> $@ |
| 1173 | echo "$(SRCDIR)\../skins/xekri/header.txt" >> $@ |
| 1174 | echo "$(SRCDIR)\accordion.js" >> $@ |
| 1175 | echo "$(SRCDIR)\alerts/bflat2.wav" >> $@ |
| 1176 | echo "$(SRCDIR)\alerts/bflat3.wav" >> $@ |
| 1177 | echo "$(SRCDIR)\alerts/bloop.wav" >> $@ |
| 1178 | echo "$(SRCDIR)\alerts/plunk.wav" >> $@ |
| 1179 | echo "$(SRCDIR)\ci_edit.js" >> $@ |
| 1180 | echo "$(SRCDIR)\copybtn.js" >> $@ |
| 1181 | echo "$(SRCDIR)\default.css" >> $@ |
| 1182 | echo "$(SRCDIR)\diff.js" >> $@ |
| 1183 | echo "$(SRCDIR)\diff.tcl" >> $@ |
| 1184 | echo "$(SRCDIR)\forum.js" >> $@ |
| 1185 | echo "$(SRCDIR)\fossil.bootstrap.js" >> $@ |
| 1186 | echo "$(SRCDIR)\fossil.confirmer.js" >> $@ |
| 1187 | echo "$(SRCDIR)\fossil.copybutton.js" >> $@ |
| 1188 | echo "$(SRCDIR)\fossil.diff.js" >> $@ |
| 1189 | echo "$(SRCDIR)\fossil.dom.js" >> $@ |
| 1190 | echo "$(SRCDIR)\fossil.fetch.js" >> $@ |
| 1191 | echo "$(SRCDIR)\fossil.numbered-lines.js" >> $@ |
| 1192 | echo "$(SRCDIR)\fossil.page.brlist.js" >> $@ |
| 1193 | echo "$(SRCDIR)\fossil.page.chat.js" >> $@ |
| 1194 | echo "$(SRCDIR)\fossil.page.fileedit.js" >> $@ |
| 1195 | echo "$(SRCDIR)\fossil.page.forumpost.js" >> $@ |
| 1196 | echo "$(SRCDIR)\fossil.page.pikchrshow.js" >> $@ |
| 1197 | echo "$(SRCDIR)\fossil.page.whistory.js" >> $@ |
| 1198 | echo "$(SRCDIR)\fossil.page.wikiedit.js" >> $@ |
| 1199 | echo "$(SRCDIR)\fossil.pikchr.js" >> $@ |
| 1200 | echo "$(SRCDIR)\fossil.popupwidget.js" >> $@ |
| 1201 | echo "$(SRCDIR)\fossil.storage.js" >> $@ |
| 1202 | echo "$(SRCDIR)\fossil.tabs.js" >> $@ |
| 1203 | echo "$(SRCDIR)\fossil.wikiedit-wysiwyg.js" >> $@ |
| 1204 | echo "$(SRCDIR)\graph.js" >> $@ |
| 1205 | echo "$(SRCDIR)\hbmenu.js" >> $@ |
| 1206 | echo "$(SRCDIR)\href.js" >> $@ |
| 1207 | echo "$(SRCDIR)\login.js" >> $@ |
| 1208 | echo "$(SRCDIR)\markdown.md" >> $@ |
| 1209 | echo "$(SRCDIR)\menu.js" >> $@ |
| 1210 | echo "$(SRCDIR)\scroll.js" >> $@ |
| 1211 | echo "$(SRCDIR)\skin.js" >> $@ |
| 1212 | echo "$(SRCDIR)\sorttable.js" >> $@ |
| 1213 | echo "$(SRCDIR)\sounds/0.wav" >> $@ |
| 1214 | echo "$(SRCDIR)\sounds/1.wav" >> $@ |
| 1215 | echo "$(SRCDIR)\sounds/2.wav" >> $@ |
| 1216 | echo "$(SRCDIR)\sounds/3.wav" >> $@ |
| 1217 | echo "$(SRCDIR)\sounds/4.wav" >> $@ |
| 1218 | echo "$(SRCDIR)\sounds/5.wav" >> $@ |
| 1219 | echo "$(SRCDIR)\sounds/6.wav" >> $@ |
| 1220 | echo "$(SRCDIR)\sounds/7.wav" >> $@ |
| 1221 | echo "$(SRCDIR)\sounds/8.wav" >> $@ |
| 1222 | echo "$(SRCDIR)\sounds/9.wav" >> $@ |
| 1223 | echo "$(SRCDIR)\sounds/a.wav" >> $@ |
| 1224 | echo "$(SRCDIR)\sounds/b.wav" >> $@ |
| 1225 | echo "$(SRCDIR)\sounds/c.wav" >> $@ |
| 1226 | echo "$(SRCDIR)\sounds/d.wav" >> $@ |
| 1227 | echo "$(SRCDIR)\sounds/e.wav" >> $@ |
| 1228 | echo "$(SRCDIR)\sounds/f.wav" >> $@ |
| 1229 | echo "$(SRCDIR)\style.admin_log.css" >> $@ |
| 1230 | echo "$(SRCDIR)\style.chat.css" >> $@ |
| 1231 | echo "$(SRCDIR)\style.fileedit.css" >> $@ |
| 1232 | echo "$(SRCDIR)\style.wikiedit.css" >> $@ |
| 1233 | echo "$(SRCDIR)\tree.js" >> $@ |
| 1234 | echo "$(SRCDIR)\useredit.js" >> $@ |
| 1235 | echo "$(SRCDIR)\wiki.wiki" >> $@ |
| 1236 | |
| 1237 | "$(OX)\add$O" : "$(OX)\add_.c" "$(OX)\add.h" |
| 1238 | $(TCC) /Fo$@ /Fd$(@D)\ -c "$(OX)\add_.c" |
| 1239 | |
| 1240 | "$(OX)\add_.c" : "$(SRCDIR)\add.c" |
| 1241 |