Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New windows installer #841

Merged
merged 46 commits into from
Jan 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1e2378e
Port Windows deployment script from batch to Powershell
doloopuntil May 8, 2020
e0131c9
Overhaul Windows installer generation script
doloopuntil May 8, 2020
8e544e5
Fix Travis deployment for Windows
doloopuntil May 8, 2020
f8d54ff
Minor cosmetic fix
doloopuntil May 8, 2020
7536975
Merge pull request #184 from doloopuntil/improve_win_ci
corrados May 27, 2020
36438a5
Don't get temp from env
ann0see Dec 23, 2020
c40e8d8
Port Windows deployment script from batch to Powershell
doloopuntil May 8, 2020
da54707
Overhaul Windows installer generation script
doloopuntil May 8, 2020
f3f763d
Fix Travis deployment for Windows
doloopuntil May 8, 2020
99e2088
Minor cosmetic fix
doloopuntil May 8, 2020
e6ab8d3
Don't get temp from env
ann0see Dec 23, 2020
52aca7c
Merge branch 'improve_win_ci' of github.com:corrados/jamulus into imp…
ann0see Dec 23, 2020
1ffb86c
Merge branch 'improve_win_ci' of github.com:ann0see/jamulus into impr…
ann0see Dec 23, 2020
2a3a11a
Add server icon to installer
ann0see Dec 23, 2020
27c2d5d
Fix server icon and desktop shortcut
Dec 23, 2020
8252e00
Add variables
ann0see Dec 23, 2020
ca5c0f6
Merge pull request #794 from ann0see/improve_win_ci
corrados Dec 24, 2020
f56e421
Add registry check for old Jamulus version and warn
ann0see Dec 28, 2020
01c5ef3
Only execute check on 64 bit
ann0see Dec 28, 2020
bab1506
Add source and code style changes
ann0see Dec 28, 2020
3ca6391
Check for Uninstaller.exe instead for registry
ann0see Dec 29, 2020
b954cca
Ask user for Desktop shortcut
ann0see Dec 29, 2020
6e45a5e
Merge pull request #800 from ann0see/win_installer
corrados Dec 29, 2020
1ef8101
Merge pull request #11 from ann0see/win_inst_desktop_readme
ann0see Dec 30, 2020
beb7c6d
fix wrong cd
ann0see Jan 2, 2021
3d4c707
Rename goto
ann0see Jan 3, 2021
88ea363
Merge pull request #806 from ann0see/win_installer
corrados Jan 4, 2021
1196758
Automatically get redirect URL from SourceForge
ann0see Jan 4, 2021
85957ed
Merge pull request #809 from ann0see/win_installer
corrados Jan 4, 2021
42af102
Run uninstaller if available
ann0see Jan 6, 2021
59384ca
Add source
ann0see Jan 6, 2021
e1a4dd4
Merge pull request #814 from ann0see/win_installer
corrados Jan 6, 2021
1cf83f7
Rewrite 32 bit OS install detection
ann0see Jan 7, 2021
59e4cb8
Fix remove of old installer
ann0see Jan 8, 2021
3d8a213
Merge pull request #819 from ann0see/win_installer
corrados Jan 8, 2021
076a54f
Add ASIO check
ann0see Jan 9, 2021
f865124
Only download dependencies if needed
ann0see Jan 9, 2021
7acffca
Merge pull request #824 from ann0see/win_installer
corrados Jan 10, 2021
b5009cd
Update install banners/wizard
geheimerEichkater Jan 15, 2021
d1ca1c5
Merge pull request #843 from geheimerEichkater/improve_win_ci
corrados Jan 15, 2021
aba097a
Remove unneeded assets
ann0see Jan 15, 2021
6aa10d6
Save user choice for desktop icon from last install
ann0see Jan 15, 2021
236d746
Merge pull request #845 from ann0see/addChoices
corrados Jan 16, 2021
440b8d1
Download NSProcess from forum
ann0see Jan 17, 2021
2774581
Remove nsProcess due to licensing issues
ann0see Jan 17, 2021
924817f
Merge pull request #852 from ann0see/addChoices
corrados Jan 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ windows/ASIOSDK2
windows/VC_redist.x64.exe
windows/vc_redist.x86.exe
windows/nsProcess.dll
windows/NSIS
debug/
release/
build/
Expand Down
54 changes: 21 additions & 33 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,37 +48,25 @@ matrix:
# on:
# repo: corrados/jamulus
# tags: true
# - os: windows
# before_install:
# - dir C:/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/10.0.17134.0/x64
# - cmd.exe /C 'cd && "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat"
# x86 && cd && cd "C:/Users/travis/build/corrados/jamulus/windows" && dir'
# - curl -vLO http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe
# - curl -vLO http://www.steinberg.net/sdk_downloads/ASIOSDK2.3.2.zip
# - unzip ASIOSDK2.3.2.zip
# - mkdir ASIOSDK2
# - cp -rvu ASIOSDK2.3.2/* ASIOSDK2
# - pwd
# - mv qt-unified-windows-x86-online.exe windows
# - mv ASIOSDK2 windows
# - cd windows
# - "./qt-unified-windows-x86-online.exe --verbose --script qt-installer-windows.qs"
# - ls -la C:/Qt/5.12.3/msvc2017/bin/qtenv2.bat
# script:
# - cmd.exe /C 'cd && "C:\Qt\5.12.3\msvc2017\bin\qtenv2.bat" && cd && "C:\Program
# Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat"
# x86 && cd "C:\Users\travis\build\corrados\jamulus" && cd && qmake Jamulus.pro
# && nmake'
# #deploy function is only available in travis-ci.com (not free) but not in travis-ci.org (free)
# #deploy:
# # provider: releases
# # api_key:
# # secure: aQ93/8XU3HEGTif0/rSiF+gcm4uRhyWFdr3Va50BprwQOrZkNg8zIMwIKKODwjLDqxaH4msgNYutcr/VLdLjo4YP43It0UIfv3LGa2VFAkFhuQurMXZlVyx8RhIGLjIaWVWN1GCbNdAQwWNNo2mAkEdRaBrj/26geZotGcYZiztGwTAdy0t/vyYjO1sLZdBKcf7dJ06Pm2ktZO/rDyE4UtCTQiRfqLCKsQ/SILbewOMG/auaSUdU0utsbvXxr+dCzqBPwdSSptWqhIORXORL5oPn6242URzIJkmw5XPwhSabhdbzUjCIN9E24z1vp+cffAohuGXyXXZy9/bGeKa0mXfAaXV+TnJkpMd+i3fN5dY+vhFrlLOpRojRK6NqvaMID6tcNNtZMmFSgaZGyCUJQn4/0X+LdPwvK3/dXY+qElJW62QiJmQAt9OBGcq8EFqQDmEtRivRlbpbERsd/IJoOxP7nI2T00g04uV543ZmhU4fmGw6MVPAlIGRsBECjB0AMTp+3xW3OaUp7jy3WZpZXRrXNI41nZogrxhevPME1BRNk3V+MWQo8R3C+bIaCa5Um/3DZxnMxZgXjI9yzzR7Z8f4RWaQCKjXx41/pk7jxm1TcEyBfRVsb313l/fRLg+fjCmaEnnxu43333XGIv4eIyAGDR8ydF2VpmyP2ejzh8I=
# # file:
# # - Jamulus.exe
# # skip_cleanup: true
# # on:
# # repo: corrados/jamulus
# # tags: true

