Fossil SCM
Add support for an Inno Setup project file for Fossil.
Commit
636025d431325ef9207c01eeb040db3f1208cccd
Parent
8b4aaef2f515b0e…
4 files changed
+66
+10
-1
+10
-1
+10
-1
+66
| --- a/setup/fossil.iss | ||
| +++ b/setup/fossil.iss | ||
| @@ -0,0 +1,66 @@ | ||
| 1 | +; | |
| 2 | +; Copyrig | |
| 3 | +; | |
| 4 | + (c) 2014 D. Richard Hipp | |
| 5 | +; | |
| 6 | +; This program is free software; you | |
| 7 | + can redistribute it and/or | |
| 8 | +; modify it under the terms of the S | |
| 9 | +implified BSD License (also | |
| 10 | +; | |
| 11 | +; | |
| 12 | +; This program is distributed in the hope that it will be useful, | |
| 13 | +ope that it will be useful, | |
| 14 | +; but without any warranty; without e | |
| 15 | +ven the implied warranty of | |
| 16 | + | |
| 17 | +; | |
| 18 | +; Author contact information: | |
| 19 | +; [email protected] | |
| 20 | +; http://www.hwaci.com/drh/ | |
| 21 | +; | |
| 22 | + | |
| 23 | +[Setup] | |
| 24 | +w.hwaci.com/drh/ | |
| 25 | +; | |
| 26 | + | |
| 27 | +[Setup] | |
| 28 | +A | |
| 29 | +AlwaysShowComponentsList=false | |
| 30 | +aysShowComponentsList=false | |
| 31 | +AppCopyright=Copyright (c) D. Richard | |
| 32 | +Hipp. All rights r | |
| 33 | +AppName=Fossil | |
| 34 | +314c52f057 | |
| 35 | +AppPublisherURL=https://www.fossil-scm.org/ | |
| 36 | +AppSupportURL=https:////www.fossil-scm.org/ | |
| 37 | +X@DC,1: | |
| 38 | +P@Di,1: | |
| 39 | +1S@E6,q: | |
| 40 | +AppReadmeFile=https://www.fossil-scm.org: | |
| 41 | +R@Gd,Q: | |
| 42 | +DefaultGroupNameSupportURL=http: | |
| 43 | +R@Gd,Q: | |
| 44 | +Defa: | |
| 45 | +R@Gd,Q: | |
| 46 | +DefaultGroupNameY@JM,1: | |
| 47 | +X@Jt,I: | |
| 48 | + | |
| 49 | + | |
| 50 | +[Components] | |
| 51 | +1S@Kd,e: | |
| 52 | + | |
| 53 | + | |
| 54 | +[Dirs] | |
| 55 | +Name: {app}\bin | |
| 56 | + | |
| 57 | + | |
| 58 | +[Files] | |
| 59 | +1i@Mc,G: | |
| 60 | + | |
| 61 | + | |
| 62 | +[Registry] | |
| 63 | +Q@Mc,2H@Ow,2: | |
| 64 | +_~AvY;: | |
| 65 | +R@Gd,Q: | |
| 66 | +DefaultGrou |
| --- a/setup/fossil.iss | |
| +++ b/setup/fossil.iss | |
| @@ -0,0 +1,66 @@ | |
| --- a/setup/fossil.iss | |
| +++ b/setup/fossil.iss | |
| @@ -0,0 +1,66 @@ | |
| 1 | ; |
| 2 | ; Copyrig |
| 3 | ; |
| 4 | (c) 2014 D. Richard Hipp |
| 5 | ; |
| 6 | ; This program is free software; you |
| 7 | can redistribute it and/or |
| 8 | ; modify it under the terms of the S |
| 9 | implified BSD License (also |
| 10 | ; |
| 11 | ; |
| 12 | ; This program is distributed in the hope that it will be useful, |
| 13 | ope that it will be useful, |
| 14 | ; but without any warranty; without e |
| 15 | ven the implied warranty of |
| 16 | |
| 17 | ; |
| 18 | ; Author contact information: |
| 19 | ; [email protected] |
| 20 | ; http://www.hwaci.com/drh/ |
| 21 | ; |
| 22 | |
| 23 | [Setup] |
| 24 | w.hwaci.com/drh/ |
| 25 | ; |
| 26 | |
| 27 | [Setup] |
| 28 | A |
| 29 | AlwaysShowComponentsList=false |
| 30 | aysShowComponentsList=false |
| 31 | AppCopyright=Copyright (c) D. Richard |
| 32 | Hipp. All rights r |
| 33 | AppName=Fossil |
| 34 | 314c52f057 |
| 35 | AppPublisherURL=https://www.fossil-scm.org/ |
| 36 | AppSupportURL=https:////www.fossil-scm.org/ |
| 37 | X@DC,1: |
| 38 | P@Di,1: |
| 39 | 1S@E6,q: |
| 40 | AppReadmeFile=https://www.fossil-scm.org: |
| 41 | R@Gd,Q: |
| 42 | DefaultGroupNameSupportURL=http: |
| 43 | R@Gd,Q: |
| 44 | Defa: |
| 45 | R@Gd,Q: |
| 46 | DefaultGroupNameY@JM,1: |
| 47 | X@Jt,I: |
| 48 | |
| 49 | |
| 50 | [Components] |
| 51 | 1S@Kd,e: |
| 52 | |
| 53 | |
| 54 | [Dirs] |
| 55 | Name: {app}\bin |
| 56 | |
| 57 | |
| 58 | [Files] |
| 59 | 1i@Mc,G: |
| 60 | |
| 61 | |
| 62 | [Registry] |
| 63 | Q@Mc,2H@Ow,2: |
| 64 | _~AvY;: |
| 65 | R@Gd,Q: |
| 66 | DefaultGrou |
+10
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -612,11 +612,15 @@ | ||
| 612 | 612 | # |
| 613 | 613 | TCLSH = tclsh |
| 614 | 614 | |
| 615 | 615 | #### Nullsoft installer MakeNSIS location |
| 616 | 616 | # |
| 617 | -MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe" | |
| 617 | +MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe" | |
| 618 | + | |
| 619 | +#### Inno Setup executable location | |
| 620 | +# | |
| 621 | +INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe" | |
| 618 | 622 | |
| 619 | 623 | #### Include a configuration file that can override any one of these settings. |
| 620 | 624 | # |
| 621 | 625 | -include config.w32 |
| 622 | 626 | |
| @@ -652,10 +656,11 @@ | ||
| 652 | 656 | ifdef USE_WINDOWS |
| 653 | 657 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate) |
| 654 | 658 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders) |
| 655 | 659 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex) |
| 656 | 660 | VERSION = $(subst /,\,$(OBJDIR)/version) |
| 661 | +CAT = type | |
| 657 | 662 | CP = copy |
| 658 | 663 | MV = copy |
| 659 | 664 | RM = del /Q |
| 660 | 665 | MKDIR = -mkdir |
| 661 | 666 | RMDIR = rmdir /S /Q |
| @@ -662,10 +667,11 @@ | ||
| 662 | 667 | else |
| 663 | 668 | TRANSLATE = $(OBJDIR)/translate |
| 664 | 669 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 665 | 670 | MKINDEX = $(OBJDIR)/mkindex |
| 666 | 671 | VERSION = $(OBJDIR)/version |
| 672 | +CAT = cat | |
| 667 | 673 | CP = cp |
| 668 | 674 | MV = mv |
| 669 | 675 | RM = rm -f |
| 670 | 676 | MKDIR = -mkdir -p |
| 671 | 677 | RMDIR = rm -rf |
| @@ -777,10 +783,13 @@ | ||
| 777 | 783 | $(RMDIR) $(OBJDIR) |
| 778 | 784 | endif |
| 779 | 785 | |
| 780 | 786 | setup: $(OBJDIR) $(APPNAME) |
| 781 | 787 | $(MAKENSIS) ./setup/fossil.nsi |
| 788 | + | |
| 789 | +innosetup: $(OBJDIR) $(APPNAME) | |
| 790 | + $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION) | |
| 782 | 791 | } |
| 783 | 792 | |
| 784 | 793 | set mhargs {} |
| 785 | 794 | foreach s [lsort $src] { |
| 786 | 795 | if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"} |
| 787 | 796 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -612,11 +612,15 @@ | |
| 612 | # |
| 613 | TCLSH = tclsh |
| 614 | |
| 615 | #### Nullsoft installer MakeNSIS location |
| 616 | # |
| 617 | MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe" |
| 618 | |
| 619 | #### Include a configuration file that can override any one of these settings. |
| 620 | # |
| 621 | -include config.w32 |
| 622 | |
| @@ -652,10 +656,11 @@ | |
| 652 | ifdef USE_WINDOWS |
| 653 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate) |
| 654 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders) |
| 655 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex) |
| 656 | VERSION = $(subst /,\,$(OBJDIR)/version) |
| 657 | CP = copy |
| 658 | MV = copy |
| 659 | RM = del /Q |
| 660 | MKDIR = -mkdir |
| 661 | RMDIR = rmdir /S /Q |
| @@ -662,10 +667,11 @@ | |
| 662 | else |
| 663 | TRANSLATE = $(OBJDIR)/translate |
| 664 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 665 | MKINDEX = $(OBJDIR)/mkindex |
| 666 | VERSION = $(OBJDIR)/version |
| 667 | CP = cp |
| 668 | MV = mv |
| 669 | RM = rm -f |
| 670 | MKDIR = -mkdir -p |
| 671 | RMDIR = rm -rf |
| @@ -777,10 +783,13 @@ | |
| 777 | $(RMDIR) $(OBJDIR) |
| 778 | endif |
| 779 | |
| 780 | setup: $(OBJDIR) $(APPNAME) |
| 781 | $(MAKENSIS) ./setup/fossil.nsi |
| 782 | } |
| 783 | |
| 784 | set mhargs {} |
| 785 | foreach s [lsort $src] { |
| 786 | if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"} |
| 787 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -612,11 +612,15 @@ | |
| 612 | # |
| 613 | TCLSH = tclsh |
| 614 | |
| 615 | #### Nullsoft installer MakeNSIS location |
| 616 | # |
| 617 | MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe" |
| 618 | |
| 619 | #### Inno Setup executable location |
| 620 | # |
| 621 | INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe" |
| 622 | |
| 623 | #### Include a configuration file that can override any one of these settings. |
| 624 | # |
| 625 | -include config.w32 |
| 626 | |
| @@ -652,10 +656,11 @@ | |
| 656 | ifdef USE_WINDOWS |
| 657 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate) |
| 658 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders) |
| 659 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex) |
| 660 | VERSION = $(subst /,\,$(OBJDIR)/version) |
| 661 | CAT = type |
| 662 | CP = copy |
| 663 | MV = copy |
| 664 | RM = del /Q |
| 665 | MKDIR = -mkdir |
| 666 | RMDIR = rmdir /S /Q |
| @@ -662,10 +667,11 @@ | |
| 667 | else |
| 668 | TRANSLATE = $(OBJDIR)/translate |
| 669 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 670 | MKINDEX = $(OBJDIR)/mkindex |
| 671 | VERSION = $(OBJDIR)/version |
| 672 | CAT = cat |
| 673 | CP = cp |
| 674 | MV = mv |
| 675 | RM = rm -f |
| 676 | MKDIR = -mkdir -p |
| 677 | RMDIR = rm -rf |
| @@ -777,10 +783,13 @@ | |
| 783 | $(RMDIR) $(OBJDIR) |
| 784 | endif |
| 785 | |
| 786 | setup: $(OBJDIR) $(APPNAME) |
| 787 | $(MAKENSIS) ./setup/fossil.nsi |
| 788 | |
| 789 | innosetup: $(OBJDIR) $(APPNAME) |
| 790 | $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION) |
| 791 | } |
| 792 | |
| 793 | set mhargs {} |
| 794 | foreach s [lsort $src] { |
| 795 | if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"} |
| 796 |
+10
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -251,11 +251,15 @@ | ||
| 251 | 251 | # |
| 252 | 252 | TCLSH = tclsh |
| 253 | 253 | |
| 254 | 254 | #### Nullsoft installer MakeNSIS location |
| 255 | 255 | # |
| 256 | -MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe" | |
| 256 | +MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe" | |
| 257 | + | |
| 258 | +#### Inno Setup executable location | |
| 259 | +# | |
| 260 | +INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe" | |
| 257 | 261 | |
| 258 | 262 | #### Include a configuration file that can override any one of these settings. |
| 259 | 263 | # |
| 260 | 264 | -include config.w32 |
| 261 | 265 | |
| @@ -612,10 +616,11 @@ | ||
| 612 | 616 | ifdef USE_WINDOWS |
| 613 | 617 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate) |
| 614 | 618 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders) |
| 615 | 619 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex) |
| 616 | 620 | VERSION = $(subst /,\,$(OBJDIR)/version) |
| 621 | +CAT = type | |
| 617 | 622 | CP = copy |
| 618 | 623 | MV = copy |
| 619 | 624 | RM = del /Q |
| 620 | 625 | MKDIR = -mkdir |
| 621 | 626 | RMDIR = rmdir /S /Q |
| @@ -622,10 +627,11 @@ | ||
| 622 | 627 | else |
| 623 | 628 | TRANSLATE = $(OBJDIR)/translate |
| 624 | 629 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 625 | 630 | MKINDEX = $(OBJDIR)/mkindex |
| 626 | 631 | VERSION = $(OBJDIR)/version |
| 632 | +CAT = cat | |
| 627 | 633 | CP = cp |
| 628 | 634 | MV = mv |
| 629 | 635 | RM = rm -f |
| 630 | 636 | MKDIR = -mkdir -p |
| 631 | 637 | RMDIR = rm -rf |
| @@ -731,10 +737,13 @@ | ||
| 731 | 737 | endif |
| 732 | 738 | |
| 733 | 739 | setup: $(OBJDIR) $(APPNAME) |
| 734 | 740 | $(MAKENSIS) ./setup/fossil.nsi |
| 735 | 741 | |
| 742 | +innosetup: $(OBJDIR) $(APPNAME) | |
| 743 | + $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION) | |
| 744 | + | |
| 736 | 745 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 737 | 746 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 738 | 747 | |
| 739 | 748 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 740 | 749 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 741 | 750 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -251,11 +251,15 @@ | |
| 251 | # |
| 252 | TCLSH = tclsh |
| 253 | |
| 254 | #### Nullsoft installer MakeNSIS location |
| 255 | # |
| 256 | MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe" |
| 257 | |
| 258 | #### Include a configuration file that can override any one of these settings. |
| 259 | # |
| 260 | -include config.w32 |
| 261 | |
| @@ -612,10 +616,11 @@ | |
| 612 | ifdef USE_WINDOWS |
| 613 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate) |
| 614 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders) |
| 615 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex) |
| 616 | VERSION = $(subst /,\,$(OBJDIR)/version) |
| 617 | CP = copy |
| 618 | MV = copy |
| 619 | RM = del /Q |
| 620 | MKDIR = -mkdir |
| 621 | RMDIR = rmdir /S /Q |
| @@ -622,10 +627,11 @@ | |
| 622 | else |
| 623 | TRANSLATE = $(OBJDIR)/translate |
| 624 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 625 | MKINDEX = $(OBJDIR)/mkindex |
| 626 | VERSION = $(OBJDIR)/version |
| 627 | CP = cp |
| 628 | MV = mv |
| 629 | RM = rm -f |
| 630 | MKDIR = -mkdir -p |
| 631 | RMDIR = rm -rf |
| @@ -731,10 +737,13 @@ | |
| 731 | endif |
| 732 | |
| 733 | setup: $(OBJDIR) $(APPNAME) |
| 734 | $(MAKENSIS) ./setup/fossil.nsi |
| 735 | |
| 736 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 737 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 738 | |
| 739 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 740 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 741 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -251,11 +251,15 @@ | |
| 251 | # |
| 252 | TCLSH = tclsh |
| 253 | |
| 254 | #### Nullsoft installer MakeNSIS location |
| 255 | # |
| 256 | MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe" |
| 257 | |
| 258 | #### Inno Setup executable location |
| 259 | # |
| 260 | INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe" |
| 261 | |
| 262 | #### Include a configuration file that can override any one of these settings. |
| 263 | # |
| 264 | -include config.w32 |
| 265 | |
| @@ -612,10 +616,11 @@ | |
| 616 | ifdef USE_WINDOWS |
| 617 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate) |
| 618 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders) |
| 619 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex) |
| 620 | VERSION = $(subst /,\,$(OBJDIR)/version) |
| 621 | CAT = type |
| 622 | CP = copy |
| 623 | MV = copy |
| 624 | RM = del /Q |
| 625 | MKDIR = -mkdir |
| 626 | RMDIR = rmdir /S /Q |
| @@ -622,10 +627,11 @@ | |
| 627 | else |
| 628 | TRANSLATE = $(OBJDIR)/translate |
| 629 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 630 | MKINDEX = $(OBJDIR)/mkindex |
| 631 | VERSION = $(OBJDIR)/version |
| 632 | CAT = cat |
| 633 | CP = cp |
| 634 | MV = mv |
| 635 | RM = rm -f |
| 636 | MKDIR = -mkdir -p |
| 637 | RMDIR = rm -rf |
| @@ -731,10 +737,13 @@ | |
| 737 | endif |
| 738 | |
| 739 | setup: $(OBJDIR) $(APPNAME) |
| 740 | $(MAKENSIS) ./setup/fossil.nsi |
| 741 | |
| 742 | innosetup: $(OBJDIR) $(APPNAME) |
| 743 | $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION) |
| 744 | |
| 745 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 746 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 747 | |
| 748 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 749 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 750 |
+10
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -251,11 +251,15 @@ | ||
| 251 | 251 | # |
| 252 | 252 | TCLSH = tclsh |
| 253 | 253 | |
| 254 | 254 | #### Nullsoft installer MakeNSIS location |
| 255 | 255 | # |
| 256 | -MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe" | |
| 256 | +MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe" | |
| 257 | + | |
| 258 | +#### Inno Setup executable location | |
| 259 | +# | |
| 260 | +INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe" | |
| 257 | 261 | |
| 258 | 262 | #### Include a configuration file that can override any one of these settings. |
| 259 | 263 | # |
| 260 | 264 | -include config.w32 |
| 261 | 265 | |
| @@ -612,10 +616,11 @@ | ||
| 612 | 616 | ifdef USE_WINDOWS |
| 613 | 617 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate) |
| 614 | 618 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders) |
| 615 | 619 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex) |
| 616 | 620 | VERSION = $(subst /,\,$(OBJDIR)/version) |
| 621 | +CAT = type | |
| 617 | 622 | CP = copy |
| 618 | 623 | MV = copy |
| 619 | 624 | RM = del /Q |
| 620 | 625 | MKDIR = -mkdir |
| 621 | 626 | RMDIR = rmdir /S /Q |
| @@ -622,10 +627,11 @@ | ||
| 622 | 627 | else |
| 623 | 628 | TRANSLATE = $(OBJDIR)/translate |
| 624 | 629 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 625 | 630 | MKINDEX = $(OBJDIR)/mkindex |
| 626 | 631 | VERSION = $(OBJDIR)/version |
| 632 | +CAT = cat | |
| 627 | 633 | CP = cp |
| 628 | 634 | MV = mv |
| 629 | 635 | RM = rm -f |
| 630 | 636 | MKDIR = -mkdir -p |
| 631 | 637 | RMDIR = rm -rf |
| @@ -731,10 +737,13 @@ | ||
| 731 | 737 | endif |
| 732 | 738 | |
| 733 | 739 | setup: $(OBJDIR) $(APPNAME) |
| 734 | 740 | $(MAKENSIS) ./setup/fossil.nsi |
| 735 | 741 | |
| 742 | +innosetup: $(OBJDIR) $(APPNAME) | |
| 743 | + $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION) | |
| 744 | + | |
| 736 | 745 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 737 | 746 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 738 | 747 | |
| 739 | 748 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 740 | 749 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 741 | 750 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -251,11 +251,15 @@ | |
| 251 | # |
| 252 | TCLSH = tclsh |
| 253 | |
| 254 | #### Nullsoft installer MakeNSIS location |
| 255 | # |
| 256 | MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe" |
| 257 | |
| 258 | #### Include a configuration file that can override any one of these settings. |
| 259 | # |
| 260 | -include config.w32 |
| 261 | |
| @@ -612,10 +616,11 @@ | |
| 612 | ifdef USE_WINDOWS |
| 613 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate) |
| 614 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders) |
| 615 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex) |
| 616 | VERSION = $(subst /,\,$(OBJDIR)/version) |
| 617 | CP = copy |
| 618 | MV = copy |
| 619 | RM = del /Q |
| 620 | MKDIR = -mkdir |
| 621 | RMDIR = rmdir /S /Q |
| @@ -622,10 +627,11 @@ | |
| 622 | else |
| 623 | TRANSLATE = $(OBJDIR)/translate |
| 624 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 625 | MKINDEX = $(OBJDIR)/mkindex |
| 626 | VERSION = $(OBJDIR)/version |
| 627 | CP = cp |
| 628 | MV = mv |
| 629 | RM = rm -f |
| 630 | MKDIR = -mkdir -p |
| 631 | RMDIR = rm -rf |
| @@ -731,10 +737,13 @@ | |
| 731 | endif |
| 732 | |
| 733 | setup: $(OBJDIR) $(APPNAME) |
| 734 | $(MAKENSIS) ./setup/fossil.nsi |
| 735 | |
| 736 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 737 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 738 | |
| 739 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 740 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 741 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -251,11 +251,15 @@ | |
| 251 | # |
| 252 | TCLSH = tclsh |
| 253 | |
| 254 | #### Nullsoft installer MakeNSIS location |
| 255 | # |
| 256 | MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe" |
| 257 | |
| 258 | #### Inno Setup executable location |
| 259 | # |
| 260 | INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe" |
| 261 | |
| 262 | #### Include a configuration file that can override any one of these settings. |
| 263 | # |
| 264 | -include config.w32 |
| 265 | |
| @@ -612,10 +616,11 @@ | |
| 616 | ifdef USE_WINDOWS |
| 617 | TRANSLATE = $(subst /,\,$(OBJDIR)/translate) |
| 618 | MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders) |
| 619 | MKINDEX = $(subst /,\,$(OBJDIR)/mkindex) |
| 620 | VERSION = $(subst /,\,$(OBJDIR)/version) |
| 621 | CAT = type |
| 622 | CP = copy |
| 623 | MV = copy |
| 624 | RM = del /Q |
| 625 | MKDIR = -mkdir |
| 626 | RMDIR = rmdir /S /Q |
| @@ -622,10 +627,11 @@ | |
| 627 | else |
| 628 | TRANSLATE = $(OBJDIR)/translate |
| 629 | MAKEHEADERS = $(OBJDIR)/makeheaders |
| 630 | MKINDEX = $(OBJDIR)/mkindex |
| 631 | VERSION = $(OBJDIR)/version |
| 632 | CAT = cat |
| 633 | CP = cp |
| 634 | MV = mv |
| 635 | RM = rm -f |
| 636 | MKDIR = -mkdir -p |
| 637 | RMDIR = rm -rf |
| @@ -731,10 +737,13 @@ | |
| 737 | endif |
| 738 | |
| 739 | setup: $(OBJDIR) $(APPNAME) |
| 740 | $(MAKENSIS) ./setup/fossil.nsi |
| 741 | |
| 742 | innosetup: $(OBJDIR) $(APPNAME) |
| 743 | $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION) |
| 744 | |
| 745 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 746 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 747 | |
| 748 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 749 | $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \ |
| 750 |