Skip to content

Commit

Permalink
Merge pull request #11 from nol888/master
Browse files Browse the repository at this point in the history
Add Rosella as submodule
  • Loading branch information
leto committed Dec 1, 2011
2 parents a897347 + 6f310f5 commit 26dbbe1
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -11,3 +11,4 @@ src/Git2/Repository.pir
src/Git2/Index.pir src/Git2/Index.pir
src/Git2/Oid.pir src/Git2/Oid.pir
src/Git2/Odb.pir src/Git2/Odb.pir
rosella
3 changes: 3 additions & 0 deletions .gitmodules
@@ -1,3 +1,6 @@
[submodule "rosella"] [submodule "rosella"]
path = rosella path = rosella
url = git://github.com/Whiteknight/Rosella url = git://github.com/Whiteknight/Rosella
[submodule "Rosella"]
path = Rosella
url = https://github.com/Whiteknight/Rosella.git
37 changes: 23 additions & 14 deletions Makefile
@@ -1,27 +1,36 @@
git2pbc := $(patsubst %.winxed,%.pbc,$(wildcard src/Git2/*.winxed))


all: build all: build


build: nci pbclib build: nci pbclib


test: build test: build rosella
parrot-nqp t/harness parrot-nqp t/harness


pbclib: src/Git2/*.winxed src/git2.pir pbclib: $(git2pbc) src/git2.pbc
winxed -c -o src/Git2/Common.pir src/Git2/Common.winxed
winxed -c -o src/Git2/Cache.pir src/Git2/Cache.winxed %.pir: %.winxed
winxed -c -o src/Git2/RefCache.pir src/Git2/RefCache.winxed winxed -c -o $@ $<
winxed -c -o src/Git2/Repository.pir src/Git2/Repository.winxed
parrot -o src/Git2/Common.pbc src/Git2/Common.pir %.pbc: %.pir
parrot -o src/Git2/Repository.pbc src/Git2/Repository.pir parrot -o $@ $<
parrot -o src/Git2/Cache.pbc src/Git2/Cache.pir
parrot -o src/Git2/RefCache.pbc src/Git2/RefCache.pir rosella: Rosella/Makefile
parrot -o src/git2.pbc src/git2.pir $(MAKE) -C Rosella build

ln -s Rosella/rosella rosella
nci:
nci: src/git2.nci

src/git2.nci:
echo '# THIS FILE IS GENERATED, edit ./bin/header2nci.pl to make changes here' > 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 ; \ 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 ; \ 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 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: clean:
-rm src/*.pbc src/git2.nci -rm -f $(git2pbc) src/git2.nci rosella
1 change: 1 addition & 0 deletions Rosella
Submodule Rosella added at 46daec

0 comments on commit 26dbbe1

Please sign in to comment.