Merge pull request #259 from ONLYOFFICE/fix/makeBugs

K0R0L · web-flow · commit 5639a0d5ddc3 · 2021-02-02T12:38:02.000+03:00
Logging makefiles name
diff --git a/build.pro b/build.pro
@@ -23,6 +23,9 @@ OO_BRANDING_SUFFIX = $$(OO_BRANDING)
 	MAKEFILE=$$join(MAKEFILE, MAKEFILE, "", "$$OO_BRANDING_SUFFIX")
 }
 
+message(current_makefile)
+message($$MAKEFILE)
+
 CONFIG += ordered
 
 core_windows {
diff --git a/scripts/build.py b/scripts/build.py
@@ -64,6 +64,7 @@ def make_pro_file(makefiles_dir, pro_file):
       if ("1" == config.option("clean")):
         base.cmd_and_return_cwd(base.app_make(), ["clean", "-f", makefiles_dir + "/build.makefile_" + file_suff], True)
         base.cmd_and_return_cwd(base.app_make(), ["distclean", "-f", makefiles_dir + "/build.makefile_" + file_suff], True)
+      print("make file: " + makefiles_dir + "/build.makefile_" + file_suff)
       base.cmd_and_return_cwd(base.app_make(), ["-f", makefiles_dir + "/build.makefile_" + file_suff])
     else:
       qmake_bat = []

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@ OO_BRANDING_SUFFIX = $$(OO_BRANDING)`
`23`	`23`	`MAKEFILE=$$join(MAKEFILE, MAKEFILE, "", "$$OO_BRANDING_SUFFIX")`
`24`	`24`	`}`
`25`	`25`
	`26`	`+message(current_makefile)`
	`27`	`+message($$MAKEFILE)`
	`28`	`+`
`26`	`29`	`CONFIG += ordered`
`27`	`30`
`28`	`31`	`core_windows {`