[Notes] [Git][BuildStream/buildstream][jjardon/use_freedesktop-sdk_18_08] doc/examples/flatpak-autotools: Use freedesktop-sdk 18.08



Title: GitLab

Javier Jardón pushed to branch jjardon/use_freedesktop-sdk_18_08 at BuildStream / buildstream

Commits:

7 changed files:

Changes:

  • doc/examples/flatpak-autotools/elements/base/sdk.bst
    ... ... @@ -2,15 +2,15 @@ kind: import
    2 2
     description: Import the base freedesktop SDK
    
    3 3
     sources:
    
    4 4
     - kind: ostree
    
    5
    -  url: gnomesdk:repo/
    
    6
    -  gpg-key: keys/gnome-sdk.gpg
    
    5
    +  url: flathub:repo/
    
    6
    +  gpg-key: keys/flathub.gpg
    
    7 7
       (?):
    
    8 8
       - arch == "x86_64":
    
    9
    -      track: runtime/org.freedesktop.BaseSdk/x86_64/1.4
    
    10
    -      ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882
    
    9
    +      track: runtime/org.freedesktop.Sdk/x86_64/18.08
    
    10
    +      ref: 266c14050460f4747ffaac89b1050c027dfad51f4fc5742d221b4a5d12e3fb71
    
    11 11
       - arch == "i386":
    
    12
    -      track: runtime/org.freedesktop.BaseSdk/i386/1.4
    
    13
    -      ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981
    
    12
    +      track: runtime/org.freedesktop.Sdk/i386/18.08
    
    13
    +      ref: 30230a5eba26b77c334e125493a4b798bd304ab6d5186574f150de5c8cdee350
    
    14 14
     config:
    
    15 15
       source: files
    
    16 16
       target: usr

  • doc/examples/flatpak-autotools/elements/hello.bst
    ... ... @@ -4,6 +4,9 @@ description: Autotools project
    4 4
     depends:
    
    5 5
     - base.bst
    
    6 6
     
    
    7
    +variables:
    
    8
    +  prefix: '/app'
    
    9
    +
    
    7 10
     sources:
    
    8 11
     - kind: local
    
    9 12
       path: files/src

  • doc/examples/flatpak-autotools/files/links/lib64
    1
    +usr/lib64
    \ No newline at end of file

  • doc/examples/flatpak-autotools/keys/flathub.gpg
    No preview for this file type
  • doc/examples/flatpak-autotools/keys/gnome-sdk.gpg deleted
    No preview for this file type
  • doc/examples/flatpak-autotools/project.conf
    1 1
     name: flatpak-autotools
    
    2 2
     
    
    3 3
     aliases:
    
    4
    -  gnomesdk: https://sdk.gnome.org/
    
    4
    +  flathub: https://dl.flathub.org/
    
    5 5
     
    
    6 6
     element-path: elements
    
    7 7
     
    

  • tests/examples/flatpak-autotools.py
    ... ... @@ -45,13 +45,13 @@ def test_autotools_build(cli, tmpdir, datafiles):
    45 45
         result = cli.run(project=project, args=['checkout', 'hello.bst', checkout])
    
    46 46
         assert result.exit_code == 0
    
    47 47
     
    
    48
    -    assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
    
    49
    -                               '/usr/share', '/usr/lib/debug',
    
    50
    -                               '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
    
    51
    -                               '/usr/lib/debug/usr/bin/hello',
    
    52
    -                               '/usr/bin/hello', '/usr/share/doc',
    
    53
    -                               '/usr/share/doc/amhello',
    
    54
    -                               '/usr/share/doc/amhello/README'])
    
    48
    +    assert_contains(checkout, ['/app', '/app/lib', '/app/bin',
    
    49
    +                               '/app/share', '/app/lib/debug',
    
    50
    +                               '/app/lib/debug/app', '/app/lib/debug/app/bin',
    
    51
    +                               '/app/lib/debug/app/bin/hello',
    
    52
    +                               '/app/bin/hello', '/app/share/doc',
    
    53
    +                               '/app/share/doc/amhello',
    
    54
    +                               '/app/share/doc/amhello/README'])
    
    55 55
     
    
    56 56
     
    
    57 57
     # Test running an executable built with autotools
    
    ... ... @@ -64,6 +64,6 @@ def test_autotools_run(cli, tmpdir, datafiles):
    64 64
         result = cli.run(project=project, args=['build', 'hello.bst'])
    
    65 65
         assert result.exit_code == 0
    
    66 66
     
    
    67
    -    result = cli.run(project=project, args=['shell', 'hello.bst', '/usr/bin/hello'])
    
    67
    +    result = cli.run(project=project, args=['shell', 'hello.bst', '/app/bin/hello'])
    
    68 68
         assert result.exit_code == 0
    
    69 69
         assert result.output == 'Hello World!\nThis is amhello 1.0.\n'



  • [Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]