Fossil SCM

Add support for an Inno Setup project file for Fossil.

mistachkin 2014-06-14 20:06 trunk merge
Commit 3887a31812d5c5ae92d11ed3f42bbfddd5fdc319
Parent 3a5c9b34f39be09…
7 files changed +66 +10 -1 +10 -1 +10 -1 +10 -1 +10 -1 +10 -1
~ setup/fossil.iss ~ src/makemake.tcl ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin
M setup/fossil.iss
+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
M src/makemake.tcl
+10 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -613,11 +613,15 @@
613613
 #
614614
 TCLSH = tclsh
615615
616616
 #### Nullsoft installer MakeNSIS location
617617
 #
618
-MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
618
+MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe"
619
+
620
+#### Inno Setup executable location
621
+#
622
+INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe"
619623
620624
 #### Include a configuration file that can override any one of these settings.
621625
 #
622626
 -include config.w32
623627
@@ -653,10 +657,11 @@
653657
 ifdef USE_WINDOWS
654658
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
655659
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
656660
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
657661
 VERSION = $(subst /,\,$(OBJDIR)/version)
662
+CAT = type
658663
 CP = copy
659664
 MV = copy
660665
 RM = del /Q
661666
 MKDIR = -mkdir
662667
 RMDIR = rmdir /S /Q
@@ -663,10 +668,11 @@
663668
 else
664669
 TRANSLATE = $(OBJDIR)/translate
665670
 MAKEHEADERS = $(OBJDIR)/makeheaders
666671
 MKINDEX = $(OBJDIR)/mkindex
667672
 VERSION = $(OBJDIR)/version
673
+CAT = cat
668674
 CP = cp
669675
 MV = mv
670676
 RM = rm -f
671677
 MKDIR = -mkdir -p
672678
 RMDIR = rm -rf
@@ -778,10 +784,13 @@
778784
 $(RMDIR) $(OBJDIR)
779785
 endif
780786
781787
 setup: $(OBJDIR) $(APPNAME)
782788
 $(MAKENSIS) ./setup/fossil.nsi
789
+
790
+innosetup: $(OBJDIR) $(APPNAME)
791
+ $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
783792
 }
784793
785794
 set mhargs {}
