Date: Friday, January 15, 2021 @ 17:21:27 Author: yan12125 Revision: 821016
archrelease: copy trunk to community-any Added: web-ext/repos/community-any/PKGBUILD (from rev 821015, web-ext/trunk/PKGBUILD) web-ext/repos/community-any/skip-if-non-git-repo.diff (from rev 821015, web-ext/trunk/skip-if-non-git-repo.diff) Deleted: web-ext/repos/community-any/PKGBUILD web-ext/repos/community-any/skip-if-non-git-repo.diff ---------------------------+ PKGBUILD | 129 ++++++++++++++++++++++---------------------- skip-if-non-git-repo.diff | 42 +++++++------- 2 files changed, 87 insertions(+), 84 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-01-15 17:21:10 UTC (rev 821015) +++ PKGBUILD 2021-01-15 17:21:27 UTC (rev 821016) @@ -1,63 +0,0 @@ -# Maintainer: Chih-Hsuan Yen <yan12...@gmail.com> - -pkgname=web-ext -pkgver=5.4.1 -pkgrel=1 -pkgdesc='A command line tool to help build, run, and test web extensions' -arch=(any) -url='https://developer.mozilla.org/en-US/Add-ons/WebExtensions' -license=('MPL2') -depends=('nodejs') -makedepends=('npm' 'node-gyp') -replaces=('nodejs-web-ext') -provides=('nodejs-web-ext') -conflicts=('nodejs-web-ext') -# to speed up the build -options=('!strip') -# tarball on npmjs lacks scripts for building from sources -source=("https://github.com/mozilla/web-ext/archive/$pkgver/web-ext-$pkgver.tar.gz" - "skip-if-non-git-repo.diff") -sha256sums=('c2591f601c1b385d1360d9d3867fbe45a0db12973b4019b066b0fa13e3207687' - 'f485e30d304023a8a503095b6d0ba1f0f9f70d476e2ce58c5a7713caaa78ab49') - -prepare() { - cd "$srcdir" - - pushd $pkgname-$pkgver - patch -Np1 -i ../skip-if-non-git-repo.diff - popd - - # -build for running webpack and tests, and the original for actual packaging - cp -r $pkgname-$pkgver{,-build} -} - -build() { - cd "$srcdir/$pkgname-$pkgver-build" - - npm install - NODE_ENV=production npm run build - cp -r dist "$srcdir/$pkgname-$pkgver" - - cd "$srcdir/$pkgname-$pkgver" - npm install --production -} - -check() { - cd "$srcdir/$pkgname-$pkgver-build" - - npm test -} - -package() { - local _npmdir="$pkgdir/usr/lib/node_modules/" - - install -Ddm755 "$_npmdir" - cp -r --no-preserve=ownership $pkgname-$pkgver "$_npmdir/$pkgname" - - # Non-deterministic race in npm gives 777 permissions to random directories. - # See https://github.com/npm/cli/issues/1103 for details. - find "${pkgdir}/usr" -type d -exec chmod 755 {} + - - install -Ddm755 "$pkgdir/usr/bin" - ln -s "/usr/lib/node_modules/$pkgname/bin/$pkgname" "$pkgdir/usr/bin/$pkgname" -} Copied: web-ext/repos/community-any/PKGBUILD (from rev 821015, web-ext/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-01-15 17:21:27 UTC (rev 821016) @@ -0,0 +1,66 @@ +# Maintainer: Chih-Hsuan Yen <yan12...@gmail.com> + +pkgname=web-ext +pkgver=5.5.0 +pkgrel=1 +pkgdesc='A command line tool to help build, run, and test web extensions' +arch=(any) +url='https://developer.mozilla.org/en-US/Add-ons/WebExtensions' +license=('MPL2') +depends=('nodejs') +makedepends=('npm' 'node-gyp') +replaces=('nodejs-web-ext') +provides=('nodejs-web-ext') +conflicts=('nodejs-web-ext') +# to speed up the build +options=('!strip') +# tarball on npmjs lacks scripts for building from sources +source=("https://github.com/mozilla/web-ext/archive/$pkgver/web-ext-$pkgver.tar.gz" + "skip-if-non-git-repo.diff") +sha256sums=('1c1951b003cbabb82c5a09dbf23567d3ae4374de8e40cb2de8c087b60f629405' + 'f7333b0c2b204a178f48f4b243bccfda84a274c3eea0f056c93d5696a889f14f') + +prepare() { + cd "$srcdir" + + pushd $pkgname-$pkgver + patch -Np1 -i ../skip-if-non-git-repo.diff + popd + + # -build for running webpack and tests, and the original for actual packaging + cp -r $pkgname-$pkgver{,-build} +} + +build() { + cd "$srcdir/$pkgname-$pkgver-build" + + npm install + NODE_ENV=production npm run build + cp -r dist "$srcdir/$pkgname-$pkgver" + + cd "$srcdir/$pkgname-$pkgver" + npm install --production +} + +check() { + cd "$srcdir/$pkgname-$pkgver-build" + + npm test +} + +package() { + local _npmdir="$pkgdir/usr/lib/node_modules/" + + install -Ddm755 "$_npmdir" + cp -r --no-preserve=ownership $pkgname-$pkgver "$_npmdir/$pkgname" + + # dtrace-provider (brought in by bunyan) is not used on Linux, and its build artifacts makes this package unreproducible + rm -r "$_npmdir"/web-ext/node_modules/dtrace-provider/build/ + + # Non-deterministic race in npm gives 777 permissions to random directories. + # See https://github.com/npm/cli/issues/1103 for details. + find "${pkgdir}/usr" -type d -exec chmod 755 {} + + + install -Ddm755 "$pkgdir/usr/bin" + ln -s "/usr/lib/node_modules/$pkgname/bin/$pkgname" "$pkgdir/usr/bin/$pkgname" +} Deleted: skip-if-non-git-repo.diff =================================================================== --- skip-if-non-git-repo.diff 2021-01-15 17:21:10 UTC (rev 821015) +++ skip-if-non-git-repo.diff 2021-01-15 17:21:27 UTC (rev 821016) @@ -1,21 +0,0 @@ -diff --git a/tests/unit/test.program.js b/tests/unit/test.program.js -index d18beff..cea3d4d 100644 ---- a/tests/unit/test.program.js -+++ b/tests/unit/test.program.js -@@ -885,7 +885,15 @@ describe('program.defaultVersionGetter', () => { - }); - - it('returns git commit information in development', function() { -- const commit = `${git.branch()}-${git.long()}`; -+ var commit; -+ try { -+ commit = `${git.branch()}-${git.long()}`; -+ } catch (error) { -+ if (error.message.includes('no git repository found')) { -+ this.skip(); -+ } -+ throw error; -+ } - const testBuildEnv = {globalEnv: 'development'}; - assert.equal(defaultVersionGetter(projectRoot, testBuildEnv), - commit); Copied: web-ext/repos/community-any/skip-if-non-git-repo.diff (from rev 821015, web-ext/trunk/skip-if-non-git-repo.diff) =================================================================== --- skip-if-non-git-repo.diff (rev 0) +++ skip-if-non-git-repo.diff 2021-01-15 17:21:27 UTC (rev 821016) @@ -0,0 +1,21 @@ +diff --git a/tests/unit/test.program.js b/tests/unit/test.program.js +index 1a89b95..71fdfdd 100644 +--- a/tests/unit/test.program.js ++++ b/tests/unit/test.program.js +@@ -911,7 +911,15 @@ describe('program.defaultVersionGetter', () => { + }); + + it('returns git commit information in development', function() { +- const commit = `${git.branch()}-${git.long()}`; ++ var commit; ++ try { ++ commit = `${git.branch()}-${git.long()}`; ++ } catch (error) { ++ if (error.message.includes('no git repository found')) { ++ this.skip(); ++ } ++ throw error; ++ } + const testBuildEnv = {globalEnv: 'development'}; + assert.equal(defaultVersionGetter(projectRoot, testBuildEnv), + commit);