Skip to content

Commit 78a94c0

Browse files
committed
Add the ability to pass npm configuration through the Makefile
1 parent 0c0bda0 commit 78a94c0

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Diff for: Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ endif
1010
PROCS=0 PREFIX=install
1111
PYTHON=python
1212
MAVEN=mvn
13+
NPM_INSTALL_CACHE=true
14+
NPMRC=
1315
BUILD_DIR=/undefined
1416
LKQL_DIR=$(BUILD_DIR)/lkql
1517
IMPACTDB_DIR=/undefined
@@ -27,6 +29,7 @@ else
2729
endif
2830

2931
ADDITIONAL_MANAGE_ARGS=
32+
MAVEN_ARGS=-Dconfig.npmInstallCache=$(NPM_INSTALL_CACHE) -Dconfig.npmrc=$(NPMRC) -Dconfig.python=$(PYTHON)
3033

3134
# WARNING: Note that for some reason parallelizing the build still doesn't work
3235
all: lkql gnatcheck build_lkql_native_jit doc
@@ -42,7 +45,7 @@ impacts:
4245

4346
format:
4447
gnatformat -P lkql_checker/gnatcheck.gpr --no-subprojects
45-
$(MAVEN) -f lkql_jit spotless:apply
48+
$(MAVEN) -f lkql_jit spotless:apply $(MAVEN_ARGS)
4649

4750
gnatcheck: lkql
4851
gnatformat -P lkql_checker/gnatcheck.gpr --no-subprojects --check
@@ -69,11 +72,11 @@ clean_lkql_jit:
6972

7073
build_lkql_jit: lkql
7174
$(MAVEN) -f lkql/build/java/ install
72-
$(MAVEN) -f lkql_jit/ clean install
75+
$(MAVEN) -f lkql_jit/ clean install $(MAVEN_ARGS)
7376

7477
build_lkql_native_jit: lkql
7578
$(MAVEN) -f lkql/build/java/ install
76-
$(MAVEN) -f lkql_jit/ clean install -P native,$(BUILD_MODE)
79+
$(MAVEN) -f lkql_jit/ clean install -P native,$(BUILD_MODE) $(MAVEN_ARGS)
7780

7881
.PHONY: lkql_checker
7982

Diff for: lkql_jit/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<config.npm></config.npm>
4444

4545
<!-- NPM configuration -->
46-
<config.npmInstallCache>./target/npm-cache</config.npmInstallCache>
46+
<config.npmInstallCache>true</config.npmInstallCache>
4747
<config.npmrc></config.npmrc>
4848

4949
<!-- List of the components to build with native image -->

0 commit comments

Comments
 (0)