Housekeeping #18
| @@ -22,6 +22,22 @@ fn main() { | |||||||
|             println!("stdout: {}", String::from_utf8_lossy(&output.stdout)); |             println!("stdout: {}", String::from_utf8_lossy(&output.stdout)); | ||||||
|             println!("stderr: {}", String::from_utf8_lossy(&output.stderr)); |             println!("stderr: {}", String::from_utf8_lossy(&output.stderr)); | ||||||
|             assert!(output.status.success()); |             assert!(output.status.success()); | ||||||
|  |  | ||||||
|  |             // move webpack results to rust webserver src | ||||||
|  |             let _ = Command::new("cmd") | ||||||
|  |                 .arg("/K") | ||||||
|  |                 .arg("move") | ||||||
|  |                 .arg("./src_webpack/bundle.js") | ||||||
|  |                 .arg("./src/webserver") | ||||||
|  |                 .output() | ||||||
|  |                 .unwrap(); | ||||||
|  |             let _ = Command::new("cmd") | ||||||
|  |                 .arg("/K") | ||||||
|  |                 .arg("move") | ||||||
|  |                 .arg("./src_webpack/index.html") | ||||||
|  |                 .arg("./src/webserver") | ||||||
|  |                 .output() | ||||||
|  |                 .unwrap(); | ||||||
|         } |         } | ||||||
|         Err(_) => { |         Err(_) => { | ||||||
|             println!("Assuming build on linux"); |             println!("Assuming build on linux"); | ||||||
| @@ -34,6 +50,18 @@ fn main() { | |||||||
|             println!("stdout: {}", String::from_utf8_lossy(&output.stdout)); |             println!("stdout: {}", String::from_utf8_lossy(&output.stdout)); | ||||||
|             println!("stderr: {}", String::from_utf8_lossy(&output.stderr)); |             println!("stderr: {}", String::from_utf8_lossy(&output.stderr)); | ||||||
|             assert!(output.status.success()); |             assert!(output.status.success()); | ||||||
|  |  | ||||||
|  |             // move webpack results to rust webserver src | ||||||
|  |             let _ = Command::new("mv") | ||||||
|  |                 .arg("./src_webpack/bundle.js") | ||||||
|  |                 .arg("./src/webserver") | ||||||
|  |                 .output() | ||||||
|  |                 .unwrap(); | ||||||
|  |             let _ = Command::new("mv") | ||||||
|  |                 .arg("./src_webpack/index.html") | ||||||
|  |                 .arg("./src/webserver") | ||||||
|  |                 .output() | ||||||
|  |                 .unwrap(); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -49,7 +49,7 @@ module.exports = { | |||||||
|   }, |   }, | ||||||
|   output: { |   output: { | ||||||
|     filename: 'bundle.js', |     filename: 'bundle.js', | ||||||
|     path: path.resolve(__dirname, '../src/webserver'), |     path: path.resolve(__dirname, '.'), | ||||||
|   }, |   }, | ||||||
|   devServer: { |   devServer: { | ||||||
|   } |   } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user