[arch-commits] Commit in eclipse/repos/community-x86_64 (4 files)

Antonio Rojas arojas at archlinux.org
Sun Dec 22 19:41:36 UTC 2019


    Date: Sunday, December 22, 2019 @ 19:41:35
  Author: arojas
Revision: 538893

archrelease: copy trunk to community-x86_64

Added:
  eclipse/repos/community-x86_64/PKGBUILD
    (from rev 538892, eclipse/trunk/PKGBUILD)
  eclipse/repos/community-x86_64/commonify
    (from rev 538892, eclipse/trunk/commonify)
Deleted:
  eclipse/repos/community-x86_64/PKGBUILD
  eclipse/repos/community-x86_64/commonify

-----------+
 PKGBUILD  |  224 ++++++++++++++++++------------------
 commonify |  368 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 296 insertions(+), 296 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-22 19:41:01 UTC (rev 538892)
+++ PKGBUILD	2019-12-22 19:41:35 UTC (rev 538893)
@@ -1,112 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Contributor: Andrew Wright <andreww at photism.org>
-# Contributor: Andreas W. Hauser <andy-aur at splashground.de>
-# Contributor: Marco Crosio <marco.crosio at gmail.com>
-
-pkgbase=eclipse
-pkgname=(eclipse-{common,java,jee,cpp,php,javascript,rust})
-pkgver=4.13
-pkgrel=1
-_release=2019-09/R
-pkgdesc="Highly extensible IDE"
-license=(EPL)
-arch=(x86_64)
-url="https://eclipse.org"
-makedepends=(python3)
-source=(commonify)
-sha256sums=('a68cccdf182449dfb4aef595ab26fe6542902421aef42a79672483865cbbd0ea')
-
-_sourcename() {
-  case $1 in
-    eclipse-common) return 1 ;;
-    eclipse-rust  ) echo $1-${_release//\//-}-incubation-linux-gtk-x86_64.tar.gz ;;
-    *             ) echo $1-${_release//\//-}-linux-gtk-x86_64.tar.gz ;;
-  esac
-}
-
-source_x86_64=()
-noextract=()
-
-for _pkg in ${pkgname[@]}; do
-  _src=$(_sourcename $_pkg) || continue
-  source_x86_64+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/$_release/$_src)
-  noextract+=($_src)
-  eval "package_$_pkg() { _package $_pkg; }"
-done
-
-sha256sums_x86_64=('18f55219c86fa4fe52f8a1a51b17c4eb99af6c215d6af8702555ea82af83acaa'
-                   'f7636bac154808f1c033e424074158f34eef3e9e36bdc61f2d0af492159d27d0'
-                   'c8c31cdc20e74d99638b67bba6269f10991d9f191d29acfa73356061e9d35eac'
-                   '77bc4bb7e1ea8a7d0ebdd28c02bdc17ffa3509a6479660dc2f781dceeb92073b'
-                   'a087b078e40b2ba7dc52cbfceee41bb76a6aa2cfef4f08934e73e0bee94aff83'
-                   'd74e42f39d69c49074bb4a9c3e8b4c8974669e3584701fe69570e1d7d6f5a9a6')
-
-prepare() {
-  local pkg src
-  for pkg in ${pkgname[@]}; do
-    mkdir $pkg
-    src=$(_sourcename $pkg) || continue
-    bsdtar -xf $src -C $pkg --strip-components 1
-  done
-}
-
-build() {
-  mkdir eclipse-common/dropins
-  touch eclipse-common/dropins/.keep
-  ./commonify --identical ${pkgname[@]}
-}
-
-package_eclipse-common() {
-  pkgdesc+=" (common files)"
-  depends=("java-environment>=8" webkit2gtk unzip)
-
-  install -d "$pkgdir/usr/lib"
-  cp -a eclipse-common "$pkgdir/usr/lib/eclipse"
-}
-
-_package() {
-  local variant i
-
-  case ${1#eclipse-} in
-    java      ) variant=Java; replaces=(eclipse) ;;
-    jee       ) variant=JEE ;;
-    cpp       ) variant=C++; replaces=(eclipse-cdt) ;;
-    php       ) variant=PHP ;;
-    javascript) variant=JavaScript ;;
-    rust      ) variant=Rust ;;
-    *         ) return 1 ;;
-  esac
-
-  pkgdesc+=" for $variant"
-  depends=("eclipse-common=$pkgver-$pkgrel" bash)
-  provides=("eclipse=$pkgver-$pkgrel")
-  conflicts=(eclipse)
-
-  install -d "$pkgdir/usr/lib"
-  cp -a $1 "$pkgdir/usr/lib/eclipse"
-
-  install -D /dev/stdin "$pkgdir/usr/bin/eclipse" <<END
-#!/bin/bash
-export ECLIPSE_HOME=/usr/lib/eclipse
-exec \$ECLIPSE_HOME/eclipse "\$@"
-END
-
-  install -Dm644 /dev/stdin "$pkgdir/usr/share/applications/eclipse.desktop" <<END
-[Desktop Entry]
-Name=Eclipse
-Comment=$variant Development Environment
-Icon=eclipse
-Exec=eclipse
-Terminal=false
-Type=Application
-Categories=Development;IDE;Java;
-StartupNotify=true
-END
-
-  for i in 16 22 24 32 48 64 128 256 512 1024; do
-    install -Dm644 eclipse-common/plugins/org.eclipse.platform_*/eclipse$i.png \
-      "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/eclipse.png"
-  done
-}

