Commit 6c10edb9 authored by Florian Lugou's avatar Florian Lugou Committed by Fabien Tessier

changed build destination to build directory and added install target

parent 53a6ccf6
...@@ -42,6 +42,9 @@ make release Prepare a new release for the website. ...@@ -42,6 +42,9 @@ make release Prepare a new release for the website.
make test Run tests on TTool. make test Run tests on TTool.
make publish_jar Build TTool and upload the resulting archive. make publish_jar Build TTool and upload the resulting archive.
!!! Must have the right ssh key installed for this !!! !!! 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 clean Clean the repository from compilation artifacts.
make ultraclean Clean the repository from binaries and compilation artifacts. make ultraclean Clean the repository from binaries and compilation artifacts.
...@@ -72,7 +75,7 @@ export TTOOL_SRC = $(TTOOL_PATH)/src/main/java ...@@ -72,7 +75,7 @@ export TTOOL_SRC = $(TTOOL_PATH)/src/main/java
export GLOBAL_JAVA = $(shell cd $(TTOOL_SRC); find . -name "[^.]*.java") export GLOBAL_JAVA = $(shell cd $(TTOOL_SRC); find . -name "[^.]*.java")
export TTOOL_RESOURCES = $(TTOOL_PATH)/src/main/resources export TTOOL_RESOURCES = $(TTOOL_PATH)/src/main/resources
export TTOOL_WEBCRAWLER_SRC = $(TTOOL_PATH)/src/main/java/web/crawler 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_LIBS = $(TTOOL_PATH)/libs
export TTOOL_LIBRARIES = $(wildcard $(TTOOL_LIBS)/*.jar) export TTOOL_LIBRARIES = $(wildcard $(TTOOL_LIBS)/*.jar)
export TTOOL_CLASSPATH = $(subst $(eval) ,:,$(TTOOL_LIBRARIES)) export TTOOL_CLASSPATH = $(subst $(eval) ,:,$(TTOOL_LIBRARIES))
...@@ -80,37 +83,37 @@ 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 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_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_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_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_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_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_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_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_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_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_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_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 all: ttool launcher graphminimize graphshow tiftranslator tmltranslator rundse remotesimulator webcrawler
...@@ -213,7 +216,7 @@ BUILDER = $(TTOOL_PATH)/builder.jar ...@@ -213,7 +216,7 @@ BUILDER = $(TTOOL_PATH)/builder.jar
BUILD_INFO = build.txt BUILD_INFO = build.txt
BUILD_TO_MODIFY = $(TTOOL_SRC)/ui/util/DefaultText.java 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)/%,\ RELEASE_STD_FILES_XML = $(patsubst %,$(TTOOL_MODELING)/%,\
TURTLE/manual-HW.xml \ TURTLE/manual-HW.xml \
...@@ -420,7 +423,7 @@ $(BASERELEASE:.tgz=.tar): $(JTTOOL_BINARY) $(TTOOL_BINARY) $(LAUNCHER_BINARY) $( ...@@ -420,7 +423,7 @@ $(BASERELEASE:.tgz=.tar): $(JTTOOL_BINARY) $(TTOOL_BINARY) $(LAUNCHER_BINARY) $(
# Basic bin # Basic bin
@mkdir -p $(TTOOL_TARGET)/bin @mkdir -p $(TTOOL_TARGET)/bin
@cp $(TTOOL_DOC)/README_bin $(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) @mkdir -p $(TTOOL_STD_RELEASE)
@$(TAR) cf $(BASERELEASE) -C $(TTOOL_TARGET_RELEASE) . @$(TAR) cf $(BASERELEASE) -C $(TTOOL_TARGET_RELEASE) .
...@@ -441,6 +444,15 @@ git: ...@@ -441,6 +444,15 @@ git:
git commit -m 'update on build version: $(BUILD_INFO)' $(BUILD_INFO) $(BUILD_TO_MODIFY) git commit -m 'update on build version: $(BUILD_INFO)' $(BUILD_INFO) $(BUILD_TO_MODIFY)
git push git push
# ========================================
# ========== INSTALL ==========
# ========================================
DESTDIR ?= $(TTOOL_PATH)
install: ttool launcher graphminimize graphshow tiftranslator tmltranslator rundse remotesimulator webcrawler
@cp $(TTOOL_BUILD)/* $(DESTDIR)/bin
# ======================================== # ========================================
# ========== TESTS ========== # ========== TESTS ==========
# ======================================== # ========================================
...@@ -469,6 +481,6 @@ clean: ...@@ -469,6 +481,6 @@ clean:
@rm -f $(TTOOL_STD_RELEASE)/*.tar @rm -f $(TTOOL_STD_RELEASE)/*.tar
ultraclean: clean ultraclean: clean
@rm -rf $(TTOOL_BIN) @rm -rf $(TTOOL_BUILD)
@rm -rf $(TTOOL_DOC_HTML) @rm -rf $(TTOOL_DOC_HTML)
@rm -rf $(TTOOL_STD_RELEASE) @rm -rf $(TTOOL_STD_RELEASE)
...@@ -35,17 +35,17 @@ subprojects { ...@@ -35,17 +35,17 @@ subprojects {
} }
test.workingDir "${rootProject.absPath}/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util" test.workingDir "${rootProject.absPath}/oldTest_DoNotUse/util/fr.tpt.ttool.tests.util"
libsDirName = "${rootProject.absPath}/bin" libsDirName = "${rootProject.absPath}/build"
task copyRuntimeLibs(type: Copy) { task copyRuntimeLibs(type: Copy) {
from configurations.runtime from configurations.runtime
from 'runtime' from 'runtime'
into "${rootProject.absPath}/bin" into "${rootProject.absPath}/build"
} }
build.finalizedBy(copyRuntimeLibs) build.finalizedBy(copyRuntimeLibs)
clean.doFirst { clean.doFirst {
delete "${rootProject.absPath}/bin" delete "${rootProject.absPath}/build"
} }
} }
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)GRAPHMINIMIZE$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)GRAPHMINIMIZE$(RESET)]
MANIFEST = $(GRAPHMINIMIZE_DIR)/manifest.txt 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_SRC_DIR = $(GRAPHMINIMIZE_DIR)/src/main/java
LOCAL_BUILD_DIR = $(GRAPHMINIMIZE_DIR)/build/classes/main LOCAL_BUILD_DIR = $(GRAPHMINIMIZE_DIR)/build/classes/main
...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf ...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(GRAPHMINIMIZE_BINARY): compile $(DEPEND) $(GRAPHMINIMIZE_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif endif
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)GRAPHSHOW$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)GRAPHSHOW$(RESET)]
MANIFEST = $(GRAPHSHOW_DIR)/manifest.txt 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_SRC_DIR = $(GRAPHSHOW_DIR)/src/main/java
LOCAL_BUILD_DIR = $(GRAPHSHOW_DIR)/build/classes/main LOCAL_BUILD_DIR = $(GRAPHSHOW_DIR)/build/classes/main
...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf ...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(GRAPHSHOW_BINARY): compile $(DEPEND) $(GRAPHSHOW_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif endif
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
......
...@@ -14,7 +14,7 @@ JARRSRCFLAGS = uf ...@@ -14,7 +14,7 @@ JARRSRCFLAGS = uf
$(JTTOOL_BINARY): compile $(JTTOOL_BINARY): compile
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)LAUNCHER$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)LAUNCHER$(RESET)]
MANIFEST = $(LAUNCHER_DIR)/manifest.txt 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_SRC_DIR = $(LAUNCHER_DIR)/src/main/java
LOCAL_BUILD_DIR = $(LAUNCHER_DIR)/build/classes/main LOCAL_BUILD_DIR = $(LAUNCHER_DIR)/build/classes/main
...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf ...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(LAUNCHER_BINARY): compile $(DEPEND) $(LAUNCHER_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif endif
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)RUNDSE$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)RUNDSE$(RESET)]
MANIFEST = $(RUNDSE_DIR)/manifest.txt 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_SRC_DIR = $(RUNDSE_DIR)/src/main/java
LOCAL_BUILD_DIR = $(RUNDSE_DIR)/build/classes/main LOCAL_BUILD_DIR = $(RUNDSE_DIR)/build/classes/main
...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf ...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(RUNDSE_BINARY): compile $(DEPEND) $(RUNDSE_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif endif
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)REMOTESIMULATOR$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)REMOTESIMULATOR$(RESET)]
MANIFEST = $(REMOTESIMULATOR_DIR)/manifest.txt 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_SRC_DIR = $(REMOTESIMULATOR_DIR)/src/main/java
LOCAL_BUILD_DIR = $(REMOTESIMULATOR_DIR)/build/classes/main LOCAL_BUILD_DIR = $(REMOTESIMULATOR_DIR)/build/classes/main
...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf ...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(REMOTESIMULATOR_BINARY): compile $(DEPEND) $(REMOTESIMULATOR_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif endif
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)TIFTRANSLATOR$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)TIFTRANSLATOR$(RESET)]
MANIFEST = $(TIFTRANSLATOR_DIR)/manifest.txt 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_SRC_DIR = $(TIFTRANSLATOR_DIR)/src/main/java
LOCAL_BUILD_DIR = $(TIFTRANSLATOR_DIR)/build/classes/main LOCAL_BUILD_DIR = $(TIFTRANSLATOR_DIR)/build/classes/main
...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf ...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(TIFTRANSLATOR_BINARY): compile $(DEPEND) $(TIFTRANSLATOR_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif endif
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)TMLTRANSLATOR$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)TMLTRANSLATOR$(RESET)]
MANIFEST = $(TMLTRANSLATOR_DIR)/manifest.txt 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_SRC_DIR = $(TMLTRANSLATOR_DIR)/src/main/java
LOCAL_BUILD_DIR = $(TMLTRANSLATOR_DIR)/build/classes/main LOCAL_BUILD_DIR = $(TMLTRANSLATOR_DIR)/build/classes/main
...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf ...@@ -18,14 +18,14 @@ JARRSRCFLAGS = uf
$(TMLTRANSLATOR_BINARY): compile $(DEPEND) $(TMLTRANSLATOR_BINARY): compile $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif endif
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)TTOOL$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)TTOOL$(RESET)]
MANIFEST = $(TTOOL_DIR)/META-INF/MANIFEST.MF 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_SRC_DIR = $(TTOOL_DIR)/src/main/java
LOCAL_RESOURCES_DIR = $(TTOOL_RESOURCES) LOCAL_RESOURCES_DIR = $(TTOOL_RESOURCES)
...@@ -11,7 +11,7 @@ LOCAL_RUNTIME_DIR = $(TTOOL_DIR)/runtime ...@@ -11,7 +11,7 @@ LOCAL_RUNTIME_DIR = $(TTOOL_DIR)/runtime
LOCAL_JAVA = $(shell cd $(LOCAL_SRC_DIR); find . -name "*.java") LOCAL_JAVA = $(shell cd $(LOCAL_SRC_DIR); find . -name "*.java")
LOCAL_CLASS = $(patsubst %.java,%.class,$(LOCAL_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) CFLAGS = $(GLOBAL_CFLAGS) -sourcepath $(TTOOL_SRC):$(LOCAL_SRC_DIR) -classpath $(TTOOL_CLASSPATH) -d $(LOCAL_BUILD_DIR)
JARFLAGS = cmf JARFLAGS = cmf
...@@ -21,16 +21,16 @@ JARRSRCFLAGS = uf ...@@ -21,16 +21,16 @@ JARRSRCFLAGS = uf
$(TTOOL_BINARY): compile $(LOCAL_RT_DEP) $(DEPEND) $(TTOOL_BINARY): compile $(LOCAL_RT_DEP) $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . 2>/dev/null @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . 2>/dev/null
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
$(TTOOL_BIN)/%: $(LOCAL_RUNTIME_DIR)/% $(TTOOL_BUILD)/%: $(LOCAL_RUNTIME_DIR)/%
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp -r $< $@ @cp -r $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA))
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)WEBCRAWLER-CLIENT$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)WEBCRAWLER-CLIENT$(RESET)]
MANIFEST = $(WEBCRAWLER_CLIENT_DIR)/manifest.txt 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_SRC_DIR = $(WEBCRAWLER_CLIENT_DIR)/src/main/java
LOCAL_BUILD_DIR = $(WEBCRAWLER_CLIENT_DIR)/build/classes/main LOCAL_BUILD_DIR = $(WEBCRAWLER_CLIENT_DIR)/build/classes/main
...@@ -10,7 +10,7 @@ LOCAL_RUNTIME_DIR = $(WEBCRAWLER_CLIENT_DIR)/runtime ...@@ -10,7 +10,7 @@ LOCAL_RUNTIME_DIR = $(WEBCRAWLER_CLIENT_DIR)/runtime
LOCAL_JAVA = $(shell cd $(LOCAL_SRC_DIR); find . -name "*.java") LOCAL_JAVA = $(shell cd $(LOCAL_SRC_DIR); find . -name "*.java")
LOCAL_CLASS = $(patsubst %.java,%.class,$(LOCAL_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) CFLAGS = $(GLOBAL_CFLAGS) -sourcepath $(TTOOL_SRC):$(LOCAL_SRC_DIR) -classpath $(TTOOL_CLASSPATH) -d $(LOCAL_BUILD_DIR)
JARFLAGS = cmf JARFLAGS = cmf
...@@ -20,14 +20,14 @@ JARRSRCFLAGS = uf ...@@ -20,14 +20,14 @@ JARRSRCFLAGS = uf
$(WEBCRAWLER_CLIENT_BINARY): compile $(LOCAL_RT_DEP) $(DEPEND) $(WEBCRAWLER_CLIENT_BINARY): compile $(LOCAL_RT_DEP) $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif endif
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) 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 ...@@ -35,8 +35,8 @@ compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC
@mkdir -p $(LOCAL_BUILD_DIR) @mkdir -p $(LOCAL_BUILD_DIR)
@$(JAVAC) $(CFLAGS) $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) @$(JAVAC) $(CFLAGS) $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA))
$(TTOOL_BIN)/%: $(LOCAL_RUNTIME_DIR)/% $(TTOOL_BUILD)/%: $(LOCAL_RUNTIME_DIR)/%
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp -r $< $@ @cp -r $< $@
clean: clean:
......
...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)WEBCRAWLER-SERVER$(RESET)] ...@@ -2,7 +2,7 @@ PREFIX = [$(COLOR)WEBCRAWLER-SERVER$(RESET)]
MANIFEST = $(WEBCRAWLER_SERVER_DIR)/manifest.txt 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_SRC_DIR = $(WEBCRAWLER_SERVER_DIR)/src/main/java
LOCAL_BUILD_DIR = $(WEBCRAWLER_SERVER_DIR)/build/classes/main LOCAL_BUILD_DIR = $(WEBCRAWLER_SERVER_DIR)/build/classes/main
...@@ -10,7 +10,7 @@ LOCAL_RUNTIME_DIR = $(WEBCRAWLER_SERVER_DIR)/runtime ...@@ -10,7 +10,7 @@ LOCAL_RUNTIME_DIR = $(WEBCRAWLER_SERVER_DIR)/runtime
LOCAL_JAVA = $(shell cd $(LOCAL_SRC_DIR); find . -name "*.java") LOCAL_JAVA = $(shell cd $(LOCAL_SRC_DIR); find . -name "*.java")
LOCAL_CLASS = $(patsubst %.java,%.class,$(LOCAL_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) CFLAGS = $(GLOBAL_CFLAGS) -sourcepath $(TTOOL_SRC):$(LOCAL_SRC_DIR) -classpath $(TTOOL_CLASSPATH) -d $(LOCAL_BUILD_DIR)
JARFLAGS = cmf JARFLAGS = cmf
...@@ -20,14 +20,14 @@ JARRSRCFLAGS = uf ...@@ -20,14 +20,14 @@ JARRSRCFLAGS = uf
$(WEBCRAWLER_SERVER_BINARY): compile $(LOCAL_RT_DEP) $(DEPEND) $(WEBCRAWLER_SERVER_BINARY): compile $(LOCAL_RT_DEP) $(DEPEND)
@echo "$(PREFIX) Archiving" @echo "$(PREFIX) Archiving"
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) . @$(JAR) $(JARFLAGS) $(MANIFEST) $@ -C $(LOCAL_BUILD_DIR) .
ifneq ($(strip $(LOCAL_RESOURCES_DIR)),) ifneq ($(strip $(LOCAL_RESOURCES_DIR)),)
@$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) . @$(JAR) $(JARRSRCFLAGS) $@ -C $(LOCAL_RESOURCES_DIR) .
endif endif
$(TTOOL_BIN)/%.jar: $(TTOOL_LIBS)/%.jar $(TTOOL_BUILD)/%.jar: $(TTOOL_LIBS)/%.jar
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp $< $@ @cp $< $@
compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC)/%,$(GLOBAL_JAVA)) 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 ...@@ -35,8 +35,8 @@ compile: $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) $(patsubst %,$(TTOOL_SRC
@mkdir -p $(LOCAL_BUILD_DIR) @mkdir -p $(LOCAL_BUILD_DIR)
@$(JAVAC) $(CFLAGS) $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA)) @$(JAVAC) $(CFLAGS) $(patsubst %,$(LOCAL_SRC_DIR)/%,$(LOCAL_JAVA))
$(TTOOL_BIN)/%: $(LOCAL_RUNTIME_DIR)/% $(TTOOL_BUILD)/%: $(LOCAL_RUNTIME_DIR)/%
@mkdir -p $(TTOOL_BIN) @mkdir -p $(TTOOL_BUILD)
@cp -r $< $@ @cp -r $< $@
clean: clean:
......
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