diff options
| author |   Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2009-02-18 12:05:53 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2009-02-18 18:45:03 +0530 |
| commit | 40492ec31fea3ce872aec3651649a0c62765d976 (patch) | |
| tree | 520683df2200fdb72e517df6303a7edd6c937379 | |
| parent | Use `make` for autotua-master (diff) | |
| download | autotua-40492ec31fea3ce872aec3651649a0c62765d976.tar.gz autotua-40492ec31fea3ce872aec3651649a0c62765d976.tar.bz2 autotua-40492ec31fea3ce872aec3651649a0c62765d976.zip | |
Fix versioning -- 0.0.1.95
Also fix Makefile to do dist in dist/ directory (similar to setup.py)
Yes, this means there will be a 0.0.2 coming soon :p
| -rw-r--r-- | master/.gitignore | 2 | ||||
| -rw-r--r-- | master/Makefile | 12 | ||||
| -rw-r--r-- | slave/.gitignore | 1 | ||||
| -rwxr-xr-x | slave/setup.py | 4 |
4 files changed, 11 insertions, 8 deletions
diff --git a/master/.gitignore b/master/.gitignore index 9ddbdf9..c0f64a8 100644 --- a/master/.gitignore +++ b/master/.gitignore @@ -1,2 +1,2 @@ -.dist/ +dist/ build/ diff --git a/master/Makefile b/master/Makefile index df95c24..6c9d89d 100644 --- a/master/Makefile +++ b/master/Makefile @@ -4,10 +4,10 @@ # INSTALL := install -DISTDIR := .dist/ +DISTDIR := dist/ BLDDIR := build/ PN := autotua-master -PV := 0.0.2 +PV := 0.0.1.95 P := $(PN)-$(PV) SUBDIRS := icons MAKE := make @@ -15,12 +15,14 @@ MAKE := make all: for dir in $(SUBDIRS) ; do ( cd $$dir ; $(MAKE) all ) ; done -dist: +dist: $(DISTDIR)/$(P).tar.bz2 + +$(DISTDIR)/$(P).tar.bz2: mkdir -p $(DISTDIR) git archive --format=tar --prefix=$(P)/ HEAD | tar x -C $(DISTDIR) cp icons/*.png $(DISTDIR)/$(P)/icons/ - tar -C $(DISTDIR) -cjf $(P).tar.bz2 $(P)/ - rm -rf $(DISTDIR) + tar -C $(DISTDIR) -cjf $(DISTDIR)/$(P).tar.bz2 $(P)/ + rm -rf $(DISTDIR)/$(P)/ clean: rm -rf $(BLDDIR) $(DISTDIR) diff --git a/slave/.gitignore b/slave/.gitignore index 3400509..be2d079 100644 --- a/slave/.gitignore +++ b/slave/.gitignore @@ -1,2 +1,3 @@ MANIFEST dist/ +build/ diff --git a/slave/setup.py b/slave/setup.py index e26e4aa..3ce1cd3 100755 --- a/slave/setup.py +++ b/slave/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # vim: set sw=4 sts=4 et : -# Copyright: 2008 Gentoo Foundation +# Copyright: 2008-09 Gentoo Foundation # Author(s): Nirbheek Chauhan <nirbheek.chauhan@gmail.com> # License: GPL-3 # @@ -30,7 +30,7 @@ class print_help(Command): """ setup(name='autotua-slave', - version='0.0.2', + version='0.0.1.95', description='Build slave for AutotuA', author='Nirbheek Chauhan', author_email='nirbheek.chauhan@gmail.com', |