Fossil SCM

Merge the fork of trunk.

mistachkin 2012-08-31 12:44 trunk merge
Commit 231113eac291edc82f22ea4f4207c0bb99a05f88
Parent 927d07c7273b32c…
3 files changed +14 -3 +13 -2 +13 -2
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+14 -3
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -530,20 +530,31 @@
530530
 foreach s [lsort $src] {
531531
 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
532532
 }
533533
 writeln "\n"
534534
 writeln "APPNAME = ${name}.exe"
535
-writeln {TRANSLATE = $(OBJDIR)/translate.exe
535
+writeln {
536
+#### Attempt to determine if this is the actual MSYS shell. If so, we need to
537
+# use forward slashes for correctness. If the SHELL environment variable
538
+# exists, it is assumed that we are building inside of a Unix-style shell.
539
+#
540
+ifdef SHELL
541
+TRANSLATE = $(OBJDIR)/translate.exe
536542
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
537543
 MKINDEX = $(OBJDIR)/mkindex.exe
538544
 VERSION = $(OBJDIR)/version.exe
539
-}
545
+else
546
+TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
547
+MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
548
+MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
549
+VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
550
+endif}
540551
541552
 writeln {
542553
 all: $(OBJDIR) $(APPNAME)
543554
544
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
555
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
545556
 cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
546557
 cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
547558
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
548559
549560
 install: $(APPNAME)
550561
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -530,20 +530,31 @@
530 foreach s [lsort $src] {
531 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
532 }
533 writeln "\n"
534 writeln "APPNAME = ${name}.exe"
535 writeln {TRANSLATE = $(OBJDIR)/translate.exe
 
 
 
 
 
 
536 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
537 MKINDEX = $(OBJDIR)/mkindex.exe
538 VERSION = $(OBJDIR)/version.exe
539 }
 
 
 
 
 
540
541 writeln {
542 all: $(OBJDIR) $(APPNAME)
543
544 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
545 cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
546 cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
547 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
548
549 install: $(APPNAME)
550
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -530,20 +530,31 @@
530 foreach s [lsort $src] {
531 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
532 }
533 writeln "\n"
534 writeln "APPNAME = ${name}.exe"
535 writeln {
536 #### Attempt to determine if this is the actual MSYS shell. If so, we need to
537 # use forward slashes for correctness. If the SHELL environment variable
538 # exists, it is assumed that we are building inside of a Unix-style shell.
539 #
540 ifdef SHELL
541 TRANSLATE = $(OBJDIR)/translate.exe
542 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
543 MKINDEX = $(OBJDIR)/mkindex.exe
544 VERSION = $(OBJDIR)/version.exe
545 else
546 TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
547 MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
548 MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
549 VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
550 endif}
551
552 writeln {
553 all: $(OBJDIR) $(APPNAME)
554
555 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
556 cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
557 cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
558 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
559
560 install: $(APPNAME)
561
M win/Makefile.mingw
+13 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -494,19 +494,30 @@
494494
 $(OBJDIR)/xfer.o \
495495
 $(OBJDIR)/xfersetup.o \
496496
 $(OBJDIR)/zip.o
497497
498498
 APPNAME = fossil.exe
499
+
500
+#### Attempt to determine if this is the actual MSYS shell. If so, we need to
501
+# use forward slashes for correctness. If the SHELL environment variable
502
+# exists, it is assumed that we are building inside of a Unix-style shell.
503
+#
504
+ifdef SHELL
499505
 TRANSLATE = $(OBJDIR)/translate.exe
500506
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
501507
 MKINDEX = $(OBJDIR)/mkindex.exe
502508
 VERSION = $(OBJDIR)/version.exe
503
-
509
+else
510
+TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
511
+MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
512
+MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
513
+VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
514
+endif
504515
505516
 all: $(OBJDIR) $(APPNAME)
506517
507
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
518
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
508519
 cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
509520
 cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
510521
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
511522
512523
 install: $(APPNAME)
513524
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -494,19 +494,30 @@
494 $(OBJDIR)/xfer.o \
495 $(OBJDIR)/xfersetup.o \
496 $(OBJDIR)/zip.o
497
498 APPNAME = fossil.exe
 
 
 
 
 
 
499 TRANSLATE = $(OBJDIR)/translate.exe
500 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
501 MKINDEX = $(OBJDIR)/mkindex.exe
502 VERSION = $(OBJDIR)/version.exe
503
 
 
 
 
 
504
505 all: $(OBJDIR) $(APPNAME)
506
507 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
508 cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
509 cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
510 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
511
512 install: $(APPNAME)
513
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -494,19 +494,30 @@
494 $(OBJDIR)/xfer.o \
495 $(OBJDIR)/xfersetup.o \
496 $(OBJDIR)/zip.o
497
498 APPNAME = fossil.exe
499
500 #### Attempt to determine if this is the actual MSYS shell. If so, we need to
501 # use forward slashes for correctness. If the SHELL environment variable
502 # exists, it is assumed that we are building inside of a Unix-style shell.
503 #
504 ifdef SHELL
505 TRANSLATE = $(OBJDIR)/translate.exe
506 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
507 MKINDEX = $(OBJDIR)/mkindex.exe
508 VERSION = $(OBJDIR)/version.exe
509 else
510 TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
511 MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
512 MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
513 VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
514 endif
515
516 all: $(OBJDIR) $(APPNAME)
517
518 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
519 cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
520 cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
521 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
522
523 install: $(APPNAME)
524
M win/Makefile.mingw.mistachkin
+13 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -494,19 +494,30 @@
494494
 $(OBJDIR)/xfer.o \
495495
 $(OBJDIR)/xfersetup.o \
496496
 $(OBJDIR)/zip.o
497497
498498
 APPNAME = fossil.exe
499
+
500
+#### Attempt to determine if this is the actual MSYS shell. If so, we need to
501
+# use forward slashes for correctness. If the SHELL environment variable
502
+# exists, it is assumed that we are building inside of a Unix-style shell.
503
+#
504
+ifdef SHELL
499505
 TRANSLATE = $(OBJDIR)/translate.exe
500506
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
501507
 MKINDEX = $(OBJDIR)/mkindex.exe
502508
 VERSION = $(OBJDIR)/version.exe
503
-
509
+else
510
+TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
511
+MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
512
+MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
513
+VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
514
+endif
504515
505516
 all: $(OBJDIR) $(APPNAME)
506517
507
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
518
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
508519
 cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
509520
 cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
510521
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
511522
512523
 install: $(APPNAME)
513524
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -494,19 +494,30 @@
494 $(OBJDIR)/xfer.o \
495 $(OBJDIR)/xfersetup.o \
496 $(OBJDIR)/zip.o
497
498 APPNAME = fossil.exe
 
 
 
 
 
 
499 TRANSLATE = $(OBJDIR)/translate.exe
500 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
501 MKINDEX = $(OBJDIR)/mkindex.exe
502 VERSION = $(OBJDIR)/version.exe
503
 
 
 
 
 
504
505 all: $(OBJDIR) $(APPNAME)
506
507 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc
508 cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
509 cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
510 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
511
512 install: $(APPNAME)
513
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -494,19 +494,30 @@
494 $(OBJDIR)/xfer.o \
495 $(OBJDIR)/xfersetup.o \
496 $(OBJDIR)/zip.o
497
498 APPNAME = fossil.exe
499
500 #### Attempt to determine if this is the actual MSYS shell. If so, we need to
501 # use forward slashes for correctness. If the SHELL environment variable
502 # exists, it is assumed that we are building inside of a Unix-style shell.
503 #
504 ifdef SHELL
505 TRANSLATE = $(OBJDIR)/translate.exe
506 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
507 MKINDEX = $(OBJDIR)/mkindex.exe
508 VERSION = $(OBJDIR)/version.exe
509 else
510 TRANSLATE = $(subst /,\\,$(OBJDIR)/translate.exe)
511 MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
512 MKINDEX = $(subst /,\\,$(OBJDIR)/mkindex.exe)
513 VERSION = $(subst /,\\,$(OBJDIR)/version.exe)
514 endif
515
516 all: $(OBJDIR) $(APPNAME)
517
518 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
519 cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
520 cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
521 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
522
523 install: $(APPNAME)
524

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button