Bläddra i källkod

Update build script for PIO 4.4 (#19034)

Victor Oliveira 4 år sedan
förälder
incheckning
bb64aa7841
Inget konto är kopplat till bidragsgivarens mejladress

+ 1
- 1
.github/workflows/test-builds.yml Visa fil

106
 
106
 
107
     - name: Install PlatformIO
107
     - name: Install PlatformIO
108
       run: |
108
       run: |
109
-        pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
109
+        pip install -U https://github.com/platformio/platformio-core/archive/master.zip
110
         platformio update
110
         platformio update
111
 
111
 
112
     - name: Check out the PR
112
     - name: Check out the PR

+ 18
- 6
buildroot/share/PlatformIO/scripts/common-dependencies.py Visa fil

9
 	import configparser
9
 	import configparser
10
 except ImportError:
10
 except ImportError:
11
 	import ConfigParser as configparser
11
 	import ConfigParser as configparser
12
-from platformio.managers.package import PackageManager
12
+try:
13
+	# PIO < 4.4
14
+	from platformio.managers.package import PackageManager
15
+except ImportError:
16
+	# PIO >= 4.4
17
+	from platformio.package.meta import PackageSpec as PackageManager
13
 
18
 
14
 Import("env")
19
 Import("env")
15
 
20
 
16
 FEATURE_CONFIG = {}
21
 FEATURE_CONFIG = {}
17
 
22
 
23
+def parse_pkg_uri(spec):
24
+	if PackageManager.__name__ == 'PackageSpec':
25
+		return PackageManager(spec).name
26
+	else:
27
+		name, _, _ = PackageManager.parse_pkg_uri(spec)
28
+		return name
29
+
18
 def add_to_feat_cnf(feature, flines):
30
 def add_to_feat_cnf(feature, flines):
19
 	feat = FEATURE_CONFIG[feature]
31
 	feat = FEATURE_CONFIG[feature]
20
 	atoms = re.sub(',\\s*', '\n', flines).strip().split('\n')
32
 	atoms = re.sub(',\\s*', '\n', flines).strip().split('\n')
56
 		if not 'lib_deps' in feat:
68
 		if not 'lib_deps' in feat:
57
 			continue
69
 			continue
58
 		for dep in feat['lib_deps']:
70
 		for dep in feat['lib_deps']:
59
-			name, _, _ = PackageManager.parse_pkg_uri(dep)
71
+			name = parse_pkg_uri(dep)
60
 			known_libs.append(name)
72
 			known_libs.append(name)
61
 	return known_libs
73
 	return known_libs
62
 
74
 
64
 	env_libs = []
76
 	env_libs = []
65
 	lib_deps = env.GetProjectOption('lib_deps')
77
 	lib_deps = env.GetProjectOption('lib_deps')
66
 	for dep in lib_deps:
78
 	for dep in lib_deps:
67
-		name, _, _ = PackageManager.parse_pkg_uri(dep)
79
+		name = parse_pkg_uri(dep)
68
 		env_libs.append(name)
80
 		env_libs.append(name)
69
 	return env_libs
81
 	return env_libs
70
 
82
 
96
 			# feat to add
108
 			# feat to add
97
 			deps_to_add = {}
109
 			deps_to_add = {}
98
 			for dep in feat['lib_deps']:
110
 			for dep in feat['lib_deps']:
99
-				name, _, _ = PackageManager.parse_pkg_uri(dep)
111
+				name = parse_pkg_uri(dep)
100
 				deps_to_add[name] = dep
112
 				deps_to_add[name] = dep
101
 
113
 
102
 			# Does the env already have the dependency?
114
 			# Does the env already have the dependency?
103
 			deps = env.GetProjectOption('lib_deps')
115
 			deps = env.GetProjectOption('lib_deps')
104
 			for dep in deps:
116
 			for dep in deps:
105
-				name, _, _ = PackageManager.parse_pkg_uri(dep)
117
+				name = parse_pkg_uri(dep)
106
 				if name in deps_to_add:
118
 				if name in deps_to_add:
107
 					del deps_to_add[name]
119
 					del deps_to_add[name]
108
 
120
 
109
 			# Are there any libraries that should be ignored?
121
 			# Are there any libraries that should be ignored?
110
 			lib_ignore = env.GetProjectOption('lib_ignore')
122
 			lib_ignore = env.GetProjectOption('lib_ignore')
111
 			for dep in deps:
123
 			for dep in deps:
112
-				name, _, _ = PackageManager.parse_pkg_uri(dep)
124
+				name = parse_pkg_uri(dep)
113
 				if name in deps_to_add:
125
 				if name in deps_to_add:
114
 					del deps_to_add[name]
126
 					del deps_to_add[name]
115
 
127
 

Laddar…
Avbryt
Spara