diff --git a/COPYING b/LICENSE similarity index 92% rename from COPYING rename to LICENSE index 94a9ed0..94a0453 100644 --- a/COPYING +++ b/LICENSE @@ -619,56 +619,3 @@ Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..3392c52 --- /dev/null +++ b/Makefile @@ -0,0 +1,25 @@ +VERSION = v20 +TAGNAME = release-$(VERSION) + +.PHONY: docs install + +install: + install.sh + +docs: + pandoc -s -w man docs/manpage.md -o docs/autojump.1 + pandoc -s -w markdown docs/manpage.md docs/install.md -o README.md + +release: + # Check for tag existence + # git describe release-$(VERSION) 2>&1 >/dev/null || exit 1 + + tools/git-version.sh $(TAGNAME) + + # Commit the version change + git commit -m "version numbering" autojump + + # Create tag + git tag -a $(TAGNAME) + + git archive --format=tar --prefix autojump_$(VERSION)/ $(TAGNAME) | gzip > autojump_$(VERSION).tar.gz diff --git a/autojump.py b/autojump.py deleted file mode 120000 index ee78df4..0000000 --- a/autojump.py +++ /dev/null @@ -1 +0,0 @@ -autojump \ No newline at end of file diff --git a/_j b/bin/_j similarity index 100% rename from _j rename to bin/_j diff --git a/autojump b/bin/autojump similarity index 100% rename from autojump rename to bin/autojump diff --git a/autojump.bash b/bin/autojump.bash similarity index 100% rename from autojump.bash rename to bin/autojump.bash diff --git a/autojump.sh b/bin/autojump.sh similarity index 100% rename from autojump.sh rename to bin/autojump.sh diff --git a/autojump.zsh b/bin/autojump.zsh similarity index 100% rename from autojump.zsh rename to bin/autojump.zsh diff --git a/icon.png b/bin/icon.png similarity index 100% rename from icon.png rename to bin/icon.png diff --git a/jumpapplet b/bin/jumpapplet similarity index 100% rename from jumpapplet rename to bin/jumpapplet diff --git a/autojump.1 b/docs/autojump.1 similarity index 100% rename from autojump.1 rename to docs/autojump.1 diff --git a/INSTALL.md b/docs/install.md similarity index 100% rename from INSTALL.md rename to docs/install.md diff --git a/manpage.md b/docs/manpage.md similarity index 100% rename from manpage.md rename to docs/manpage.md diff --git a/make_doc.sh b/make_doc.sh deleted file mode 100755 index c957d85..0000000 --- a/make_doc.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -pandoc -s -w man manpage.md -o autojump.1 -pandoc -s -w markdown manpage.md INSTALL.md -o README.md diff --git a/make_release.sh b/make_release.sh deleted file mode 100755 index 1051c7b..0000000 --- a/make_release.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - - -if [ $# -ne 1 ] -then - echo "Usage: `basename $0` release" - echo "where release is of the form v11, v12, ..." - exit 1 -fi -version=$1 -tagname=release-${version} -./git-version.sh ${tagname} - -# Commit the version change -git commit -m "version numbering" autojump - -#Create tag -git tag -a ${tagname} - -#check for tag existence -git describe release-$1 2>&1 >/dev/null || -{ - echo "Invalid version $1" - exit 1 -} - -git archive --format=tar --prefix autojump_${version}/ ${tagname} | gzip > autojump_${version}.tar.gz diff --git a/git-version.sh b/tools/git-version.sh similarity index 84% rename from git-version.sh rename to tools/git-version.sh index 3f359e0..725745f 100755 --- a/git-version.sh +++ b/tools/git-version.sh @@ -2,13 +2,11 @@ # add git revision to autojump # Fail silently if there is no git directory, ie. if the user installed from a regular download -if [[ ! -d .git ]] -then +if [[ ! -d .git ]]; then exit fi -if [ -z "$1" ] -then +if [ -z "$1" ]; then gitrevision=`git describe` if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then gitrevision=$gitrevision"-dirty" @@ -17,4 +15,4 @@ else gitrevision="$1" fi -sed -i "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"$gitrevision\"/" autojump +sed -i "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"$gitrevision\"/" ./bin/autojump