Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: technomancy/leiningen
...
head fork: technomancy/leiningen
Checking mergeability… Don't worry, you can still create the pull request.
  • 13 commits
  • 10 files changed
  • 0 commit comments
  • 2 contributors
Commits on Dec 03, 2010
@technomancy Strip out cross-platform crap from bin/lein. ce99a4b
Commits on Dec 04, 2010
@technomancy Add dependency jars in /usr/share/java to the classpath. 5130ce3
Commits on Dec 17, 2010
@travis travis Use lein-deb to package leiningen for deployment on deb based systems
Add lein-deb to the dev-dependencies and add the minimal configuration
to build a package that will install correctly on a debian based
system. The deb currently ships all of leiningen's dependencies
as well as leiningen itself, and sticks them into /usr/share/java.
This is actually pretty rude, and will cause problems if
any other package wants to install these dependencies in this location.

We should either a) work to get these dependencies packaged up
as debs and ship them separately or b) install these debs
to a leiningen specific location to avoid conflicts. I'll email
the list to solicit opinions.

I also needed to tweak bin/lein just a little:

1) fix what seems like a bash typo in LEIN_HOME creation
2) add leiningen itself to the classpath
9dca2ec
Commits on Dec 28, 2010
@travis travis Don't package everything in the deb
Add a depends section to the deb definition and ant jar from the deb, since
these are available via an existing deb package.

