Skip to content

Commit 2801f67

Browse files
levittelevitte
committed
Have install targets depend on more precise build targets
We only had the main 'install' target depend on 'all'. This changes the dependencies so targets like install_dev, install_runtime_libs, install_engines and install_programs depend on build targets that are correspond to them more specifically. This increases the parallel possibilities. Fixes #7466 Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from #7583) (cherry picked from commit e8d01a6)
1 parent 82ca431 commit 2801f67

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎Configurations/descrip.mms.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ descrip.mms : FORCE
368368

369369
# Install helper targets #############################################
370370

371-
install_sw : all install_dev install_engines install_runtime -
371+
install_sw : install_dev install_engines install_runtime -
372372
install_startup install_ivp
373373

374374
uninstall_sw : uninstall_dev uninstall_engines uninstall_runtime -
@@ -405,7 +405,7 @@ install_dev : check_INSTALLTOP install_runtime_libs
405405
map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }
406406
@{$unified_info{install}->{libraries}}) -}
407407

408-
install_engines : check_INSTALLTOP
408+
install_engines : check_INSTALLTOP install_runtime_libs build_engines
409409
@ {- output_off() unless scalar @{$unified_info{engines}}; "" -} !
410410
@ WRITE SYS$OUTPUT "*** Installing engines"
411411
- CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch']
@@ -416,7 +416,7 @@ install_engines : check_INSTALLTOP
416416

417417
install_runtime: install_programs
418418

419-
install_runtime_libs : check_INSTALLTOP
419+
install_runtime_libs : check_INSTALLTOP build_libs
420420
@ {- output_off() if $disabled{shared}; "" -} !
421421
@ WRITE SYS$OUTPUT "*** Installing shareable images"
422422
@ ! Install shared (runtime) libraries
@@ -426,7 +426,7 @@ install_runtime_libs : check_INSTALLTOP
426426
@install_shlibs) -}
427427
@ {- output_on() if $disabled{shared}; "" -} !
428428

429-
install_programs : check_INSTALLTOP install_runtime_libs
429+
install_programs : check_INSTALLTOP install_runtime_libs build_programs
430430
@ {- output_off() if $disabled{apps}; "" -} !
431431
@ ! Install the main program
432432
- CREATE/DIR ossl_installroot:[EXE.'arch']

‎Configurations/unix-Makefile.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ depend:
323323

324324
# Install helper targets #############################################
325325

326-
install_sw: all install_dev install_engines install_runtime
326+
install_sw: install_dev install_engines install_runtime
327327

328328
uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
329329

@@ -461,7 +461,7 @@ uninstall_dev:
461461
-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
462462
-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)
463463
464-
install_engines:
464+
install_engines: install_runtime_libs build_engines
465465
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
466466
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
467467
@echo "*** Installing engines"
@@ -490,7 +490,7 @@ uninstall_engines:
490490
491491
install_runtime: install_programs
492492
493-
install_runtime_libs:
493+
install_runtime_libs: build_libs
494494
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
495495
@ : {- output_off() if windowsdll(); "" -}
496496
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)
@@ -514,7 +514,7 @@ install_runtime_libs:
514514
: {- output_on() if windowsdll(); "" -}; \
515515
done
516516
517-
install_programs: install_runtime_libs
517+
install_programs: install_runtime_libs build_programs
518518
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
519519
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin
520520
@$(ECHO) "*** Installing runtime programs"

‎Configurations/windows-makefile.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ depend:
267267

268268
# Install helper targets #############################################
269269

270-
install_sw: all install_dev install_engines install_runtime
270+
install_sw: install_dev install_engines install_runtime
271271

272272
uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
273273

@@ -309,7 +309,7 @@ install_dev: install_runtime_libs
309309

310310
uninstall_dev:
311311

312-
install_engines:
312+
install_engines: install_runtime_libs build_engines
313313
@if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 )
314314
@$(ECHO) "*** Installing engines"
315315
@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(ENGINESDIR)"
@@ -322,7 +322,7 @@ uninstall_engines:
322322

323323
install_runtime: install_programs
324324

325-
install_runtime_libs:
325+
install_runtime_libs: build_libs
326326
@if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 )
327327
@$(ECHO) "*** Installing runtime libraries"
328328
@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin"
@@ -332,7 +332,7 @@ install_runtime_libs:
332332
"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBPDBS) \
333333
"$(INSTALLTOP)\bin"
334334

335-
install_programs: install_runtime_libs
335+
install_programs: install_runtime_libs build_programs
336336
@if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 )
337337
@$(ECHO) "*** Installing runtime programs"
338338
@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin"

0 commit comments

Comments
 (0)