diff options
| author | Jose <jose@zeroc.com> | 2016-09-23 18:23:58 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-23 18:23:58 +0200 |
| commit | 06780cb330799ef177cad7bba58b11276c8f533f (patch) | |
| tree | e74033a20d4c36d21b90802452257890494db2a3 /java | |
| parent | JAR install fixes (diff) | |
| download | ice-06780cb330799ef177cad7bba58b11276c8f533f.tar.bz2 ice-06780cb330799ef177cad7bba58b11276c8f533f.tar.xz ice-06780cb330799ef177cad7bba58b11276c8f533f.zip | |
Windows Java build fixes
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.mak | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/java/Makefile.mak b/java/Makefile.mak index 7c0f66fcfe2..508ea3f3c04 100644 --- a/java/Makefile.mak +++ b/java/Makefile.mak @@ -15,19 +15,10 @@ GRADLE = gradlew.bat GRADLE = ./gradlew !endif -!if "$(prefix)" != "" - GRADLEOPTS += -Pprefix=$(prefix) +!if "$(PREFIX)" != "" +GRADLEOPTS = $(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) $(GRADLEOPTS) build @@ -35,10 +26,13 @@ dist: $(GRADLE) $(GRADLEOPTS) dist clean: - $(GRADLE) $(GRADLEOPTS) clean + $(GRADLE) $(GRADLEOPTS) clean + +tests: + $(GRADLE) $(GRADLEOPTS) :test:assemble install:: - $(GRADLE) $(GRADLEOPTS) install + $(GRADLE) $(GRADLEOPTS) install test: @python .\allTests.py |