diff options
Diffstat (limited to 'apps/plugins/puzzles/src/Buildscr')
-rw-r--r-- | apps/plugins/puzzles/src/Buildscr | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/apps/plugins/puzzles/src/Buildscr b/apps/plugins/puzzles/src/Buildscr index 910981f079..c72084477b 100644 --- a/apps/plugins/puzzles/src/Buildscr +++ b/apps/plugins/puzzles/src/Buildscr | |||
@@ -51,14 +51,10 @@ enddelegate | |||
51 | 51 | ||
52 | # Build the Windows binaries and installer, and the CHM file. | 52 | # Build the Windows binaries and installer, and the CHM file. |
53 | in puzzles do make -f Makefile.doc clean | 53 | in puzzles do make -f Makefile.doc clean |
54 | in puzzles do make -f Makefile.doc chm | 54 | in puzzles do make -f Makefile.doc # build help files for installer |
55 | in puzzles do make -f Makefile.doc # build help file for installer | ||
56 | in puzzles do mason.pl --args '{"version":"$(Version)","descfile":"gamedesc.txt"}' winwix.mc > puzzles.wxs | 55 | in puzzles do mason.pl --args '{"version":"$(Version)","descfile":"gamedesc.txt"}' winwix.mc > puzzles.wxs |
57 | in puzzles do perl winiss.pl $(Version) gamedesc.txt > puzzles.iss | 56 | in puzzles do perl winiss.pl $(Version) gamedesc.txt > puzzles.iss |
58 | delegate windows | 57 | delegate windows |
59 | # Ignore the poorly controlled return value from HHC, and instead | ||
60 | # just test that the output file was generated. | ||
61 | in puzzles with htmlhelp do/win hhc puzzles.hhp & type puzzles.chm >nul | ||
62 | # FIXME: Cygwin alternative? | 58 | # FIXME: Cygwin alternative? |
63 | in puzzles with visualstudio do/win nmake -f Makefile.vc clean | 59 | in puzzles with visualstudio do/win nmake -f Makefile.vc clean |
64 | in puzzles with visualstudio do/win nmake -f Makefile.vc VER=-DVER=$(Version) | 60 | in puzzles with visualstudio do/win nmake -f Makefile.vc VER=-DVER=$(Version) |
@@ -67,12 +63,11 @@ delegate windows | |||
67 | # provide a 'more info' URL, and an optional -n option to provide a | 63 | # provide a 'more info' URL, and an optional -n option to provide a |
68 | # program name, and that it can take multiple .exe filename | 64 | # program name, and that it can take multiple .exe filename |
69 | # arguments and sign them all in place. | 65 | # arguments and sign them all in place. |
70 | ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe | 66 | ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe |
71 | # Build installers. | 67 | # Build installers. |
72 | in puzzles with wix do/win candle puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj | 68 | in puzzles with wix do/win candle puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj |
73 | in puzzles with innosetup do/win iscc puzzles.iss | 69 | in puzzles with innosetup do/win iscc puzzles.iss |
74 | ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" puzzles.msi Output/installer.exe | 70 | ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" puzzles.msi Output/installer.exe |
75 | return puzzles/puzzles.chm | ||
76 | return puzzles/*.exe | 71 | return puzzles/*.exe |
77 | return puzzles/Output/installer.exe | 72 | return puzzles/Output/installer.exe |
78 | return puzzles/puzzles.msi | 73 | return puzzles/puzzles.msi |
@@ -114,9 +109,7 @@ in puzzles do chmod +x *.exe | |||
114 | # return puzzles/puzzles.armv4.cab | 109 | # return puzzles/puzzles.armv4.cab |
115 | #enddelegate | 110 | #enddelegate |
116 | 111 | ||
117 | # Build the help file and the HTML docs. | 112 | # Build the HTML docs. |
118 | in puzzles do make -f Makefile.doc clean # remove CHM-target HTML | ||
119 | in puzzles do make -f Makefile.doc # and rebuild help file... | ||
120 | in puzzles do mkdir doc | 113 | in puzzles do mkdir doc |
121 | in puzzles do mkdir devel | 114 | in puzzles do mkdir devel |
122 | in puzzles/doc do halibut --html -Chtml-contents-filename:index.html -Chtml-index-filename:indexpage.html -Chtml-template-filename:%k.html -Chtml-template-fragment:%k ../puzzles.but | 115 | in puzzles/doc do halibut --html -Chtml-contents-filename:index.html -Chtml-index-filename:indexpage.html -Chtml-template-filename:%k.html -Chtml-template-fragment:%k ../puzzles.but |