Copied: eclipse/repos/community-x86_64/PKGBUILD (from rev 538892, eclipse/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-22 19:41:35 UTC (rev 538893)
@@ -0,0 +1,112 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Andrew Wright <andreww at photism.org>
+# Contributor: Andreas W. Hauser <andy-aur at splashground.de>
+# Contributor: Marco Crosio <marco.crosio at gmail.com>
+
+pkgbase=eclipse
+pkgname=(eclipse-{common,java,jee,cpp,php,javascript,rust})
+pkgver=4.14
+pkgrel=1
+_release=2019-12/R
+pkgdesc="Highly extensible IDE"
+license=(EPL)
+arch=(x86_64)
+url="https://eclipse.org"
+makedepends=(python3)
+source=(commonify)
+sha256sums=('a68cccdf182449dfb4aef595ab26fe6542902421aef42a79672483865cbbd0ea')
+sha256sums_x86_64=('eea78b2daab7c5d3e11cd86d0782023a05f7e173265f470536357ef97cd31a29'
+                   'a012ad5dd54c344aff66b82f0ed37b54002e727566c7d786d0d60f96b1117c38'
+                   '56c3f4757d31ac002f996de0e81edb18cdf660d6193aa0b076e25dae32079789'
+                   '427b1d74485ccde8b3c6d2b23390be74123281e90ad8e93db701d9835130039a'
+                   '2a17772438a1966f182e2aa2433e1119c9988b2d50f54dc89f476fcca8fe2755'
+                   '88ff37f326648a8bfc061ec9e14823a776e182b715ca5d7dc06b6942c903460c')
+
+_sourcename() {
+  case $1 in
+    eclipse-common) return 1 ;;
+    eclipse-rust  ) echo $1-${_release//\//-}-incubation-linux-gtk-x86_64.tar.gz ;;
+    *             ) echo $1-${_release//\//-}-linux-gtk-x86_64.tar.gz ;;
+  esac
+}
+
+source_x86_64=()
+noextract=()
+
+for _pkg in ${pkgname[@]}; do
+  _src=$(_sourcename $_pkg) || continue
+  source_x86_64+=(http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/$_release/$_src)
+  noextract+=($_src)
+  eval "package_$_pkg() { _package $_pkg; }"
+done
+
+
+prepare() {
+  local pkg src
+  for pkg in ${pkgname[@]}; do
+    mkdir $pkg
+    src=$(_sourcename $pkg) || continue
+    bsdtar -xf $src -C $pkg --strip-components 1
+  done
+}
+
+build() {
+  mkdir eclipse-common/dropins
+  touch eclipse-common/dropins/.keep
+  ./commonify --identical ${pkgname[@]}
+}
+
+package_eclipse-common() {
+  pkgdesc+=" (common files)"
+  depends=("java-environment>=8" webkit2gtk unzip)
+
+  install -d "$pkgdir/usr/lib"
+  cp -a eclipse-common "$pkgdir/usr/lib/eclipse"
+}
+
+_package() {
+  local variant i
+
+  case ${1#eclipse-} in
+    java      ) variant=Java; replaces=(eclipse) ;;
+    jee       ) variant=JEE ;;
+    cpp       ) variant=C++; replaces=(eclipse-cdt) ;;
+    php       ) variant=PHP ;;
+    javascript) variant=JavaScript ;;
+    rust      ) variant=Rust ;;
+    *         ) return 1 ;;
+  esac
+
+  pkgdesc+=" for $variant"
+  depends=("eclipse-common=$pkgver-$pkgrel" bash)
+  provides=("eclipse=$pkgver-$pkgrel")
+  conflicts=(eclipse)
+
+  install -d "$pkgdir/usr/lib"
+  cp -a $1 "$pkgdir/usr/lib/eclipse"
+
+  install -D /dev/stdin "$pkgdir/usr/bin/eclipse" <<END
+#!/bin/bash
+export ECLIPSE_HOME=/usr/lib/eclipse
+exec \$ECLIPSE_HOME/eclipse "\$@"
+END
+
+  install -Dm644 /dev/stdin "$pkgdir/usr/share/applications/eclipse.desktop" <<END
+[Desktop Entry]
+Name=Eclipse
+Comment=$variant Development Environment
+Icon=eclipse
+Exec=eclipse
+Terminal=false
+Type=Application
+Categories=Development;IDE;Java;
+StartupNotify=true
+END
+
+  for i in 16 22 24 32 48 64 128 256 512 1024; do
+    install -Dm644 eclipse-common/plugins/org.eclipse.platform_*/eclipse$i.png \
+      "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/eclipse.png"
+  done
+}

