diff options
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/msi/README.md | 22 | ||||
| -rw-r--r-- | src/msi/readme.txt | 3 | ||||
| -rw-r--r-- | src/msi/sok.wxs | 67 |
4 files changed, 51 insertions, 43 deletions
diff --git a/meson.build b/meson.build index f3f4600..d78e81f 100644 --- a/meson.build +++ b/meson.build @@ -54,7 +54,7 @@ custom_target('msi', wixl, '-o', '@OUTPUT@', '-D', 'BUILD_DIR=.', - '-D', 'ASSETS_DIR=../assets', + '-D', 'SRC_ROOT_DIR=' + meson.source_root(), '-D', 'SDL_LIB_DIR=' + MSI_SDL_LIB_DIR, '@INPUT@', ] diff --git a/src/msi/README.md b/src/msi/README.md deleted file mode 100644 index 7d420f5..0000000 --- a/src/msi/README.md +++ /dev/null @@ -1,22 +0,0 @@ -Generate MSI installer for Windows. - -Setup: - - apt-get install wixl - -Build (using sok.msi build target): - - ninja sok.msi - -Dependencies: - -* `SDL2-devel` (from libsdl.org) -* `SDL2_ttf-devel` (from libsdl.org) - -Example (generate by hand): - - # generate sok.msi - wixl -o sok.msi \ - -D BUILD_DIR=../../build-w64 \ - -D SDL_LIB_DIR=/usr/local/x86_64-w64-mingw32/bin \ - sok.wxs diff --git a/src/msi/readme.txt b/src/msi/readme.txt new file mode 100644 index 0000000..1b7ac5a --- /dev/null +++ b/src/msi/readme.txt @@ -0,0 +1,3 @@ +Pablotron Sokoban README
+========================
+Blah blah blah
diff --git a/src/msi/sok.wxs b/src/msi/sok.wxs index be830d0..d1bcfa9 100644 --- a/src/msi/sok.wxs +++ b/src/msi/sok.wxs @@ -1,24 +1,30 @@ <?xml version='1.0' encoding='utf-8'?> <!-- -To build: - wixl -o sok.msi \ - -D BUILD_DIR=../../build-w64 \ - -D SDL_LIB_DIR=/usr/local/x86_64-w64-mingw32/bin \ - sok.wxs +Generate MSI installer for Windows. + +Setup: + + apt-get install wixl + +Build (using sok.msi build target): + + ninja sok.msi + +Dependencies: + +* `SDL2-devel` (from libsdl.org) +* `SDL2_ttf-devel` (from libsdl.org) + +Example (generate by hand): + + # generate sok.msi + wixl -o sok.msi \ + -D BUILD_DIR=../../build-w64 \ + -D SDL_LIB_DIR=/usr/local/x86_64-w64-mingw32/bin \ + sok.wxs GUIDs (wget -qO- https://www.uuidgenerator.net/api/guid/10): -# 3626b379-ca7b-4fae-990e-b00cdeb0f2d7 -# dd702ed3-2b65-4d05-bc99-205aafbb8c37 -# ca5c1c3c-4bb5-4123-b8ff-e1228e3457eb -# be925023-1bc1-4e05-a5bf-64b831106651 -# 29d288a3-09f7-408b-8412-8d0e6176a235 -# 8089e94a-61f3-402e-b1b4-6b7346dc96e9 -# 1e8a655d-7370-410c-95f2-2e42c41d9031 -# 67058335-6a4e-4cf0-bc34-c8cc2e2e2578 -# e9383c16-e1cb-432a-b8db-d799c8225c85 -# 58de5bfd-4962-4fbc-a2e7-01da77bd050b -# 364e3bc9-53c8-465b-ae02-edf3e53b327c -0aca3163-98b4-4302-9dad-9dfaac254620 +# 0aca3163-98b4-4302-9dad-9dfaac254620 3a68235a-03d2-4751-ab4a-1914a97792fc 10951342-4abb-4c51-b91c-94c8643f9c91 57dc91da-cde4-4299-b5dc-b93bd563e9b1 @@ -60,7 +66,7 @@ adc88948-391e-48cf-8067-b002dcba4411 <Icon Id='sok.ico' - SourceFile='$(var.ASSETS_DIR)/sok.ico' + SourceFile='$(var.SRC_ROOT_DIR)/assets/sok.ico' /> <Property @@ -77,7 +83,7 @@ adc88948-391e-48cf-8067-b002dcba4411 Id='ProgramMenuDir' Guid='364e3bc9-53c8-465b-ae02-edf3e53b327c' > - <RemoveFolder Id='ProgramMenuDir' On='uninstall' /> + <RemoveFolder Id='ProgramMenuDir' On='uninstall'/> <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' @@ -89,7 +95,7 @@ adc88948-391e-48cf-8067-b002dcba4411 </Directory> </Directory> - <Directory Id='DesktopFolder' Name='Desktop' /> + <Directory Id='DesktopFolder' Name='Desktop'/> <Directory Id='ProgramFilesFolder' Name='PFiles'> <Directory Id='Pablotron' Name='Pablotron'> @@ -129,6 +135,26 @@ adc88948-391e-48cf-8067-b002dcba4411 </Component> <Component + Id='cmp-readme-txt' + Guid='0aca3163-98b4-4302-9dad-9dfaac254620' + > + <File + Id='file-readme-txt' + Name='readme.txt' + DiskId='1' + Source='$(var.SRC_ROOT_DIR)/src/msi/readme.txt' + KeyPath='yes' + > + <Shortcut + Id='shortcut-menu-readme-txt' + Directory='ProgramMenuDir' + Name='Pablotron Sokoban Manual' + WorkingDirectory='INSTALLDIR' + /> + </File> + </Component> + + <Component Id='cmp-solve-exe' Guid='be925023-1bc1-4e05-a5bf-64b831106651' > @@ -212,6 +238,7 @@ adc88948-391e-48cf-8067-b002dcba4411 <Feature Id='Complete' Level='1'> <ComponentRef Id='cmp-sok-exe'/> + <ComponentRef Id='cmp-readme-txt'/> <ComponentRef Id='cmp-solve-exe'/> <ComponentRef Id='cmp-text-exe'/> <ComponentRef Id='cmp-libfreetype-dll'/> |