gitify the tree, especially the web makefile.

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644 (file)
index 10cbbc3..0000000
--- a/.bzrignore
+++ /dev/null
@@ -1,15 +0,0 @@
-.depends
-*.d
-*~
-tools/ccan_depends
-tools/doc_extract
-tools/namespacize
-tools/run_tests
-tools/ccanlint/ccanlint
-tools/ccanlint/generated-compulsory-tests
-tools/ccanlint/generated-normal-tests
-inter-depends
-test-depends
-lib-depends
-tools/_infotojson/infotojson
-tools/ccanlint/test/run-file_analysis

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..cc82ce6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+.depends
+*.d
+*.o
+ccan/*-Makefile
+*~
+tools/ccan_depends
+tools/doc_extract
+tools/namespacize
+tools/run_tests
+tools/ccanlint/ccanlint
+tools/ccanlint/generated-compulsory-tests
+tools/ccanlint/generated-normal-tests
+inter-depends
+test-depends
+lib-depends
+tools/_infotojson/infotojson
+tools/ccanlint/test/run-file_analysis

diff --git a/Makefile b/Makefile
index 28ea503bfe7641e8ff77311c0951eeee947becdc..c1f5ea8f6d78a17d8c5dd4cb087e4b4092726fb0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ libccan.a(%.o): ccan/%.o
        $(AR) r $@ $<
 
 clean: tools-clean
        $(AR) r $@ $<
 
 clean: tools-clean

-       $(RM) `find . -name '*.o'` `find . -name '.depends'` `find . -name '*.a'`  `find . -name info` `find . -name '*.d'`
+       $(RM) `find * -name '*.o'` `find * -name '.depends'` `find * -name '*.a'`  `find * -name info` `find * -name '*.d'`

        $(RM) inter-depends lib-depends test-depends ccan/*-Makefile
 
 # Creates a dependency from the tests to the object files which it needs.
        $(RM) inter-depends lib-depends test-depends ccan/*-Makefile
 
 # Creates a dependency from the tests to the object files which it needs.

diff --git a/Makefile-web b/Makefile-web
index 472070e2c2a6559e924b1d4af98cf5de37cde7fe..6079c9d9faf2cc14f2931f8d0db85401dd705784 100644 (file)
--- a/Makefile-web
+++ b/Makefile-web
@@ -2,7 +2,7 @@
 WEBDIR=/home/rusty/www/html/ccan
 
 # Ignore EXCLUDE when making webpages.
 WEBDIR=/home/rusty/www/html/ccan
 
 # Ignore EXCLUDE when making webpages.

-REALLY_ALL=$(patsubst ccan/%/_info, %, $(shell bzr ls -R ccan | grep '/_info$$'))
+REALLY_ALL=$(patsubst ccan/%/_info, %, $(wildcard ccan/*/_info))

 ALL_PAGES=$(patsubst %, $(WEBDIR)/info/%.html, $(REALLY_ALL))
 DIRECT_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/%.tar.bz2, $(REALLY_ALL))
 DEPEND_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/with-deps/%.tar.bz2, $(REALLY_ALL))
 ALL_PAGES=$(patsubst %, $(WEBDIR)/info/%.html, $(REALLY_ALL))
 DIRECT_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/%.tar.bz2, $(REALLY_ALL))
 DEPEND_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/with-deps/%.tar.bz2, $(REALLY_ALL))