- os: windows
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need this file?

env:
# QT_ACCOUNT_USERNAME and QT_ACCOUNT_PASSWORD variables for Qt registration at install time
- secure: WlWyUMU53vGPwZ340bZZy3PVJJfuFZ8gegyLHGYXo1Hp++BCtHJ5FH2kVYxW0pUNqKobkrlGdNMLrhfDD5qATj6TqbRTQr/XKqK5Qhe8sf7Ag/Z+AUjguED7QL0th2Ll6eBlSc9ayrQfvCjvzmyFXGB85iXvuJlbqUCya6xRyiflq37KimLGjxFOhUkCGsIgraUxUxGm/dLj07x2gH1XeozzSOhX/4uDwlP+y642zWyWf/pOrUTSuid97TJseD9tAmLqFpVo43BqDuCe1/7OmBnZkJQb4obU43KeRAHLUCSnbI+kVVNfW8j0/1ynObngIZoC+KQnvc+4NTU13yRez8HoFcEXa9l9oTRBu+nFu+TM+c8+EBNKDZxrdF2NYLRuNdYIzVqZsbSIT+8aoAwMS+bO9AgW2KCelz7zCSoPRokfM2vH7JPEq7Ofib8neK4MEzAKYL1K0/vDlZktsxX8xIhrzgJQCF8IloMLPR3sKIOckYjBzsQG9Q6QJqC6BKJJSpeN6I6LF6cksSMcUalhsqgCghrLFHalJj0mhkSQGTvXtDr3OOfPSicj1fC3efqjiZ9uT6b5yR2gC9e4NaC0qLcqLuHJL10CUjn2eizKBqr0Onu/ybkkClfBUFzu3uOf8YMq3I1hp4xzkfEPAb1A2Iem6rYA9ndyGUnXrYNoLRs=
- secure: ldDKzVJFDbA1+tJg4jicBTUAzm83mjybEY2hvPxMofE2gBNwAFRj2+XJD5H1tQ/BBE3LADOVRiwiCxZZLSotIChmmrtQJ68tshYTwcpjf+VQ3m59NsHl0xbjP3/B9DYu1zBOhUc43gGsDnRulvzDi8HwbxrM4ACNCepy+zq+a8M7BytddrhZSgIT0rsTBU0t/StH7B/Pu6E6KByelgdmbnZbuAqaT2HMi+IiGrAJiw70Hmq4BgegsEv4kLyNLe2ofZsdvmFw20Gumfg9B4PFM2S0QESj2pPwFgz+uYUgS/0ncpGdFTshnDKPFj7ePgrHT8eM9bMC8BM8RedpoR0vSUyioCxx0YJzSsw8JE8DEe3qNt3HmhPcH678wrYxs3cXLoTC8kBGDPD6drzqBIvILVfPJcaXRJlD7I+GOIkXFojLrxDZRy9I73KbWHGRONLguGBVyqJxGVrPH6hjEAxhgLLMUAnoh61wPFtvnayT+SbWl2NbAewnsjfCNnLgBZOxdmlKMjC5yUH3wnnyBn5jEAHcjrtbSfQ+lD+ZlYmeuimgsvjomHOHKw3N2+tfKW9lAH45ShiiMIMOk9HP9zKnDnyG6hI0q9wPFxWrkc3RZpRmQO1S9QjB2gD3cWiVMNTBYI+XNOqZEUicTc4XwOByf8bm5SyH4H1+8o1RytgbEZY=
before_install:
- curl -vL -o "${TEMP}/qt-installer.exe" http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe
- "${TEMP}/qt-installer.exe --verbose --script ./windows/qt-installer-windows.qs"
script:
- powershell -ExecutionPolicy ByPass -Command "./windows/deploy_windows.ps1"
#deploy function is only available in travis-ci.com (not free) but not in travis-ci.org (free)
#deploy:
# provider: releases
# api_key:
# secure: aQ93/8XU3HEGTif0/rSiF+gcm4uRhyWFdr3Va50BprwQOrZkNg8zIMwIKKODwjLDqxaH4msgNYutcr/VLdLjo4YP43It0UIfv3LGa2VFAkFhuQurMXZlVyx8RhIGLjIaWVWN1GCbNdAQwWNNo2mAkEdRaBrj/26geZotGcYZiztGwTAdy0t/vyYjO1sLZdBKcf7dJ06Pm2ktZO/rDyE4UtCTQiRfqLCKsQ/SILbewOMG/auaSUdU0utsbvXxr+dCzqBPwdSSptWqhIORXORL5oPn6242URzIJkmw5XPwhSabhdbzUjCIN9E24z1vp+cffAohuGXyXXZy9/bGeKa0mXfAaXV+TnJkpMd+i3fN5dY+vhFrlLOpRojRK6NqvaMID6tcNNtZMmFSgaZGyCUJQn4/0X+LdPwvK3/dXY+qElJW62QiJmQAt9OBGcq8EFqQDmEtRivRlbpbERsd/IJoOxP7nI2T00g04uV543ZmhU4fmGw6MVPAlIGRsBECjB0AMTp+3xW3OaUp7jy3WZpZXRrXNI41nZogrxhevPME1BRNk3V+MWQo8R3C+bIaCa5Um/3DZxnMxZgXjI9yzzR7Z8f4RWaQCKjXx41/pk7jxm1TcEyBfRVsb313l/fRLg+fjCmaEnnxu43333XGIv4eIyAGDR8ydF2VpmyP2ejzh8I=
# file:
# - Jamulus.exe
# skip_cleanup: true
# on:
# repo: corrados/jamulus
# tags: true

108 changes: 0 additions & 108 deletions windows/deploy_windows.bat

This file was deleted.

Loading