ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6838 from ajaakko-arm/sw4stm_tmppath_fix 

export: Fix invalid config header path in Sw4STM32
pull/6480/head
Cruz Monrreal 2018-05-14 10:37:01 -05:00 committed by GitHub
parent 506f9a8905 5330fa8ce5
commit 598e5118a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/export/sw4stm32/__init__.py
View File

@ -17,7 +17,7 @@ limitations under the License.
from __future__ import print_function, absolute_import
from builtins import str
from os.path import splitext, basename, join
from os.path import splitext, basename, relpath, join
import shutil
from tools.utils import mkdir
from tools.export.gnuarmeclipse import GNUARMEclipse
@ -290,7 +290,6 @@ class Sw4STM32(GNUARMEclipse):
},
}
@classmethod
def is_target_supported(cls, target_name):
target = TARGET_MAP[target_name]
@ -434,7 +433,9 @@ class Sw4STM32(GNUARMEclipse):
self.resources.win_to_unix()
config_header = self.filter_dot(self.toolchain.get_config_header())
config_header = self.toolchain.get_config_header()
if config_header:
config_header = relpath(config_header, self.resources.file_basepath[config_header])
libraries = []
for lib in self.resources.libraries:

2
tools/export/sw4stm32/cproject_common.tmpl
View File

@ -28,7 +28,7 @@
<option id="fr.ac6.managedbuild.option.gnu.cross.floatabi.{{u.id}}" name="Floating-point ABI" superClass="fr.ac6.managedbuild.option.gnu.cross.floatabi" value="fr.ac6.managedbuild.option.gnu.cross.floatabi.{{opts['common']['arm.target.fpu.abi']}}" valueType="enumerated"/>
{% endif %}
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.{{u.id}}" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/>
<builder buildPath="${workspace_loc:/{{name}}}/{{opts['name']}}" id="fr.ac6.managedbuild.builder.gnu.cross.{{u.id}}" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="fr.ac6.managedbuild.builder.gnu.cross"/>
<builder buildPath="${workspace_loc:/{{name}}}/{{opts['name']}}" id="fr.ac6.managedbuild.builder.gnu.cross.{{u.id}}" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="fr.ac6.managedbuild.builder.gnu.cross"/>
<tool id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.{{opts['uid']['tool_c_compiler']}}" name="MCU GCC Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler">
{% if cfg_id == 'debug' %}
<option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.{{u.id}}" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.c.optimization.level.more" valueType="enumerated"/>