Fossil

Check-in [9c0e1cae]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fix cross-compilation of mingw target on Linux/Darwin
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9c0e1caec5ecaedbdb7a43fc17c8b3bf5044d473
User & Date: jan.nijtmans 2012-09-02 12:50:32
Context
2012-09-03
00:24
Fix dependencies on generated headers in the MinGW makefile. Also, remove superfluous EXE extension on executables used during the build process. check-in: 4e8d2f29 user: mistachkin tags: trunk
2012-09-02
19:39
Minor additional fixes related to [c8c0b78c84]:
- Use _wsystem() in stead of system() on Windows
- Use g.argv[0] in stead of fossil_nameofexe() where only printing is involved
- Use fossil_nameofexe() where fossil_system() is involved
- Move the determination of the full windows path to fossil_nameofexec,
  so g.argv[0] can always be the unmodified argv[0]
- g.argv[0] and fossil_nameofexec() are in utf-8, so we cannot use fprintf
  directly. Exception: when printing malloc errors.
Closed-Leaf check-in: be06861f user: jan.nijtmans tags: ticket-c8c0b78c84
12:50
fix cross-compilation of mingw target on Linux/Darwin check-in: 9c0e1cae user: jan.nijtmans tags: trunk
2012-09-01
04:45
Remove leftover instances of non-ASCII characters from several files. check-in: f15ce59b user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/makemake.tcl.

534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
writeln "APPNAME = ${name}.exe"
writeln {
#### Attempt to determine if this is the actual MSYS shell.  If so, we need to
#    use forward slashes for correctness.  If the SHELL environment variable
#    exists, it is assumed that we are building inside of a Unix-style shell.
#
ifdef SHELL
TRANSLATE   = $(OBJDIR)/translate.exe
MAKEHEADERS = $(OBJDIR)/makeheaders.exe
MKINDEX     = $(OBJDIR)/mkindex.exe
VERSION     = $(OBJDIR)/version.exe
else
TRANSLATE   = $(subst /,\\,$(OBJDIR)/translate.exe)
MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
MKINDEX     = $(subst /,\\,$(OBJDIR)/mkindex.exe)
VERSION     = $(subst /,\\,$(OBJDIR)/version.exe)
endif}








|
|
|
|







534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
writeln "APPNAME = ${name}.exe"
writeln {
#### Attempt to determine if this is the actual MSYS shell.  If so, we need to
#    use forward slashes for correctness.  If the SHELL environment variable
#    exists, it is assumed that we are building inside of a Unix-style shell.
#
ifdef SHELL
TRANSLATE   = $(OBJDIR)/translate
MAKEHEADERS = $(OBJDIR)/makeheaders
MKINDEX     = $(OBJDIR)/mkindex
VERSION     = $(OBJDIR)/version
else
TRANSLATE   = $(subst /,\\,$(OBJDIR)/translate.exe)
MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
MKINDEX     = $(subst /,\\,$(OBJDIR)/mkindex.exe)
VERSION     = $(subst /,\\,$(OBJDIR)/version.exe)
endif}

Changes to win/Makefile.mingw.

498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
APPNAME = fossil.exe

#### Attempt to determine if this is the actual MSYS shell.  If so, we need to
#    use forward slashes for correctness.  If the SHELL environment variable
#    exists, it is assumed that we are building inside of a Unix-style shell.
#
ifdef SHELL
TRANSLATE   = $(OBJDIR)/translate.exe
MAKEHEADERS = $(OBJDIR)/makeheaders.exe
MKINDEX     = $(OBJDIR)/mkindex.exe
VERSION     = $(OBJDIR)/version.exe
else
TRANSLATE   = $(subst /,\\,$(OBJDIR)/translate.exe)
MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
MKINDEX     = $(subst /,\\,$(OBJDIR)/mkindex.exe)
VERSION     = $(subst /,\\,$(OBJDIR)/version.exe)
endif








|
|
|
|







498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
APPNAME = fossil.exe

#### Attempt to determine if this is the actual MSYS shell.  If so, we need to
#    use forward slashes for correctness.  If the SHELL environment variable
#    exists, it is assumed that we are building inside of a Unix-style shell.
#
ifdef SHELL
TRANSLATE   = $(OBJDIR)/translate
MAKEHEADERS = $(OBJDIR)/makeheaders
MKINDEX     = $(OBJDIR)/mkindex
VERSION     = $(OBJDIR)/version
else
TRANSLATE   = $(subst /,\\,$(OBJDIR)/translate.exe)
MAKEHEADERS = $(subst /,\\,$(OBJDIR)/makeheaders.exe)
MKINDEX     = $(subst /,\\,$(OBJDIR)/mkindex.exe)
VERSION     = $(subst /,\\,$(OBJDIR)/version.exe)
endif