Compare commits

...
19 Commits
Author SHA1 Message Date
Jean-André Santoni 55b1aa33ac Try that 2019-02-07 22:32:03 +07:00
Jean-André Santoni ed88f01462 This should fix it 2019-02-07 22:10:36 +07:00
Jean-André Santoni a6a4ddcb07 Debug 2019-02-07 22:02:23 +07:00
Jean-André Santoni 3f64358568 Debug 2019-02-07 21:49:54 +07:00
Jean-André Santoni 9a358b459c Debug 2019-02-07 21:41:58 +07:00
Jean-André Santoni e5fe1e4091 Debug 2019-02-07 21:29:38 +07:00
Jean-André Santoni 80357fdabc Install go-msi using go 2019-02-07 21:05:28 +07:00
Jean-André Santoni 8c63b4469d Debug 2019-02-07 20:45:09 +07:00
Jean-André Santoni 52a7602241 This? 2019-02-07 20:23:37 +07:00
Jean-André Santoni 59d083128e Fix cores 2019-02-07 20:05:38 +07:00
Jean-André Santoni a02f3847ba Revert "Revert "Generate an MSI for Windows (#137)""
This reverts commit 5b3dbb744c.
2019-02-07 19:25:56 +07:00
Jean-André Santoni 66d33c467d Merge remote-tracking branch 'origin/master' into kivutar/fixmsi 2019-02-07 18:03:18 +07:00
Jean-André Santoni 09c19f36fa Debug 2019-02-04 11:01:13 +07:00
Jean-André Santoni 1440ea421d Fix 2019-02-03 22:11:27 +07:00
Jean-André Santoni 975ea36d5a Test msi generation 2019-02-03 21:56:09 +07:00
Jean-André Santoni c50b90a7d9 fix 2019-02-03 21:46:29 +07:00
Jean-André Santoni 028e8aa12c Try WiX 2019-02-03 21:45:26 +07:00
Jean-André Santoni 73c9af0cba Debug 2019-02-03 21:34:56 +07:00
Jean-André Santoni 0aa78854c0 Debug 2019-02-03 21:21:06 +07:00
4 changed files with 53 additions and 6 deletions

No files matched your search

+2
View File
@@ -4,3 +4,5 @@ settings.json
*.app
*.dmg
cores
*.dll
*.msi
+10 -5
View File
@@ -74,6 +74,10 @@ matrix:
os: windows
before_install:
- choco install make
- choco install nuget.commandline
- nuget install WiX
- export PATH="$PATH:/c/Users/travis/gopath/src/github.com/libretro/ludo/WiX.3.11.1/tools"
- go get github.com/mh-cbon/go-msi
- wget http://static.kivutar.me/openal-soft-1.19.0-bin.zip
- 7z x openal-soft-1.19.0-bin.zip -o/c/Users/travis/openal-soft-1.19.0-bin
- export CGO_CFLAGS="-I/c/Users/travis/openal-soft-1.19.0-bin/include/"
@@ -88,10 +92,11 @@ matrix:
- gocyclo -over 19 $GO_FILES
- golint -set_exit_status $(go list ./...)
- go build -v -ldflags '-H=windowsgui'
- if [[ -n "$TRAVIS_TAG" ]]; then mkdir -p ./Ludo-Windows-x86_64-${TRAVIS_TAG:1}/; fi
- if [[ -n "$TRAVIS_TAG" ]]; then cp *.dll ./Ludo-Windows-x86_64-${TRAVIS_TAG:1}/; fi
- if [[ -n "$TRAVIS_TAG" ]]; then wget https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x64.exe; fi
- if [[ -n "$TRAVIS_TAG" ]]; then OS="Windows" ARCH=x86_64 VERSION=${TRAVIS_TAG:1} make zip; fi
- go-msi check-env
- OS="Windows" ARCH=x86_64 VERSION=0.3.3 make msi
- if [[ -n "$TRAVIS_TAG" ]]; then choco install go-msi; fi
- if [[ -n "$TRAVIS_TAG" ]]; then export PATH="$PATH;$WIX/bin"; fi
- if [[ -n "$TRAVIS_TAG" ]]; then OS="Windows" ARCH=x86_64 VERSION=${TRAVIS_TAG:1} make msi; fi
deploy:
skip_cleanup: true
@@ -102,7 +107,7 @@ deploy:
- Ludo-Linux-x86_64-${TRAVIS_TAG:1}.tar.gz
- Ludo-Linux-arm-${TRAVIS_TAG:1}.tar.gz
- Ludo-OSX-x86_64-${TRAVIS_TAG:1}.dmg
- Ludo-Windows-x86_64-${TRAVIS_TAG:1}.zip
- Ludo-Windows-x86_64-${TRAVIS_TAG:1}.msi
on:
repo: libretro/ludo
tags: true
+4 -1
View File
@@ -93,5 +93,8 @@ tar: ludo $(SOBJS)
cp -r cores $(BUNDLENAME)/
tar -zcf $(BUNDLENAME).tar.gz $(BUNDLENAME)\
msi: ludo.exe $(DLLS)
go-msi make --msi $(BUNDLENAME).msi --version=$(VERSION) --arch=x64
clean:
rm -rf $(BUNDLENAME).app ludo wc empty.dmg $(BUNDLENAME).dmg $(BUNDLENAME)-* cores/
rm -rf *.app ludo ludo.exe wc *.dmg $(BUNDLENAME)-* *.msi cores/
+37
View File
@@ -0,0 +1,37 @@
{
"product": "Ludo",
"company": "libretro",
"license": "COPYING",
"upgrade-code": "37fcda1b-c004-4262-82dd-2498f146ba7f",
"files": {
"guid": "cd3804b7-fd8f-45b2-8119-a2b1c4c7d068",
"items": [
"ludo.exe",
"OpenAL32.dll",
"libwinpthread-1.dll"
]
},
"directories": [
"assets",
"database",
"cores"
],
"shortcuts": {
"guid": "5ab52dc2-c638-4662-8284-90d25bc7d3a7",
"items": [
{
"name": "Ludo",
"description": "A user friendly libretro frontend",
"target": "[INSTALLDIR]\\ludo.exe",
"wdir": "INSTALLDIR",
"arguments": ""
}
]
},
"choco": {
"description": "Ludo",
"project-url": "https://github.com/libretro/ludo",
"tags": "libretro",
"license-url": "https://github.com/libretro/ludo/blob/master/COPYING"
}
}