Skip to content

Commit

Permalink
first attempt at make all
Browse files Browse the repository at this point in the history
  • Loading branch information
ddale committed Nov 29, 2010
1 parent 599470b commit f4469d4
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 31 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ help:
all: clean export postprocess final-cleanup gc all: clean export postprocess final-cleanup gc


clean: clean:
rm -rf matplotlib matplotlib.save vendor log-* revisions-matplotlib \ rm -rf matplotlib matplotlib.save log-* revisions-matplotlib \
revisions-vendor verify-matplotlib.git verify-matplotlib.git


svn2git: svn2git:
git clone git://gitorious.org/svn2git/svn2git.git svn2git git clone git://gitorious.org/svn2git/svn2git.git svn2git


svn2git/svn-all-fast-export: svn2git svn2git/svn-all-fast-export: svn2git
cd svn2git && git checkout -f e1bebdeb4 && git clean -f -x cd svn2git && git checkout master && git clean -f -x
cd svn2git && qmake cd svn2git && qmake
make -C svn2git make -C svn2git


Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ We do matplotlib SVN -> GIT conversion as listed below.
All of this is driven by a Makefile, whose targets we list below. All of this is driven by a Makefile, whose targets we list below.
Quick usage: Quick usage:


svnsync http://... matplotlib-svn svnsync sync file://`pwd`/mpl-svn
make all SVN=matplotlib-svn make all SVN=mpl-svn


You also need an ``authors.map`` in the format You also need an ``authors.map`` in the format


Expand Down
67 changes: 42 additions & 25 deletions matplotlib.rules
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,41 +13,58 @@ match /trunk/matplotlib/
branch master branch master
end match end match


# Identify other roots; but remove them only in post-processing

match /trunk/([^/]+)/
repository matplotlib
branch crud/repos/\1
end match

# or just skip them to begin with

#match /trunk/([^/]+)/
#end match



# Branches # Branches
# -------- # --------


# Release branches # Release branches


#match /branches/(1.0.3.x)/ match /branches/(v0_91_maint)/
# repository numpy repository matplotlib
# branch maintenance/\1 branch maintenance/v0.91.x
#end match end match


#match /branches/(1.1.x)/ match /branches/(v0_98_5_maint)/
# repository numpy repository matplotlib
# branch maintenance/\1 branch maintenance/v0.98.5.x
#end match end match


#match /branches/(1.2.x)/ match /branches/(v0_99_maint)/
# repository numpy repository matplotlib
# branch maintenance/\1 branch maintenance/v0.99.x
#end match end match


#match /branches/(1.3.x)/ match /branches/(v1_0_maint)/
# repository numpy repository matplotlib
# branch maintenance/\1 branch maintenance/v1.0.x
#end match end match


#match /branches/(1.4.x)/ match /branches/(transforms)/
# repository numpy repository matplotlib
# branch maintenance/\1 branch transforms
#end match end match


#match /branches/(1.5.x)/ match /branches/(unit_support)/
# repository numpy repository matplotlib
# branch maintenance/\1 branch unit_support
#end match end match

match /branches/(py3k)/
repository matplotlib
branch py3k
end match


#match /branches/v0_3_2/ #match /branches/v0_3_2/
# repository numpy # repository numpy
Expand Down Expand Up @@ -114,6 +131,6 @@ end match
# Rest of the tags are crud; but again remove them only in post-processing # Rest of the tags are crud; but again remove them only in post-processing


match /tags/([^/]+)/ match /tags/([^/]+)/
repository numpy repository matplotlib
branch crud/svntags/\1 branch crud/svntags/\1
end match end match
5 changes: 4 additions & 1 deletion tree-checksum.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -242,7 +242,10 @@ def feed_string(s):
if os.path.isfile(svnpath): if os.path.isfile(svnpath):
feed_file(svnpath) feed_file(svnpath)
else: else:
feed_file(fullpath) try:
feed_file(fullpath)
except IOError:
print('missing file %s' % fullpath)


return digest.hexdigest() return digest.hexdigest()


Expand Down

0 comments on commit f4469d4

Please sign in to comment.