diff --git a/Makefile b/Makefile index 87929151b4cf5aa5cf08a257ec02a720301891a0..6bfa8624a5118c359dd4690268f62f21e5be5bf0 100755 --- a/Makefile +++ b/Makefile @@ -267,7 +267,7 @@ $(STDRELEASE:.tgz=.tar): $(BASERELEASE:.tgz=.tar) @cp $(TTOOL_EXE) $(TTOOL_TARGET)/ @cp $(TTOOL_CONFIG_SRC) $(TTOOL_TARGET)/bin @cp $(TTOOL_LOTOS_H) $(TTOOL_TARGET)/bin - @$(TAR) uf $@ -C $(TTOOL_TARGET_RELEASE) TTool/lotos TTool/nc TTool/bin TTool/java TTool/figures TTool/nc TTool/lotos TTool/doc/prototyping_with_soclib_installation_guide.pdf TTool/doc/prototyping_with_soclib_user_guide.pdf $(patsubst $(TTOOL_DOC)/%,TTool/%,$(TTOOL_EXE)) $(patsubst $(TTOOL_DOC)/%,TTool/bin/%,$(TTOOL_CONFIG_SRC)) + @$(TAR) uf $@ -C $(TTOOL_TARGET_RELEASE) TTool/lotos TTool/nc TTool/bin TTool/java TTool/figures TTool/doc/prototyping_with_soclib_installation_guide.pdf TTool/doc/prototyping_with_soclib_user_guide.pdf $(patsubst $(TTOOL_DOC)/%,TTool/%,$(TTOOL_EXE)) $(ADVANCED_RELEASE:.tgz=.tar): $(STDRELEASE:.tgz=.tar) documentation @echo "$(PREFIX) Generating advanced release" @@ -286,7 +286,7 @@ $(ADVANCED_RELEASE:.tgz=.tar): $(STDRELEASE:.tgz=.tar) documentation @cp -r $(WEBCRAWLER_CLIENT_DIR)/src/main/java/* $(TTOOL_TARGET)/src @cp -r $(WEBCRAWLER_SERVER_DIR)/src/main/java/* $(TTOOL_TARGET)/src @find $(TTOOL_TARGET)/src -type f -not \( -name '*.java' -o -name '*.gif' -o -name '*.jjt' -o -name '*.txt' \) -a -exec rm -f {} \; - @cp -R $(TTOOL_DOC)/README_src $(TTOOL_TARGET)/src + @cp $(TTOOL_DOC)/README_src $(TTOOL_TARGET)/src @$(TAR) uf $@ -C $(TTOOL_TARGET_RELEASE) TTool/doc/srcdoc TTool/src $(TTOOL_PREINSTALL_WINDOWS:.tgz=.tar): $(BASERELEASE:.tgz=.tar) diff --git a/build.txt b/build.txt index 0631c30f3aa3c683b28d6270e757720dcece1210..2480a4d9e276626bb1d138e2caffd068010b38ff 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -12283 \ No newline at end of file +12284 \ No newline at end of file diff --git a/doc/README_src b/doc/README_src index ef6d71a264b32ed56ff09a133da7b3c8e662ae6f..ad16384c92016bf895573f0077aa5bd8dc5134ae 100644 --- a/doc/README_src +++ b/doc/README_src @@ -1,15 +1,10 @@ -TTool, an open-source UML toolkit for modeling emebedded systems and procotols. -TTool is developed at ENST, http://labsoc.comelec.enst.fr/turtle/ -------------------------------------------------------------------------------- +TTool, an open-source UML toolkit for modeling embedded systems. +TTool is developed at Telecom ParisTech, http://ttool.telecom-paristech.fr/ +----------------------------------------------------------------------------- + -The src directory contains all Java sources and images used to generate the jar archive of TTool, and of the launcher. -Basically, sources are dispatched in subdirectories as follows: -* ddtranslator: source files to translate a TURTLE deployment diagram into a RT-LOTOS specification -* launcher: source files of the launcher -* myutil: various fonctions such as graphical functions, graph functions, etc. -* sddescription: source files for textually describing sequence diagrams and interaction overview diagrams -* sdtranslator: source files implementing the translation of sequence and interaction overview diagrams textual description into RT-LOTOS specifications -* translator: source files implementing the translation of TURTLE designs into RT-LOTOS specifications. Also, trasnlation of TURTLE designs into Java code -* ui: all files implementing TTool's graphical interface -In the src directory, the top root file of TTool is provided, as well as other files explaining different ways of starting TTool. \ No newline at end of file +The src directory contains all Java sources and resources (e.g., images) used to generate the jar archive of TTool, and of the launcher. +Basically, sources are dispatched in subdirectories as follows: +* main/java contains the java source code +* main/resources contains the resources e.g. all icons. diff --git a/executablecode/example/README b/executablecode/example/README index fda1b7bce68f6e81414ffd2623f22650272788e9..ac9fc0e8ba59395b050153979bdfa10d88ac01dd 100644 --- a/executablecode/example/README +++ b/executablecode/example/README @@ -1,8 +1,20 @@ -* First, compile the microwave graphical interface +*Microwave system +-First, compile the microwave graphical interface $ javac *.java -* Start the microwave interface +-Start the microwave interface $ java MainMicrowave -* Open the microwave model with code in TTool -* Generate the code, compile it, execute it +-Open the microwave model with code in TTool +-Generate the code, compile it, execute it + + +*Pressure controller system +-First, compile the pressure controller system +$ javac *.java + +-Start the pressure controller GUI +$ java MainPressureController + +-Open the pressure controller model with code in TTool +-Generate the code, compile it, execute it diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java index 4d890bcc6b90d03c7b1ebf9b17d17a73d7ad0607..81cc0316af56b5ceb9dc135f692c145182e760d2 100755 --- a/src/main/java/ui/util/DefaultText.java +++ b/src/main/java/ui/util/DefaultText.java @@ -51,8 +51,8 @@ package ui.util; */ public class DefaultText { - public static String BUILD = "12282"; - public static String DATE = "2017/06/29 16:06:50 CET"; + public static String BUILD = "12283"; + public static String DATE = "2017/06/30 02:01:27 CET"; public static StringBuffer sbAbout = makeAbout();