diff options
| author | Jose <jose@zeroc.com> | 2016-09-21 22:43:50 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-21 22:43:50 +0200 |
| commit | 9b77bb6f45b6c1172c9740f05ac63c0e62954bad (patch) | |
| tree | e57a524454d9956811235b8a6cfd1304216a2f42 /java | |
| parent | Fix ICE-7257 (diff) | |
| download | ice-9b77bb6f45b6c1172c9740f05ac63c0e62954bad.tar.bz2 ice-9b77bb6f45b6c1172c9740f05ac63c0e62954bad.tar.xz ice-9b77bb6f45b6c1172c9740f05ac63c0e62954bad.zip | |
Use GRADLEOPTS in Java Makefiles
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile | 27 | ||||
| -rw-r--r-- | java/Makefile.mak | 30 |
2 files changed, 40 insertions, 17 deletions
diff --git a/java/Makefile b/java/Makefile index 5ec69f9d894..28ecb3293e9 100644 --- a/java/Makefile +++ b/java/Makefile @@ -7,29 +7,40 @@ # # ********************************************************************** +ifeq ($(GRADLE),) +GRADLE = ./gradlew +endif + ifneq ($(prefix),) -INSTALL_FLAGS += -Pprefix=$(prefix) + GRADLEOPTS += -Pprefix=$(prefix) endif ifneq ($(DESTDIR),) -INSTALL_FLAGS += -PDESTDIR=$(DESTDIR) + GRADLEOPTS += -PDESTDIR=$(DESTDIR) endif -ifeq ($(GRADLE),) -GRADLE = ./gradlew +ifneq ($(install_javadir),) + GRADLEOPTS += -Dorg.gradle.project.jarDir=$(install_javadir) +endif + +ifneq ($(install_bindir),) + GRADLEOPTS += -Dorg.gradle.project.binDir=$(install_bindir) endif all: - $(GRADLE) $(BUILD_FLAGS) build + $(GRADLE) $(GRADLEOPTS) build + +tests: + $(GRADLE) $(GRADLEOPTS) :test:assemble dist: - $(GRADLE) $(BUILD_FLAGS) dist + $(GRADLE) $(GRADLEOPTS) dist clean: - $(GRADLE) clean + $(GRADLE) $(GRADLEOPTS) clean install:: - $(GRADLE) $(INSTALL_FLAGS) install + $(GRADLE) $(GRADLEOPTS) install test:: @python ./allTests.py diff --git a/java/Makefile.mak b/java/Makefile.mak index af425eeafe0..7c0f66fcfe2 100644 --- a/java/Makefile.mak +++ b/java/Makefile.mak @@ -11,22 +11,34 @@ GRADLE = gradlew.bat !endif +!if "$(GRADLE)" == "" +GRADLE = ./gradlew +!endif + +!if "$(prefix)" != "" + GRADLEOPTS += -Pprefix=$(prefix) +!endif + +!if "$(install_javadir)" != "" + GRADLEOPTS += -Dorg.gradle.project.jarDir=$(install_javadir) +!endif + +!if "$(install_bindir)" != "" + GRADLEOPTS += -Dorg.gradle.project.binDir=$(install_bindir) +!endif + + all: - $(GRADLE) build + $(GRADLE) $(GRADLEOPTS) build dist: - $(GRADLE) :Ice:assemble :Freeze:assemble :Glacier2:assemble :IceGrid:assemble :ant:assemble \ - :IceBox:assemble :IceDiscovery:assemble :IcePatch2:assemble :IceStorm:assemble :IceGridGUI:assemble + $(GRADLE) $(GRADLEOPTS) dist clean: - $(GRADLE) clean + $(GRADLE) $(GRADLEOPTS) clean install:: -!if "$(PREFIX)" != "" - $(GRADLE) -Dorg.gradle.project.prefix="$(PREFIX)" install -!else - $(GRADLE) install -!endif + $(GRADLE) $(GRADLEOPTS) install test: @python .\allTests.py |