Skip to content

Commit 47d1816

Browse files
committed
[GR-11319] Reduce verbosity of build.
PullRequest: graalpython/166
2 parents 14ba3fa + b75b63a commit 47d1816

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178

179179
setup +: [
180180
["mx", "sforceimport"],
181-
["mx", "-v", "--dynamicimports", self.dynamicImports, "build"],
181+
["mx", "--dynamicimports", self.dynamicImports, "build"],
182182
]
183183
},
184184
commonBuilder: commonBuilder,

graalpython/com.oracle.graal.python.cext/Makefile

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3636
# SOFTWARE.
3737

38+
QUIETLY$(MX_VERBOSE) = @
3839
LIBDIR=${VPATH}/../lib-graalpython
3940
TARGET_LIB=${LIBDIR}/capi.bc
4041

@@ -64,25 +65,25 @@ rebuild:
6465
$(MAKE) -C ${VPATH} ${TARGET_LIB} ${MODULE_TARGETS} ${HEADER_TARGETS}
6566

6667
${LIBDIR}/modules/%.bc: ${VPATH}/modules/%.o
67-
@mkdir -p ${LIBDIR}/modules
68-
llvm-link -o $@ $+
68+
$(QUIETLY) mkdir -p ${LIBDIR}/modules
69+
$(QUIETLY) llvm-link -o $@ $+
6970

7071
${TARGET_LIB}: ${OBJ_FILES}
71-
llvm-link -o $@ $+
72+
$(QUIETLY) llvm-link -o $@ $+
7273

7374
${VPATH}/src/%.o: ${VPATH}/src/%.c ${VPATH}/Makefile ${VPATH}/src/capi.h ${INCLUDE_FILES}
74-
clang ${CFLAGS} ${WARNINGS} ${INCLUDES} -o $@ -c $<
75-
opt -o $@ $@ ${OPT_FLAGS}
75+
$(QUIETLY) clang ${CFLAGS} ${WARNINGS} ${INCLUDES} -o $@ -c $<
76+
$(QUIETLY) opt -o $@ $@ ${OPT_FLAGS}
7677

7778
${VPATH}/modules/%.o: ${VPATH}/modules/%.c ${VPATH}/Makefile ${VPATH}/src/capi.h ${INCLUDE_FILES}
78-
clang ${CFLAGS} ${WARNINGS} ${INCLUDES} -o $@ -c $<
79-
opt -o $@ $@ ${OPT_FLAGS}
79+
$(QUIETLY) clang ${CFLAGS} ${WARNINGS} ${INCLUDES} -o $@ -c $<
80+
$(QUIETLY) opt -o $@ $@ ${OPT_FLAGS}
8081

8182
${VPATH}/../include/%.h: ${INCLUDE_FILES}
82-
@mkdir -p ${VPATH}/../include/
83-
@cp $(@:${VPATH}/../include/%.h=${VPATH}/include/%.h) $@
83+
$(QUIETLY) mkdir -p ${VPATH}/../include/
84+
$(QUIETLY) cp $(@:${VPATH}/../include/%.h=${VPATH}/include/%.h) $@
8485

8586
clean:
86-
@rm -f ${TARGET_LIB}
87-
@rm -f ${TARGET_LIB}.bc
88-
@rm -f ${OBJ_FILES}
87+
$(QUIETLY) rm -f ${TARGET_LIB}
88+
$(QUIETLY) rm -f ${TARGET_LIB}.bc
89+
$(QUIETLY) rm -f ${OBJ_FILES}

graalpython/com.oracle.graal.python.parser.antlr/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3636
# SOFTWARE.
3737

38+
QUIETLY$(MX_VERBOSE) = @
3839
TARGETS=${OUTPUT_PATH}/Python3BaseVisitor.java \
3940
${OUTPUT_PATH}/Python3Listener.java \
4041
${OUTPUT_PATH}/Python3BaseListener.java \
@@ -54,8 +55,8 @@ define postprocess_file
5455
endef
5556

5657
${STAMP}: ${SOURCE}
57-
touch $@
58-
${JAVA_HOME}/bin/java -cp ${ANTLR_JAR} org.antlr.v4.Tool -visitor -package ${PARSER_PKG} -o ${OUTPUT_PATH} ${SOURCE}
58+
$(QUIETLY) touch $@
59+
$(QUIETLY) ${JAVA_HOME}/bin/java -cp ${ANTLR_JAR} org.antlr.v4.Tool -visitor -package ${PARSER_PKG} -o ${OUTPUT_PATH} ${SOURCE}
5960
$(foreach var,$(TARGETS),$(call postprocess_file,$(var));)
6061

6162
clean:

graalpython/com.oracle.graal.python.parser.antlr/postprocess.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ def postprocess(file):
109109

110110
if __name__ == '__main__':
111111
fpath = sys.argv[1]
112-
print("postprocessing {}".format(fpath))
113112
with open(fpath, 'r') as FILE:
114113
content = COPYRIGHT_HEADER.format(postprocess(FILE))
115114
with open(fpath, 'w+') as FILE:

mx.graalpython/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
},
2626
{
2727
"name": "sulong",
28-
"version": "659590a09dd9dee3d0f4cc2baa6ca2fab989f6b2",
28+
"version": "4b7936d675b48707548427edee740570cb5f3eaf",
2929
"urls": [
3030
{"url": "https://github.com/graalvm/sulong", "kind": "git"},
3131
]
3232
},
3333
{
3434
"name": "regex",
35-
"version": "187fcb14548993512254f02e582436f0e7fe3bcf",
35+
"version": "5e7409244ac702a26b310c1802296a2d3a80cb27",
3636
"subdir": True,
3737
"urls": [
3838
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)