@@ -10,28 +10,29 @@ WEB_SUBDIRS=$(WEBDIR)/tarballs $(WEBDIR)/junkcode $(WEBDIR)/tarballs/with-deps $
 JUNKDIRS=$(wildcard junkcode/*)
 JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html)
 JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2)
 JUNKDIRS=$(wildcard junkcode/*)
 JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html)
 JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2)

-BZRBROWSE=$(WEBDIR)/bzrbrowse.cgi $(WEBDIR)/file.png $(WEBDIR)/folder.png $(WEBDIR)/symlink.png

 
 

-upload: fastcheck webpages
-       bzr push
-       send-web # Rusty's upload script.
+upload: fastcheck
+       git push origin HEAD:master

 
 

-webpages: $(WEB_SUBDIRS) $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(BZRBROWSE) $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(ALL_PAGES) junkpages
+clean-tree:
+       ! git status --porcelain | grep .

 
 

-junkpages:  $(WEBDIR)/list.html $(WEBDIR)/junkcode $(JUNKPAGES) $(JUNKBALLS)
-$(WEB_SUBDIRS):
+webpages: clean-tree $(WEB_SUBDIRS) $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(ALL_PAGES) junkpages
+
+junkpages: $(WEBDIR)/list.html $(WEBDIR)/junkcode $(JUNKPAGES) $(JUNKBALLS)
+$(WEB_SUBDIRS): $(WEBDIR)

        mkdir -p $@
 
 $(WEBDIR)/junkcode/%.tar.bz2: junkcode/% $(WEBDIR)/junkcode
        mkdir -p $@
 
 $(WEBDIR)/junkcode/%.tar.bz2: junkcode/% $(WEBDIR)/junkcode

-       (bzr ls --recursive --versioned --kind=file --null $<; bzr ls --recursive --versioned --kind=symlink --null $<) | xargs -0 -x tar cvfj $@ 
+       git ls-files -z $< | xargs -0 -x tar cvfj $@ 

 
 $(WEBDIR)/junkcode/%.html: $(WEBDIR)/junkcode/%.tar.bz2
        cd $(WEBDIR) && tar xfj junkcode/$*.tar.bz2
        php5 web/staticjunkcode.php junkcode/$* $* > $@
 
 
 $(WEBDIR)/junkcode/%.html: $(WEBDIR)/junkcode/%.tar.bz2
        cd $(WEBDIR) && tar xfj junkcode/$*.tar.bz2
        php5 web/staticjunkcode.php junkcode/$* $* > $@
 

-# We want tarball to contain ccan/
-$(WEBDIR)/ccan.tar.bz2: config.h Makefile Makefile-ccan $(shell bzr ls --versioned --kind=file --recursive ccan) $(shell bzr ls --versioned --recursive --kind=file tools) $(shell bzr ls --versioned --kind=symlink --recursive ccan) $(shell bzr ls --versioned --recursive --kind=symlink tools)
-       DIR=`pwd` && cd /tmp && ln -sf "$$DIR" ccan && tar cvfj $@ `for f in $^; do echo ccan/$$f; done` && rm ccan
+# We want tarball to contain ccan/; we put junkcode in, but don't depend on it.
+$(WEBDIR)/ccan.tar.bz2: config.h Makefile Makefile-ccan $(shell git ls-files ccan tools licenses)
+       DIR=`pwd` && cd /tmp && ln -sf "$$DIR" ccan && tar cvfj $@ `for f in $^; do echo ccan/$$f; done` ccan/junkcode && rm ccan

 
 $(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php
 
 
 $(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php
 


@@ -57,17 +58,14 @@ $(WEBDIR)/Makefile-ccan: Makefile-ccan
 $(WEBDIR)/ccan.jpg: web/ccan.jpg
        cp $< $@
 
 $(WEBDIR)/ccan.jpg: web/ccan.jpg
        cp $< $@
 

-$(BZRBROWSE): $(WEBDIR)/%: web/bzrbrowse/%
-       cp $< $@
-

 $(WEBDIR)/info/%.html: $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2
        URLPREFIX=../ php5 web/staticmoduleinfo.php `pwd`/ccan/$* > $@
 
 $(WEBDIR)/info/%.html: $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2
        URLPREFIX=../ php5 web/staticmoduleinfo.php `pwd`/ccan/$* > $@
 

-$(WEBDIR)/tarballs/%.tar.bz2: ccan/%/_info
-       tar -c -j -f $@ `bzr ls --recursive --versioned --kind=file ccan/$*` `bzr ls --recursive --versioned --kind=symlink ccan/$*` $$(for l in $$(bzr ls --recursive --versioned --kind=symlink ccan/$* | xargs -r ls -l | sed 's,.*/,,'); do echo licenses/$$l; done | sort -u)
+$(WEBDIR)/tarballs/%.tar.bz2: ccan/%/_info clean-tree
+       tar -c -j -f $@ $$(git ls-files ccan/$*) $$(git ls-files ccan/$* | xargs -n1 -r readlink | sed -n 's,^../../,,p' | sort -u)

 
 

-$(WEBDIR)/tarballs/with-deps/%.tar.bz2: ccan/%/_info tools/ccan_depends
-       tar cfj $@ $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) | xargs -n 1 bzr ls --recursive --versioned --kind=file) $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) | xargs -n 1 bzr ls --recursive --versioned --kind=symlink) $$(for l in $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) | xargs -r -n 1 bzr ls --recursive --versioned --kind=symlink | xargs -r ls -l | sed 's,.*/,,'); do echo licenses/$$l; done | sort -u)
+$(WEBDIR)/tarballs/with-deps/%.tar.bz2: ccan/%/_info tools/ccan_depends clean-tree
+       tar -c -j -f $@ $$(git ls-files $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) ) ) $$(git ls-files $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) ) | xargs -n1 -r readlink | sed -n 's,^../../,,p' | sort -u)

 
 distclean: distclean-web
 
 
 distclean: distclean-web
 