786795
 foreach s [lsort $src] {
787796
 if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
788797
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -613,11 +613,15 @@
613 #
614 TCLSH = tclsh
615
616 #### Nullsoft installer MakeNSIS location
617 #
618 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
 
 
 
 
619
620 #### Include a configuration file that can override any one of these settings.
621 #
622 -include config.w32
623
@@ -653,10 +657,11 @@
653 ifdef USE_WINDOWS
654 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
655 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
656 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
657 VERSION = $(subst /,\,$(OBJDIR)/version)
 
658 CP = copy
659 MV = copy
660 RM = del /Q
661 MKDIR = -mkdir
662 RMDIR = rmdir /S /Q
@@ -663,10 +668,11 @@
663 else
664 TRANSLATE = $(OBJDIR)/translate
665 MAKEHEADERS = $(OBJDIR)/makeheaders
666 MKINDEX = $(OBJDIR)/mkindex
667 VERSION = $(OBJDIR)/version
 
668 CP = cp
669 MV = mv
670 RM = rm -f
671 MKDIR = -mkdir -p
672 RMDIR = rm -rf
@@ -778,10 +784,13 @@
778 $(RMDIR) $(OBJDIR)
779 endif
780
781 setup: $(OBJDIR) $(APPNAME)
782 $(MAKENSIS) ./setup/fossil.nsi
 
 
 
783 }
784
785 set mhargs {}
786 foreach s [lsort $src] {
787 if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
788
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -613,11 +613,15 @@
613 #
614 TCLSH = tclsh
615
616 #### Nullsoft installer MakeNSIS location
617 #
618 MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe"
619
620 #### Inno Setup executable location
621 #
622 INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe"
623
624 #### Include a configuration file that can override any one of these settings.
625 #
626 -include config.w32
627
@@ -653,10 +657,11 @@
657 ifdef USE_WINDOWS
658 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
659 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
660 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
661 VERSION = $(subst /,\,$(OBJDIR)/version)
662 CAT = type
663 CP = copy
664 MV = copy
665 RM = del /Q
666 MKDIR = -mkdir
667 RMDIR = rmdir /S /Q
@@ -663,10 +668,11 @@
668 else
669 TRANSLATE = $(OBJDIR)/translate
670 MAKEHEADERS = $(OBJDIR)/makeheaders
671 MKINDEX = $(OBJDIR)/mkindex
672 VERSION = $(OBJDIR)/version
673 CAT = cat
674 CP = cp
675 MV = mv
676 RM = rm -f
677 MKDIR = -mkdir -p
678 RMDIR = rm -rf
@@ -778,10 +784,13 @@
784 $(RMDIR) $(OBJDIR)
785 endif
786
787 setup: $(OBJDIR) $(APPNAME)
788 $(MAKENSIS) ./setup/fossil.nsi
789
790 innosetup: $(OBJDIR) $(APPNAME)
791 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
792 }
793
794 set mhargs {}
795 foreach s [lsort $src] {
796 if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
797
M src/makemake.tcl
+10 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -613,11 +613,15 @@
613613
 #
614614
 TCLSH = tclsh
615615
616616
 #### Nullsoft installer MakeNSIS location
617617
 #
618
-MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
618
+MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe"
619
+
620
+#### Inno Setup executable location
621
+#
622
+INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe"
619623
620624
 #### Include a configuration file that can override any one of these settings.
621625
 #
622626
 -include config.w32
623627
@@ -653,10 +657,11 @@
653657
 ifdef USE_WINDOWS
654658
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
655659
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
656660
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
657661
 VERSION = $(subst /,\,$(OBJDIR)/version)
662
+CAT = type
658663
 CP = copy
659664
 MV = copy
660665
 RM = del /Q
661666
 MKDIR = -mkdir
662667
 RMDIR = rmdir /S /Q
@@ -663,10 +668,11 @@
663668
 else
664669
 TRANSLATE = $(OBJDIR)/translate
665670
 MAKEHEADERS = $(OBJDIR)/makeheaders
666671
 MKINDEX = $(OBJDIR)/mkindex
667672
 VERSION = $(OBJDIR)/version
673
+CAT = cat
668674
 CP = cp
669675
 MV = mv
670676
 RM = rm -f
671677
 MKDIR = -mkdir -p
672678
 RMDIR = rm -rf
@@ -778,10 +784,13 @@
778784
 $(RMDIR) $(OBJDIR)
779785
 endif
780786
781787
 setup: $(OBJDIR) $(APPNAME)
782788
 $(MAKENSIS) ./setup/fossil.nsi
789
+
790
+innosetup: $(OBJDIR) $(APPNAME)
791
+ $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
783792
 }
784793
785794
 set mhargs {}
