Fossil SCM

Move Fossil NSIS setup file to the 'setup' directory.

mistachkin 2014-06-12 20:40 trunk
Commit 8b4aaef2f515b0e38b2001145885070f0e88a159
Parent 3e5ebe2b9027cde…
5 files changed -55 +1 -1 +1 -1 +1 -1 +1 -1
- fossil.nsi ~ setup/fossil.nsi ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
D fossil.nsi
-55
--- a/fossil.nsi
+++ b/fossil.nsi
@@ -1,55 +0,0 @@
1
-; example2.nsi
2
-;
3
-; This script is based on example1.nsi, but adds uninstall support
4
-; and (optionally) start menu shortcuts.
5
-;
6
-; It will install notepad.exe into a directory that the user selects,
7
-;
8
-
9
-; The name of the installer
10
-Name "Fossil"
11
-
12
-; The file to write
13
-OutFile "fossil-setup.exe"
14
-
15
-; The default installation directory
16
-InstallDir $PROGRAMFILES\Fossil
17
-; Registry key to check for directory (so if you install again, it will
18
-; overwrite the old one automatically)
19
-InstallDirRegKey HKLM SOFTWARE\Fossil "Install_Dir"
20
-
21
-; The text to prompt the user to enter a directory
22
-ComponentText "This will install fossil on your computer."
23
-; The text to prompt the user to enter a directory
24
-DirText "Choose a directory to install in to:"
25
-
26
-; The stuff to install
27
-Section "Fossil (required)"
28
- ; Set output path to the installation directory.
29
- SetOutPath $INSTDIR
30
- ; Put file there
31
- File "..\fossil.exe"
32
- ; Write the installation path into the registry
33
- WriteRegStr HKLM SOFTWARE\Fossil "Install_Dir" "$INSTDIR"
34
- ; Write the uninstall keys for Windows
35
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "DisplayName" "Fossil (remove only)"
36
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "UninstallString" '"$INSTDIR\uninstall.exe"'
37
- WriteUninstaller "uninstall.exe"
38
-SectionEnd
39
-
40
-
41
-; uninstall stuff
42
-
43
-UninstallText "This will uninstall fossil. Hit next to continue."
44
-
45
-; special uninstall section.
46
-Section "Uninstall"
47
- ; remove registry keys
48
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil"
49
- DeleteRegKey HKLM SOFTWARE\Fossil
50
- ; remove files
51
- Delete $INSTDIR\fossil.exe
52
- ; MUST REMOVE UNINSTALLER, too
53
- Delete $INSTDIR\uninstall.exe
54
- ; remove shortcuts, if any.
55
- RMDir "$SM
--- a/fossil.nsi
+++ b/fossil.nsi
@@ -1,55 +0,0 @@
1 ; example2.nsi
2 ;
3 ; This script is based on example1.nsi, but adds uninstall support
4 ; and (optionally) start menu shortcuts.
5 ;
6 ; It will install notepad.exe into a directory that the user selects,
7 ;
8
9 ; The name of the installer
10 Name "Fossil"
11
12 ; The file to write
13 OutFile "fossil-setup.exe"
14
15 ; The default installation directory
16 InstallDir $PROGRAMFILES\Fossil
17 ; Registry key to check for directory (so if you install again, it will
18 ; overwrite the old one automatically)
19 InstallDirRegKey HKLM SOFTWARE\Fossil "Install_Dir"
20
21 ; The text to prompt the user to enter a directory
22 ComponentText "This will install fossil on your computer."
23 ; The text to prompt the user to enter a directory
24 DirText "Choose a directory to install in to:"
25
26 ; The stuff to install
27 Section "Fossil (required)"
28 ; Set output path to the installation directory.
29 SetOutPath $INSTDIR
30 ; Put file there
31 File "..\fossil.exe"
32 ; Write the installation path into the registry
33 WriteRegStr HKLM SOFTWARE\Fossil "Install_Dir" "$INSTDIR"
34 ; Write the uninstall keys for Windows
35 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "DisplayName" "Fossil (remove only)"
36 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil" "UninstallString" '"$INSTDIR\uninstall.exe"'
37 WriteUninstaller "uninstall.exe"
38 SectionEnd
39
40
41 ; uninstall stuff
42
43 UninstallText "This will uninstall fossil. Hit next to continue."
44
45 ; special uninstall section.
46 Section "Uninstall"
47 ; remove registry keys
48 DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Fossil"
49 DeleteRegKey HKLM SOFTWARE\Fossil
50 ; remove files
51 Delete $INSTDIR\fossil.exe
52 ; MUST REMOVE UNINSTALLER, too
53 Delete $INSTDIR\uninstall.exe
54 ; remove shortcuts, if any.
55 RMDir "$SM
--- a/fossil.nsi
+++ b/fossil.nsi
@@ -1,55 +0,0 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
M setup/fossil.nsi
+1 -1
--- a/setup/fossil.nsi
+++ b/setup/fossil.nsi
@@ -27,7 +27,7 @@
2727
 Section "Fossil (required)"
