From 90df417a8ca07da66442aa6b4abd8486b332e8ca Mon Sep 17 00:00:00 2001 From: Tom Tanner Date: Fri, 20 Mar 2015 10:34:30 +0000 Subject: [PATCH 1/4] Fixed Scons build for existing bits. Changed pynedit.pro to fetch from 'standard' install location Changed saveas code to use organizer report rather than uibase - this way it's not dependant on the vagaries of the include path, and works the same as the rest of the organiser directory --- src/proxy/SConscript | 3 +++ src/runner/SConscript | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/proxy/SConscript b/src/proxy/SConscript index 19d79be..ec2e10a 100644 --- a/src/proxy/SConscript +++ b/src/proxy/SConscript @@ -32,3 +32,6 @@ lib = env.SharedLibrary('proxyPython', [ 'proxypython.cpp' ] + env.RES(env.Glob('*.rc'))) env.InstallModule(lib) + +res = env['QT_USED_MODULES'] +Return('res') diff --git a/src/runner/SConscript b/src/runner/SConscript index 5710e7a..5877a10 100644 --- a/src/runner/SConscript +++ b/src/runner/SConscript @@ -44,3 +44,6 @@ cpp_files = [ lib = env.SharedLibrary('pythonRunner', cpp_files + targets) env.InstallModule(lib) + +res = env['QT_USED_MODULES'] +Return('res') From e602014dda667d88b4e410a3cf7b42a00e79fe2d Mon Sep 17 00:00:00 2001 From: Tom Tanner Date: Sun, 22 Mar 2015 10:49:15 +0000 Subject: [PATCH 2/4] Fix a meory leak with modules that error during loading More Sconscript stuff --- src/runner/SConscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/runner/SConscript b/src/runner/SConscript index 5877a10..7a57e2a 100644 --- a/src/runner/SConscript +++ b/src/runner/SConscript @@ -43,7 +43,8 @@ cpp_files = [ lib = env.SharedLibrary('pythonRunner', cpp_files + targets) -env.InstallModule(lib) +#This is referred to from inside a resource file. We don't install it. +#env.InstallModule(lib) res = env['QT_USED_MODULES'] Return('res') From a1fdb5447191e6f90df09380a86feffe02936cb7 Mon Sep 17 00:00:00 2001 From: Tom Tanner Date: Wed, 25 Mar 2015 22:35:53 +0000 Subject: [PATCH 3/4] Add in all the necessary stuff for scons --- src/runner/SConscript | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/runner/SConscript b/src/runner/SConscript index 7a57e2a..efb78bd 100644 --- a/src/runner/SConscript +++ b/src/runner/SConscript @@ -46,5 +46,15 @@ lib = env.SharedLibrary('pythonRunner', cpp_files + targets) #This is referred to from inside a resource file. We don't install it. #env.InstallModule(lib) +# However... +# we do need boost-python and pythonvv.dll and pythonvv.zip (though the last +# isn't needed to just bring up the module) +#env.Pseudo('install') +#env.Depends('install', +# (env.Install('${INSTALL_PATH}', 'pyCfg.py'), +# env.Install(os.path.join('${INSTALL_PATH}', 'data'), +# ( ui, rc, 'settings.json' )), +# )) + res = env['QT_USED_MODULES'] Return('res') From d6edcf4fa0736e156710b62fd467f5cfb7a49367 Mon Sep 17 00:00:00 2001 From: Tom Tanner Date: Sat, 28 Mar 2015 10:39:40 +0000 Subject: [PATCH 4/4] Adding an icon to nxmhandler so that it looks pretty in firefox --- src/proxy/SConscript | 14 ++++++-------- src/proxy/embedrunner.rc | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/proxy/SConscript b/src/proxy/SConscript index ec2e10a..d5b15ed 100644 --- a/src/proxy/SConscript +++ b/src/proxy/SConscript @@ -19,17 +19,15 @@ env.AppendUnique(LIBS = 'shell32') runner = env.File(os.path.join('..', '..', 'pythonRunner', 'pythonRunner.dll')) -env.AppendUnique(RCFLAGS = [ - '/dSCONS_VARIANT', - '/i"%s"' % runner.dir -]) - +runner_env = env.Clone() +runner_env.AppendUnique(CPPDEFINES = 'SCONS_BUILD') +runner_env.AppendUnique(CPPPATH = runner.dir) +rc = runner_env.RES('embedrunner.rc') # Make sure we have the proper dependencies so it gets built -env.Depends('embedrunner.res', runner) +runner_env.Depends(rc, runner) # There's a whole load of unused C++ files in here. -lib = env.SharedLibrary('proxyPython', - [ 'proxypython.cpp' ] + env.RES(env.Glob('*.rc'))) +lib = env.SharedLibrary('proxyPython', [ 'proxypython.cpp' ] + rc) env.InstallModule(lib) diff --git a/src/proxy/embedrunner.rc b/src/proxy/embedrunner.rc index 336ab57..e3e5f2a 100644 --- a/src/proxy/embedrunner.rc +++ b/src/proxy/embedrunner.rc @@ -1,6 +1,6 @@ #include "resource.h" -#ifdef SCONS_VARIANT +#ifdef SCONS_BUILD IDR_LOADER_DLL BINARY MOVEABLE PURE pythonRunner.dll #else #ifdef _DEBUG