M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-07 14:22:52 +03:00
parent 6b1576461d
commit 61fc37b574
173 changed files with 960 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/GlobalData/Makefile/Makefile.java
View File

@@ -1,4 +1,5 @@
package GlobalData.Makefile;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common.Utils.TextLog;
@@ -37,7 +38,7 @@ public class Makefile extends ModuleAnchestor {
Vector<String> titles = new Vector<>();
Vector<String> objects = new Vector<>();
Vector<String> bodies = new Vector<>();
String binary = Utils.DQuotes("0"); // Utils.DQuotes(project.name);
String binary = CommonUtils.DQuotes("0"); // Utils.DQuotes(project.name);
for (Module module : modules.values()) {
//определить а активен ли модуль.
//выбран ли он. есть ли у него компилятор. есть ли для него программы.
@@ -61,7 +62,7 @@ public class Makefile extends ModuleAnchestor {
for (DBProjectFile program : programsToAssembly) {
//--
program.last_assembly_name = module.language.toString() + "_" + i + ".o";
String object = Utils.DQuotes(program.last_assembly_name);
String object = CommonUtils.DQuotes(program.last_assembly_name);
module_objects.add(object);
module_body +=
object + ":\n" +
@@ -78,7 +79,7 @@ public class Makefile extends ModuleAnchestor {
++i;
}
titles.add(String.join("\n",
LANG_ + "COMMAND=" + Utils.DQuotes(module_compiler.call_command) + " " + module.command,
LANG_ + "COMMAND=" + CommonUtils.DQuotes(module_compiler.call_command) + " " + module.command,
LANG_ + "FLAGS=" + module.flags,
LANG_ + "OBJECTS=" + String.join(" ", module_objects),
""
@@ -88,7 +89,7 @@ public class Makefile extends ModuleAnchestor {
}
}
return String.join("\n",
"LINK_COMMAND=" + Utils.DQuotes(linker.call_command) + " " + command,
"LINK_COMMAND=" + CommonUtils.DQuotes(linker.call_command) + " " + command,
"LINK_FLAGS=" + flags + "\n",
String.join("\n", titles),
"all: " + binary,
@@ -124,7 +125,7 @@ public class Makefile extends ModuleAnchestor {
for (DBProjectFile program : programsToAssembly) {
//--
program.last_assembly_name = module.language.toString() + "_" + i + ".o";
String object = Utils.DQuotes(program.last_assembly_name);
String object = CommonUtils.DQuotes(program.last_assembly_name);
module_objects.add(object);
module_body +=
object + ":\n" +
@@ -141,7 +142,7 @@ public class Makefile extends ModuleAnchestor {
++i;
}
titles.add(String.join("\n",
LANG_ + "COMMAND=" + Utils.DQuotes(module_compiler.call_command) + " " + module.command,
LANG_ + "COMMAND=" + CommonUtils.DQuotes(module_compiler.call_command) + " " + module.command,
LANG_ + "FLAGS=" + module.flags,
LANG_ + "OBJECTS=" + String.join(" ", module_objects),
""
@@ -178,7 +179,7 @@ public class Makefile extends ModuleAnchestor {
if (linker.type.equals(CompilerType.dvm)) {
if (!Current.getProject().languageName.getDVMLink().equals(command))
Log.Writeln("команда линковки " +
Utils.Quotes(command) +
CommonUtils.Quotes(command) +
" не соответствует языку текущего проекта "
+ Current.getProject().languageName.getDescription() + "\n" +
"Используйте команду " + Current.getProject().languageName.getDVMLink());