Deleted: commonify
===================================================================
--- commonify	2019-12-22 19:41:01 UTC (rev 538892)
+++ commonify	2019-12-22 19:41:35 UTC (rev 538893)
@@ -1,184 +0,0 @@
-#!/usr/bin/env python3
-from argparse import ArgumentParser
-from asyncio import (
-    BoundedSemaphore,
-    IncompleteReadError,
-    create_subprocess_exec,
-    gather,
-    get_running_loop,
-    run,
-)
-from asyncio.subprocess import DEVNULL, PIPE
-from contextlib import asynccontextmanager
-from enum import Enum, auto
-from logging import DEBUG, INFO, basicConfig, getLogger
-from os import cpu_count, remove, removedirs, renames
-from os.path import isdir, join as pjoin, relpath, split as psplit
-from sys import exit
-
-logger = getLogger(__name__)
-
-
-class Mode(Enum):
-    identical = auto()
-    nonconflicting = auto()
-
-
-def parse_args(args=None):
-    parser = ArgumentParser(description="Extract common files.")
-
-    modes = parser.add_mutually_exclusive_group(required=True)
-    for m in Mode:
-        modes.add_argument(
-            f"--{m.name}",
-            dest="mode",
-            action="store_const",
-            const=m,
-            help=f"extract {m.name} common files",
-        )
-
-    parser.add_argument("-n", "--dry-run", action="store_true", help="Dry run (do nothing)")
-    parser.add_argument("-v", "--verbose", action="store_true", help="Raise verbosity")
-    parser.add_argument(
-        "common_dir", metavar="COMMON_DIR", help="common files directory to move to"
-    )
-    parser.add_argument("targets", nargs="+", metavar="INPUT_DIR", help="directory to move from")
-
-    return parser.prog, parser.parse_args(args)
-
-
- at asynccontextmanager
-async def bounded_exec(*args, **kwargs):
-    loop = get_running_loop()
-
-    try:
-        semaphore = loop.__bounded_exec_semaphore
-    except AttributeError:
-        semaphore = loop.__bounded_exec_semaphore = BoundedSemaphore(value=cpu_count() + 1)
-
-    async with semaphore:
-        process = await create_subprocess_exec(*args, **kwargs)
-        try:
-            yield process
-        finally:
-            if process.returncode is None:
-                try:
-                    process.kill()
-                except OSError:
-                    pass
-                await process.wait()
-
-
-class DiffError(RuntimeError):
-    pass
-
-
-async def diff(file1, file2):
-    async with bounded_exec(
-        "diff", "-q", file1, file2, stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL
-    ) as p:
-        ret = await p.wait()
-
-    if ret != 0:
-        raise DiffError()
-
-
-async def identical(files):
-    if len(files) < 2:
-        return True
-    first, *rest = files
-    fut = gather(*[diff(first, f) for f in rest])
-    try:
-        await fut
-    except DiffError:
-        return False
-    else:
-        return True
-    finally:
-        fut.cancel()
-
-
-def removes(path):
-    remove(path)
-    head, tail = psplit(path)
-    if head and tail:
-        try:
-            removedirs(head)
-        except OSError:
-            pass
-
-
-def commonify_file(common_file, files):
-    first, *rest = files
-    renames(first, common_file)
-    for f in rest:
-        removes(f)
-
-
-async def find_files(path):
-    async with bounded_exec(
-        "find", path, "-type", "f", "-print0", stdin=DEVNULL, stdout=PIPE, stderr=DEVNULL
-    ) as p:
-        while True:
-            try:
-                line = await p.stdout.readuntil(b"\x00")
-            except IncompleteReadError as e:
-                line = e.partial
-                if not line:
-                    break
-                raise
-            yield line[:-1].decode()
-
-
-async def scan_one(target, files):
-    n = 0
-    async for f in find_files(target):
-        files.setdefault(relpath(f, target), []).append(target)
-        n += 1
-    logger.info("Found %d files in %r", n, target)
-
-
-async def scan(targets):
-    files = {}
-    await gather(*[scan_one(t, files) for t in targets])
-    return files
-
-
-def arg_dir(s):
-    if not isdir(s):
-        raise ValueError(f"{s!r} is not a directory")
-    return s
-
-
-async def commonify(settings, common_file, targets):
-    files = [pjoin(t, common_file) for t in targets]
-
-    if not await identical(files):
-        logger.info("Divergent file %r", common_file)
-        return False
-
-    if len(files) == len(settings.targets):
-        logger.debug("Identical file %r", common_file)
-    elif settings.mode == Mode.nonconflicting:
-        logger.debug("Nonconflicting file %r in %r", common_file, targets)
-    else:
-        logger.debug("Partly identical file %r in %r", common_file, targets)
-        return False
-
-    if not settings.dry_run:
-        commonify_file(pjoin(settings.common_dir, common_file), files)
-
-    return True
-
-
-async def main(settings):
-    files = await scan(arg_dir(t) for t in settings.targets)
-    results = await gather(*[commonify(settings, *ft) for ft in files.items()])
-    logger.info("%d %s files in %r", sum(results), settings.mode.name, settings.common_dir)
-    return 0
-
-
-if __name__ == "__main__":
-    prog, settings = parse_args()
-    basicConfig(level=DEBUG if settings.verbose else INFO, format=f"{prog}: %(message)s")
-    exit(run(main(settings), debug=settings.verbose))