786795
 foreach s [lsort $src] {
787796
 if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
788797
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -613,11 +613,15 @@
613 #
614 TCLSH = tclsh
615
616 #### Nullsoft installer MakeNSIS location
617 #
618 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
 
 
 
 
619
620 #### Include a configuration file that can override any one of these settings.
621 #
622 -include config.w32
623
@@ -653,10 +657,11 @@
653 ifdef USE_WINDOWS
654 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
655 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
656 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
657 VERSION = $(subst /,\,$(OBJDIR)/version)
 
658 CP = copy
659 MV = copy
660 RM = del /Q
661 MKDIR = -mkdir
662 RMDIR = rmdir /S /Q
@@ -663,10 +668,11 @@
663 else
664 TRANSLATE = $(OBJDIR)/translate
665 MAKEHEADERS = $(OBJDIR)/makeheaders
666 MKINDEX = $(OBJDIR)/mkindex
667 VERSION = $(OBJDIR)/version
 
668 CP = cp
669 MV = mv
670 RM = rm -f
671 MKDIR = -mkdir -p
672 RMDIR = rm -rf
@@ -778,10 +784,13 @@
778 $(RMDIR) $(OBJDIR)
779 endif
780
781 setup: $(OBJDIR) $(APPNAME)
782 $(MAKENSIS) ./setup/fossil.nsi
 
 
 
783 }
784
785 set mhargs {}
786 foreach s [lsort $src] {
787 if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
788
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -613,11 +613,15 @@
613 #
614 TCLSH = tclsh
615
616 #### Nullsoft installer MakeNSIS location
617 #
618 MAKENSIS = "$(PROGRAMFILES)\NSIS\MakeNSIS.exe"
619
620 #### Inno Setup executable location
621 #
622 INNOSETUP = "$(PROGRAMFILES)\Inno Setup 5\ISCC.exe"
623
624 #### Include a configuration file that can override any one of these settings.
625 #
626 -include config.w32
627
@@ -653,10 +657,11 @@
657 ifdef USE_WINDOWS
658 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
659 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
660 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
661 VERSION = $(subst /,\,$(OBJDIR)/version)
662 CAT = type
663 CP = copy
664 MV = copy
665 RM = del /Q
666 MKDIR = -mkdir
667 RMDIR = rmdir /S /Q
@@ -663,10 +668,11 @@
668 else
669 TRANSLATE = $(OBJDIR)/translate
670 MAKEHEADERS = $(OBJDIR)/makeheaders
671 MKINDEX = $(OBJDIR)/mkindex
672 VERSION = $(OBJDIR)/version
673 CAT = cat
674 CP = cp
675 MV = mv
676 RM = rm -f
677 MKDIR = -mkdir -p
678 RMDIR = rm -rf
@@ -778,10 +784,13 @@
784 $(RMDIR) $(OBJDIR)
785 endif
786
787 setup: $(OBJDIR) $(APPNAME)
788 $(MAKENSIS) ./setup/fossil.nsi
789
790 innosetup: $(OBJDIR) $(APPNAME)
791 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
792 }
793
794 set mhargs {}
795 foreach s [lsort $src] {
796 if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
797
M win/Makefile.mingw
+10 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -251,11 +251,15 @@
251251
 #
252252
 TCLSH = tclsh
253253
254254
 #### Nullsoft installer MakeNSIS location
255255
 #
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"
257261
258262
 #### Include a configuration file that can override any one of these settings.
259263
 #
260264
 -include config.w32
261265
@@ -615,10 +619,11 @@
615619
 ifdef USE_WINDOWS
616620
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
617621
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
618622
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
619623
 VERSION = $(subst /,\,$(OBJDIR)/version)
624
+CAT = type
620625
 CP = copy
621626
 MV = copy
622627
 RM = del /Q
623628
 MKDIR = -mkdir
624629
 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
625630
 else
626631
 TRANSLATE = $(OBJDIR)/translate
627632
 MAKEHEADERS = $(OBJDIR)/makeheaders
628633
 MKINDEX = $(OBJDIR)/mkindex
629634
 VERSION = $(OBJDIR)/version
635
+CAT = cat
630636
 CP = cp
631637
 MV = mv
632638
 RM = rm -f
633639
 MKDIR = -mkdir -p
634640
 RMDIR = rm -rf
@@ -734,10 +740,13 @@
734740
 endif
735741
736742
 setup: $(OBJDIR) $(APPNAME)
737743
 $(MAKENSIS) ./setup/fossil.nsi
738744
745
+innosetup: $(OBJDIR) $(APPNAME)
746
+ $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
747
+
739748
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
740749
 $(MKINDEX) $(TRANS_SRC) >$@
741750
742751
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
743752
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
744753
--- 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
@@ -615,10 +619,11 @@
615 ifdef USE_WINDOWS
616 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
617 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
618 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
619 VERSION = $(subst /,\,$(OBJDIR)/version)
 
620 CP = copy
621 MV = copy
622 RM = del /Q
623 MKDIR = -mkdir
624 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
625 else
626 TRANSLATE = $(OBJDIR)/translate
627 MAKEHEADERS = $(OBJDIR)/makeheaders
628 MKINDEX = $(OBJDIR)/mkindex
629 VERSION = $(OBJDIR)/version
 
630 CP = cp
631 MV = mv
632 RM = rm -f
633 MKDIR = -mkdir -p
634 RMDIR = rm -rf
@@ -734,10 +740,13 @@
734 endif
735
736 setup: $(OBJDIR) $(APPNAME)
737 $(MAKENSIS) ./setup/fossil.nsi
738
 
 
 
739 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
740 $(MKINDEX) $(TRANS_SRC) >$@
741
742 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
743 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
744
--- 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
@@ -615,10 +619,11 @@
619 ifdef USE_WINDOWS
620 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
621 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
622 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
623 VERSION = $(subst /,\,$(OBJDIR)/version)
624 CAT = type
625 CP = copy
626 MV = copy
627 RM = del /Q
628 MKDIR = -mkdir
629 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
630 else
631 TRANSLATE = $(OBJDIR)/translate
632 MAKEHEADERS = $(OBJDIR)/makeheaders
633 MKINDEX = $(OBJDIR)/mkindex
634 VERSION = $(OBJDIR)/version
635 CAT = cat
636 CP = cp
637 MV = mv
638 RM = rm -f
639 MKDIR = -mkdir -p
640 RMDIR = rm -rf
@@ -734,10 +740,13 @@
740 endif
741
742 setup: $(OBJDIR) $(APPNAME)
743 $(MAKENSIS) ./setup/fossil.nsi
744
745 innosetup: $(OBJDIR) $(APPNAME)
746 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
747
748 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
749 $(MKINDEX) $(TRANS_SRC) >$@
750
751 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
752 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
753
M win/Makefile.mingw
+10 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -251,11 +251,15 @@
251251
 #
252252
 TCLSH = tclsh
253253
254254
 #### Nullsoft installer MakeNSIS location
255255
 #
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"
257261
258262
 #### Include a configuration file that can override any one of these settings.
259263
 #
260264
 -include config.w32
261265
@@ -615,10 +619,11 @@
615619
 ifdef USE_WINDOWS
616620
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
617621
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
618622
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
619623
 VERSION = $(subst /,\,$(OBJDIR)/version)
624
+CAT = type
620625
 CP = copy
621626
 MV = copy
622627
 RM = del /Q
623628
 MKDIR = -mkdir
624629
 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
625630
 else
626631
 TRANSLATE = $(OBJDIR)/translate
627632
 MAKEHEADERS = $(OBJDIR)/makeheaders
628633
 MKINDEX = $(OBJDIR)/mkindex
629634
 VERSION = $(OBJDIR)/version
635
+CAT = cat
630636
 CP = cp
631637
 MV = mv
632638
 RM = rm -f
633639
 MKDIR = -mkdir -p
634640
 RMDIR = rm -rf
@@ -734,10 +740,13 @@
734740
 endif
735741
736742
 setup: $(OBJDIR) $(APPNAME)
737743
 $(MAKENSIS) ./setup/fossil.nsi
738744
745
+innosetup: $(OBJDIR) $(APPNAME)
746
+ $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
747
+
739748
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
740749
 $(MKINDEX) $(TRANS_SRC) >$@
741750
742751
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
743752
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
744753
--- 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
@@ -615,10 +619,11 @@
615 ifdef USE_WINDOWS
616 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
617 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
618 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
619 VERSION = $(subst /,\,$(OBJDIR)/version)
 
620 CP = copy
621 MV = copy
622 RM = del /Q
623 MKDIR = -mkdir
624 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
625 else
626 TRANSLATE = $(OBJDIR)/translate
627 MAKEHEADERS = $(OBJDIR)/makeheaders
628 MKINDEX = $(OBJDIR)/mkindex
629 VERSION = $(OBJDIR)/version
 
630 CP = cp
631 MV = mv
632 RM = rm -f
633 MKDIR = -mkdir -p
634 RMDIR = rm -rf
@@ -734,10 +740,13 @@
734 endif
735
736 setup: $(OBJDIR) $(APPNAME)
737 $(MAKENSIS) ./setup/fossil.nsi
738
 
 
 
739 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
740 $(MKINDEX) $(TRANS_SRC) >$@
741
742 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
743 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
744
--- 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
@@ -615,10 +619,11 @@
619 ifdef USE_WINDOWS
620 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
621 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
622 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
623 VERSION = $(subst /,\,$(OBJDIR)/version)
624 CAT = type
625 CP = copy
626 MV = copy
627 RM = del /Q
628 MKDIR = -mkdir
629 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
630 else
631 TRANSLATE = $(OBJDIR)/translate
632 MAKEHEADERS = $(OBJDIR)/makeheaders
633 MKINDEX = $(OBJDIR)/mkindex
634 VERSION = $(OBJDIR)/version
635 CAT = cat
636 CP = cp
637 MV = mv
638 RM = rm -f
639 MKDIR = -mkdir -p
640 RMDIR = rm -rf
@@ -734,10 +740,13 @@
740 endif
741
742 setup: $(OBJDIR) $(APPNAME)
743 $(MAKENSIS) ./setup/fossil.nsi
744
745 innosetup: $(OBJDIR) $(APPNAME)
746 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
747
748 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
749 $(MKINDEX) $(TRANS_SRC) >$@
750
751 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
752 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
753
M win/Makefile.mingw.mistachkin
+10 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -251,11 +251,15 @@
251251
 #
252252
 TCLSH = tclsh
253253
254254
 #### Nullsoft installer MakeNSIS location
255255
 #
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"
257261
258262
 #### Include a configuration file that can override any one of these settings.
259263
 #
260264
 -include config.w32
261265
@@ -615,10 +619,11 @@
615619
 ifdef USE_WINDOWS
616620
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
617621
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
618622
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
619623
 VERSION = $(subst /,\,$(OBJDIR)/version)
624
+CAT = type
620625
 CP = copy
621626
 MV = copy
622627
 RM = del /Q
623628
 MKDIR = -mkdir
624629
 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
625630
 else
626631
 TRANSLATE = $(OBJDIR)/translate
627632
 MAKEHEADERS = $(OBJDIR)/makeheaders
628633
 MKINDEX = $(OBJDIR)/mkindex
629634
 VERSION = $(OBJDIR)/version
635
+CAT = cat
630636
 CP = cp
631637
 MV = mv
632638
 RM = rm -f
633639
 MKDIR = -mkdir -p
634640
 RMDIR = rm -rf
@@ -734,10 +740,13 @@
734740
 endif
735741
736742
 setup: $(OBJDIR) $(APPNAME)
737743
 $(MAKENSIS) ./setup/fossil.nsi
738744
745
+innosetup: $(OBJDIR) $(APPNAME)
746
+ $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
747
+
739748
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
740749
 $(MKINDEX) $(TRANS_SRC) >$@
741750
742751
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
743752
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
744753
--- 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
@@ -615,10 +619,11 @@
615 ifdef USE_WINDOWS
616 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
617 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
618 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
619 VERSION = $(subst /,\,$(OBJDIR)/version)
 
620 CP = copy
621 MV = copy
622 RM = del /Q
623 MKDIR = -mkdir
624 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
625 else
626 TRANSLATE = $(OBJDIR)/translate
627 MAKEHEADERS = $(OBJDIR)/makeheaders
628 MKINDEX = $(OBJDIR)/mkindex
629 VERSION = $(OBJDIR)/version
 
630 CP = cp
631 MV = mv
632 RM = rm -f
633 MKDIR = -mkdir -p
634 RMDIR = rm -rf
@@ -734,10 +740,13 @@
734 endif
735
736 setup: $(OBJDIR) $(APPNAME)
737 $(MAKENSIS) ./setup/fossil.nsi
738
 
 
 
739 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
740 $(MKINDEX) $(TRANS_SRC) >$@
741
742 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
743 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
744
--- 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
@@ -615,10 +619,11 @@
619 ifdef USE_WINDOWS
620 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
621 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
622 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
623 VERSION = $(subst /,\,$(OBJDIR)/version)
624 CAT = type
625 CP = copy
626 MV = copy
627 RM = del /Q
628 MKDIR = -mkdir
629 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
630 else
631 TRANSLATE = $(OBJDIR)/translate
632 MAKEHEADERS = $(OBJDIR)/makeheaders
633 MKINDEX = $(OBJDIR)/mkindex
634 VERSION = $(OBJDIR)/version
635 CAT = cat
636 CP = cp
637 MV = mv
638 RM = rm -f
639 MKDIR = -mkdir -p
640 RMDIR = rm -rf
@@ -734,10 +740,13 @@
740 endif
741
742 setup: $(OBJDIR) $(APPNAME)
743 $(MAKENSIS) ./setup/fossil.nsi
744
745 innosetup: $(OBJDIR) $(APPNAME)
746 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
747
748 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
749 $(MKINDEX) $(TRANS_SRC) >$@
750
751 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
752 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
753
M win/Makefile.mingw.mistachkin
+10 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -251,11 +251,15 @@
251251
 #
252252
 TCLSH = tclsh
253253
254254
 #### Nullsoft installer MakeNSIS location
255255
 #
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"
257261
258262
 #### Include a configuration file that can override any one of these settings.
259263
 #
260264
 -include config.w32
261265
@@ -615,10 +619,11 @@
615619
 ifdef USE_WINDOWS
616620
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
617621
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
618622
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
619623
 VERSION = $(subst /,\,$(OBJDIR)/version)
624
+CAT = type
620625
 CP = copy
621626
 MV = copy
622627
 RM = del /Q
623628
 MKDIR = -mkdir
624629
 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
625630
 else
626631
 TRANSLATE = $(OBJDIR)/translate
627632
 MAKEHEADERS = $(OBJDIR)/makeheaders
628633
 MKINDEX = $(OBJDIR)/mkindex
629634
 VERSION = $(OBJDIR)/version
635
+CAT = cat
630636
 CP = cp
631637
 MV = mv
632638
 RM = rm -f
633639
 MKDIR = -mkdir -p
634640
 RMDIR = rm -rf
@@ -734,10 +740,13 @@
734740
 endif
735741
736742
 setup: $(OBJDIR) $(APPNAME)
737743
 $(MAKENSIS) ./setup/fossil.nsi
738744
745
+innosetup: $(OBJDIR) $(APPNAME)
746
+ $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
747
+
739748
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
740749
 $(MKINDEX) $(TRANS_SRC) >$@
741750
742751
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
743752
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
744753
--- 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
@@ -615,10 +619,11 @@
615 ifdef USE_WINDOWS
616 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
617 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
618 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
619 VERSION = $(subst /,\,$(OBJDIR)/version)
 
620 CP = copy
621 MV = copy
622 RM = del /Q
623 MKDIR = -mkdir
624 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
625 else
626 TRANSLATE = $(OBJDIR)/translate
627 MAKEHEADERS = $(OBJDIR)/makeheaders
628 MKINDEX = $(OBJDIR)/mkindex
629 VERSION = $(OBJDIR)/version
 
630 CP = cp
631 MV = mv
632 RM = rm -f
633 MKDIR = -mkdir -p
634 RMDIR = rm -rf
@@ -734,10 +740,13 @@
734 endif
735
736 setup: $(OBJDIR) $(APPNAME)
737 $(MAKENSIS) ./setup/fossil.nsi
738
 
 
 
739 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
740 $(MKINDEX) $(TRANS_SRC) >$@
741
742 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
743 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
744
--- 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
@@ -615,10 +619,11 @@
619 ifdef USE_WINDOWS
620 TRANSLATE = $(subst /,\,$(OBJDIR)/translate)
621 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders)
622 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex)
623 VERSION = $(subst /,\,$(OBJDIR)/version)
624 CAT = type
625 CP = copy
626 MV = copy
627 RM = del /Q
628 MKDIR = -mkdir
629 RMDIR = rmdir /S /Q
@@ -625,10 +630,11 @@
630 else
631 TRANSLATE = $(OBJDIR)/translate
632 MAKEHEADERS = $(OBJDIR)/makeheaders
633 MKINDEX = $(OBJDIR)/mkindex
634 VERSION = $(OBJDIR)/version
635 CAT = cat
636 CP = cp
637 MV = mv
638 RM = rm -f
639 MKDIR = -mkdir -p
640 RMDIR = rm -rf
@@ -734,10 +740,13 @@
740 endif
741
742 setup: $(OBJDIR) $(APPNAME)
743 $(MAKENSIS) ./setup/fossil.nsi
744
745 innosetup: $(OBJDIR) $(APPNAME)
746 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
747
748 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
749 $(MKINDEX) $(TRANS_SRC) >$@
750
751 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
752 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
753

Keyboard Shortcuts

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