diff --git a/Makefile b/Makefile index 8d69ef754da6c0d96ff6ea2540e6d5770a73a4fc..47bc1fca28396fd3bb23e0af0b841da655ef93db 100755 --- a/Makefile +++ b/Makefile @@ -35,6 +35,8 @@ TIFTRANSLATOR_JAR_TXT = tiftranslator.txt TMLTRANSLATOR_JAR_TXT = tmltranslator.txt WEBCRAWLER_SERVER_JAR_TXT = webcrawler.txt WEBCRAWLER_CLIENT_JAR_TXT = client.txt +WEBCRAWLER_SERVER_BINARY = webcrawler-server.jar +WEBCRAWLER_CLIENT_BINARY = webcrawler-client.jar RUNDSE_JAR_TXT = rundse.txt REMOTESIMULATOR_JAR_TXT = simulationcontrol.txt TTOOL_CONFIG = config.xml @@ -60,7 +62,9 @@ ENTERPRISE_LOGO = starting_logo_enterprise.gif #Variable that points to TTool installation Path TTOOL_PATH := $(shell /bin/pwd) TTOOL_SRC = $(TTOOL_PATH)/src +TTOOL_WEBCRAWLER_SRC = $(TTOOL_PATH)/src/web/crawler TTOOL_BIN = $(TTOOL_PATH)/bin +TTOOL_CLASSPATH_BINARY = $(TTOOL_BIN)/JavaPlot.jar:$(TTOOL_BIN)/commons-codec-1.10.jar:$(TTOOL_BIN)/commons-io-2.4-javadoc.jar:$(TTOOL_BIN)/commons-io-2.4.jar:$(TTOOL_BIN)/derby.jar:$(TTOOL_BIN)/derbyclient-10.9.1.0.jar:$(TTOOL_BIN)/derbynet.jar:$(TTOOL_BIN)/dom4j-1.6.1.jar:$(TTOOL_BIN)/jaxen-1.1.6.jar:$(TTOOL_BIN)/jsoup-1.8.1.jar:$(TTOOL_BIN)/opencloud.jar:. TTOOL_MODELING = $(TTOOL_PATH)/modeling #TTOOL_MODELING = $(TTOOL_PATH)/figures TTOOL_EXECUTABLECODE = $(TTOOL_PATH)/executablecode @@ -142,19 +146,19 @@ svn: svn update build.txt src/ui/DefaultText.java $(JAVA) -jar $(BUILDER) $(BUILD_INFO) $(BUILD_TO_MODIFY) svn --username apvrille commit build.txt src/ui/DefaultText.java -m 'update on build version: builder.txt' - $(JAVAC) $(CLASSPATH) $(TTOOL_SRC) $(TTOOL_SRC)/*.java + $(JAVAC) $(CLASSPATH) $(TTOOL_SRC) $(TTOOL_SRC)/*.java $(TTOOL_WEBCRAWLER_SRC)/*.java basicsvnapvrille: date svn --username apvrille update build.txt src/ui/DefaultText.java $(JAVA) -jar $(BUILDER) $(BUILD_INFO) $(BUILD_TO_MODIFY) svn --username apvrille commit build.txt src/ui/DefaultText.java -m 'update on build version: builder.txt' - $(JAVAC) $(CLASSPATH) $(TTOOL_SRC) $(TTOOL_SRC)/*.java + $(JAVAC) $(CLASSPATH) $(TTOOL_SRC) $(TTOOL_SRC)/*.java $(TTOOL_WEBCRAWLER_SRC)/*.java myrelease: basic launcher ttooljar basic: - $(JAVAC) $(SOURCEPATH) $(TTOOL_SRC) $(CLASSPATH) $(TTOOL_BIN)/$(JSOUP_BINARY):$(TTOOL_BIN)/$(COMMON_CODEC_BINARY) $(TTOOL_SRC)/*.java + $(JAVAC) $(SOURCEPATH) $(TTOOL_SRC) $(CLASSPATH) $(TTOOL_CLASSPATH_BINARY) $(TTOOL_SRC)/*.java $(TTOOL_WEBCRAWLER_SRC)/*.java jar: launcher ttooljar tiftranslator tmltranslator rundse remotesimulator webcrawler @@ -184,6 +188,12 @@ remotesimulator: rm -f $(TTOOL_BIN)/$(REMOTESIMULATOR_BINARY) cd $(TTOOL_SRC);$(JAR) cmf $(REMOTESIMULATOR_JAR_TXT) $(TTOOL_BIN)/$(REMOTESIMULATOR_BINARY) RemoteSimulationControl.class remotesimulation/*.class +webcrawler: + rm -f $(TTOOL_BIN)/$(WEBCRAWLER_SERVER_BINARY) + cd $(TTOOL_SRC);$(JAR) cmf $(WEBCRAWLER_SERVER_JAR_TXT) $(TTOOL_BIN)/$(WEBCRAWLER_SERVER_BINARY) web/crawler/*.class + rm -f $(TTOOL_BIN)/$(WEBCRAWLER_CLIENT_BINARY) + cd $(TTOOL_SRC);$(JAR) cmf $(WEBCRAWLER_CLIENT_JAR_TXT) $(TTOOL_BIN)/$(WEBCRAWLER_CLIENT_BINARY) web/crawler/*.class + documentation: $(JAVADOC) $(CLASSPATH) $(TTOOL_SRC) -d $(TTOOL_DOC_HTML) $(TTOOL_SRC)/*.java $(TTOOL_SRC)/*/*.java $(TTOOL_SRC)/*/*/*.java $(TTOOL_SRC)/fr/inria/oasis/vercors/cttool/model/*.java diff --git a/bin/JavaPlot.jar b/bin/JavaPlot.jar new file mode 100644 index 0000000000000000000000000000000000000000..ab4353fa8a8abb1fcfeefd681a1e3b4848eb848a Binary files /dev/null and b/bin/JavaPlot.jar differ diff --git a/bin/client.jar b/bin/client.jar new file mode 100644 index 0000000000000000000000000000000000000000..af9097c012055131102da7d9e1b331c3522d2a4e Binary files /dev/null and b/bin/client.jar differ diff --git a/bin/commons-io-2.4-javadoc.jar b/bin/commons-io-2.4-javadoc.jar new file mode 100644 index 0000000000000000000000000000000000000000..e388f287f903ee9777a12451b83cd4b08bc9ae5c Binary files /dev/null and b/bin/commons-io-2.4-javadoc.jar differ diff --git a/bin/commons-io-2.4.jar b/bin/commons-io-2.4.jar new file mode 100644 index 0000000000000000000000000000000000000000..90035a4fe068e65d42edf621a0ffc78b4b020cdc Binary files /dev/null and b/bin/commons-io-2.4.jar differ diff --git a/bin/crawler.jar b/bin/crawler.jar new file mode 100644 index 0000000000000000000000000000000000000000..9c19aedff2a09586cc7665e88544a8e827cc98a7 Binary files /dev/null and b/bin/crawler.jar differ diff --git a/bin/derby.jar b/bin/derby.jar new file mode 100644 index 0000000000000000000000000000000000000000..2beaa1b9e73109ff0a5ad85ad88fd3d2f2df2080 Binary files /dev/null and b/bin/derby.jar differ diff --git a/bin/derbyclient-10.9.1.0.jar b/bin/derbyclient-10.9.1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..0974859bb58df959df6219143daf01cfaf6deaea Binary files /dev/null and b/bin/derbyclient-10.9.1.0.jar differ diff --git a/bin/derbynet.jar b/bin/derbynet.jar new file mode 100644 index 0000000000000000000000000000000000000000..c6bb211760e9f0d41c7832b6754c907cc1b1d8e6 Binary files /dev/null and b/bin/derbynet.jar differ diff --git a/bin/dom4j-1.6.1.jar b/bin/dom4j-1.6.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..c8c4dbb92d6c23a7fbb2813eb721eb4cce91750c Binary files /dev/null and b/bin/dom4j-1.6.1.jar differ diff --git a/bin/jaxen-1.1.6.jar b/bin/jaxen-1.1.6.jar new file mode 100644 index 0000000000000000000000000000000000000000..52f47a4f433a9985896a1e6ff6d6a10b98d3cd41 Binary files /dev/null and b/bin/jaxen-1.1.6.jar differ diff --git a/bin/jttool.jar b/bin/jttool.jar new file mode 100644 index 0000000000000000000000000000000000000000..918628a62f53d545d080d4a4d05a62fbb792ef68 Binary files /dev/null and b/bin/jttool.jar differ diff --git a/bin/opencloud.jar b/bin/opencloud.jar new file mode 100644 index 0000000000000000000000000000000000000000..36bb35765d2cd9c15c117d2b58c6da80e7987aeb Binary files /dev/null and b/bin/opencloud.jar differ diff --git a/bin/ttooldemo.jar b/bin/ttooldemo.jar new file mode 100644 index 0000000000000000000000000000000000000000..eda430aa871089e97ea6823159b442f560208717 Binary files /dev/null and b/bin/ttooldemo.jar differ diff --git a/bin/webcrawler-server.jar b/bin/webcrawler-server.jar new file mode 100644 index 0000000000000000000000000000000000000000..b398962e143448a7835c3b0cdcecbf5e1775669e Binary files /dev/null and b/bin/webcrawler-server.jar differ