diff --git a/web/staticindex.php b/web/staticindex.php
index 9e8f19351b16526f2334af0c1ed1cfd669f55f9c..0a521023f125fdf0727454b5d637d33c7decf9f7 100644 (file)
--- a/web/staticindex.php
+++ b/web/staticindex.php
@@ -18,33 +18,36 @@ CCAN is loosely modelled after the successful <a href="http://cpan.org">CPAN pro
 for Perl code development and sharing.
 </p>
 
 for Perl code development and sharing.
 </p>
 

-<h2>Getting The Code</h2>
+<h2>Get The Code</h2>

 
 

+<p> You can get each module as a tarball (<a href="list.html">see
+list</a>), get a tarball of <a href="ccan.tar.bz2">the whole repository</a> with tools,
+or clone our <a href="http://git.ozlabs.org/?p=ccan">git repository</a> (<tt>git clone git://git.ozlabs.org/~ccan/ccan</tt>).
+</p>
+
+<h2>Use The Code</h2>

 <p>
 <p>

-Once you <a href="list.html">grab some modules</a>, there are two basic
-ways to use it:
+There are two ways to use it:

 <ol>
 <ol>

-<li> Just hack it to compile in your project.
+<li> Put modules into a ccan/ subdirectory into your project.  Add a "config.h" (like
+     <a href="example-config.h">this example</a>) and compile every .c file
+     in ccan/* (as in this <a href="Makefile-ccan">Makefile</a>)).

 
 

-<li> Use it in place by giving it a "config.h" (steal
-     <a href="example-config.h">this example</a>) and compiling all the .c
-       files (simply, or as in this <a href="Makefile-ccan">Makefile</a>).
+<li> Alternatively, just hack whatever parts you want so it compiles in
+your project.

 </ol>
 </p>
 
 </ol>
 </p>
 

+<h2>Add Code</h2>

 <p>
 <p>

-There's also a
-<a href="http://bazaar-vcs.org/">Bazaar</a> repository for all the CCAN
-infrastructure at http://ccan.ozlabs.org/repo (<a href="http://ccan.ozlabs.org/browse">browse</a>).
+We always welcome new code!  Copy an existing module and run the "ccanlint"
+tool over it, or just send any code you have lying around any let someone
+else polish it up.

 </p>
 
 </p>
 

-<h2>Module Contributions</h2>
-
-<p>
-We welcome new code!  The guide to creating new modules is a work in
-progress (just copy an existing module), but anyone can send code to
+<p>Anyone can send code or a git pull request to

 the <a href="http://ozlabs.org/mailman/listinfo/ccan">friendly
 the <a href="http://ozlabs.org/mailman/listinfo/ccan">friendly

-mailing list</a> or just <a href="upload.html">upload it</a>.
+mailing list</a> or just <a href="upload.html">upload it using the web form</a>.

 </p>
 
 <p>
 </p>
 
 <p>


@@ -67,10 +70,5 @@ We also have an IRC channel: #ccan on <a href="http://freenode.net">Freenode</a>
 <p>
 We also have a <a href="Wiki/">wiki</a>; feel free to enhance it.
 </p>
 <p>
 We also have a <a href="Wiki/">wiki</a>; feel free to enhance it.
 </p>

-
-<p>
-<i>Rusty Russell</i>
-</p>
-

 <hr>
 </body></html>
 <hr>
 </body></html>