fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2025-12-22 09:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

PICARD-1465: Adjust appxmanifest for store requirements

Browse Source
This commit is contained in:
Philipp Wolfer
2020-01-14 20:26:22 +01:00
parent 740cfa7541
commit 4059a0c3d0
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/package-windows.yml vendored
View File

@@ -65,16 +65,22 @@ jobs:
pip install -r requirements-win.txt pip install -r requirements-win.txt
- name: Run tests - name: Run tests
run: python setup.py test run: python setup.py test
- name: Build Windows 10 app package # - name: Build Windows 10 signed app package
# run: |
# If ($Env:CODESIGN) {
# & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER -CertificateFile .\codesign.pfx -CertificatePassword $Env:CODESIGN_PFX_PASSWORD
# } Else {
# & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER
# }
# Move-Item .\dist\*.msix .\artifacts
# env:
# CODESIGN_PFX_PASSWORD: ${{ secrets.CODESIGN_PFX_PASSWORD }}
- name: Build Windows 10 store app package
run: | run: |
If ($Env:CODESIGN) { & .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER
& .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER -CertificateFile .\codesign.pfx -CertificatePassword $Env:CODESIGN_PFX_PASSWORD
} Else {
& .\scripts\package\win-package-appx.ps1 -BuildNumber $Env:BUILD_NUMBER
}
Move-Item .\dist\*.msix .\artifacts Move-Item .\dist\*.msix .\artifacts
env: env:
CODESIGN_PFX_PASSWORD: ${{ secrets.CODESIGN_PFX_PASSWORD }} PICARD_APPX_PUBLISHER: CN=0A9169B7-05A3-4ED9-8876-830F17846709
- name: Build Windows installer - name: Build Windows installer
if: always() if: always()
run: | run: |

2
appxmanifest.xml.in
View File

@@ -6,7 +6,7 @@
<Identity <Identity
Name="%(app-id)s" Name="%(app-id)s"
Version="%(version)s" Version="%(version)s"
Publisher="CN=Metabrainz Foundation Inc., O=Metabrainz Foundation Inc., L=San Luis Obispo, S=California, C=US" Publisher="%(publisher)s"
ProcessorArchitecture="x64"/> ProcessorArchitecture="x64"/>
<Properties> <Properties>
<DisplayName>%(display-name)s</DisplayName> <DisplayName>%(display-name)s</DisplayName>

4
setup.py
View File

@@ -244,10 +244,12 @@ class picard_build(build):
} }
generate_file('win-version-info.txt.in', 'win-version-info.txt', {**args, **version_args}) generate_file('win-version-info.txt.in', 'win-version-info.txt', {**args, **version_args})
default_publisher = 'CN=Metabrainz Foundation Inc., O=Metabrainz Foundation Inc., L=San Luis Obispo, S=California, C=US'
generate_file('appxmanifest.xml.in', 'appxmanifest.xml', { generate_file('appxmanifest.xml.in', 'appxmanifest.xml', {
'app-id': PICARD_APP_ID, 'app-id': "MetaBrainzFoundationInc." + PICARD_APP_ID,
'display-name': PICARD_DISPLAY_NAME, 'display-name': PICARD_DISPLAY_NAME,
'short-name': PICARD_APP_NAME, 'short-name': PICARD_APP_NAME,
'publisher': os.environ.get('PICARD_APPX_PUBLISHER', default_publisher)
'version': file_version_str, 'version': file_version_str,
}) })
elif sys.platform == 'linux': elif sys.platform == 'linux':