Date: Tuesday, December 12, 2017 @ 10:27:50 Author: arodseth Revision: 273979
archrelease: copy trunk to community-any Added: clojure/repos/community-any/PKGBUILD (from rev 273978, clojure/trunk/PKGBUILD) clojure/repos/community-any/clojure.install (from rev 273978, clojure/trunk/clojure.install) clojure/repos/community-any/clojure.sh (from rev 273978, clojure/trunk/clojure.sh) Deleted: clojure/repos/community-any/PKGBUILD clojure/repos/community-any/clj.sh clojure/repos/community-any/clojure.install clojure/repos/community-any/clojure.sh -----------------+ PKGBUILD | 85 +++++++++++++++------------------ clj.sh | 138 ------------------------------------------------------ clojure.install | 10 +-- clojure.sh | 2 4 files changed, 45 insertions(+), 190 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-12-12 10:27:41 UTC (rev 273978) +++ PKGBUILD 2017-12-12 10:27:50 UTC (rev 273979) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Chris O'Donnell <christopher.p.odonn...@gmail.com> -# Contributor: Sam May <sam....@gmail.com> - -pkgname=clojure -pkgver=1.9.0 -pkgrel=1 -pkgdesc='LISP for the JVM' -url='http://clojure.org/' -arch=('any') -license=('CPL') -depends=('java-environment' 'bash') -makedepends=('java-environment' 'classpath' 'git' 'maven') -optdepends=('rlwrap: friendlier shell with readline support') -install='clojure.install' -source=("$pkgname::git://github.com/clojure/clojure.git#tag=$pkgname-$pkgver" - 'clj.sh' - "$pkgname.sh") -sha256sums=('SKIP' - '2194819fd417174351172d94e3ccff050479401ca883b57d325a349072200bee' - 'b3fa6257dad10fb39851e87563269b80b2473623126595d9c279bbd90e97f052') - -build() { - cd "$pkgname" - - mvn package -Dmaven.test.skip=true -Dmaven.repo.local=m2 -} - -check() { - cd "$pkgname" - - mvn test -Dmaven.repo.local=m2 -} - -package() { - install -Dm755 clj.sh "$pkgdir/usr/bin/clj" - install -Dm755 clj.sh "$pkgdir/usr/bin/clojure" - install -Dm755 "$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" - install -Dm644 "$pkgname/target/$pkgname-$pkgver.jar" \ - "$pkgdir/usr/share/$pkgname/$pkgname.jar" -} - -# getver: clojure.org/downloads -# vim:set ts=2 sw=2 et: Copied: clojure/repos/community-any/PKGBUILD (from rev 273978, clojure/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-12-12 10:27:50 UTC (rev 273979) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Chris O'Donnell <christopher.p.odonn...@gmail.com> +# Contributor: Sam May <sam....@gmail.com> + +pkgname=clojure +pkgver=1.9.0 +pkgrel=2 +pkgdesc='LISP for the JVM' +url='http://clojure.org/' +arch=('any') +license=('CPL') +depends=('java-environment' 'bash') +makedepends=('java-environment' 'classpath' 'git' 'maven') +optdepends=('rlwrap: friendlier shell with readline support') +install='clojure.install' +source=("https://download.clojure.org/install/clojure-tools-$pkgver.273.tar.gz" + clojure.sh) +sha256sums=('64d1c714d758feee5fc76f3c044c229965d068f140868af0930280bcfbc0b976' + 'b3fa6257dad10fb39851e87563269b80b2473623126595d9c279bbd90e97f052') + +prepare() { + sed -i -e 's@PREFIX@/usr/share/clojure@g' clojure-tools/clojure +} + +package() { + install -Dm644 clojure-tools/deps.edn "$pkgdir/usr/share/clojure/deps.edn" + install -Dm644 clojure-tools/example-deps.edn \ + "$pkgdir/usr/share/clojure/example-deps.edn" + install -Dm644 clojure-tools/clojure-tools-1.9.0.273.jar \ + "$pkgdir/usr/share/clojure/libexec/clojure-tools-1.9.0.273.jar" + install -Dm755 clojure-tools/clojure "$pkgdir/usr/bin/clojure" + install -Dm755 clojure-tools/clj "$pkgdir/usr/bin/clj" + install -Dm755 clojure.sh "$pkgdir/etc/profile.d/clojure.sh" +} + +# getver: clojure.org/downloads +# vim: ts=2 sw=2 et: Deleted: clj.sh =================================================================== --- clj.sh 2017-12-12 10:27:41 UTC (rev 273978) +++ clj.sh 2017-12-12 10:27:50 UTC (rev 273979) @@ -1,138 +0,0 @@ -#!/bin/bash -# -# Launcher script for Clojure programs. These environment variables can be -# used to configure the script: -# -# CLOJURE_HOME -# The root directory where Clojure is installed. -# CLOJURE_JAVA -# The name of the java executable used to run Clojure. -# CLOJURE_JAVA_OPTS -# Additional options to be passed to the java executable. -# CLOJURE_CLASSPATH -# A path to be added to Clojure's classpath. -# CLOJURE_LIBRARY_PATH -# A path to be searched for native code such as DLL's or JNI -# libraries. This gets added to the Java options as -# "-Djava.library.path=$CLOJURE_LIBRARY_PATH". -# CLOJURE_LIB -# This directory, and any jars inside it, will be automatically -# added to Clojure's classpath. -# -# CLOJURE_JLINE -# This should be the path to Jline jar. -# TODO: -# make CLOJURE_LIB a path instead of a single directory -# allow for adding to CLOJURE_LIB from the command line - -usage="\ -usage: clojure [options] [file1 [file2] ...] - -Options: - --help, -h show this message - --java-cmd, -J the Java executable to use - --java-opts, -j add options to be passed on to the JVM - --classpath, -cp add to Clojure's classpath - --library-path, -L add to the path to search for native libraries - --verbose, -v print initialization information -" -## read ~/.clojurerc for home configuration -[ -e ~/.clojurerc ] && . ~/.clojurerc - -## read ./.clojurerc for project specific configuration -[ -e ./.clojurerc ] && . ./.clojurerc - -if [ ! "$CLOJURE_HOME" ]; then - # Find the real path to Clojure's home directory if $0 is a symlink - #program="$0" - #while [ -h "$program" ]; do - # ls=`ls -ld "$program"` - # link=`expr "$ls" : '.*-> \(.*\)$'` - # if expr "$link" : '.*/.*' >/dev/null; then - # program="$link" - # else - # program="`dirname $program`/$link" - # fi - #done - #script_dir=`dirname "$program"` - #relative_clojure_home=`dirname "$script_dir"` - #CLOJURE_HOME=`cd "$relative_clojure_home" && pwd` - . /etc/profile.d/clojure.sh -fi - -if [ ! "$CLOJURE_JAVA" ]; then - CLOJURE_JAVA="java"; -fi - -if [ ! "$CLOJURE_JAVA_OPTS" ]; then - CLOJURE_JAVA_OPTS="-Dpid=$$"; # set the pid for SLIME -fi - -if [ ! "$CLOJURE_CLASSPATH" ]; then - CLOJURE_CLASSPATH="." -fi - -## Add Clojure home jars. -for jar in "$CLOJURE_HOME"/*.jar; do - CLOJURE_CLASSPATH="$CLOJURE_CLASSPATH:$jar" -done - -if [ -d "$CLOJURE_LIB" ]; then - CLOJURE_CLASSPATH="$CLOJURE_CLASSPATH:$CLOJURE_LIB" - for jar in "$CLOJURE_LIB"/*.jar; do - CLOJURE_CLASSPATH="$CLOJURE_CLASSPATH:$jar" - done -fi - -# this is now the same for both the repl and for scripts -main="clojure.main" -repl=0 -verbose=0 - -while true; do - case $1 in - -h|--help) - echo "$usage"; exit 1;; - -J|--java-cmd) - CLOJURE_JAVA="$2"; shift; shift;; - -j|--java-opts) - CLOJURE_JAVA_OPTS="$CLOJURE_JAVA_OPTS $2"; shift; shift;; - -cp|--classpath) - CLOJURE_CLASSPATH="$CLOJURE_CLASSPATH:$2"; shift; shift;; - -L|--library-path) - if [ "$CLOJURE_LIBRARY_PATH" ]; then - CLOJURE_LIBRARY_PATH="$CLOJURE_LIBRARY_PATH:$2"; - else - CLOJURE_LIBRARY_PATH="$2"; - fi - shift; shift;; - -v|--verbose) - verbose=1; shift;; - *) break;; - esac -done - -[ $verbose -eq 1 ] && echo "$CLOJURE_CLASSPATH" - -# If we didn't get any files to load on the commandline, we want to run the -# repl, with command line editing if available. -[ $# -eq 0 ] && repl=1 - -# If the classpath contains the JLine jar, use the JLine console runner -if expr "$CLOJURE_CLASSPATH" : ".*jline.*\.jar" >/dev/null; then - [ $repl -eq 1 ] && jline="jline.ConsoleRunner" -fi - -# Enable rlwrap if present -if [ $repl -eq 1 ] && [ -z $jline ]; then - rlwrap=`type -p rlwrap` -fi - -## Add CLOJURE_LIBRARY_PATH to the Java options if necessary -if [ -n "$CLOJURE_LIBRARY_PATH" ]; then - CLOJURE_JAVA_OPTS="$CLOJURE_JAVA_OPTS -Djava.library.path=$CLOJURE_LIBRARY_PATH" -fi - -cmd=`echo $rlwrap "$CLOJURE_JAVA" "$CLOJURE_JAVA_OPTS" -cp "$CLOJURE_CLASSPATH" $jline $main` -[ $verbose -eq 1 ] && echo "$cmd" "$@" -exec `echo $cmd` "$@" Deleted: clojure.install =================================================================== --- clojure.install 2017-12-12 10:27:41 UTC (rev 273978) +++ clojure.install 2017-12-12 10:27:50 UTC (rev 273979) @@ -1,5 +0,0 @@ -post_install() { - echo 'Relogin or source /etc/profile.d/clojure.sh' -} - -# vim:set ts=2 sw=2 et: Copied: clojure/repos/community-any/clojure.install (from rev 273978, clojure/trunk/clojure.install) =================================================================== --- clojure.install (rev 0) +++ clojure.install 2017-12-12 10:27:50 UTC (rev 273979) @@ -0,0 +1,5 @@ +post_install() { + echo 'Relogin or source /etc/profile.d/clojure.sh' +} + +# vim:set ts=2 sw=2 et: Deleted: clojure.sh =================================================================== --- clojure.sh 2017-12-12 10:27:41 UTC (rev 273978) +++ clojure.sh 2017-12-12 10:27:50 UTC (rev 273979) @@ -1 +0,0 @@ -export CLOJURE_HOME=/usr/share/clojure Copied: clojure/repos/community-any/clojure.sh (from rev 273978, clojure/trunk/clojure.sh) =================================================================== --- clojure.sh (rev 0) +++ clojure.sh 2017-12-12 10:27:50 UTC (rev 273979) @@ -0,0 +1 @@ +export CLOJURE_HOME=/usr/share/clojure