Bugzilla – Attachment 182071 Details for
Bug 39849
Target dependency issue in Makefile
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39849: Fix makefile target dependency order
Bug-39849-Fix-makefile-target-dependency-order.patch (text/plain), 2.96 KB, created by
Martin Renvoize (ashimema)
on 2025-05-08 12:10:59 UTC
(
hide
)
Description:
Bug 39849: Fix makefile target dependency order
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2025-05-08 12:10:59 UTC
Size:
2.96 KB
patch
obsolete
>From 5c8569b4931996cf98cc398c8a66fdf70b53cbf6 Mon Sep 17 00:00:00 2001 >From: David Cook <dcook@prosentient.com.au> >Date: Wed, 7 May 2025 07:04:30 +0000 >Subject: [PATCH] Bug 39849: Fix makefile target dependency order > >This patch fixes the makefile target dependency order, so that it runs >in this order: >1. Build CSS and JS assets >2. Run pm_to_blib, which is the step that copies over most of Koha's files >into blib >3. Move 'vue/dist' files via "move_compiled_js" makefile target/step > >To test: >1a. Run 'git archive --format=tar HEAD > "koha.orig.tar"' >1b. sudo mkdir /opt/koha /opt/build_koha >1c. sudo chown kohadev-koha /opt/koha /opt/build_koha >1d. mv koha.orig.tar /opt/build_koha/. >1e. cd /opt/build_koha >1f. tar xvf koha.orig.tar >2. Run "perl Makefile.PL" >Choose "single" >Choose "/opt/koha" for target directory >Choose the defaults for the rest >3. Run "make" >4. Note the first step is the CSS/JS build >5. Note the second step is the copying of files to "blib" >6. Run "find -name 'esm.js.map'" and note it appears in the regular >build location as well as in "blib" >7. Run "find -name 'swagger_bundle.json'" and note it appears in >the regular build location as well as in "blib" >8. Run "make install" >9. Run the above "find" commands using "/opt/koha" and note that >the files appear in the installed directory > >Signed-off-by: Blou <philippe.blouin@inlibro.com> >Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk> >--- > Makefile.PL | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > >diff --git a/Makefile.PL b/Makefile.PL >index 879907e36af..cb75329ed12 100644 >--- a/Makefile.PL >+++ b/Makefile.PL >@@ -1909,17 +1909,22 @@ sub top_targets { > my $inherited = shift->SUPER::top_targets(@_); > my $compile_step; > >- #NOTE: Make "all" depend on "compile_css_js" >- $compile_step .= "all :: compile_css_js\n"; >+ #NOTE: Make "all" depend on "compile_css_js" and "move_compiled_js", so that it runs those targets/steps >+ $compile_step .= "all :: compile_css_js move_compiled_js\n"; > $compile_step .= "\t" . '$(NOECHO) $(NOOP)' . "\n"; > $compile_step .= "\n"; > >- #NOTE: Make compile_css_js depend on pm_to_blib, so we have access to the blib directory >- $compile_step .= "compile_css_js: pm_to_blib\n"; >+ #NOTE: Build CSS and Javascript assets >+ $compile_step .= "compile_css_js:\n"; > $compile_step .= "\t" . '$(PERLRUN) build-resources.PL' . "\n"; >+ $compile_step .= "\n"; > >+ #NOTE: Make move_compiled_js depend on compile_css_js, so we have our generated Javascript assets >+ #NOTE: Make move_compiled_js depend on pm_to_blib, so we have access to the blib directory > #NOTE: Copy the generated vue dist files into the relevant blib >+ $compile_step .= "move_compiled_js: compile_css_js pm_to_blib\n"; > $compile_step .= "\t" . 'cp -r koha-tmpl/intranet-tmpl/prog/js/vue/dist blib/INTRANET_TMPL_DIR/prog/js/vue/' . "\n"; >+ $compile_step .= "\n"; > > my $top_targets = $compile_step . "\n" . $inherited; > return $top_targets; >-- >2.49.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 39849
:
182014
|
182024
| 182071