mirror of
				https://github.com/espressif/esp-idf.git
				synced 2025-10-30 20:51:41 +00:00 
			
		
		
		
	ldgen: allow + sign in archive names
Closes https://github.com/espressif/esp-idf/issues/8073
This commit is contained in:
		| @@ -4160,7 +4160,6 @@ tools/kconfig_new/test/confserver/test_confserver.py | |||||||
| tools/kconfig_new/test/gen_kconfig_doc/test_kconfig_out.py | tools/kconfig_new/test/gen_kconfig_doc/test_kconfig_out.py | ||||||
| tools/kconfig_new/test/gen_kconfig_doc/test_target_visibility.py | tools/kconfig_new/test/gen_kconfig_doc/test_target_visibility.py | ||||||
| tools/ldgen/entity.py | tools/ldgen/entity.py | ||||||
| tools/ldgen/fragments.py |  | ||||||
| tools/ldgen/generation.py | tools/ldgen/generation.py | ||||||
| tools/ldgen/ldgen.py | tools/ldgen/ldgen.py | ||||||
| tools/ldgen/ldgen_common.py | tools/ldgen/ldgen_common.py | ||||||
| @@ -4170,7 +4169,6 @@ tools/ldgen/samples/template.ld | |||||||
| tools/ldgen/sdkconfig.py | tools/ldgen/sdkconfig.py | ||||||
| tools/ldgen/test/data/linker_script.ld | tools/ldgen/test/data/linker_script.ld | ||||||
| tools/ldgen/test/test_entity.py | tools/ldgen/test/test_entity.py | ||||||
| tools/ldgen/test/test_fragments.py |  | ||||||
| tools/ldgen/test/test_generation.py | tools/ldgen/test/test_generation.py | ||||||
| tools/ldgen/test/test_output_commands.py | tools/ldgen/test/test_output_commands.py | ||||||
| tools/mass_mfg/mfg_gen.py | tools/mass_mfg/mfg_gen.py | ||||||
|   | |||||||
| @@ -1,17 +1,6 @@ | |||||||
| # | # | ||||||
| # Copyright 2021 Espressif Systems (Shanghai) CO LTD | # SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD | ||||||
| # | # SPDX-License-Identifier: Apache-2.0 | ||||||
| # Licensed under the Apache License, Version 2.0 (the "License"); |  | ||||||
| # you may not use this file except in compliance with the License. |  | ||||||
| # You may obtain a copy of the License at |  | ||||||
| # |  | ||||||
| #     http://www.apache.org/licenses/LICENSE-2.0 |  | ||||||
| # |  | ||||||
| # Unless required by applicable law or agreed to in writing, software |  | ||||||
| # distributed under the License is distributed on an "AS IS" BASIS, |  | ||||||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |  | ||||||
| # See the License for the specific language governing permissions and |  | ||||||
| # limitations under the License. |  | ||||||
| # | # | ||||||
| import abc | import abc | ||||||
| import os | import os | ||||||
| @@ -190,7 +179,7 @@ class Fragment(): | |||||||
|     """ |     """ | ||||||
|  |  | ||||||
|     IDENTIFIER = Word(alphas + '_', alphanums + '_') |     IDENTIFIER = Word(alphas + '_', alphanums + '_') | ||||||
|     ENTITY = Word(alphanums + '.-_$') |     ENTITY = Word(alphanums + '.-_$+') | ||||||
|  |  | ||||||
|     @abc.abstractmethod |     @abc.abstractmethod | ||||||
|     def set_key_value(self, key, parse_results): |     def set_key_value(self, key, parse_results): | ||||||
|   | |||||||
| @@ -1,19 +1,9 @@ | |||||||
| #!/usr/bin/env python | #!/usr/bin/env python | ||||||
| # | # | ||||||
| # Copyright 2021 Espressif Systems (Shanghai) CO LTD | # SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD | ||||||
| # | # SPDX-License-Identifier: Apache-2.0 | ||||||
| # Licensed under the Apache License, Version 2.0 (the "License"); |  | ||||||
| # you may not use this file except in compliance with the License. |  | ||||||
| # You may obtain a copy of the License at |  | ||||||
| # |  | ||||||
| #     http://www.apache.org/licenses/LICENSE-2.0 |  | ||||||
| # |  | ||||||
| # Unless required by applicable law or agreed to in writing, software |  | ||||||
| # distributed under the License is distributed on an "AS IS" BASIS, |  | ||||||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |  | ||||||
| # See the License for the specific language governing permissions and |  | ||||||
| # limitations under the License. |  | ||||||
| # | # | ||||||
|  |  | ||||||
| import os | import os | ||||||
| import sys | import sys | ||||||
| import tempfile | import tempfile | ||||||
| @@ -682,6 +672,18 @@ entries: | |||||||
|         with self.assertRaises(ParseFatalException): |         with self.assertRaises(ParseFatalException): | ||||||
|             FragmentFile(test_fragment, self.sdkconfig) |             FragmentFile(test_fragment, self.sdkconfig) | ||||||
|  |  | ||||||
|  |     def test_archive_allowed_names(self): | ||||||
|  |         test_fragment = self.create_fragment_file(u""" | ||||||
|  | [mapping:test] | ||||||
|  | archive: | ||||||
|  |     libstdc++.a | ||||||
|  | entries: | ||||||
|  |     * (default) | ||||||
|  | """) | ||||||
|  |  | ||||||
|  |         fragment_file = FragmentFile(test_fragment, self.sdkconfig) | ||||||
|  |         self.assertEqual('libstdc++.a', fragment_file.fragments[0].archive) | ||||||
|  |  | ||||||
|     def test_empty_entries(self): |     def test_empty_entries(self): | ||||||
|         test_fragment = self.create_fragment_file(u""" |         test_fragment = self.create_fragment_file(u""" | ||||||
| [mapping:test] | [mapping:test] | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Ivan Grokhotkov
					Ivan Grokhotkov