Ben Gamari pushed to branch wip/fix-upload-libs at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • .gitlab/rel_eng/upload_ghc_libs.py
    ... ... @@ -52,6 +52,7 @@ def prep_base():
    52 52
     def prep_ghc_internal():
    
    53 53
         shutil.copy('config.guess', 'libraries/ghc-internal')
    
    54 54
         shutil.copy('config.sub', 'libraries/ghc-internal')
    
    55
    +    build_copy_file(PACKAGES['ghc-internal'], Path('GHC/Internal/PrimopWrappers.hs'))
    
    55 56
     
    
    56 57
     def build_copy_file(pkg: Package, f: Path):
    
    57 58
         target = Path('_build') / 'stage1' / pkg.path / 'build' / f
    
    ... ... @@ -75,9 +76,6 @@ def modify_file(pkg: Package, fname: Path, f: Callable[[str], str]):
    75 76
         s = target.read_text()
    
    76 77
         target.write_text(f(s))
    
    77 78
     
    
    78
    -def prep_ghc_prim():
    
    79
    -    build_copy_file(PACKAGES['ghc-prim'], Path('GHC/PrimopWrappers.hs'))
    
    80
    -
    
    81 79
     def prep_ghc_bignum():
    
    82 80
         shutil.copy('config.guess', 'libraries/base')
    
    83 81
         shutil.copy('config.sub', 'libraries/base')
    
    ... ... @@ -112,7 +110,6 @@ PACKAGES = {
    112 110
             Package('base', Path("libraries/base"), prep_base),
    
    113 111
             Package('ghc-internal', Path("libraries/ghc-internal"), prep_ghc_internal),
    
    114 112
             Package('ghc-experimental', Path("libraries/ghc-experimental"), no_prep),
    
    115
    -        Package('ghc-prim', Path("libraries/ghc-prim"), prep_ghc_prim),
    
    116 113
             Package('integer-gmp', Path("libraries/integer-gmp"), no_prep),
    
    117 114
             Package('ghc-bignum', Path("libraries/ghc-bignum"), prep_ghc_bignum),
    
    118 115
             Package('template-haskell', Path("libraries/template-haskell"), no_prep),
    
    ... ... @@ -137,7 +134,6 @@ def cabal_upload(tarball: Path, creds: Credentials, publish: bool=False, extra_a
    137 134
         run(['cabal', 'upload'] + extra_args + [tarball] + creds_args, check=True)
    
    138 135
     
    
    139 136
     def prepare_sdist(pkg: Package):
    
    140
    -
    
    141 137
         print(f'Preparing package {pkg.name}...')
    
    142 138
         shutil.rmtree(pkg.path / 'dist-newstyle', ignore_errors=True)
    
    143 139
         build_file_hadrian(pkg.path / '{}.cabal'.format(pkg.name))