SF.net SVN: geany-plugins:[2309] trunk/geany-plugins/wscript

[eht16 at users.sourceforge.net]

Revision: 2309
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2309&view=rev
Author:   eht16
Date:     2011-10-22 11:23:24 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
Fix automatic installer creation

Modified Paths:
--------------
    trunk/geany-plugins/wscript

Modified: trunk/geany-plugins/wscript
===================================================================
--- trunk/geany-plugins/wscript	2011-10-22 10:49:16 UTC (rev 2308)
+++ trunk/geany-plugins/wscript	2011-10-22 11:23:24 UTC (rev 2309)
@@ -39,6 +39,7 @@
 
 import os
 import tempfile
+from glob import glob
 from waflib import Logs, Scripting, Utils
 from waflib.Tools import c_preproc
 from waflib.Errors import ConfigurationError
@@ -313,14 +314,14 @@
 
     # strip all binaries
     Logs.pprint('CYAN', 'Stripping %sfiles' % ('and signing binary ' if do_sign else ''))
-    # TODO rewrite this using ctx
-    files = glob.glob(os.path.join(ctx.env['G_PREFIX'], 'lib', '*.dll'))
-    files.append(ctx.env['G_PREFIX'] + '\lib\geany-plugins\geanylua\libgeanylua.dll')
+    install_dir = '%s-%s' % (APPNAME, VERSION) # should be ctx.env['G_PREFIX']
+    files = glob(os.path.join(install_dir, 'lib', '*.dll'))
+    files.append(os.path.join(install_dir, 'lib\geany-plugins\geanylua\libgeanylua.dll'))
     for filename in files: # sign the DLL files
         ctx.exec_command('strip %s' % filename)
         sign_binary(filename)
     # create the installer
-    launch('makensis /V2 /NOCD build/geany-plugins.nsi', 'Creating the installer', 'CYAN')
+    launch(ctx, 'makensis /V2 /NOCD build/geany-plugins.nsi', 'Creating the installer', 'CYAN')
     sign_binary('geany-plugins-%s_setup.exe' % VERSION)
 
 

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