Skip to content

Commit

Permalink
Version bump to 0.1.99+ in preparation for 0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
rstacruz committed Dec 29, 2009
1 parent 64f506e commit f85c33d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Sparkup makefile
#
VERSION = $(shell cat VERSION)
# ================

# Account for incremental version numbers (e.g., 0.3.5-20091229)
VERSION = $(subst {date},${shell date +%Y%m%d},$(shell cat VERSION))
ROOT := $(PWD)

# Paths
Expand All @@ -11,10 +13,10 @@ DISTRIB_FILES = ${DISTRIB_PLUGINS} ${DISTRIB_PATH}/readme.txt

# Files
README = README.md
SPARKUP_PY = src/sparkup/sparkup.py
SPARKUP_PY = ${DISTRIB_PATH}/sparkup.py
FINAL_ZIP = sparkup-${VERSION}.zip

.PHONY: all distrib ${DISTRIB_PATH} ${DISTRIB_PLUGINS}
.PHONY: all distrib ${DISTRIB_PATH} ${DISTRIB_PLUGINS} distrib_cleanup ${SPARKUP_PY}
all: ${FINAL_ZIP}
@echo ------
@echo
Expand All @@ -32,7 +34,10 @@ ${FINAL_ZIP}: distrib
--exclude */.DS_Store --exclude */Thumbs.db --exclude */*.pyc

# Distribution path
distrib: ${DISTRIB_PATH} ${DISTRIB_FILES}
distrib: ${DISTRIB_PATH} ${DISTRIB_FILES} distrib_cleanup

distrib_cleanup:
rm ${SPARKUP_PY}

${DISTRIB_PATH}:
mkdir -p "$@"
Expand Down Expand Up @@ -62,5 +67,5 @@ ${DISTRIB_PATH}/generic: ${SPARKUP_PY}

# Sources
${SPARKUP_PY}:
# Nothing to do
cat "src/sparkup/sparkup.py" | sed 's/^VERSION.*$$/VERSION = "${VERSION}"/' > $@

7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ Build instructions
The files in the source tree are not useable straight away: you need to build the plugins
first. Simple type `make` (assuming you have GNU make installed) in the project's root.

What it will do:

- Create a directory called `sparkup-<version>/`
- Put the packaged, ready-to-use plugins there
- Inject the version number (from the file `VERSION`) to the copies of sparkup.py in that directory
- Create a redistributable ZIP file (s`parkup-<version>.zip`)

Usage and installation
----------------------
You may download Sparkup from Github. [Download the latest version here](http://github.com/rstacruz/sparkup/downloads).
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.1.99
v0.1.99-{date}
2 changes: 1 addition & 1 deletion src/sparkup/sparkup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import re
from optparse import OptionParser

VERSION = "0.1.99"
VERSION = "000" # This line will be replaced in the make process.

# =============================================================================

Expand Down

0 comments on commit f85c33d

Please sign in to comment.