Browse Source

Use PlatformIO 4 default dir structure (#14879)

Chris Pepper 5 years ago
parent
commit
2971b48a12

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py View File

@@ -17,7 +17,7 @@ def print_error(e):
17 17
     print('\nUnable to find destination disk (' + e + ')\n' \
18 18
           'Please select it in platformio.ini using the upload_port keyword ' \
19 19
           '(https://docs.platformio.org/en/latest/projectconf/section_env_upload.html) ' \
20
-          'or copy the firmware (.pioenvs/' + env.get('PIOENV') + '/firmware.bin) manually to the appropriate disk\n')
20
+          'or copy the firmware (.pio/build/' + env.get('PIOENV') + '/firmware.bin) manually to the appropriate disk\n')
21 21
 
22 22
 try:
23 23
     if current_OS == 'Windows':

+ 1
- 0
buildroot/bin/env_clean View File

@@ -3,6 +3,7 @@
3 3
 rm -rf .pioenvs
4 4
 rm -rf .piolibdeps
5 5
 rm -rf .piolib
6
+rm -rf .pio
6 7
 
7 8
 if [[ $1 = "--deep" ]]; then
8 9
   rm -rf ~/.platformio/packages/*

+ 4
- 4
buildroot/share/atom/auto_build.py View File

@@ -421,17 +421,17 @@ def open_file(path):
421 421
 def get_build_last():
422 422
       env_last = ''
423 423
       DIR_PWD = os.listdir('.')
424
-      if '.pioenvs' in DIR_PWD:
424
+      if '.pio' in DIR_PWD:
425 425
         date_last = 0.0
426
-        DIR__pioenvs = os.listdir('.pioenvs')
426
+        DIR__pioenvs = os.listdir('.pio')
427 427
         for name in DIR__pioenvs:
428 428
           if 0 <= name.find('.') or 0 <= name.find('-'):   # skip files in listing
429 429
             continue
430
-          DIR_temp = os.listdir('.pioenvs/' + name)
430
+          DIR_temp = os.listdir('.pio/build/' + name)
431 431
           for names_temp in DIR_temp:
432 432
 
433 433
             if 0 == names_temp.find('firmware.'):
434
-              date_temp = os.path.getmtime('.pioenvs/' + name + '/' + names_temp)
434
+              date_temp = os.path.getmtime('.pio/build/' + name + '/' + names_temp)
435 435
               if date_temp > date_last:
436 436
                 date_last = date_temp
437 437
                 env_last = name

+ 3
- 3
buildroot/share/atom/create_custom_upload_command_CDC.py View File

@@ -97,7 +97,7 @@ else:
97 97
       avrdude_exe_path =  'buildroot\\share\\atom\\avrdude_5.10.exe'
98 98
 
99 99
   #    source_path = env.get("PROJECTBUILD_DIR") + '\\' + env.get("PIOENV") + '\\firmware.hex'
100
-      source_path =  '.pioenvs\\' + env.get("PIOENV") + '\\firmware.hex'
100
+      source_path =  '.pio\\build\\' + env.get("PIOENV") + '\\firmware.hex'
101 101
 
102 102
       upload_string = avrdude_exe_path + ' -p usb1286 -c avr109 -P ' + com_CDC + ' -U flash:w:' + source_path + ':i'
103 103
 
@@ -113,7 +113,7 @@ else:
113 113
       avrdude_exe_path =  'buildroot/share/atom/avrdude_5.10_macOS'
114 114
 
115 115
 #      source_path = env.get("PROJECTBUILD_DIR") + '/' + env.get("PIOENV") + '/firmware.hex'
116
-      source_path = '.pioenvs/' + env.get("PIOENV") + '/firmware.hex'
116
+      source_path = '.pio/build/' + env.get("PIOENV") + '/firmware.hex'
117 117
 
118 118
 
119 119
 #      upload_string = 'avrdude -p usb1286 -c avr109 -P ' + com_CDC + ' -U flash:w:' + source_path + ':i'
@@ -132,7 +132,7 @@ else:
132 132
 
133 133
       avrdude_exe_path =  'buildroot/share/atom/avrdude_5.10_linux'
134 134
 #      source_path = env.get("PROJECTBUILD_DIR") + '/' + env.get("PIOENV") + '/firmware.hex'
135
-      source_path = '.pioenvs/' + env.get("PIOENV") + '/firmware.hex'
135
+      source_path = '.pio/build/' + env.get("PIOENV") + '/firmware.hex'
136 136
 
137 137
 #      upload_string = 'avrdude -p usb1286 -c avr109 -P ' + com_CDC + ' -U flash:w:' + source_path + ':i'
138 138
       upload_string = avrdude_exe_path + ' -p usb1286 -c avr109 -P ' + com_CDC + ' -C ' + avrdude_conf_path  + ' -U flash:w:' + source_path + ':i'

+ 0
- 3
platformio.ini View File

@@ -17,9 +17,6 @@
17 17
 
18 18
 [platformio]
19 19
 src_dir      = Marlin
20
-build_dir    = .pioenvs
21
-lib_dir      = .piolib
22
-libdeps_dir  = .piolibdeps
23 20
 boards_dir   = buildroot/share/PlatformIO/boards
24 21
 default_envs = megaatmega2560
25 22
 

Loading…
Cancel
Save