Revision: 427 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=427&view=rev Author: eht16 Date: 2009-02-02 20:02:45 +0000 (Mon, 02 Feb 2009)

Log Message: ----------- Let './waf configure' create a simple Makefile as a wrapper for running Waf commands. Update the README.waf.

Modified Paths: -------------- trunk/README.waf trunk/wscript

Modified: trunk/README.waf =================================================================== --- trunk/README.waf 2009-02-02 19:52:06 UTC (rev 426) +++ trunk/README.waf 2009-02-02 20:02:45 UTC (rev 427) @@ -10,7 +10,27 @@ To exclude some plugins, ./waf configure accepts the option ""-enable-plugins" which takes a comma-separated list of plugins to compile, e.g.

-./waf configure --enable-plugins=instantsave,geanysendmail,spellcheck +./waf configure --enable-plugins=geanysendmail,spellcheck

+Similarly you can also disable certain plugins from the list with + +./waf configure --skip-plugins=geanydoc,geanyvc + +To update the language catalogues of plugins with enabled I18n support, run: + +./waf --update-po + + For more configure options, run ./waf configure --help + + +For convenience, running './waf configure' will create a simple Makefile +as a wrapper for './waf [options]'. +Currently, the following make targets are available: + +make all +make install +make uninstall +make update-po +make clean

Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-02-02 19:52:06 UTC (rev 426) +++ trunk/wscript 2009-02-02 20:02:45 UTC (rev 427) @@ -117,7 +117,36 @@ '0.2') ]

+makefile_template = '''#!/usr/bin/make -f +# Waf Makefile wrapper

+all: + @./waf build + +update-po: + @./waf --update-po + +install: + @if test -n "$(DESTDIR)"; then \ + ./waf install --destdir="$(DESTDIR)"; \ + else \ + ./waf install; \ + fi; + +uninstall: + @if test -n "$(DESTDIR)"; then \ + ./waf uninstall --destdir="$(DESTDIR)"; \ + else \ + ./waf uninstall; \ + fi; + +clean: + @./waf clean + +.PHONY: clean uninstall install all +''' + + preproc.go_absolute = True preproc.standard_includes = []

@@ -233,7 +262,12 @@ conf.env.append_value('enabled_plugins', enabled_plugins) conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H'.split())

+ # write a simply Makefile + f = open('Makefile', 'w') + print >>f, makefile_template + f.close

+ def set_options(opt): opt.tool_options('compiler_cc') opt.tool_options('intltool')

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.