diff --git a/.travis.yml b/.travis.yml index ee62a6da..5c91f4b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,13 +34,16 @@ before_deploy: - pushd bin/$CONFIGURATION - zip -r XWord-macOS.zip XWord.app/ -x *.fbp - popd + - sed -e "s/{VERSION}/${XWORD_VERSION}/" -e "s/{OS_FILE}/XWord-macOS.zip/" dist/packages_template.lua > dist/packages_mac.lua # Deploy tagged release builds to GitHub Releases deploy: provider: releases api_key: secure: dT5W1MsTMFYjN6mDnSqpL7QjHkL/R6When5elNX9dwGLafCyRN2ohAUa6lpt17v8NG3//qF9BZLZOymA7D9kNqILGbt8mjCu053WBknekI9BTG593HQhsV2y0nA8p2J3y95/Qdty/t0jg/QdWqV60O0w6VQFGoHOb9EUVKCu9cR+WX4kVz2uadB8ms8r2YDeC0fUnrA/w1XnopohJw3P/hiV6S2+u1eeWFFyjOTuTJcyg6cHkxMysj/4N4llxOU/to0/nQYKg+sc9B7hHLFmwHxLbq1prn9LG9kRwDmCnzNlV0OgPOT2vP+LSwyfvp4zuHNC61sIH8OSVKCmn3keM/ZDahKB37Zd0eQKBxLNm9iu/UibBN7R+4QtVXgPkfqZb9bFhpy9fi+MxiYXUzbl3q3p7werLooI42KFzkJ2KxSkP3ZEQko3XsdAdgeBZVXzD/Ze0IMnaTQSeCPQbzbMjXA0mIwOkWCIj77dqOnQOdjAURA+U5tUt1Q2TUa9yJHXT5O6J2XNXdCbM5JlzBNoo9orcTjuwnsyplvMovKw1Qx0DGVG0hNakp2tNszsH4LeJKrAdWr1KXGu392Shq3XCya3X76jhQBO9zMDAe0txdFpnmx6Pi8GYlFabU2OWoWmNsnJVxOsMGKL8wz1vRx4uakFY4WzgDO/SI/6zkQ43W8= - file: bin/$CONFIGURATION/XWord-macOS.zip + file: + - bin/$CONFIGURATION/XWord-macOS.zip + - dist/packages_mac.lua skip_cleanup: true on: tags: true diff --git a/appveyor.yml b/appveyor.yml index 2190ac94..8b137002 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,6 +33,7 @@ build_script: # For release builds, also build docs and run dist steps. - IF %CONFIGURATION%==Release pushd doc & make_help.cmd & popd - IF %CONFIGURATION%==Release pushd dist & "%ProgramFiles(x86)%\NSIS\makensis.exe" /V4 XWord.nsi & popd + - IF %CONFIGURATION%==Release sed -e "s/{VERSION}/%XWORD_VERSION%/" -e "s/{OS_FILE}/XWord-Windows.exe/" dist/packages_template.lua > dist/packages_windows.lua # Zip the full build folder and make it available as an artifact. after_build: @@ -45,12 +46,15 @@ artifacts: - path: dist\XWord-Windows.exe name: XWord-Windows.exe + - path: dist\packages_windows.lua + name: packages_windows.lua + # Deploy tagged release builds to GitHub Releases deploy: provider: GitHub auth_token: secure: di7vtZSm1K8JwmYD0z+PVfcDGav/KwuK4CeBdp4oKoT7ImfJ7ksFSV6zcLcW6qui - artifact: XWord-Windows.exe + artifact: XWord-Windows.exe,packages_windows.lua on: appveyor_repo_tag: true configuration: Release diff --git a/dist/packages_template.lua b/dist/packages_template.lua new file mode 100644 index 00000000..69621675 --- /dev/null +++ b/dist/packages_template.lua @@ -0,0 +1,7 @@ +return { + xword = { + download = "https://github.com/mrichards42/xword/releases/download/{VERSION}/{OS_FILE}", + name = "XWord", + version = "{VERSION}", + }, +} diff --git a/scripts/xword/pkgmgr/updater/init.lua b/scripts/xword/pkgmgr/updater/init.lua index f964b752..7cfcdb2a 100644 --- a/scripts/xword/pkgmgr/updater/init.lua +++ b/scripts/xword/pkgmgr/updater/init.lua @@ -26,7 +26,7 @@ if not task.is_main then return P end -- Check for an update. Callback is called after the task executes local osname = wx.__WXMSW__ and 'windows' or wx.__WXMAC__ and 'mac' or 'linux' -P.packages_url = "http://sourceforge.net/projects/wx-xword/files/scripts/packages_"..osname..".lua" +P.packages_url = "https://mrichards42.github.io/xword/packages_"..osname..".lua" function P.CheckForUpdates(callback) -- Make sure we have a directory for the updates file