2828
 ; Set output path to the installation directory.
2929
 SetOutPath $INSTDIR
30
- ; Put file there
30
+ ; Put file there
3131
 File "..\fossil.exe"
3232
 ; Write the installation path into the registry
3333
 WriteRegStr HKLM SOFTWARE\Fossil "Install_Dir" "$INSTDIR"
--- a/setup/fossil.nsi
+++ b/setup/fossil.nsi
@@ -27,7 +27,7 @@
27 Section "Fossil (required)"
28 ; Set output path to the installation directory.
29 SetOutPath $INSTDIR
30 ; Put file there
31 File "..\fossil.exe"
32 ; Write the installation path into the registry
33 WriteRegStr HKLM SOFTWARE\Fossil "Install_Dir" "$INSTDIR"
--- a/setup/fossil.nsi
+++ b/setup/fossil.nsi
@@ -27,7 +27,7 @@
27 Section "Fossil (required)"
28 ; Set output path to the installation directory.
29 SetOutPath $INSTDIR
30 ; Put file there
31 File "..\fossil.exe"
32 ; Write the installation path into the registry
33 WriteRegStr HKLM SOFTWARE\Fossil "Install_Dir" "$INSTDIR"
M src/makemake.tcl
+1 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -776,11 +776,11 @@
776776
 $(RM) $(APPNAME)
777777
 $(RMDIR) $(OBJDIR)
778778
 endif
779779
780780
 setup: $(OBJDIR) $(APPNAME)
781
- $(MAKENSIS) ./fossil.nsi
781
+ $(MAKENSIS) ./setup/fossil.nsi
782782
 }
783783
784784
 set mhargs {}
785785
 foreach s [lsort $src] {
786786
 if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
787787
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -776,11 +776,11 @@
776 $(RM) $(APPNAME)
777 $(RMDIR) $(OBJDIR)
778 endif
779
780 setup: $(OBJDIR) $(APPNAME)
781 $(MAKENSIS) ./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
@@ -776,11 +776,11 @@
776 $(RM) $(APPNAME)
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
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -729,11 +729,11 @@
729729
 $(RM) $(APPNAME)
730730
 $(RMDIR) $(OBJDIR)
731731
 endif
732732
733733
 setup: $(OBJDIR) $(APPNAME)
734
- $(MAKENSIS) ./fossil.nsi
734
+ $(MAKENSIS) ./setup/fossil.nsi
735735
736736
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
737737
 $(MKINDEX) $(TRANS_SRC) >$@
738738
739739
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
740740
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -729,11 +729,11 @@
729 $(RM) $(APPNAME)
730 $(RMDIR) $(OBJDIR)
731 endif
732
733 setup: $(OBJDIR) $(APPNAME)
734 $(MAKENSIS) ./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
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -729,11 +729,11 @@
729 $(RM) $(APPNAME)
730 $(RMDIR) $(OBJDIR)
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
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -729,11 +729,11 @@
729729
 $(RM) $(APPNAME)
730730
 $(RMDIR) $(OBJDIR)
731731
 endif
732732
733733
 setup: $(OBJDIR) $(APPNAME)
734
- $(MAKENSIS) ./fossil.nsi
734
+ $(MAKENSIS) ./setup/fossil.nsi
735735
736736
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
737737
 $(MKINDEX) $(TRANS_SRC) >$@
738738
739739
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
740740
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -729,11 +729,11 @@
729 $(RM) $(APPNAME)
730 $(RMDIR) $(OBJDIR)
731 endif
732
733 setup: $(OBJDIR) $(APPNAME)
734 $(MAKENSIS) ./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
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -729,11 +729,11 @@
729 $(RM) $(APPNAME)
730 $(RMDIR) $(OBJDIR)
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

Keyboard Shortcuts

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