SF.net SVN: geany: [2655] trunk

[eht16 at users.sourceforge.net]

Revision: 2655
          http://geany.svn.sourceforge.net/geany/?rev=2655&view=rev
Author:   eht16
Date:     2008-06-06 09:38:34 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
Remove unused imports.
Remove hacks for Doxyfile.in and geany.desktop.in.
Move htmldoc and apidoc targets into shutdown().         

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/wscript

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-06 14:53:40 UTC (rev 2654)
+++ trunk/ChangeLog	2008-06-06 16:38:34 UTC (rev 2655)
@@ -8,7 +8,11 @@
    process it only once.
  * plugins/vcdiff.c:
    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>

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2008-06-06 14:53:40 UTC (rev 2654)
+++ trunk/wscript	2008-06-06 16:38:34 UTC (rev 2655)
@@ -38,8 +38,8 @@
 """
 
 
-import Params, Configure, Common, Runner, misc, Options
-import sys, os, subprocess
+import Params, Configure, Common, Runner, misc
+import sys, os, subprocess, shutil
 
 
 APPNAME = 'geany'
@@ -199,6 +199,7 @@
 
 def build(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
         os.chdir('./po')
         try:
@@ -283,11 +284,6 @@
         build_plugin('htmlchars')
         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
     obj         = bld.create_obj('intltool_in')
     obj.source  = 'geany.desktop.in'
@@ -383,23 +379,16 @@
             print 'Icon cache not updated. After install, run this:'
             print 'gtk-update-icon-cache -q -f -t %s' % dir
 
-
-def init():
     if Params.g_options.apidoc:
-        # FIXME remove this very ugly hack and find a way to generate the
-        # Doxyfile in doc/ and not in build/doc/
-        if not os.path.exists('doc/Doxyfile'):
-            os.symlink(os.path.abspath(blddir) + '/default/doc/Doxyfile',  'doc/Doxyfile')
-
+        doxyfile = os.path.join(Params.g_build.m_srcnode.abspath( \
+            Params.g_build.env()), 'doc', 'Doxyfile')
         os.chdir('doc')
-        ret = launch('doxygen', 'Generating API reference documentation')
-        sys.exit(ret)
+        launch('doxygen ' + doxyfile, 'Generating API reference documentation')
 
     if Params.g_options.htmldoc:
         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')
-        sys.exit(ret)
 
 
 # Simple function to execute a command and print its exit status


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