Copied: eclipse/repos/community-x86_64/commonify (from rev 538892, eclipse/trunk/commonify)
===================================================================
--- commonify	                        (rev 0)
+++ commonify	2019-12-22 19:41:35 UTC (rev 538893)
@@ -0,0 +1,184 @@
+#!/usr/bin/env python3
+from argparse import ArgumentParser
+from asyncio import (
+    BoundedSemaphore,
+    IncompleteReadError,
+    create_subprocess_exec,
+    gather,
+    get_running_loop,
+    run,
+)
+from asyncio.subprocess import DEVNULL, PIPE
+from contextlib import asynccontextmanager
+from enum import Enum, auto
+from logging import DEBUG, INFO, basicConfig, getLogger
+from os import cpu_count, remove, removedirs, renames
+from os.path import isdir, join as pjoin, relpath, split as psplit
+from sys import exit
+
+logger = getLogger(__name__)
+
+
+class Mode(Enum):
+    identical = auto()
+    nonconflicting = auto()
+
+
+def parse_args(args=None):
+    parser = ArgumentParser(description="Extract common files.")
+
+    modes = parser.add_mutually_exclusive_group(required=True)
+    for m in Mode:
+        modes.add_argument(
+            f"--{m.name}",
+            dest="mode",
+            action="store_const",
+            const=m,
+            help=f"extract {m.name} common files",
+        )
+
+    parser.add_argument("-n", "--dry-run", action="store_true", help="Dry run (do nothing)")
+    parser.add_argument("-v", "--verbose", action="store_true", help="Raise verbosity")
+    parser.add_argument(
+        "common_dir", metavar="COMMON_DIR", help="common files directory to move to"
+    )
+    parser.add_argument("targets", nargs="+", metavar="INPUT_DIR", help="directory to move from")
+
+    return parser.prog, parser.parse_args(args)
+
+
+ at asynccontextmanager
+async def bounded_exec(*args, **kwargs):
+    loop = get_running_loop()
+
+    try:
+        semaphore = loop.__bounded_exec_semaphore
+    except AttributeError:
+        semaphore = loop.__bounded_exec_semaphore = BoundedSemaphore(value=cpu_count() + 1)
+
+    async with semaphore:
+        process = await create_subprocess_exec(*args, **kwargs)
+        try:
+            yield process
+        finally:
+            if process.returncode is None:
+                try:
+                    process.kill()
+                except OSError:
+                    pass
+                await process.wait()
+
+
+class DiffError(RuntimeError):
+    pass
+
+
+async def diff(file1, file2):
+    async with bounded_exec(
+        "diff", "-q", file1, file2, stdin=DEVNULL, stdout=DEVNULL, stderr=DEVNULL
+    ) as p:
+        ret = await p.wait()
+
+    if ret != 0:
+        raise DiffError()
+
+
+async def identical(files):
+    if len(files) < 2:
+        return True
+    first, *rest = files
+    fut = gather(*[diff(first, f) for f in rest])
+    try:
+        await fut
+    except DiffError:
+        return False
+    else:
+        return True
+    finally:
+        fut.cancel()
+
+
+def removes(path):
+    remove(path)
+    head, tail = psplit(path)
+    if head and tail:
+        try:
+            removedirs(head)
+        except OSError:
+            pass
+
+
+def commonify_file(common_file, files):
+    first, *rest = files
+    renames(first, common_file)
+    for f in rest:
+        removes(f)
+
+
+async def find_files(path):
+    async with bounded_exec(
+        "find", path, "-type", "f", "-print0", stdin=DEVNULL, stdout=PIPE, stderr=DEVNULL
+    ) as p:
+        while True:
+            try:
+                line = await p.stdout.readuntil(b"\x00")
+            except IncompleteReadError as e:
+                line = e.partial
+                if not line:
+                    break
+                raise
+            yield line[:-1].decode()
+
+
+async def scan_one(target, files):
+    n = 0
+    async for f in find_files(target):
+        files.setdefault(relpath(f, target), []).append(target)
+        n += 1
+    logger.info("Found %d files in %r", n, target)
+
+
+async def scan(targets):
+    files = {}
+    await gather(*[scan_one(t, files) for t in targets])
+    return files
+
+
+def arg_dir(s):
+    if not isdir(s):
+        raise ValueError(f"{s!r} is not a directory")
+    return s
+
+
+async def commonify(settings, common_file, targets):
+    files = [pjoin(t, common_file) for t in targets]
+
+    if not await identical(files):
+        logger.info("Divergent file %r", common_file)
+        return False
+
+    if len(files) == len(settings.targets):
+        logger.debug("Identical file %r", common_file)
+    elif settings.mode == Mode.nonconflicting:
+        logger.debug("Nonconflicting file %r in %r", common_file, targets)
+    else:
+        logger.debug("Partly identical file %r in %r", common_file, targets)
+        return False
+
+    if not settings.dry_run:
+        commonify_file(pjoin(settings.common_dir, common_file), files)
+
+    return True
+
+
+async def main(settings):
+    files = await scan(arg_dir(t) for t in settings.targets)
+    results = await gather(*[commonify(settings, *ft) for ft in files.items()])
+    logger.info("%d %s files in %r", sum(results), settings.mode.name, settings.common_dir)
+    return 0
+
+
+if __name__ == "__main__":
+    prog, settings = parse_args()
+    basicConfig(level=DEBUG if settings.verbose else INFO, format=f"{prog}: %(message)s")
+    exit(run(main(settings), debug=settings.verbose))


More information about the arch-commits mailing list