sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused imports.

Browse Source 
Remove hacks for Doxyfile.in and geany.desktop.in.
Move htmldoc and apidoc targets into shutdown().         


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2655 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2008-06-06 16:38:34 +00:00
parent 3a5345c3d4
commit 3f33385c76
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -8,7 +8,11 @@
process it only once. process it only once.
* plugins/vcdiff.c: * plugins/vcdiff.c:
Fix diff output when files were manually added with 'git add' Fix diff output when files were manually added with 'git add'
in GIT repositories (patch by Yura Siamashka). in GIT repositories (patch by Yura Siamashka, thanks).
* wscript:
Remove unused imports.
Remove hacks for Doxyfile.in and geany.desktop.in.
Move htmldoc and apidoc targets into shutdown().
2008-06-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2008-06-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

25
wscript
View File

@ -38,8 +38,8 @@ Requires WAF SVN r3530 (or later) and Python (>= 2.4).
""" """
import Params, Configure, Common, Runner, misc, Options import Params, Configure, Common, Runner, misc
import sys, os, subprocess import sys, os, subprocess, shutil
APPNAME = 'geany' APPNAME = 'geany'
@ -199,6 +199,7 @@ def set_options(opt):
def build(bld): def build(bld):
def build_update_po(bld): def build_update_po(bld):
# TODO: rework this code to not alter .po files on normal build
# the following code was taken from midori's WAF script, thanks # the following code was taken from midori's WAF script, thanks
os.chdir('./po') os.chdir('./po')
try: try:
@ -283,11 +284,6 @@ def build(bld):
build_plugin('htmlchars') build_plugin('htmlchars')
build_plugin('vcdiff') build_plugin('vcdiff')
# little hack'ish: hard link geany.desktop.in.in to geany.desktop.in as intltool_in doesn't
# like a .desktop.in.in but we want to keep it for autotools compatibility
if not os.path.exists('geany.desktop.in'):
os.link('geany.desktop.in.in', 'geany.desktop.in')
# geany.desktop # geany.desktop
obj = bld.create_obj('intltool_in') obj = bld.create_obj('intltool_in')
obj.source = 'geany.desktop.in' obj.source = 'geany.desktop.in'
@ -383,23 +379,16 @@ def shutdown():
print 'Icon cache not updated. After install, run this:' print 'Icon cache not updated. After install, run this:'
print 'gtk-update-icon-cache -q -f -t %s' % dir print 'gtk-update-icon-cache -q -f -t %s' % dir
def init():
if Params.g_options.apidoc: if Params.g_options.apidoc:
# FIXME remove this very ugly hack and find a way to generate the doxyfile = os.path.join(Params.g_build.m_srcnode.abspath( \
# Doxyfile in doc/ and not in build/doc/ Params.g_build.env()), 'doc', 'Doxyfile')
if not os.path.exists('doc/Doxyfile'):
os.symlink(os.path.abspath(blddir) + '/default/doc/Doxyfile', 'doc/Doxyfile')
os.chdir('doc') os.chdir('doc')
ret = launch('doxygen', 'Generating API reference documentation') launch('doxygen ' + doxyfile, 'Generating API reference documentation')
sys.exit(ret)
if Params.g_options.htmldoc: if Params.g_options.htmldoc:
os.chdir('doc') os.chdir('doc')
ret = launch('rst2html -stg --stylesheet=geany.css geany.txt geany.html', launch('rst2html -stg --stylesheet=geany.css geany.txt geany.html',
'Generating HTML documentation') 'Generating HTML documentation')
sys.exit(ret)
# Simple function to execute a command and print its exit status # Simple function to execute a command and print its exit status