From 6cb2ef2bd29c18e12a91f91db7fe2c33c8b40391 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 24 Aug 2015 23:41:23 +0200 Subject: [PATCH] [DEV] crate basic version 0.6.0 --- bin/lutin | 9 +++++++-- lutin/target.py | 3 +++ setup.py | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/lutin b/bin/lutin index c3e1d72..33253af 100755 --- a/bin/lutin +++ b/bin/lutin @@ -31,6 +31,7 @@ myArgs.add(arguments.ArgDefine("s", "force-strip", desc="Force the stripping of myArgs.add_section("properties", "keep in the sequency of the cible") myArgs.add(arguments.ArgDefine("t", "target", haveParam=True, desc="Select a target (by default the platform is the computer that compile this) To know list : 'lutin.py --list-target'")) myArgs.add(arguments.ArgDefine("c", "compilator", list=[["clang",""],["gcc",""]], desc="Compile with clang or Gcc mode (by default gcc will be used)")) +myArgs.add(arguments.ArgDefine("", "compilator-version", haveParam=True, desc="with travis we need to specify the name of the version if we want to compile with gcc 4.9 ==> --compilator-version=4.9")) myArgs.add(arguments.ArgDefine("m", "mode", list=[["debug",""],["release",""]], desc="Compile in release or debug mode (default release)")) myArgs.add(arguments.ArgDefine("a", "arch", list=[["auto","Automatic choice"],["arm","Arm processer"],["x86","Generic PC : AMD/Intel"],["ppc","Power PC"]], desc="Architecture to compile")) myArgs.add(arguments.ArgDefine("b", "bus", list=[["auto","Automatic choice"],["32","32 bits"],["64","64 bits"]], desc="Adressing size (Bus size)")) @@ -140,7 +141,8 @@ config = { "arch":"auto", "generate-package":True, "simulation":False, - "gcov":False + "gcov":False, + "compilator-version":"" } # load the default target : my_target = None @@ -149,6 +151,8 @@ actionDone=False for argument in localArgument: if parseGenericArg(argument, False) == True: continue + elif argument.get_option_nName() == "compilator-version": + config["compilator-version"] = argument.get_arg() elif argument.get_option_nName() == "package": config["generate-package"]=False elif argument.get_option_nName() == "simulation": @@ -178,7 +182,8 @@ for argument in localArgument: "arch":"auto", "generate-package":True, "simulation":False, - "gcov":False + "gcov":False, + "compilator-version":"" } #remove previous target my_target = None diff --git a/lutin/target.py b/lutin/target.py index 284373a..9e2b5b6 100644 --- a/lutin/target.py +++ b/lutin/target.py @@ -155,6 +155,9 @@ class Target: self.xx = self.cross + "g++" #self.ar=self.cross + "ar" #self.ranlib=self.cross + "ranlib" + if self.config["compilator-version"] != "": + self.cc = self.cc + "-" + self.config["compilator-version"] + self.xx = self.xx + "-" + self.config["compilator-version"] #get g++ compilation version : ret = multiprocess.run_command_direct(self.xx + " -dumpversion"); diff --git a/setup.py b/setup.py index b24d5b7..f7415e9 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ def readme(): # https://pypi.python.org/pypi?%3Aaction=list_classifiers setup(name='lutin', - version='0.5.14', + version='0.6.0', description='Lutin generic builder', long_description=readme(), url='http://github.com/HeeroYui/lutin',