Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Some cleanups, bumped displayed version to 0.6devel

  • Loading branch information...
commit dfce574d31dac86cd64c2ec8113148e3a7a88189 1 parent c9238dd
michalp authored
16 contexo/cmdline/ctx.py
@@ -61,7 +61,7 @@
61 61 #TODO: make args not global in ctx.py
62 62
63 63 #------------------------------------------------------------------------------
64   -def getBuildConfiguration( cview ):
  64 +def getBuildConfiguration( cview , args):
65 65 from contexo import ctx_bc
66 66 from contexo import config
67 67
@@ -292,7 +292,7 @@ def cmd_buildmod(args):
292 292 # Prepare all
293 293 cview = ctx_view.CTXView( args.view, getAccessPolicy(args), validate=bool(args.repo_validation) )
294 294 modules = expand_list_files(cview, args.modules)
295   - bc = getBuildConfiguration( cview )
  295 + bc = getBuildConfiguration( cview, args )
296 296
297 297 depmgr = CTXDepMgr( cview.getItemPaths('modules') )
298 298 depmgr.addCodeModules( modules, args.tests )
@@ -349,7 +349,7 @@ def cmd_buildcomp(args):
349 349 # Prepare all
350 350 cview = ctx_view.CTXView( args.view, getAccessPolicy(args), validate=bool(args.repo_validation) )
351 351 components = expand_list_files( cview, args.components )
352   - bc = getBuildConfiguration( cview )
  352 + bc = getBuildConfiguration( cview, args )
353 353 depmgr = CTXDepMgr ( cview.getItemPaths('modules') )
354 354 session = ctx_base.CTXBuildSession( bc )
355 355 session.setDependencyManager( depmgr )
@@ -419,7 +419,7 @@ def cmd_export(args):
419 419
420 420 # Prepare all
421 421 cview = ctx_view.CTXView( args.view, getAccessPolicy(args), validate=bool(args.repo_validation) )
422   - bc = getBuildConfiguration( cview )
  422 + bc = getBuildConfiguration( cview, args )
423 423 depmgr = CTXDepMgr ( cview.getItemPaths('modules') )
424 424 session = ctx_base.CTXBuildSession( bc )
425 425 session.setDependencyManager( depmgr )
@@ -463,7 +463,7 @@ def cmd_export(args):
463 463
464 464 # Dispatch export data to handler (through pipe)
465 465 package = CTXExportData()
466   - package.setExportData( module_map, components, None, session, depmgr,
  466 + package.setExportData( module_map, components, args.tests, session, depmgr,
467 467 cview, envLayout, args )
468 468 package.dispatch()
469 469
@@ -525,7 +525,7 @@ def cmd_clean(args):
525 525 cview = ctx_view.CTXView( args.view, getAccessPolicy(args), validate=bool(args.repo_validation) )
526 526
527 527 exp_modules = expand_list_files(cview, args.modules)
528   - bc = getBuildConfiguration( cview )
  528 + bc = getBuildConfiguration( cview, args )
529 529
530 530 depmgr = CTXDepMgr( cview.getItemPaths('modules') )
531 531 depmgr.addCodeModules( exp_modules, args.tests )
@@ -795,5 +795,5 @@ def cmd_prop(args):
795 795 ###############################################################################
796 796
797 797 # Parse cmdline
798   -args = parser.parse_args()
799   -args.func(args)
  798 +argsa=parser.parse_args()
  799 +argsa.func(argsa)
14 contexo/ctx_depmgr.py
@@ -680,13 +680,13 @@ def getCodeModulesWithDependencies( self ):
680 680
681 681 return list (moduleRoots)
682 682
683   -
684   - def getCodeModulesDependencies( self, input_modules ):
685   -
686   - input_modules = assureList( input_modules )
687   - codeModules = self.getCodeModulesWithDependencies()
688   -
689   - return list (codeModules- set(input_modules))
  683 +#
  684 +# def getCodeModulesDependencies( self, input_modules ):
  685 +#
  686 +# input_modules = assureList( input_modules )
  687 +# codeModules = self.getCodeModulesWithDependencies()
  688 +#
  689 +# return list (codeModules- set(input_modules))
690 690
691 691 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
692 692 # Returns a list of CTXCodeModule from the named list of modules.
4 contexo/ctx_sysinfo.py
@@ -17,8 +17,8 @@
17 17 #
18 18
19 19 CTX_VER_MAJOR = 0
20   -CTX_VER_MINOR = 5
21   -CTX_VER_STATE = 'rc1'
  20 +CTX_VER_MINOR = 6
  21 +CTX_VER_STATE = 'devel'
22 22 CTX_DISPLAYVERSION = '%d.%d %s'%(CTX_VER_MAJOR, CTX_VER_MINOR, CTX_VER_STATE)
23 23 CTX_LICENSE = 'licesed under GPLv2 ( http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt )'
24 24
2  contexo/xmltools.py
@@ -3,7 +3,7 @@
3 3 from xml.sax.saxutils import XMLGenerator
4 4 from xml.sax.xmlreader import AttributesImpl
5 5
6   -#pretty formating xml
  6 +#pretty formatting xml
7 7
8 8 class XMLGenerator:
9 9 def __init__(self, output):

0 comments on commit dfce574

Please sign in to comment.
Something went wrong with that request. Please try again.