Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stud.IP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stud.IP
Stud.IP
Commits
f8d0c9a4
Commit
f8d0c9a4
authored
2 years ago
by
Elmar Ludwig
Committed by
Jan-Hendrik Willms
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
replace use of "npm bin" with "npx", fixes
#2122
Closes
#2122
Merge request
!1376
parent
a14f800f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+3
-4
3 additions, 4 deletions
Makefile
with
3 additions
and
4 deletions
Makefile
+
3
−
4
View file @
f8d0c9a4
CODECEPT
=
composer/bin/codecept
CATALOGS
=
locale/en/LC_MESSAGES/studip.mo locale/en/LC_MESSAGES/js-resources.json
NPM_BIN
=
$(
shell npm bin
)
RESOURCES
=
$(
shell find resources
-type
f
)
PHP_SOURCES
=
$(
shell find app config lib public templates
-name
'*.php'
\(
!
-path
'public/plugins_packages/*'
-o
-path
'public/plugins_packages/core/*'
\)
)
...
...
@@ -79,17 +78,17 @@ test-unit: $(CODECEPT)
catalogs
:
npm $(CATALOGS)
optimize-icons
:
npm
find public/assets/images/icons
-type
f | xargs
-P0
$(
NPM_BIN
)
/
svgo
-q
--config
=
config/svgo.config.js
find public/assets/images/icons
-type
f | xargs
-P0
npx
svgo
-q
--config
=
config/svgo.config.js
# default rules for gettext handling
js-%.pot
:
$(VUE_SOURCES)
$(
NPM_BIN
)
/
gettext-extract
--attribute
v-translate
--output
$@
$(
VUE_SOURCES
)
npx
gettext-extract
--attribute
v-translate
--output
$@
$(
VUE_SOURCES
)
js-%.po
:
js-%.pot
msgmerge
-qU
-C
$(
dir
$@
)
studip.po
$@
$<
js-%.json
:
js-%.po
$(
NPM_BIN
)
/
gettext-compile
--output
$@
$<
npx
gettext-compile
--output
$@
$<
sed
-i
~
's/^{[^{]*//;s/}$$//'
$@
%.pot
:
$(PHP_SOURCES)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment