restructure files, working make doc and make release

XhinLiang · Apr 17, 2012 · acfc5c1 · acfc5c1
1 parent 2ebcdba
commit acfc5c1
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 90 deletions.
diff --git a/COPYING → LICENSE b/COPYING → 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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <http://www.gnu.org/licenses/>.
-
-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:
-
-    <program>  Copyright (C) <year>  <name of author>
-    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
-<http://www.gnu.org/licenses/>.
-
-  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
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile 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
diff --git a/_j → bin/_j b/_j → bin/_j
diff --git a/autojump → bin/autojump b/autojump → bin/autojump
diff --git a/autojump.bash → bin/autojump.bash b/autojump.bash → bin/autojump.bash
diff --git a/autojump.sh → bin/autojump.sh b/autojump.sh → bin/autojump.sh
diff --git a/autojump.zsh → bin/autojump.zsh b/autojump.zsh → bin/autojump.zsh
diff --git a/icon.png → bin/icon.png b/icon.png → bin/icon.png
diff --git a/jumpapplet → bin/jumpapplet b/jumpapplet → bin/jumpapplet
diff --git a/autojump.1 → docs/autojump.1 b/autojump.1 → docs/autojump.1
diff --git a/INSTALL.md → docs/install.md b/INSTALL.md → docs/install.md
diff --git a/manpage.md → docs/manpage.md b/manpage.md → docs/manpage.md
diff --git a/make_doc.sh b/make_doc.sh
diff --git a/make_release.sh b/make_release.sh
diff --git a/git-version.sh → tools/git-version.sh b/git-version.sh → 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