Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Some cleanups, bumped displayed version to 0.6devel

  • Loading branch information...
commit dfce574d31dac86cd64c2ec8113148e3a7a88189 1 parent c9238dd
michalp authored
16 contexo/cmdline/ctx.py
View
@@ -61,7 +61,7 @@
#TODO: make args not global in ctx.py
#------------------------------------------------------------------------------
-def getBuildConfiguration( cview ):
+def getBuildConfiguration( cview , args):
from contexo import ctx_bc
from contexo import config
@@ -292,7 +292,7 @@ def cmd_buildmod(args):
# Prepare all
cview = ctx_view.CTXView( args.view, getAccessPolicy(args), validate=bool(args.repo_validation) )
modules = expand_list_files(cview, args.modules)
- bc = getBuildConfiguration( cview )
+ bc = getBuildConfiguration( cview, args )
depmgr = CTXDepMgr( cview.getItemPaths('modules') )
depmgr.addCodeModules( modules, args.tests )
@@ -349,7 +349,7 @@ def cmd_buildcomp(args):
# Prepare all
cview = ctx_view.CTXView( args.view, getAccessPolicy(args), validate=bool(args.repo_validation) )
components = expand_list_files( cview, args.components )
- bc = getBuildConfiguration( cview )
+ bc = getBuildConfiguration( cview, args )
depmgr = CTXDepMgr ( cview.getItemPaths('modules') )
session = ctx_base.CTXBuildSession( bc )
session.setDependencyManager( depmgr )
@@ -419,7 +419,7 @@ def cmd_export(args):
# Prepare all
cview = ctx_view.CTXView( args.view, getAccessPolicy(args), validate=bool(args.repo_validation) )
- bc = getBuildConfiguration( cview )
+ bc = getBuildConfiguration( cview, args )
depmgr = CTXDepMgr ( cview.getItemPaths('modules') )
session = ctx_base.CTXBuildSession( bc )
session.setDependencyManager( depmgr )
@@ -463,7 +463,7 @@ def cmd_export(args):
# Dispatch export data to handler (through pipe)
package = CTXExportData()
- package.setExportData( module_map, components, None, session, depmgr,
+ package.setExportData( module_map, components, args.tests, session, depmgr,
cview, envLayout, args )
package.dispatch()
@@ -525,7 +525,7 @@ def cmd_clean(args):
cview = ctx_view.CTXView( args.view, getAccessPolicy(args), validate=bool(args.repo_validation) )
exp_modules = expand_list_files(cview, args.modules)
- bc = getBuildConfiguration( cview )
+ bc = getBuildConfiguration( cview, args )
depmgr = CTXDepMgr( cview.getItemPaths('modules') )
depmgr.addCodeModules( exp_modules, args.tests )
@@ -795,5 +795,5 @@ def cmd_prop(args):
###############################################################################
# Parse cmdline
-args = parser.parse_args()
-args.func(args)
+argsa=parser.parse_args()
+argsa.func(argsa)
14 contexo/ctx_depmgr.py
View
@@ -680,13 +680,13 @@ def getCodeModulesWithDependencies( self ):
return list (moduleRoots)
-
- def getCodeModulesDependencies( self, input_modules ):
-
- input_modules = assureList( input_modules )
- codeModules = self.getCodeModulesWithDependencies()
-
- return list (codeModules- set(input_modules))
+#
+# def getCodeModulesDependencies( self, input_modules ):
+#
+# input_modules = assureList( input_modules )
+# codeModules = self.getCodeModulesWithDependencies()
+#
+# return list (codeModules- set(input_modules))
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Returns a list of CTXCodeModule from the named list of modules.
4 contexo/ctx_sysinfo.py
View
@@ -17,8 +17,8 @@
#
CTX_VER_MAJOR = 0
-CTX_VER_MINOR = 5
-CTX_VER_STATE = 'rc1'
+CTX_VER_MINOR = 6
+CTX_VER_STATE = 'devel'
CTX_DISPLAYVERSION = '%d.%d %s'%(CTX_VER_MAJOR, CTX_VER_MINOR, CTX_VER_STATE)
CTX_LICENSE = 'licesed under GPLv2 ( http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt )'
2  contexo/xmltools.py
View
@@ -3,7 +3,7 @@
from xml.sax.saxutils import XMLGenerator
from xml.sax.xmlreader import AttributesImpl
-#pretty formating xml
+#pretty formatting xml
class XMLGenerator:
def __init__(self, output):
Please sign in to comment.
Something went wrong with that request. Please try again.