From 6d640069f33b9320e4238b5a5026e018f86ef844 Mon Sep 17 00:00:00 2001
From: Florian Lugou <florian.lugou@telecom-paristech.fr>
Date: Thu, 2 Nov 2017 15:02:45 +0100
Subject: [PATCH] changed build destination to build directory and added
install target
---
Makefile | 42 ++++++++++++++++++++++++--------------
build.gradle | 6 +++---
graphminimize/Makefile | 8 ++++----
graphshow/Makefile | 8 ++++----
jttool/Makefile | 2 +-
launcher/Makefile | 8 ++++----
rundse/Makefile | 8 ++++----
simulationcontrol/Makefile | 8 ++++----
tiftranslator/Makefile | 8 ++++----
tmltranslator/Makefile | 8 ++++----
ttool/Makefile | 14 ++++++-------
webcrawler/client/Makefile | 14 ++++++-------
webcrawler/server/Makefile | 14 ++++++-------
13 files changed, 80 insertions(+), 68 deletions(-)
diff --git a/Makefile b/Makefile
index bd8b20feb7..1cd94ad479 100755
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,9 @@ make release Prepare a new release for the website.
make test Run tests on TTool.
make publish_jar Build TTool and upload the resulting archive.
!!! Must have the right ssh key installed for this !!!
+make install Install TTool, the jar of companion software and the runtime
+ dependencies to $$DESTDIR/bin. By default, install to
+ $(TTOOL_PATH)/bin.
make clean Clean the repository from compilation artifacts.
make ultraclean Clean the repository from binaries and compilation artifacts.
@@ -72,7 +75,7 @@ export TTOOL_SRC = $(TTOOL_PATH)/src/main/java
export GLOBAL_JAVA = $(shell cd $(TTOOL_SRC); find . -name "[^.]*.java")
export TTOOL_RESOURCES = $(TTOOL_PATH)/src/main/resources
export TTOOL_WEBCRAWLER_SRC = $(TTOOL_PATH)/src/main/java/web/crawler
-export TTOOL_BIN = $(TTOOL_PATH)/bin
+export TTOOL_BUILD = $(TTOOL_PATH)/build
export TTOOL_LIBS = $(TTOOL_PATH)/libs
export TTOOL_LIBRARIES = $(wildcard $(TTOOL_LIBS)/*.jar)
export TTOOL_CLASSPATH = $(subst $(eval) ,:,$(TTOOL_LIBRARIES))
@@ -80,37 +83,37 @@ export TTOOL_CLASSPATH = $(subst $(eval) ,:,$(TTOOL_LIBRARIES))
export GLOBAL_CFLAGS = -encoding "UTF8" -Xlint:unchecked -Xlint:deprecation -Xlint:cast -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:fallthrough
export TTOOL_DIR = $(TTOOL_PATH)/ttool
-export TTOOL_BINARY = $(TTOOL_BIN)/ttool.jar
+export TTOOL_BINARY = $(TTOOL_BUILD)/ttool.jar
export LAUNCHER_DIR = $(TTOOL_PATH)/launcher
-export LAUNCHER_BINARY = $(TTOOL_BIN)/launcher.jar
+export LAUNCHER_BINARY = $(TTOOL_BUILD)/launcher.jar
export GRAPHMINIMIZE_DIR = $(TTOOL_PATH)/graphminimize
-export GRAPHMINIMIZE_BINARY = $(TTOOL_BIN)/graphminimize.jar
+export GRAPHMINIMIZE_BINARY = $(TTOOL_BUILD)/graphminimize.jar
export GRAPHSHOW_DIR = $(TTOOL_PATH)/graphshow
-export GRAPHSHOW_BINARY = $(TTOOL_BIN)/graphshow.jar
+export GRAPHSHOW_BINARY = $(TTOOL_BUILD)/graphshow.jar
export TIFTRANSLATOR_DIR = $(TTOOL_PATH)/tiftranslator
-export TIFTRANSLATOR_BINARY = $(TTOOL_BIN)/tiftranslator.jar
+export TIFTRANSLATOR_BINARY = $(TTOOL_BUILD)/tiftranslator.jar
export TMLTRANSLATOR_DIR = $(TTOOL_PATH)/tmltranslator
-export TMLTRANSLATOR_BINARY = $(TTOOL_BIN)/tmltranslator.jar
+export TMLTRANSLATOR_BINARY = $(TTOOL_BUILD)/tmltranslator.jar
export RUNDSE_DIR = $(TTOOL_PATH)/rundse
-export RUNDSE_BINARY = $(TTOOL_BIN)/rundse.jar
+export RUNDSE_BINARY = $(TTOOL_BUILD)/rundse.jar
export REMOTESIMULATOR_DIR = $(TTOOL_PATH)/simulationcontrol
-export REMOTESIMULATOR_BINARY = $(TTOOL_BIN)/simulationcontrol.jar
+export REMOTESIMULATOR_BINARY = $(TTOOL_BUILD)/simulationcontrol.jar
export WEBCRAWLER_CLIENT_DIR = $(TTOOL_PATH)/webcrawler/client
-export WEBCRAWLER_CLIENT_BINARY = $(TTOOL_BIN)/webcrawler-client.jar
+export WEBCRAWLER_CLIENT_BINARY = $(TTOOL_BUILD)/webcrawler-client.jar
export WEBCRAWLER_SERVER_DIR = $(TTOOL_PATH)/webcrawler/server
-export WEBCRAWLER_SERVER_BINARY = $(TTOOL_BIN)/webcrawler-server.jar
+export WEBCRAWLER_SERVER_BINARY = $(TTOOL_BUILD)/webcrawler-server.jar
export JTTOOL_DIR = $(TTOOL_PATH)/jttool
-export JTTOOL_BINARY = $(TTOOL_BIN)/jttool.jar
+export JTTOOL_BINARY = $(TTOOL_BUILD)/jttool.jar
all: ttool launcher graphminimize graphshow tiftranslator tmltranslator rundse remotesimulator webcrawler
@@ -213,7 +216,7 @@ BUILDER = $(TTOOL_PATH)/builder.jar
BUILD_INFO = build.txt
BUILD_TO_MODIFY = $(TTOOL_SRC)/ui/util/DefaultText.java
-TTOOL_LOTOS_H = $(patsubst $(TTOOL_DIR)/runtime/%,$(TTOOL_BIN)/%,$(wildcard $(TTOOL_DIR)/runtime/spec*))
+TTOOL_LOTOS_H = $(patsubst $(TTOOL_DIR)/runtime/%,$(TTOOL_BUILD)/%,$(wildcard $(TTOOL_DIR)/runtime/spec*))
RELEASE_STD_FILES_XML = $(patsubst %,$(TTOOL_MODELING)/%,\
TURTLE/manual-HW.xml \
@@ -420,7 +423,7 @@ $(BASERELEASE:.tgz=.tar): $(JTTOOL_BINARY) $(TTOOL_BINARY) $(LAUNCHER_BINARY) $(
# Basic bin
@mkdir -p $(TTOOL_TARGET)/bin
@cp $(TTOOL_DOC)/README_bin $(TTOOL_TARGET)/bin
- @cp $(TTOOL_BIN)/*.jar $(TTOOL_TARGET)/bin
+ @cp $(TTOOL_BUILD)/*.jar $(TTOOL_TARGET)/bin
@mkdir -p $(TTOOL_STD_RELEASE)
@$(TAR) cf $(BASERELEASE) -C $(TTOOL_TARGET_RELEASE) .
@@ -441,6 +444,15 @@ git:
git commit -m 'update on build version: $(BUILD_INFO)' $(BUILD_INFO) $(BUILD_TO_MODIFY)
git push
+# ========================================
+# ========== INSTALL ==========
+# ========================================
+
+DESTDIR ?= $(TTOOL_PATH)
+
+install: ttool launcher graphminimize graphshow tiftranslator tmltranslator rundse remotesimulator webcrawler
+ @cp $(TTOOL_BUILD)/* $(DESTDIR)/bin
+
# ========================================
# ========== TESTS ==========
# ========================================
@@ -469,6 +481,6 @@ clean:
@rm -f $(TTOOL_STD_RELEASE)/*.tar
ultraclean: clean
- @rm -rf $(TTOOL_BIN)
+ @rm -rf $(TTOOL_BUILD)
@rm -rf $(TTOOL_DOC_HTML)
@rm -rf $(TTOOL_STD_RELEASE)
diff --git a/build.gradle b/build.gradle
index ce300c6b59..5dafb00189 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,17 +35,17 @@ subprojects {
}
test.workingDir "${rootProject.absPath}/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util"
- libsDirName = "${rootProject.absPath}/bin"
+ libsDirName = "${rootProject.absPath}/build"
task copyRuntimeLibs(type: Copy) {
from configurations.runtime
from 'runtime'
- into "${rootProject.absPath}/bin"
+ into "${rootProject.absPath}/build"
}
build.finalizedBy(copyRuntimeLibs)
clean.doFirst {
- delete "${rootProject.absPath}/bin"
+ delete "${rootProject.absPath}/build"
}
}
diff --git a/graphminimize/Makefile b/graphminimize/Makefile
index aab7db2504..9e342abacb 100644
--- a/graphminimize/Makefile
+++ b/graphminimize/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)GRAPHMINIMIZE$(RESET)]
MANIFEST = $(GRAPHMINIMIZE_DIR)/manifest.txt
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(GRAPHMINIMIZE_DIR)/src/main/java
LOCAL_BUILD_DIR = $(GRAPHMINIMIZE_DIR)/build/classes/main
@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(GRAPHMINIMIZE_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
diff --git a/graphshow/Makefile b/graphshow/Makefile
index 476cb619da..06ec047296 100644
--- a/graphshow/Makefile
+++ b/graphshow/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)GRAPHSHOW$(RESET)]
MANIFEST = $(GRAPHSHOW_DIR)/manifest.txt
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(GRAPHSHOW_DIR)/src/main/java
LOCAL_BUILD_DIR = $(GRAPHSHOW_DIR)/build/classes/main
@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(GRAPHSHOW_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
diff --git a/jttool/Makefile b/jttool/Makefile
index 246280f3a9..9ea1e80d9b 100644
--- a/jttool/Makefile
+++ b/jttool/Makefile
@@ -14,7 +14,7 @@ JARRSRCFLAGS = uf
$(JTTOOL_BINARY): compile
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
diff --git a/launcher/Makefile b/launcher/Makefile
index 95a0fd0db2..73b28fd7b3 100644
--- a/launcher/Makefile
+++ b/launcher/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)LAUNCHER$(RESET)]
MANIFEST = $(LAUNCHER_DIR)/manifest.txt
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(LAUNCHER_DIR)/src/main/java
LOCAL_BUILD_DIR = $(LAUNCHER_DIR)/build/classes/main
@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(LAUNCHER_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
diff --git a/rundse/Makefile b/rundse/Makefile
index 3df2e56a8e..e03bc7b144 100644
--- a/rundse/Makefile
+++ b/rundse/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)RUNDSE$(RESET)]
MANIFEST = $(RUNDSE_DIR)/manifest.txt
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(RUNDSE_DIR)/src/main/java
LOCAL_BUILD_DIR = $(RUNDSE_DIR)/build/classes/main
@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(RUNDSE_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
diff --git a/simulationcontrol/Makefile b/simulationcontrol/Makefile
index b4d44231c0..e84e3f2d0b 100644
--- a/simulationcontrol/Makefile
+++ b/simulationcontrol/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)REMOTESIMULATOR$(RESET)]
MANIFEST = $(REMOTESIMULATOR_DIR)/manifest.txt
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(REMOTESIMULATOR_DIR)/src/main/java
LOCAL_BUILD_DIR = $(REMOTESIMULATOR_DIR)/build/classes/main
@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(REMOTESIMULATOR_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
diff --git a/tiftranslator/Makefile b/tiftranslator/Makefile
index 4f52b688d6..886f8b77bf 100644
--- a/tiftranslator/Makefile
+++ b/tiftranslator/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)TIFTRANSLATOR$(RESET)]
MANIFEST = $(TIFTRANSLATOR_DIR)/manifest.txt
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(TIFTRANSLATOR_DIR)/src/main/java
LOCAL_BUILD_DIR = $(TIFTRANSLATOR_DIR)/build/classes/main
@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(TIFTRANSLATOR_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
diff --git a/tmltranslator/Makefile b/tmltranslator/Makefile
index 4d0f9760d6..d516b8f374 100644
--- a/tmltranslator/Makefile
+++ b/tmltranslator/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)TMLTRANSLATOR$(RESET)]
MANIFEST = $(TMLTRANSLATOR_DIR)/manifest.txt
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(TMLTRANSLATOR_DIR)/src/main/java
LOCAL_BUILD_DIR = $(TMLTRANSLATOR_DIR)/build/classes/main
@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(TMLTRANSLATOR_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
diff --git a/ttool/Makefile b/ttool/Makefile
index fe2ed9e897..44cc5ef11f 100644
--- a/ttool/Makefile
+++ b/ttool/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)TTOOL$(RESET)]
MANIFEST = $(TTOOL_DIR)/META-INF/MANIFEST.MF
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(TTOOL_DIR)/src/main/java
LOCAL_RESOURCES_DIR = $(TTOOL_RESOURCES)
@@ -11,7 +11,7 @@ LOCAL_RUNTIME_DIR = $(TTOOL_DIR)/runtime
LOCAL_JAVA = $(shell cd $(LOCAL_SRC_DIR); find . -name "*.java")
LOCAL_CLASS = $(patsubst %.java,%.class,$(LOCAL_JAVA))
-LOCAL_RT_DEP = $(patsubst $(LOCAL_RUNTIME_DIR)/%,$(TTOOL_BIN)/%,$(wildcard $(LOCAL_RUNTIME_DIR)/*))
+LOCAL_RT_DEP = $(patsubst $(LOCAL_RUNTIME_DIR)/%,$(TTOOL_BUILD)/%,$(wildcard $(LOCAL_RUNTIME_DIR)/*))
CFLAGS = $(GLOBAL_CFLAGS) -sourcepath $(TTOOL_SRC):$(LOCAL_SRC_DIR) -classpath $(TTOOL_CLASSPATH) -d $(LOCAL_BUILD_DIR)
JARFLAGS = cmf
@@ -21,16 +21,16 @@ JARRSRCFLAGS = uf
$(TTOOL_BINARY): compile $(LOCAL_RT_DEP) $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . 2>/dev/null
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
-$(TTOOL_BIN)/%: $(LOCAL_RUNTIME_DIR)/%
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%: $(LOCAL_RUNTIME_DIR)/%
+ @mkdir -p $(TTOOL_BUILD)
@cp -r $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
diff --git a/webcrawler/client/Makefile b/webcrawler/client/Makefile
index 999f8c9af2..47d12ebfb3 100644
--- a/webcrawler/client/Makefile
+++ b/webcrawler/client/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)WEBCRAWLER-CLIENT$(RESET)]
MANIFEST = $(WEBCRAWLER_CLIENT_DIR)/manifest.txt
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(WEBCRAWLER_CLIENT_DIR)/src/main/java
LOCAL_BUILD_DIR = $(WEBCRAWLER_CLIENT_DIR)/build/classes/main
@@ -10,7 +10,7 @@ LOCAL_RUNTIME_DIR = $(WEBCRAWLER_CLIENT_DIR)/runtime
LOCAL_JAVA = $(shell cd $(LOCAL_SRC_DIR); find . -name "*.java")
LOCAL_CLASS = $(patsubst %.java,%.class,$(LOCAL_JAVA))
-LOCAL_RT_DEP = $(patsubst $(LOCAL_RUNTIME_DIR)/%,$(TTOOL_BIN)/%,$(wildcard $(LOCAL_RUNTIME_DIR)/*))
+LOCAL_RT_DEP = $(patsubst $(LOCAL_RUNTIME_DIR)/%,$(TTOOL_BUILD)/%,$(wildcard $(LOCAL_RUNTIME_DIR)/*))
CFLAGS = $(GLOBAL_CFLAGS) -sourcepath $(TTOOL_SRC):$(LOCAL_SRC_DIR) -classpath $(TTOOL_CLASSPATH) -d $(LOCAL_BUILD_DIR)
JARFLAGS = cmf
@@ -20,14 +20,14 @@ JARRSRCFLAGS = uf
$(WEBCRAWLER_CLIENT_BINARY): compile $(LOCAL_RT_DEP) $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
@@ -35,8 +35,8 @@ compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC
@mkdir -p $(LOCAL_BUILD_DIR)
@$(JAVAC) $(CFLAGS) $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA))
-$(TTOOL_BIN)/%: $(LOCAL_RUNTIME_DIR)/%
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%: $(LOCAL_RUNTIME_DIR)/%
+ @mkdir -p $(TTOOL_BUILD)
@cp -r $< $@
clean:
diff --git a/webcrawler/server/Makefile b/webcrawler/server/Makefile
index 41945c5217..47e7cacf74 100644
--- a/webcrawler/server/Makefile
+++ b/webcrawler/server/Makefile
@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)WEBCRAWLER-SERVER$(RESET)]
MANIFEST = $(WEBCRAWLER_SERVER_DIR)/manifest.txt
-DEPEND = $(patsubst %,$(TTOOL_BIN)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
+DEPEND = $(patsubst %,$(TTOOL_BUILD)/%,$(shell cat $(MANIFEST) | grep Class-Path | cut -d: -f2))
LOCAL_SRC_DIR = $(WEBCRAWLER_SERVER_DIR)/src/main/java
LOCAL_BUILD_DIR = $(WEBCRAWLER_SERVER_DIR)/build/classes/main
@@ -10,7 +10,7 @@ LOCAL_RUNTIME_DIR = $(WEBCRAWLER_SERVER_DIR)/runtime
LOCAL_JAVA = $(shell cd $(LOCAL_SRC_DIR); find . -name "*.java")
LOCAL_CLASS = $(patsubst %.java,%.class,$(LOCAL_JAVA))
-LOCAL_RT_DEP = $(patsubst $(LOCAL_RUNTIME_DIR)/%,$(TTOOL_BIN)/%,$(wildcard $(LOCAL_RUNTIME_DIR)/*))
+LOCAL_RT_DEP = $(patsubst $(LOCAL_RUNTIME_DIR)/%,$(TTOOL_BUILD)/%,$(wildcard $(LOCAL_RUNTIME_DIR)/*))
CFLAGS = $(GLOBAL_CFLAGS) -sourcepath $(TTOOL_SRC):$(LOCAL_SRC_DIR) -classpath $(TTOOL_CLASSPATH) -d $(LOCAL_BUILD_DIR)
JARFLAGS = cmf
@@ -20,14 +20,14 @@ JARRSRCFLAGS = uf
$(WEBCRAWLER_SERVER_BINARY): compile $(LOCAL_RT_DEP) $(DEPEND)
@echo "$(PREFIX) Archiving"
- @mkdir -p $(TTOOL_BIN)
+ @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif
-$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
+ @mkdir -p $(TTOOL_BUILD)
@cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
@@ -35,8 +35,8 @@ compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC
@mkdir -p $(LOCAL_BUILD_DIR)
@$(JAVAC) $(CFLAGS) $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA))
-$(TTOOL_BIN)/%: $(LOCAL_RUNTIME_DIR)/%
- @mkdir -p $(TTOOL_BIN)
+$(TTOOL_BUILD)/%: $(LOCAL_RUNTIME_DIR)/%
+ @mkdir -p $(TTOOL_BUILD)
@cp -r $< $@
clean:
--
GitLab