Permalink
Browse files

Merge pull request #11 from nol888/master

Add Rosella as submodule
  • Loading branch information...
2 parents a897347 + 6f310f5 commit 26dbbe1ec79f7b1d4487217e40a49a231db55811 @leto leto committed Dec 1, 2011
Showing with 28 additions and 14 deletions.
  1. +1 −0 .gitignore
  2. +3 −0 .gitmodules
  3. +23 −14 Makefile
  4. +1 −0 Rosella
View
@@ -11,3 +11,4 @@ src/Git2/Repository.pir
src/Git2/Index.pir
src/Git2/Oid.pir
src/Git2/Odb.pir
+rosella
View
@@ -1,3 +1,6 @@
[submodule "rosella"]
path = rosella
url = git://github.com/Whiteknight/Rosella
+[submodule "Rosella"]
+ path = Rosella
+ url = https://github.com/Whiteknight/Rosella.git
View
@@ -1,27 +1,36 @@
+git2pbc := $(patsubst %.winxed,%.pbc,$(wildcard src/Git2/*.winxed))
all: build
build: nci pbclib
-test: build
+test: build rosella
parrot-nqp t/harness
-pbclib: src/Git2/*.winxed src/git2.pir
- winxed -c -o src/Git2/Common.pir src/Git2/Common.winxed
- winxed -c -o src/Git2/Cache.pir src/Git2/Cache.winxed
- winxed -c -o src/Git2/RefCache.pir src/Git2/RefCache.winxed
- winxed -c -o src/Git2/Repository.pir src/Git2/Repository.winxed
- parrot -o src/Git2/Common.pbc src/Git2/Common.pir
- parrot -o src/Git2/Repository.pbc src/Git2/Repository.pir
- parrot -o src/Git2/Cache.pbc src/Git2/Cache.pir
- parrot -o src/Git2/RefCache.pbc src/Git2/RefCache.pir
- parrot -o src/git2.pbc src/git2.pir
-
-nci:
+pbclib: $(git2pbc) src/git2.pbc
+
+%.pir: %.winxed
+ winxed -c -o $@ $<
+
+%.pbc: %.pir
+ parrot -o $@ $<
+
+rosella: Rosella/Makefile
+ $(MAKE) -C Rosella build
+ ln -s Rosella/rosella rosella
+
+nci: src/git2.nci
+
+src/git2.nci:
echo '# THIS FILE IS GENERATED, edit ./bin/header2nci.pl to make changes here' > src/git2.nci ; \
echo "[package]\nGit2::Raw\n\n[lib]\n\nlibgit2.so\n\n[defs]\n" >> src/git2.nci ; \
perl ./bin/header2nci.pl /usr/local/include/git2.h >> src/git2.nci ; \
for i in /usr/local/include/git2/*; do perl ./bin/header2nci.pl $$i >> src/git2.nci ; done
+Rosella/Makefile:
+ git submodule init
+ git submodule update
+
+.PHONY : clean
clean:
- -rm src/*.pbc src/git2.nci
+ -rm -f $(git2pbc) src/git2.nci rosella
Submodule Rosella added at 46daec

0 comments on commit 26dbbe1

Please sign in to comment.