I tried to do the same thing for the maven deps via
libmaven2-core-java and libmaven-ant-tasks-java
(http://packages.ubuntu.com/maverick/libmaven2-core-java,
http://packages.ubuntu.com/natty/libmaven-ant-tasks-java)
but ran into issues with the version of maven (2.2.1) available
in the deb repos. Specifically, using 2.2.1 many lein
commands would do some work and then hang. A thread dump
(https://gist.github.com/757708) suggests this has something
to do with edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue
but my JVM-fu is not sufficient to immediately understand the problem.

Additionally, libmaven-ant-tasks-java is only available in natty, and
would need to be backported or PPA hosted to be available to other
systems.

A better solution would be to have this package depend on an
older version of maven (2.0.10 would be ideal, since that's what
leiningen specifies in project.clj) but I could not find this
in any repos. An even better solution would be to have leiningen
work on 2.2.1, but it's not clear this is worth the effort
at the moment, since lein may move to aether anyway.

With all this in mind I've decided to just package the maven
dependencies with the leiningen deb for now. To avoid conflicts with
other packages, put leiningen's custom dependencies into
/usr/share/java/lein and put all jars in that directory onto
the classpath in bin/lein.
6083e00
Commits on Jan 14, 2011
@technomancy Merge master (c. 1.5.0) into debian. df799b9
Commits on May 25, 2011
@technomancy Merge master (c. 1.6.0) into debian. 33c9939
Commits on Jun 29, 2011
@technomancy Merge branch 'master' into debian (c. 1.6)
Conflicts:
	bin/lein
	project.clj
5cab46d
@technomancy Try using a proper debian/ dir instead of lein-deb. 20d3bde
Commits on Jun 30, 2011
@technomancy Merge branch 'master' into debian
Conflicts:
	bin/lein
	project.clj
14ec8b3
Commits on Jul 01, 2011
@technomancy Depend on librobert-hooke and libclucy; fix (?) rules. 4c82ce1
@technomancy Merge branch 'master' into debian 0764797
Commits on Jul 02, 2011
@technomancy First actually-working from-real-deb lein build.
Modulo having to manually install contrib 1.2, clucy, hooke, and lancet.
84e6269
Commits on Jul 14, 2011
@technomancy Merge master from 1.6.1. d65484c
View
1  .gitignore
@@ -5,6 +5,7 @@ test_projects/sample/pom.xml
classes/
lib/
leiningen*.jar
+leiningen*.deb
lein-swank/lein-swank*.jar
autodoc/
bin/nom
View
187 bin/lein
@@ -1,19 +1,8 @@
-#!/bin/sh
+#!/bin/bash
LEIN_VERSION="1.6.1"
export LEIN_VERSION
-case $LEIN_VERSION in
- *SNAPSHOT) SNAPSHOT="YES" ;;
- *) SNAPSHOT="NO" ;;
-esac
-
-# Make sure classpath is in unix format for manipulating, then put
-# it back to windows format when we use it
-if [ "$OSTYPE" = "cygwin" ] && [ "$CLASSPATH" != "" ]; then
- CLASSPATH=`cygpath -up $CLASSPATH`
-fi
-
if [ `whoami` = "root" ] && [ "$LEIN_ROOT" = "" ]; then
echo "WARNING: You're currently running as root; probably by accident."
echo "Press control-C to abort or Enter to continue as root."
@@ -21,10 +10,10 @@ if [ `whoami` = "root" ] && [ "$LEIN_ROOT" = "" ]; then
read _
fi
+# cd to the project root, if applicable
NOT_FOUND=1
ORIGINAL_PWD="$PWD"
-while [ ! -r "$PWD/project.clj" ] && [ "$PWD" != "/" ] && [ $NOT_FOUND -ne 0 ]
-do
+while [ ! -r "$PWD/project.clj" ] && [ "$PWD" != "/" ] && [ $NOT_FOUND -ne 0 ]; do
cd ..
if [ "$(dirname "$PWD")" = "/" ]; then
NOT_FOUND=0
@@ -32,9 +21,10 @@ do
fi
done
-if [ "$LEIN_HOME" = "" ]; then
- LEIN_HOME="$HOME/.lein"
-fi
+# Support $JAVA_OPTS for backwards-compatibility.
+JVM_OPTS=${JVM_OPTS:-"$JAVA_OPTS"}
+JAVA_CMD=${JAVA_CMD:-"java"}
+LEIN_HOME=${LEIN_HOME:-"$HOME/.lein"}
DEV_PLUGINS="$(ls -1 lib/dev/*jar 2> /dev/null)"
USER_PLUGINS="$(ls -1 "$LEIN_HOME"/plugins/*jar 2> /dev/null)"
@@ -69,7 +59,7 @@ LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/"
LEIN_JAR="$HOME/.lein/self-installs/leiningen-$LEIN_VERSION-standalone.jar"
-CLOJURE_JAR="$HOME/.m2/repository/org/clojure/clojure/1.2.1/clojure-1.2.1.jar"
+CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar"
NULL_DEVICE=/dev/null
# apply context specific CLASSPATH entries
@@ -84,147 +74,32 @@ else
SCRIPT="$0"
fi
-# resolve symlinks to the script itself portably
-while [ -h "$SCRIPT" ] ; do
- ls=`ls -ld "$SCRIPT"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- SCRIPT="$link"
- else
- SCRIPT="$(dirname "$SCRIPT"$)/$link"
- fi
+SHARE_JARS="ant ant-launcher classworlds clojure-1.2 \
+lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \
+maven-error-diagnostics maven-model maven-settings maven-project maven-profile \
+maven-repository-metadataplexus-container-default-alpha plexus-interpolation \
+plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \
+xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet leiningen
+backport-util-concurrent" # NFI why that last one is necessary
+for JAR in $SHARE_JARS; do
+ CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
done
-BIN_DIR="$(dirname "$SCRIPT")"
-
-if [ -r "$BIN_DIR/../src/leiningen/core.clj" ]; then
- # Running from source checkout
- LEIN_DIR="$(dirname "$BIN_DIR")"
- LEIN_LIBS="$(find -H "$LEIN_DIR/lib" -mindepth 1 -maxdepth 1 -print0 2> /dev/null | tr \\0 \:)"
- CLASSPATH="$CLASSPATH:$LEIN_LIBS:$LEIN_DIR/src:$LEIN_DIR/classes:$LEIN_DIR/resources:$LEIN_JAR"
-
- if [ "$LEIN_LIBS" = "" -a "$1" != "self-install" -a ! -r "$LEIN_JAR" ]; then
- echo "Leiningen is missing its dependencies. Please see \"Building\" in the README."
- exit 1
- fi
-else
- # Not running from a checkout
- CLASSPATH="$CLASSPATH:$LEIN_JAR"
-
- if [ ! -r "$LEIN_JAR" -a "$1" != "self-install" ]; then
- "$0" self-install
- fi
+if [ $DEBUG ]; then
+ echo $CLASSPATH
+ echo $CLOJURE_JAR
fi
-HTTP_CLIENT="wget --no-check-certificate -O"
-if type -p curl >/dev/null 2>&1; then
- if [ "$https_proxy" != "" ]; then
- CURL_PROXY="-x $https_proxy"
+# Use rlwrap if appropriate
+if ([ "$1" = "repl" ] || [ "$1" = "interactive" ] || [ "$1" = "int" ]) &&
+ [ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]; then
+ which rlwrap > /dev/null
+ if [ $? -eq 0 ]; then
+ RLWRAP="rlwrap -m -q '\"'" # custom quote chars
fi
- HTTP_CLIENT="curl $CURL_PROXY --insecure -f -L -o"
fi
-export JAVA_CMD=${JAVA_CMD:-"java"}
-
-# Support $JAVA_OPTS for backwards-compatibility.
-export JVM_OPTS=${JVM_OPTS:-"$JAVA_OPTS"}
-
-# TODO: investigate http://skife.org/java/unix/2011/06/20/really_executable_jars.html
-# If you're packaging this for a package manager (.deb, homebrew, etc)
-# you need to remove the self-install and upgrade functionality.
-if [ "$1" = "self-install" ]; then
- echo "Downloading Leiningen now..."
- LEIN_DIR=`dirname "$LEIN_JAR"`
- mkdir -p "$LEIN_DIR"
- LEIN_URL="https://github.com/downloads/technomancy/leiningen/leiningen-$LEIN_VERSION-standalone.jar"
- $HTTP_CLIENT "$LEIN_JAR" "$LEIN_URL"
- if [ $? != 0 ]; then
- echo "Failed to download $LEIN_URL"
- if [ $SNAPSHOT = "YES" ]; then
- echo "If you have Maven installed, you can do"
- echo "mvn dependency:copy-dependencies; mv target/dependency lib"
- echo "See README.md for further SNAPSHOT build instructions."
- fi
- rm $LEIN_JAR 2> /dev/null
- exit 1
- fi
-elif [ "$1" = "upgrade" ]; then
- if [ "$LEIN_DIR" != "" ]; then
- echo "The upgrade task is not meant to be run from a checkout."
- exit 1
- fi
- if [ $SNAPSHOT = "YES" ]; then
- echo "The upgrade task is only meant for stable releases."
- echo "See the \"Hacking\" section of the README."
- exit 1
- fi
- if [ ! -w "$SCRIPT" ]; then
- echo "You do not have permission to upgrade the installation in $SCRIPT"
- exit 1
- else
- echo "The script at $SCRIPT will be upgraded to the latest stable version."
- echo -n "Do you want to continue [Y/n]? "
- read RESP
- case "$RESP" in
- y|Y|"")
- echo
- echo "Upgrading..."
- TARGET="/tmp/lein-$$-upgrade"
- LEIN_SCRIPT_URL="https://github.com/technomancy/leiningen/raw/stable/bin/lein"
- $HTTP_CLIENT "$TARGET" "$LEIN_SCRIPT_URL" \
- && mv "$TARGET" "$SCRIPT" \
- && chmod +x "$SCRIPT" \
- && echo && $SCRIPT self-install && echo && echo "Now running" `$SCRIPT version`
- exit $?;;
- *)
- echo "Aborted."
- exit 1;;
- esac
- fi
-else
- if [ "$OSTYPE" = "cygwin" ]; then
- # When running on Cygwin, use Windows-style paths for java
- CLOJURE_JAR=`cygpath -w "$CLOJURE_JAR"`
- ORIGINAL_PWD=`cygpath -w "$ORIGINAL_PWD"`
- CLASSPATH=`cygpath -wp "$CLASSPATH"`
- NULL_DEVICE=NUL
- fi
-
- if [ $DEBUG ]; then
- echo $CLASSPATH
- echo $CLOJURE_JAR
- fi
-
- JLINE=""
- if ([ "$1" = "repl" ] || [ "$1" = "interactive" ] || [ "$1" = "int" ]) &&
- [ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]; then
- # Use rlwrap if it's available, otherwise fall back to JLine
- RLWRAP=`which rlwrap`
- if [ ! -x "$RLWRAP" ] || [ "$RLWRAP" = "" ]; then
- if [ ! -r "$LEIN_HOME/.jline-warn" ]; then
- echo "Using JLine for console I/O; install rlwrap for optimum experience."
- touch "$LEIN_HOME/.jline-warn"
- fi
- RLWRAP=""
- JLINE=jline.ConsoleRunner
- if [ "$OSTYPE" = "cygwin" ]; then
- JLINE="-Djline.terminal=jline.UnixTerminal jline.ConsoleRunner"
- CYGWIN_JLINE=y
- fi
- else
- # Test to see if rlwrap supports custom quote chars
- rlwrap -m -q '"' echo "hi" > /dev/null 2>&1
- if [ $? -eq 0 ]; then
- RLWRAP="$RLWRAP -m -q '\"'"
- fi
- fi
- fi
-
- # The -Xbootclasspath argument is optional here: if the jar
- # doesn't exist everything will still work, it will just have a
- # slower JVM boot.
- test $CYGWIN_JLINE && stty -icanon min 1 -echo
- if [ "$1" = "trampoline" ]; then
+if [ "$1" = "trampoline" ]; then
TRAMPOLINE_FILE="/tmp/lein-trampoline-$$"
if [ "$OSTYPE" = "cygwin" ]; then
TRAMPOLINE_FILE=`cygpath -w $TRAMPOLINE_FILE`
@@ -232,18 +107,16 @@ else
$JAVA_CMD -Xbootclasspath/a:"$CLOJURE_JAR" -client $JVM_OPTS \
-Dleiningen.original.pwd="$ORIGINAL_PWD" \
-Dleiningen.trampoline-file=$TRAMPOLINE_FILE -cp "$CLASSPATH" \
- $JLINE clojure.main -e "(use 'leiningen.core)(-main)" \
+ clojure.main -e "(use 'leiningen.core)(-main)" \
$NULL_DEVICE "$@"
if [ -r $TRAMPOLINE_FILE ]; then
TRAMPOLINE="$(cat $TRAMPOLINE_FILE)"
rm $TRAMPOLINE_FILE
exec sh -c "exec $TRAMPOLINE"
fi
- else
+else
exec $RLWRAP $JAVA_CMD -Xbootclasspath/a:"$CLOJURE_JAR" -client $JVM_OPTS \
-Dleiningen.original.pwd="$ORIGINAL_PWD" \
- -cp "$CLASSPATH" $JLINE clojure.main -e "(use 'leiningen.core)(-main)" \
+ -cp "$CLASSPATH" clojure.main -e "(use 'leiningen.core)(-main)" \
$NULL_DEVICE "$@"
- fi
- test $CYGWIN_JLINE && stty icanon echo
fi
View
5 debian/changelog
@@ -0,0 +1,5 @@
+leiningen (1.6.1-1) unstable; urgency=low
+
+ * Initial release. (Closes: #566963)
+
+ -- Phil Hagelberg <technomancy@gmail.com> Tue, 28 Jun 2011 16:02:58 -0700
View
1  debian/compat
@@ -0,0 +1 @@
+7
View
18 debian/control
@@ -0,0 +1,18 @@
+Source: leiningen
+Section: devel
+Priority: optional
+Maintainer: Phil Hagelberg <technomancy@gmail.com>
+Build-Depends: debhelper (>> 7), javahelper (>= 0.32)
+Build-Depends-Indep: clojure1.2, java2-runtime
+Standards-Version: 3.8.3
+Homepage: https://github.com/technomancy/leiningen
+
+Package: leiningen
+Architecture: all
+Depends: java2-runtime, clojure1.2, libmaven-ant-tasks-java,
+ libmaven2-core-java, librobert-hooke-clojure, libclucy-clojure, ant1.7
+Recommends: rlwrap
+Description: A Clojure build tool designed not to set your hair on fire.
+ Building Clojure projects with tools designed for Java can be an
+ exercise in frustration. With Leiningen, you describe your build with
+ Clojure.
View
233 debian/copyright
@@ -0,0 +1,233 @@
+Name: leiningen
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Source: https://github.com/technomancy/leiningen.
+
+Upstream Author: Phil Hagelberg <technomancy@gmail.com>
+
+Copyright: 2009-2011 Phil Hagelberg <technomancy@gmail.com> and contributors.
+License: EPL-1.0
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
+ THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+ 1. DEFINITIONS
+
+ "Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and
+ documentation distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+
+ i) changes to the Program, and
+
+ ii) additions to the Program;
+
+ where such changes and/or additions to the Program originate from and
+ are distributed by that particular Contributor. A Contribution
+ 'originates' from a Contributor if it was added to the Program by such
+ Contributor itself or anyone acting on such Contributor's
+ behalf. Contributions do not include additions to the Program which:
+ (i) are separate modules of software distributed in conjunction with
+ the Program under their own license agreement, and (ii) are not
+ derivative works of the Program.
+
+ "Contributor" means any person or entity that distributes the Program.
+
+ "Licensed Patents" mean patent claims licensable by a Contributor
+ which are necessarily infringed by the use or sale of its Contribution
+ alone or when combined with the Program.
+
+ "Program" means the Contributions distributed in accordance with this
+ Agreement.
+
+ "Recipient" means anyone who receives the Program under this
+ Agreement, including all Contributors.
+
+ 2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free copyright
+ license to reproduce, prepare derivative works of, publicly display,
+ publicly perform, distribute and sublicense the Contribution of such
+ Contributor, if any, and such derivative works, in source code and
+ object code form.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby
+ grants Recipient a non-exclusive, worldwide, royalty-free patent
+ license under Licensed Patents to make, use, sell, offer to sell,
+ import and otherwise transfer the Contribution of such Contributor, if
+ any, in source code and object code form. This patent license shall
+ apply to the combination of the Contribution and the Program if, at
+ the time the Contribution is added by the Contributor, such addition
+ of the Contribution causes such combination to be covered by the
+ Licensed Patents. The patent license shall not apply to any other
+ combinations which include the Contribution. No hardware per se is
+ licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the
+ licenses to its Contributions set forth herein, no assurances are
+ provided by any Contributor that the Program does not infringe the
+ patent or other intellectual property rights of any other entity. Each
+ Contributor disclaims any liability to Recipient for claims brought by
+ any other entity based on infringement of intellectual property rights
+ or otherwise. As a condition to exercising the rights and licenses
+ granted hereunder, each Recipient hereby assumes sole responsibility
+ to secure any other intellectual property rights needed, if any. For
+ example, if a third party patent license is required to allow
+ Recipient to distribute the Program, it is Recipient's responsibility
+ to acquire that license before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright
+ license set forth in this Agreement.
+
+ 3. REQUIREMENTS
+
+ A Contributor may choose to distribute the Program in object code form
+ under its own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties
+ and conditions, express and implied, including warranties or
+ conditions of title and non-infringement, and implied warranties or
+ conditions of merchantability and fitness for a particular purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability
+ for damages, including direct, indirect, special, incidental and
+ consequential damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are
+ offered by that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable
+ manner on or through a medium customarily used for software exchange.
+
+ When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+
+ b) a copy of this Agreement must be included with each copy of the Program.
+
+ Contributors may not remove or alter any copyright notices contained
+ within the Program.
+
+ Each Contributor must identify itself as the originator of its
+ Contribution, if any, in a manner that reasonably allows subsequent
+ Recipients to identify the originator of the Contribution.
+
+ 4. COMMERCIAL DISTRIBUTION
+
+ Commercial distributors of software may accept certain
+ responsibilities with respect to end users, business partners and the
+ like. While this license is intended to facilitate the commercial use
+ of the Program, the Contributor who includes the Program in a
+ commercial product offering should do so in a manner which does not
+ create potential liability for other Contributors. Therefore, if a
+ Contributor includes the Program in a commercial product offering,
+ such Contributor ("Commercial Contributor") hereby agrees to defend
+ and indemnify every other Contributor ("Indemnified Contributor")
+ against any losses, damages and costs (collectively "Losses") arising
+ from claims, lawsuits and other legal actions brought by a third party
+ against the Indemnified Contributor to the extent caused by the acts
+ or omissions of such Commercial Contributor in connection with its
+ distribution of the Program in a commercial product offering. The
+ obligations in this section do not apply to any claims or Losses
+ relating to any actual or alleged intellectual property
+ infringement. In order to qualify, an Indemnified Contributor must: a)
+ promptly notify the Commercial Contributor in writing of such claim,
+ and b) allow the Commercial Contributor tocontrol, and cooperate with
+ the Commercial Contributor in, the defense and any related settlement
+ negotiations. The Indemnified Contributor may participate in any such
+ claim at its own expense.
+
+ For example, a Contributor might include the Program in a commercial
+ product offering, Product X. That Contributor is then a Commercial
+ Contributor. If that Commercial Contributor then makes performance
+ claims, or offers warranties related to Product X, those performance
+ claims and warranties are such Commercial Contributor's responsibility
+ alone. Under this section, the Commercial Contributor would have to
+ defend claims against the other Contributors related to those
+ performance claims and warranties, and if a court requires any other
+ Contributor to pay any damages as a result, the Commercial Contributor
+ must pay those damages.
+
+ 5. NO WARRANTY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+ PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
+ WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+ OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+ responsible for determining the appropriateness of using and
+ distributing the Program and assumes all risks associated with its
+ exercise of rights under this Agreement , including but not limited to
+ the risks and costs of program errors, compliance with applicable
+ laws, damage to or loss of data, programs or equipment, and
+ unavailability or interruption of operations.
+
+ 6. DISCLAIMER OF LIABILITY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
+ ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+ WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+ DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+ HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+ 7. GENERAL
+
+ If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of
+ the remainder of the terms of this Agreement, and without further
+ action by the parties hereto, such provision shall be reformed to the
+ minimum extent necessary to make such provision valid and enforceable.
+
+ If Recipient institutes patent litigation against any entity
+ (including a cross-claim or counterclaim in a lawsuit) alleging that
+ the Program itself (excluding combinations of the Program with other
+ software or hardware) infringes such Recipient's patent(s), then such
+ Recipient's rights granted under Section 2(b) shall terminate as of
+ the date such litigation is filed.
+
+ All Recipient's rights under this Agreement shall terminate if it
+ fails to comply with any of the material terms or conditions of this
+ Agreement and does not cure such failure in a reasonable period of
+ time after becoming aware of such noncompliance. If all Recipient's
+ rights under this Agreement terminate, Recipient agrees to cease use
+ and distribution of the Program as soon as reasonably
+ practicable. However, Recipient's obligations under this Agreement and
+ any licenses granted by Recipient relating to the Program shall
+ continue and survive.
+
+ Everyone is permitted to copy and distribute copies of this Agreement,
+ but in order to avoid inconsistency the Agreement is copyrighted and
+ may only be modified in the following manner. The Agreement Steward
+ reserves the right to publish new versions (including revisions) of
+ this Agreement from time to time. No one other than the Agreement
+ Steward has the right to modify this Agreement. The Eclipse Foundation
+ is the initial Agreement Steward. The Eclipse Foundation may assign
+ the responsibility to serve as the Agreement Steward to a suitable
+ separate entity. Each new version of the Agreement will be given a
+ distinguishing version number. The Program (including Contributions)
+ may always be distributed subject to the version of the Agreement
+ under which it was received. In addition, after a new version of the
+ Agreement is published, Contributor may elect to distribute the
+ Program (including its Contributions) under the new version. Except as
+ expressly stated in Sections 2(a) and 2(b) above, Recipient receives
+ no rights or licenses to the intellectual property of any Contributor
+ under this Agreement, whether expressly, by implication, estoppel or
+ otherwise. All rights in the Program not expressly granted under this
+ Agreement are reserved.
+
+ This Agreement is governed by the laws of the State of Washington and
+ the intellectual property laws of the United States of America. No
+ party to this Agreement will bring a legal action under this Agreement
+ more than one year after the cause of action arose. Each party waives
+ its rights to a jury trial in any resulting litigation.
View
30 debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+
+clean:
+ rm -rf classes *jar *deb debian/leiningen/
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+build:
+ LEIN_ROOT=y bin/lein compile :all, jar
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_install -i bin/lein /usr/bin/
+ dh_installdocs -i
+ dh_installchangelogs -i
+ jh_installlibs -i leiningen-1.6.1.jar
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary: binary-indep
View
53 pom.xml
@@ -9,13 +9,13 @@
<url>https://github.com/technomancy/leiningen</url>
<licenses>
<license>
- <name>Eclipse Public License</name>
+ <name>Eclipse Public License 1.0</name>
</license>
</licenses>
<scm>
<connection>scm:git:git://github.com/technomancy/leiningen.git</connection>
<developerConnection>scm:git:ssh://git@github.com/technomancy/leiningen.git</developerConnection>
- <tag>2cb7ec9af48b1a094848a5e9963ea201015a5645</tag>
+ <tag>6c3cfdf30bb0c49f3ad95cc8944d644cc80fef3a</tag>
<url>https://github.com/technomancy/leiningen</url>
</scm>
<build>
@@ -42,55 +42,6 @@
<url>http://clojars.org/repo/</url>
</repository>
</repositories>
- <dependencies>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojure</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>clojure-contrib</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>clucy</groupId>
- <artifactId>clucy</artifactId>
- <version>0.2.1</version>
- </dependency>
- <dependency>
- <groupId>lancet</groupId>
- <artifactId>lancet</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- <exclusions>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>robert</groupId>
- <artifactId>hooke</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-ant-tasks</artifactId>
- <version>2.0.10</version>
- <exclusions>
- <exclusion>
- <artifactId>ant</artifactId>
- <groupId>ant</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
</project>
<!-- This file was autogenerated by Leiningen.
View
9 project.clj
@@ -5,13 +5,6 @@
(defproject leiningen "1.6.1"
:description "Automate Clojure projects without setting your hair on fire."
:url "https://github.com/technomancy/leiningen"
- :license {:name "Eclipse Public License"}
- :dependencies [[org.clojure/clojure "1.2.1"]
- [org.clojure/clojure-contrib "1.2.0"]
- [clucy "0.2.2"]
- [lancet "1.0.1"]
- [jline "0.9.94" :exclusions [junit]]
- [robert/hooke "1.1.2"]
- [org.apache.maven/maven-ant-tasks "2.0.10" :exclusions [ant]]]
+ :license {:name "Eclipse Public License 1.0"}
:disable-implicit-clean true
:eval-in-leiningen true)
View
9 todo.org
@@ -11,6 +11,15 @@ See also https://github.com/technomancy/leiningen/issues
- Aether: how would it integrate? Improvement over maven-ant-tasks?
- Tests in Nailgun: would it require a separate shell script?
- How could nonlinear versions be represented?
+* Debian packaging
+ - [x] package simple libs
+ - [ ] lancet.core
+ - [ ] man page (written, but not getting installed)
+ - [x] fix clucy to not hardcode lucene 3
+ - [ ] package contrib 1.2
+ - [x] ITP for deps
+ - [ ] don't hard-code version in rules/binary
+ - [ ] investigate jh_depends
* For 2.0
- Quit using ant's Java task. It is horrible.
Try a custom classloader approach?

No commit comments for this range

Something went wrong with that request. Please try again.