Commit 38877234 authored by Ludovic Apvrille's avatar Ludovic Apvrille

Adding new libs to the TTool Makefile

parent 8be79d99
......@@ -231,6 +231,24 @@ RELEASE_STD_FILES_XML = $(patsubst %,$(TTOOL_MODELING)/%,\
AVATAR/MicroWaveOven_SafetySecurity_fullMethodo.xml)
RELEASE_STD_FILES_LIB = $(patsubst %,$(TTOOL_MODELING)/%,\
TURTLE/TClock1.lib \
DIPLODOCUS/CPlibrary/ConfigPollingDMA_SD.lib\
DIPLODOCUS/CPlibrary/ConfigureDMA_SD.lib\
DIPLODOCUS/CPlibrary/DMACycle_SD.lib\
DIPLODOCUS/CPlibrary/DMAPollingCycleP_AD.lib\
DIPLODOCUS/CPlibrary/DMATransfer_NoPolling_MainCP.lib\
DIPLODOCUS/CPlibrary/DMATransfer_Polling_MainCP.lib\
DIPLODOCUS/CPlibrary/DMATransferCycleP_AD.lib\
DIPLODOCUS/CPlibrary/DMATransferCycleP_SD.lib\
DIPLODOCUS/CPlibrary/EnableFlag_SD.lib\
DIPLODOCUS/CPlibrary/LoadCPU_LoadConfigureSD.lib\
DIPLODOCUS/CPlibrary/LoadCPU_LoadTransferCycleSD.lib\
DIPLODOCUS/CPlibrary/LoadCPU_mainCP.lib\
DIPLODOCUS/CPlibrary/PollingCycle_SD.lib\
DIPLODOCUS/CPlibrary/StoreCPU_mainCP.lib\
DIPLODOCUS/CPlibrary/StoreCPU_StoreConfigureSD.lib\
DIPLODOCUS/CPlibrary/StoreCPU_StoreTransferCycleSD.lib\
DIPLODOCUS/CPlibrary/TerminateDMA_SD.lib\
DIPLODOCUS/StoreCPU_StoreConfigureCycleSD.lib\
TURTLE/TTimerv01.lib)
RELEASE_STD_FILES_LICENSES = $(patsubst %,$(TTOOL_DOC)/%,\
LICENSE \
......
TTool, an open-source UML toolkit for modeling embedded systems and procotols.
TTool is developed at ENST, http://labsoc.comelec.enst.fr/turtle/
-------------------------------------------------------------------------------
TTool is developed at Telecom ParisTech, http://ttool.telecom-paristech.fr/
-----------------------------------------------------------------------------------------------------------
TTool: the TURTLE Toolkit
TTool
-------------------------
TTool relies on JDK 1.6 or later. For more information about installation or use of TTool, please, refer to :
http://labsoc.comelec.enst.fr/TURTLE/HELP/index.html
For the DIPLODOCUS UML profile, please refer to:
http://www.comelec.enst.fr/recherche/labsoc/projets/DIPLODOCUS
Installing TTool
----------------
Basically, TTool is offered as a gipped-tar archive. To uncompress it under Linux, type the following command (if we assume thar archive is named ttool.tgz) in the directory in which you wish to install TTool:
$ tar -xofz ttool.tgz
Various directories are created. A README_<directory name> file located in each of them summarizes its purpose and content.
\ No newline at end of file
TTool relies on JDK 1.7 or later. For more information about installation or use of TTool, please, refer to the website.
This diff is collapsed.
......@@ -2239,24 +2239,24 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
// load the new TURTLE modeling
// Issue #41: Moved to common method
loadModels( gtm.mergeTURTLEGModeling(oldmodeling, s), "merged" );
// try {
// //TraceManager.addDev("Merging");
// gtm.enableUndo(false);
// gtm.loadModelingFromXML(gtm.mergeTURTLEGModeling(oldmodeling, s));
// gtm.enableUndo(true);
// gtm.saveOperation(getCurrentSelectedPoint());
// //gtm.saveOperation(tcdp);
// frame.setTitle("TTool: " + file.getAbsolutePath());
// makeLotosFile();
//
// if (gtm.getCheckingErrors().size() > 0) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly merged", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// }
//
// } catch (MalformedModelingException mme) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly merged", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// }
// dtree.forceUpdate();
// try {
// //TraceManager.addDev("Merging");
// gtm.enableUndo(false);
// gtm.loadModelingFromXML(gtm.mergeTURTLEGModeling(oldmodeling, s));
// gtm.enableUndo(true);
// gtm.saveOperation(getCurrentSelectedPoint());
// //gtm.saveOperation(tcdp);
// frame.setTitle("TTool: " + file.getAbsolutePath());
// makeLotosFile();
//
// if (gtm.getCheckingErrors().size() > 0) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly merged", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// }
//
// } catch (MalformedModelingException mme) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly merged", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// }
// dtree.forceUpdate();
}
}
......@@ -2331,32 +2331,32 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
// open the new TURTLE modeling
newTurtleModeling();
// gtm.enableUndo(false);
// gtm.enableUndo(false);
// Update configuration
updateLastOpenFile(_f);
// Issue #41: Moved to common method
loadModels( s, "loaded" );
// // load the new TURTLE modeling
// try {
// gtm.loadModelingFromXML(s);
// //gtm.saveOperation(tcdp);
// frame.setTitle("TTool: " + file.getAbsolutePath());
// makeLotosFile();
//
// if (gtm.getCheckingErrors().size() > 0) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
//
// }
// } catch (MalformedModelingException mme) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// frame.setTitle("TToolt: unamed project");
// }
//
// gtm.enableUndo(true);
// gtm.saveOperation(getCurrentSelectedPoint());
// dtree.forceUpdate();
// // load the new TURTLE modeling
// try {
// gtm.loadModelingFromXML(s);
// //gtm.saveOperation(tcdp);
// frame.setTitle("TTool: " + file.getAbsolutePath());
// makeLotosFile();
//
// if (gtm.getCheckingErrors().size() > 0) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
//
// }
// } catch (MalformedModelingException mme) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// frame.setTitle("TToolt: unamed project");
// }
//
// gtm.enableUndo(true);
// gtm.saveOperation(getCurrentSelectedPoint());
// dtree.forceUpdate();
getCurrentTDiagramPanel().repaint();
}
}
......@@ -2400,24 +2400,24 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
loadModels( s, "loaded" );
//TraceManager.addDev("Loading");
// load the new TURTLE modeling
// try {
// gtm.loadModelingFromXML(s);
// //gtm.saveOperation(tcdp);
// frame.setTitle("TTool: " + file.getAbsolutePath());
// makeLotosFile();
//
// if (gtm.getCheckingErrors().size() > 0) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// }
// }
// catch (MalformedModelingException mme) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded ", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// frame.setTitle("TTool: unamed project");
// }
//
// dtree.forceUpdate();
// gtm.enableUndo(true);
// gtm.saveOperation(getCurrentSelectedPoint());
// try {
// gtm.loadModelingFromXML(s);
// //gtm.saveOperation(tcdp);
// frame.setTitle("TTool: " + file.getAbsolutePath());
// makeLotosFile();
//
// if (gtm.getCheckingErrors().size() > 0) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// }
// }
// catch (MalformedModelingException mme) {
// JOptionPane.showMessageDialog(frame, "Modeling could not be correctly loaded ", "Error when loading modeling", JOptionPane.INFORMATION_MESSAGE);
// frame.setTitle("TTool: unamed project");
// }
//
// dtree.forceUpdate();
// gtm.enableUndo(true);
// gtm.saveOperation(getCurrentSelectedPoint());
}
//Added by Solange
......
......@@ -737,7 +737,7 @@ public class TGUIAction extends AbstractAction {
// Issue #35: Renamed action name to be closer to actual functionality
actions[ACT_GEN_UPPAAL] = new TAction("gen_uppaal-command", "Safety Verification (UPPAAL)", IconManager.imgic86, IconManager.imgic86, "Safety Verification (UPPAAL)", "Formal safety verification of TTool diagrams with UPPAAL", '0');
actions[ACT_AVATAR_MODEL_CHECKER] = new TAction("avatar-model-checker", "Avatar model checker", IconManager.imgic140, IconManager.imgic140, "Avatar model checker", "Executes the AVATAR model checker from an AVATAR design", '0');
actions[ACT_AVATAR_MODEL_CHECKER] = new TAction("avatar-model-checker", "Safety verification", IconManager.imgic140, IconManager.imgic140, "Safety verification (Internal tool)", "Safety verification with the internal model checker", '0');
actions[ACT_GEN_JAVA] = new TAction("gen_java-command", "Generate JAVA", IconManager.imgic38, IconManager.imgic39, "Generate JAVA", "Generates Java code from TURTLE diagrams", 0);
actions[ACT_SIMU_JAVA] = new TAction("gen_simujava-command", "Java-based simulation", IconManager.imgic38, IconManager.imgic39, "JAVA-based simualtion", "Simulate diagrams using Java language", 0);
//@author: Huy TRUONG
......
......@@ -75,11 +75,12 @@ public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternal
protected final static int FV_MAPPING_DIPLO = 4;
protected final static int SIM_TRACE_MAPPING_DIPLO = 5;
protected final static int SIM_ANIM_MAPPING_DIPLO = 8;
protected final static int PROVERIF_DIPLO = 9;
protected final static int TML_MAPPING_DIPLO = 6;
protected final String[] SHORT_ACTION_NAMES = {
"sim-trace", "upp", "lot", "tml",
"fv", "sim-trace", "tmap", "sim-anim", "sim-anim"};
"fv", "sim-trace", "tmap", "sim-anim", "sim-anim", "sec"};
protected final String[] LONG_ACTION_NAMES = {
/*0*/ "Generate a vcd simulation trace of a DIPLODOCUS functional model",
......@@ -90,7 +91,8 @@ public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternal
/*5*/ "Simulate a DIPLODOCUS mapping model",
"Generate a TMAP/TARCHI/TML text dscription of a DIPLODOCUS mapping model",
"Simulate and animate DIPLODOCUS functional models",
"Simulate and animate DIPLODOCUS mapping models"
"Simulate and animate DIPLODOCUS mapping models",
"Security verification"
};
protected int[] validations;
......
......@@ -84,12 +84,13 @@ public class DiplodocusMethodologyDiagramReferenceToApplication extends Diplodoc
}
public void makeValidationInfos(DiplodocusMethodologyDiagramName dn) {
dn.setValidationsNumber(4);
dn.setValidationsNumber(5);
dn.setValidationsInfo(0, DiplodocusMethodologyDiagramName.SIM_ANIM_APP_DIPLO);
dn.setValidationsInfo(1, DiplodocusMethodologyDiagramName.SIM_TRACE_APP_DIPLO);
//dn.setValidationsInfo(2, DiplodocusMethodologyDiagramName.LOT_APP_DIPLO);
dn.setValidationsInfo(2, DiplodocusMethodologyDiagramName.UPP_APP_DIPLO);
dn.setValidationsInfo(3, DiplodocusMethodologyDiagramName.TML_APP_DIPLO);
dn.setValidationsInfo(3, DiplodocusMethodologyDiagramName.PROVERIF_DIPLO);
dn.setValidationsInfo(4, DiplodocusMethodologyDiagramName.TML_APP_DIPLO);
}
public boolean makeCall(String diagramName, int index) {
......@@ -148,6 +149,16 @@ public class DiplodocusMethodologyDiagramReferenceToApplication extends Diplodoc
}
break;
case 3:
if (tdp.getMGUI().checkModelingSyntax(diagramName, true)) {
if (tdp.getMGUI().checkModelingSyntax(diagramName, true)) {
tdp.getMGUI().avatarProVerifVerification();
return true;
}
return false;
}
break;
case 4:
if (tdp.getMGUI().checkModelingSyntax(diagramName, true)) {
TraceManager.addDev("Generate TML");
tmp = tdp.getMGUI().generateTMLTxt();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment