Line 0
Link Here
|
|
|
1 |
--- Build.PL.orig 2020-01-27 06:19:45 UTC |
2 |
+++ Build.PL |
3 |
@@ -109,16 +109,7 @@ EOF |
4 |
if !$cpanm; |
5 |
my @cpanm_args = (); |
6 |
push @cpanm_args, "--sudo" if $sudo; |
7 |
- |
8 |
- # install local::lib without --local-lib otherwise it's not usable afterwards |
9 |
- if (!eval "use local::lib qw(local-lib); 1") { |
10 |
- my $res = system $cpanm, @cpanm_args, 'local::lib'; |
11 |
- warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n" |
12 |
- if $res != 0; |
13 |
- } |
14 |
- |
15 |
- push @cpanm_args, ('--local-lib', 'local-lib'); |
16 |
- |
17 |
+ |
18 |
# make sure our cpanm is updated (old ones don't support the ~ syntax) |
19 |
system $cpanm, @cpanm_args, 'App::cpanminus'; |
20 |
|
21 |
--- lib/Slic3r.pm.orig 2020-01-27 06:19:45 UTC |
22 |
+++ lib/Slic3r.pm |
23 |
@@ -43,9 +43,9 @@ warn "Running Slic3r under Perl 5.16 is neither suppor |
24 |
|
25 |
use FindBin; |
26 |
# Path to the images. |
27 |
-my $varpath = decode_path($FindBin::Bin) . "/var"; |
28 |
+my $varpath = decode_path($FindBin::RealBin) . "/var"; |
29 |
if ($^O eq 'darwin' && !-d $varpath) { |
30 |
- $varpath = decode_path($FindBin::Bin) . "/../Resources/var"; |
31 |
+ $varpath = decode_path($FindBin::RealBin) . "/../Resources/var"; |
32 |
} |
33 |
our $var = sub { "$varpath/$_[0]" }; |
34 |
|
35 |
--- lib/Slic3r/GUI.pm.orig 2020-01-27 06:19:45 UTC |
36 |
+++ lib/Slic3r/GUI.pm |
37 |
@@ -179,7 +179,7 @@ sub OnInit { |
38 |
|
39 |
# load init bundle |
40 |
{ |
41 |
- my @dirs = ($FindBin::Bin); |
42 |
+ my @dirs = ($FindBin::RealBin); |
43 |
if (&Wx::wxMAC) { |
44 |
push @dirs, qw(); |
45 |
} elsif (&Wx::wxMSW) { |
46 |
--- slic3r.pl.orig 2020-01-27 06:19:45 UTC |
47 |
+++ slic3r.pl |
48 |
@@ -5,8 +5,7 @@ use warnings; |
49 |
|
50 |
BEGIN { |
51 |
use FindBin; |
52 |
- use lib "$FindBin::Bin/lib"; |
53 |
- use local::lib '--no-create', "$FindBin::Bin/local-lib"; |
54 |
+ use lib "$FindBin::RealBin/lib"; |
55 |
} |
56 |
|
57 |
use File::Basename qw(basename); |
58 |
@@ -78,9 +77,9 @@ if ($opt{load}) { |
59 |
$configfile = Slic3r::decode_path($configfile); |
60 |
if (-e Slic3r::encode_path($configfile)) { |
61 |
push @external_configs, Slic3r::Config->load($configfile); |
62 |
- } elsif (-e Slic3r::encode_path("$FindBin::Bin/$configfile")) { |
63 |
- printf STDERR "Loading $FindBin::Bin/$configfile\n"; |
64 |
- push @external_configs, Slic3r::Config->load("$FindBin::Bin/$configfile"); |
65 |
+ } elsif (-e Slic3r::encode_path("$FindBin::RealBin/$configfile")) { |
66 |
+ printf STDERR "Loading $FindBin::RealBin/$configfile\n"; |
67 |
+ push @external_configs, Slic3r::Config->load("$FindBin::RealBin/$configfile"); |
68 |
} else { |
69 |
$opt{ignore_nonexistent_config} or die "Cannot find specified configuration file ($configfile).\n"; |
70 |
} |
71 |
--- t/adaptive_slicing.t.orig 2020-01-27 06:19:45 UTC |
72 |
+++ t/adaptive_slicing.t |
73 |
@@ -4,8 +4,7 @@ use warnings; |
74 |
|
75 |
BEGIN { |
76 |
use FindBin; |
77 |
- use lib "$FindBin::Bin/../lib"; |
78 |
- use local::lib "$FindBin::Bin/../local-lib"; |
79 |
+ use lib "$FindBin::RealBin/../lib"; |
80 |
} |
81 |
|
82 |
use List::Util qw(first sum); |
83 |
--- t/adaptive_width.t.orig 2020-01-27 06:19:45 UTC |
84 |
+++ t/adaptive_width.t |
85 |
@@ -6,8 +6,7 @@ plan tests => 32; |
86 |
|
87 |
BEGIN { |
88 |
use FindBin; |
89 |
- use lib "$FindBin::Bin/../lib"; |
90 |
- use local::lib "$FindBin::Bin/../local-lib"; |
91 |
+ use lib "$FindBin::RealBin/../lib"; |
92 |
} |
93 |
|
94 |
use List::Util qw(first); |
95 |
--- t/angles.t.orig 2020-01-27 06:19:45 UTC |
96 |
+++ t/angles.t |
97 |
@@ -6,10 +6,7 @@ plan tests => 34; |
98 |
|
99 |
BEGIN { |
100 |
use FindBin; |
101 |
- use lib "$FindBin::Bin/../lib"; |
102 |
- use lib "$FindBin::Bin/../lib"; |
103 |
- use lib "$FindBin::Bin/../lib"; |
104 |
- use local::lib "$FindBin::Bin/../local-lib"; |
105 |
+ use lib "$FindBin::RealBin/../lib"; |
106 |
} |
107 |
|
108 |
use Slic3r; |
109 |
@@ -92,4 +89,4 @@ sub line_orientation { |
110 |
sub line_direction { |
111 |
my ($l) = @_; |
112 |
return Slic3r::Line->new(@$l)->direction; |
113 |
-} |
114 |
\ No newline at end of file |
115 |
+} |
116 |
--- t/arcs.t.orig 2020-01-27 06:19:45 UTC |
117 |
+++ t/arcs.t |
118 |
@@ -6,8 +6,7 @@ plan tests => 24; |
119 |
|
120 |
BEGIN { |
121 |
use FindBin; |
122 |
- use lib "$FindBin::Bin/../lib"; |
123 |
- use local::lib "$FindBin::Bin/../local-lib"; |
124 |
+ use lib "$FindBin::RealBin/../lib"; |
125 |
} |
126 |
|
127 |
use Slic3r; |
128 |
--- t/avoid_crossing_perimeters.t.orig 2020-01-27 06:19:45 UTC |
129 |
+++ t/avoid_crossing_perimeters.t |
130 |
@@ -4,8 +4,7 @@ use warnings; |
131 |
|
132 |
BEGIN { |
133 |
use FindBin; |
134 |
- use lib "$FindBin::Bin/../lib"; |
135 |
- use local::lib "$FindBin::Bin/../local-lib"; |
136 |
+ use lib "$FindBin::RealBin/../lib"; |
137 |
} |
138 |
|
139 |
use List::Util qw(first sum); |
140 |
--- t/bridges.t.orig 2020-01-27 06:19:45 UTC |
141 |
+++ t/bridges.t |
142 |
@@ -4,8 +4,7 @@ use warnings; |
143 |
|
144 |
BEGIN { |
145 |
use FindBin; |
146 |
- use lib "$FindBin::Bin/../lib"; |
147 |
- use local::lib "$FindBin::Bin/../local-lib"; |
148 |
+ use lib "$FindBin::RealBin/../lib"; |
149 |
} |
150 |
|
151 |
use List::Util qw(first sum); |
152 |
--- t/clean_polylines.t.orig 2020-01-27 06:19:45 UTC |
153 |
+++ t/clean_polylines.t |
154 |
@@ -6,8 +6,7 @@ plan tests => 6; |
155 |
|
156 |
BEGIN { |
157 |
use FindBin; |
158 |
- use lib "$FindBin::Bin/../lib"; |
159 |
- use local::lib "$FindBin::Bin/../local-lib"; |
160 |
+ use lib "$FindBin::RealBin/../lib"; |
161 |
} |
162 |
|
163 |
use Slic3r; |
164 |
--- t/clipper.t.orig 2020-01-27 06:19:45 UTC |
165 |
+++ t/clipper.t |
166 |
@@ -6,8 +6,7 @@ plan tests => 6; |
167 |
|
168 |
BEGIN { |
169 |
use FindBin; |
170 |
- use lib "$FindBin::Bin/../lib"; |
171 |
- use local::lib "$FindBin::Bin/../local-lib"; |
172 |
+ use lib "$FindBin::RealBin/../lib"; |
173 |
} |
174 |
|
175 |
use List::Util qw(sum); |
176 |
--- t/collinear.t.orig 2020-01-27 06:19:45 UTC |
177 |
+++ t/collinear.t |
178 |
@@ -6,8 +6,7 @@ plan tests => 11; |
179 |
|
180 |
BEGIN { |
181 |
use FindBin; |
182 |
- use lib "$FindBin::Bin/../lib"; |
183 |
- use local::lib "$FindBin::Bin/../local-lib"; |
184 |
+ use lib "$FindBin::RealBin/../lib"; |
185 |
} |
186 |
|
187 |
use Slic3r; |
188 |
--- t/combineinfill.t.orig 2020-01-27 06:19:45 UTC |
189 |
+++ t/combineinfill.t |
190 |
@@ -4,8 +4,7 @@ use warnings; |
191 |
|
192 |
BEGIN { |
193 |
use FindBin; |
194 |
- use lib "$FindBin::Bin/../lib"; |
195 |
- use local::lib "$FindBin::Bin/../local-lib"; |
196 |
+ use lib "$FindBin::RealBin/../lib"; |
197 |
} |
198 |
|
199 |
use List::Util qw(first); |
200 |
--- t/config.t.orig 2020-01-27 06:19:45 UTC |
201 |
+++ t/config.t |
202 |
@@ -4,8 +4,7 @@ use warnings; |
203 |
|
204 |
BEGIN { |
205 |
use FindBin; |
206 |
- use lib "$FindBin::Bin/../lib"; |
207 |
- use local::lib "$FindBin::Bin/../local-lib"; |
208 |
+ use lib "$FindBin::RealBin/../lib"; |
209 |
} |
210 |
|
211 |
use Slic3r; |
212 |
--- t/cooling.t.orig 2020-01-27 06:19:45 UTC |
213 |
+++ t/cooling.t |
214 |
@@ -6,8 +6,7 @@ plan tests => 13; |
215 |
|
216 |
BEGIN { |
217 |
use FindBin; |
218 |
- use lib "$FindBin::Bin/../lib"; |
219 |
- use local::lib "$FindBin::Bin/../local-lib"; |
220 |
+ use lib "$FindBin::RealBin/../lib"; |
221 |
} |
222 |
|
223 |
use List::Util qw(none all); |
224 |
--- t/custom_gcode.t.orig 2020-01-27 06:19:45 UTC |
225 |
+++ t/custom_gcode.t |
226 |
@@ -4,8 +4,7 @@ use warnings; |
227 |
|
228 |
BEGIN { |
229 |
use FindBin; |
230 |
- use lib "$FindBin::Bin/../lib"; |
231 |
- use local::lib "$FindBin::Bin/../local-lib"; |
232 |
+ use lib "$FindBin::RealBin/../lib"; |
233 |
} |
234 |
|
235 |
use List::Util qw(first); |
236 |
--- t/fill.t.orig 2020-01-27 06:19:45 UTC |
237 |
+++ t/fill.t |
238 |
@@ -6,8 +6,7 @@ plan tests => 95; |
239 |
|
240 |
BEGIN { |
241 |
use FindBin; |
242 |
- use lib "$FindBin::Bin/../lib"; |
243 |
- use local::lib "$FindBin::Bin/../local-lib"; |
244 |
+ use lib "$FindBin::RealBin/../lib"; |
245 |
} |
246 |
|
247 |
use List::Util qw(first sum max); |
248 |
--- t/flow.t.orig 2020-01-27 06:19:45 UTC |
249 |
+++ t/flow.t |
250 |
@@ -4,8 +4,7 @@ use warnings; |
251 |
|
252 |
BEGIN { |
253 |
use FindBin; |
254 |
- use lib "$FindBin::Bin/../lib"; |
255 |
- use local::lib "$FindBin::Bin/../local-lib"; |
256 |
+ use lib "$FindBin::RealBin/../lib"; |
257 |
} |
258 |
|
259 |
use List::Util qw(first sum); |
260 |
--- t/gaps.t.orig 2020-01-27 06:19:45 UTC |
261 |
+++ t/gaps.t |
262 |
@@ -4,8 +4,7 @@ use warnings; |
263 |
|
264 |
BEGIN { |
265 |
use FindBin; |
266 |
- use lib "$FindBin::Bin/../lib"; |
267 |
- use local::lib "$FindBin::Bin/../local-lib"; |
268 |
+ use lib "$FindBin::RealBin/../lib"; |
269 |
} |
270 |
|
271 |
use List::Util qw(first); |
272 |
--- t/gcode.t.orig 2020-01-27 06:19:45 UTC |
273 |
+++ t/gcode.t |
274 |
@@ -4,8 +4,7 @@ use warnings; |
275 |
|
276 |
BEGIN { |
277 |
use FindBin; |
278 |
- use lib "$FindBin::Bin/../lib"; |
279 |
- use local::lib "$FindBin::Bin/../local-lib"; |
280 |
+ use lib "$FindBin::RealBin/../lib"; |
281 |
} |
282 |
|
283 |
use List::Util qw(first); |
284 |
--- t/geometry.t.orig 2020-01-27 06:19:45 UTC |
285 |
+++ t/geometry.t |
286 |
@@ -6,8 +6,7 @@ plan tests => 44; |
287 |
|
288 |
BEGIN { |
289 |
use FindBin; |
290 |
- use lib "$FindBin::Bin/../lib"; |
291 |
- use local::lib "$FindBin::Bin/../local-lib"; |
292 |
+ use lib "$FindBin::RealBin/../lib"; |
293 |
} |
294 |
|
295 |
use Slic3r; |
296 |
--- t/layers.t.orig 2020-01-27 06:19:45 UTC |
297 |
+++ t/layers.t |
298 |
@@ -4,8 +4,7 @@ use warnings; |
299 |
|
300 |
BEGIN { |
301 |
use FindBin; |
302 |
- use lib "$FindBin::Bin/../lib"; |
303 |
- use local::lib "$FindBin::Bin/../local-lib"; |
304 |
+ use lib "$FindBin::RealBin/../lib"; |
305 |
} |
306 |
|
307 |
use List::Util qw(first); |
308 |
--- t/loops.t.orig 2020-01-27 06:19:45 UTC |
309 |
+++ t/loops.t |
310 |
@@ -6,8 +6,7 @@ plan tests => 4; |
311 |
|
312 |
BEGIN { |
313 |
use FindBin; |
314 |
- use lib "$FindBin::Bin/../lib"; |
315 |
- use local::lib "$FindBin::Bin/../local-lib"; |
316 |
+ use lib "$FindBin::RealBin/../lib"; |
317 |
} |
318 |
|
319 |
use Slic3r; |
320 |
--- t/multi.t.orig 2020-01-27 06:19:45 UTC |
321 |
+++ t/multi.t |
322 |
@@ -4,8 +4,7 @@ use warnings; |
323 |
|
324 |
BEGIN { |
325 |
use FindBin; |
326 |
- use lib "$FindBin::Bin/../lib"; |
327 |
- use local::lib "$FindBin::Bin/../local-lib"; |
328 |
+ use lib "$FindBin::RealBin/../lib"; |
329 |
} |
330 |
|
331 |
use List::Util qw(first); |
332 |
--- t/perimeters.t.orig 2020-01-27 06:19:45 UTC |
333 |
+++ t/perimeters.t |
334 |
@@ -4,8 +4,7 @@ use warnings; |
335 |
|
336 |
BEGIN { |
337 |
use FindBin; |
338 |
- use lib "$FindBin::Bin/../lib"; |
339 |
- use local::lib "$FindBin::Bin/../local-lib"; |
340 |
+ use lib "$FindBin::RealBin/../lib"; |
341 |
} |
342 |
|
343 |
use Slic3r::ExtrusionLoop ':roles'; |
344 |
--- t/polyclip.t.orig 2020-01-27 06:19:45 UTC |
345 |
+++ t/polyclip.t |
346 |
@@ -6,8 +6,7 @@ plan tests => 18; |
347 |
|
348 |
BEGIN { |
349 |
use FindBin; |
350 |
- use lib "$FindBin::Bin/../lib"; |
351 |
- use local::lib "$FindBin::Bin/../local-lib"; |
352 |
+ use lib "$FindBin::RealBin/../lib"; |
353 |
} |
354 |
|
355 |
use Slic3r; |
356 |
--- t/pressure.t.orig 2020-01-27 06:19:45 UTC |
357 |
+++ t/pressure.t |
358 |
@@ -4,8 +4,7 @@ use warnings; |
359 |
|
360 |
BEGIN { |
361 |
use FindBin; |
362 |
- use lib "$FindBin::Bin/../lib"; |
363 |
- use local::lib "$FindBin::Bin/../local-lib"; |
364 |
+ use lib "$FindBin::RealBin/../lib"; |
365 |
} |
366 |
|
367 |
use List::Util qw(); |
368 |
--- t/print.t.orig 2020-01-27 06:19:45 UTC |
369 |
+++ t/print.t |
370 |
@@ -4,8 +4,7 @@ use warnings; |
371 |
|
372 |
BEGIN { |
373 |
use FindBin; |
374 |
- use lib "$FindBin::Bin/../lib"; |
375 |
- use local::lib "$FindBin::Bin/../local-lib"; |
376 |
+ use lib "$FindBin::RealBin/../lib"; |
377 |
} |
378 |
|
379 |
use List::Util qw(first); |
380 |
--- t/retraction.t.orig 2020-01-27 06:19:45 UTC |
381 |
+++ t/retraction.t |
382 |
@@ -4,8 +4,7 @@ use warnings; |
383 |
|
384 |
BEGIN { |
385 |
use FindBin; |
386 |
- use lib "$FindBin::Bin/../lib"; |
387 |
- use local::lib "$FindBin::Bin/../local-lib"; |
388 |
+ use lib "$FindBin::RealBin/../lib"; |
389 |
} |
390 |
|
391 |
use List::Util qw(any); |
392 |
--- t/shells.t.orig 2020-01-27 06:19:45 UTC |
393 |
+++ t/shells.t |
394 |
@@ -4,8 +4,7 @@ use warnings; |
395 |
|
396 |
BEGIN { |
397 |
use FindBin; |
398 |
- use lib "$FindBin::Bin/../lib"; |
399 |
- use local::lib "$FindBin::Bin/../local-lib"; |
400 |
+ use lib "$FindBin::RealBin/../lib"; |
401 |
} |
402 |
|
403 |
use List::Util qw(first sum); |
404 |
--- t/skirt_brim.t.orig 2020-01-27 06:19:45 UTC |
405 |
+++ t/skirt_brim.t |
406 |
@@ -4,8 +4,7 @@ use warnings; |
407 |
|
408 |
BEGIN { |
409 |
use FindBin; |
410 |
- use lib "$FindBin::Bin/../lib"; |
411 |
- use local::lib "$FindBin::Bin/../local-lib"; |
412 |
+ use lib "$FindBin::RealBin/../lib"; |
413 |
} |
414 |
|
415 |
use List::Util qw(first); |
416 |
--- t/slice.t.orig 2020-01-27 06:19:45 UTC |
417 |
+++ t/slice.t |
418 |
@@ -7,8 +7,7 @@ plan tests => 16; |
419 |
|
420 |
BEGIN { |
421 |
use FindBin; |
422 |
- use lib "$FindBin::Bin/../lib"; |
423 |
- use local::lib "$FindBin::Bin/../local-lib"; |
424 |
+ use lib "$FindBin::RealBin/../lib"; |
425 |
} |
426 |
|
427 |
# temporarily disable compilation errors due to constant not being exported anymore |
428 |
--- t/speed.t.orig 2020-01-27 06:19:45 UTC |
429 |
+++ t/speed.t |
430 |
@@ -4,8 +4,7 @@ use warnings; |
431 |
|
432 |
BEGIN { |
433 |
use FindBin; |
434 |
- use lib "$FindBin::Bin/../lib"; |
435 |
- use local::lib "$FindBin::Bin/../local-lib"; |
436 |
+ use lib "$FindBin::RealBin/../lib"; |
437 |
} |
438 |
|
439 |
use List::Util qw(none); |
440 |
--- t/support.t.orig 2020-01-27 06:19:45 UTC |
441 |
+++ t/support.t |
442 |
@@ -4,8 +4,7 @@ use warnings; |
443 |
|
444 |
BEGIN { |
445 |
use FindBin; |
446 |
- use lib "$FindBin::Bin/../lib"; |
447 |
- use local::lib "$FindBin::Bin/../local-lib"; |
448 |
+ use lib "$FindBin::RealBin/../lib"; |
449 |
} |
450 |
|
451 |
use List::Util qw(first); |
452 |
--- t/svg.t.orig 2020-01-27 06:19:45 UTC |
453 |
+++ t/svg.t |
454 |
@@ -4,8 +4,7 @@ use warnings; |
455 |
|
456 |
BEGIN { |
457 |
use FindBin; |
458 |
- use lib "$FindBin::Bin/../lib"; |
459 |
- use local::lib "$FindBin::Bin/../local-lib"; |
460 |
+ use lib "$FindBin::RealBin/../lib"; |
461 |
} |
462 |
|
463 |
use Slic3r; |
464 |
--- t/thin.t.orig 2020-01-27 06:19:45 UTC |
465 |
+++ t/thin.t |
466 |
@@ -4,8 +4,7 @@ use warnings; |
467 |
|
468 |
BEGIN { |
469 |
use FindBin; |
470 |
- use lib "$FindBin::Bin/../lib"; |
471 |
- use local::lib "$FindBin::Bin/../local-lib"; |
472 |
+ use lib "$FindBin::RealBin/../lib"; |
473 |
} |
474 |
|
475 |
use Slic3r; |
476 |
--- t/threads.t.orig 2020-01-27 06:19:45 UTC |
477 |
+++ t/threads.t |
478 |
@@ -4,8 +4,7 @@ use warnings; |
479 |
|
480 |
BEGIN { |
481 |
use FindBin; |
482 |
- use lib "$FindBin::Bin/../lib"; |
483 |
- use local::lib "$FindBin::Bin/../local-lib"; |
484 |
+ use lib "$FindBin::RealBin/../lib"; |
485 |
} |
486 |
|
487 |
use List::Util qw(first); |
488 |
--- t/vibrationlimit.t.orig 2020-01-27 06:19:45 UTC |
489 |
+++ t/vibrationlimit.t |
490 |
@@ -4,8 +4,7 @@ use warnings; |
491 |
|
492 |
BEGIN { |
493 |
use FindBin; |
494 |
- use lib "$FindBin::Bin/../lib"; |
495 |
- use local::lib "$FindBin::Bin/../local-lib"; |
496 |
+ use lib "$FindBin::RealBin/../lib"; |
497 |
} |
498 |
|
499 |
use Slic3r; |
500 |
--- utils/amf-to-stl.pl.orig 2020-01-27 06:19:45 UTC |
501 |
+++ utils/amf-to-stl.pl |
502 |
@@ -6,8 +6,7 @@ use warnings; |
503 |
|
504 |
BEGIN { |
505 |
use FindBin; |
506 |
- use lib "$FindBin::Bin/../lib"; |
507 |
- use local::lib "$FindBin::Bin/../local-lib"; |
508 |
+ use lib "$FindBin::RealBin/../lib"; |
509 |
} |
510 |
|
511 |
use File::Basename qw(basename); |
512 |
--- utils/config-bundle-to-config.pl.orig 2020-01-27 06:19:45 UTC |
513 |
+++ utils/config-bundle-to-config.pl |
514 |
@@ -8,8 +8,7 @@ use warnings; |
515 |
|
516 |
BEGIN { |
517 |
use FindBin; |
518 |
- use lib "$FindBin::Bin/../lib"; |
519 |
- use local::lib "$FindBin::Bin/../local-lib"; |
520 |
+ use lib "$FindBin::RealBin/../lib"; |
521 |
} |
522 |
|
523 |
use Getopt::Long qw(:config no_auto_abbrev); |
524 |
--- utils/dump-stl.pl.orig 2020-01-27 06:19:45 UTC |
525 |
+++ utils/dump-stl.pl |
526 |
@@ -7,8 +7,7 @@ use warnings; |
527 |
|
528 |
BEGIN { |
529 |
use FindBin; |
530 |
- use lib "$FindBin::Bin/../lib"; |
531 |
- use local::lib "$FindBin::Bin/../local-lib"; |
532 |
+ use lib "$FindBin::RealBin/../lib"; |
533 |
} |
534 |
|
535 |
use Slic3r; |
536 |
--- utils/estimate-gcode-time.pl.orig 2020-01-27 06:19:45 UTC |
537 |
+++ utils/estimate-gcode-time.pl |
538 |
@@ -5,8 +5,7 @@ use warnings; |
539 |
|
540 |
BEGIN { |
541 |
use FindBin; |
542 |
- use lib "$FindBin::Bin/../lib"; |
543 |
- use local::lib "$FindBin::Bin/../local-lib"; |
544 |
+ use lib "$FindBin::RealBin/../lib"; |
545 |
} |
546 |
|
547 |
use Slic3r; |
548 |
--- utils/gcode_sectioncut.pl.orig 2020-01-27 06:19:45 UTC |
549 |
+++ utils/gcode_sectioncut.pl |
550 |
@@ -6,8 +6,7 @@ use warnings; |
551 |
|
552 |
BEGIN { |
553 |
use FindBin; |
554 |
- use lib "$FindBin::Bin/../lib"; |
555 |
- use local::lib "$FindBin::Bin/../local-lib"; |
556 |
+ use lib "$FindBin::RealBin/../lib"; |
557 |
} |
558 |
|
559 |
use Getopt::Long qw(:config no_auto_abbrev); |
560 |
--- utils/pdf-slices.pl.orig 2020-01-27 06:19:45 UTC |
561 |
+++ utils/pdf-slices.pl |
562 |
@@ -6,8 +6,7 @@ use warnings; |
563 |
|
564 |
BEGIN { |
565 |
use FindBin; |
566 |
- use lib "$FindBin::Bin/../lib"; |
567 |
- use local::lib "$FindBin::Bin/../local-lib"; |
568 |
+ use lib "$FindBin::RealBin/../lib"; |
569 |
} |
570 |
|
571 |
use Getopt::Long qw(:config no_auto_abbrev); |
572 |
--- utils/send-gcode.pl.orig 2020-01-27 06:19:45 UTC |
573 |
+++ utils/send-gcode.pl |
574 |
@@ -5,8 +5,7 @@ use warnings; |
575 |
|
576 |
BEGIN { |
577 |
use FindBin; |
578 |
- use lib "$FindBin::Bin/../lib"; |
579 |
- use local::lib "$FindBin::Bin/../local-lib"; |
580 |
+ use lib "$FindBin::RealBin/../lib"; |
581 |
} |
582 |
|
583 |
use Slic3r; |
584 |
--- utils/split_stl.pl.orig 2020-01-27 06:19:45 UTC |
585 |
+++ utils/split_stl.pl |
586 |
@@ -6,8 +6,7 @@ use warnings; |
587 |
|
588 |
BEGIN { |
589 |
use FindBin; |
590 |
- use lib "$FindBin::Bin/../lib"; |
591 |
- use local::lib "$FindBin::Bin/../local-lib"; |
592 |
+ use lib "$FindBin::RealBin/../lib"; |
593 |
} |
594 |
|
595 |
use File::Basename qw(basename); |
596 |
--- utils/stl-to-amf.pl.orig 2020-01-27 06:19:45 UTC |
597 |
+++ utils/stl-to-amf.pl |
598 |
@@ -6,8 +6,7 @@ use warnings; |
599 |
|
600 |
BEGIN { |
601 |
use FindBin; |
602 |
- use lib "$FindBin::Bin/../lib"; |
603 |
- use local::lib "$FindBin::Bin/../local-lib"; |
604 |
+ use lib "$FindBin::RealBin/../lib"; |
605 |
} |
606 |
|
607 |
use File::Basename qw(basename); |
608 |
--- utils/view-mesh.pl.orig 2020-01-27 06:19:45 UTC |
609 |
+++ utils/view-mesh.pl |
610 |
@@ -6,8 +6,7 @@ use warnings; |
611 |
|
612 |
BEGIN { |
613 |
use FindBin; |
614 |
- use lib "$FindBin::Bin/../lib"; |
615 |
- use local::lib "$FindBin::Bin/../local-lib"; |
616 |
+ use lib "$FindBin::RealBin/../lib"; |
617 |
} |
618 |
|
619 |
use Getopt::Long qw(:config no_auto_abbrev); |
620 |
--- utils/view-toolpaths.pl.orig 2020-01-27 06:19:45 UTC |
621 |
+++ utils/view-toolpaths.pl |
622 |
@@ -6,8 +6,7 @@ use warnings; |
623 |
|
624 |
BEGIN { |
625 |
use FindBin; |
626 |
- use lib "$FindBin::Bin/../lib"; |
627 |
- use local::lib "$FindBin::Bin/../local-lib"; |
628 |
+ use lib "$FindBin::RealBin/../lib"; |
629 |
} |
630 |
|
631 |
use Getopt::Long qw(:config no_auto_abbrev); |
632 |
--- utils/wireframe.pl.orig 2020-01-27 06:19:45 UTC |
633 |
+++ utils/wireframe.pl |
634 |
@@ -7,8 +7,7 @@ use warnings; |
635 |
|
636 |
BEGIN { |
637 |
use FindBin; |
638 |
- use lib "$FindBin::Bin/../lib"; |
639 |
- use local::lib "$FindBin::Bin/../local-lib"; |
640 |
+ use lib "$FindBin::RealBin/../lib"; |
641 |
} |
642 |
|
643 |
use Getopt::Long qw(:config no_auto_abbrev); |
644 |
--- xs/t/18_motionplanner.t.orig 2020-01-27 06:19:45 UTC |
645 |
+++ xs/t/18_motionplanner.t |
646 |
@@ -5,7 +5,7 @@ use warnings; |
647 |
|
648 |
BEGIN { |
649 |
use FindBin; |
650 |
- use lib "$FindBin::Bin/../../lib"; |
651 |
+ use lib "$FindBin::RealBin/../../lib"; |
652 |
} |
653 |
|
654 |
use Slic3r::XS; |