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

4
src/GlobalData/Module/Module.java
View File

@@ -1,11 +1,11 @@
package GlobalData.Module;
import Common_old.Constants;
import Common.CommonConstants;
import Common_old.Current;
import _VisualDVM.Global;
import GlobalData.Makefile.Makefile;
import ProjectData.LanguageName;
public class Module extends ModuleAnchestor {
public int makefile_id = Constants.Nan;
public int makefile_id = CommonConstants.Nan;
public LanguageName language = LanguageName.n;
public int on = 1; //учитывать ли модуль при сборке. указание пользователя. если файлы отсутствуют - игнорится
public Module() {

14
src/GlobalData/Module/ModuleAnchestor.java
View File

@@ -1,13 +1,13 @@
package GlobalData.Module;
import Common_old.Constants;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Global;
import Common_old.Utils.Utils;
import GlobalData.Compiler.Compiler;
public class ModuleAnchestor extends iDBObject {
//--------------------------------------------------------------------------------------
public int machine_id = Constants.Nan;
public int compiler_id = Constants.Nan;
public int machine_id = CommonConstants.Nan;
public int compiler_id = CommonConstants.Nan;
public String command = ""; //дополнительная команда компилятору. между вызовом и флагами.
public String flags = ""; //последовательность флагов
//---------------------------------------------------------------------------------------
@@ -22,11 +22,11 @@ public class ModuleAnchestor extends iDBObject {
public String getDescription() {
String res = "";
if (getCompiler() != null) {
res += Utils.Brackets(getCompiler().getDescription());
res += CommonUtils.Brackets(getCompiler().getDescription());
if (!command.isEmpty())
res += " " + Utils.Brackets(command);
res += " " + CommonUtils.Brackets(command);
if (!flags.isEmpty())
res += " " + Utils.Brackets(flags);
res += " " + CommonUtils.Brackets(flags);
}
return res;
}

4
src/GlobalData/Module/UI/ModuleAnchestorForm.java
View File

@@ -1,5 +1,5 @@
package GlobalData.Module.UI;
import Common_old.Constants;
import Common.CommonConstants;
import Common_old.Current;
import Common_old.UI.UI;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
@@ -103,7 +103,7 @@ public class ModuleAnchestorForm<T extends ModuleAnchestor> extends DBObjectDial
public void ProcessResult() {
Result.machine_id = Current.getMachine().id;
Compiler compiler = (Compiler) fields.cbCompilers.getSelectedItem();
Result.compiler_id = (compiler != null) ? compiler.id : Constants.Nan;
Result.compiler_id = (compiler != null) ? compiler.id : CommonConstants.Nan;
Result.command = command;
Result.flags = flags;
}