From d42ef2223dae15778921a7a87cd8615b4deb5a94 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Mon, 4 Jan 2021 08:34:09 -0500
Subject: [PATCH] Build: Add i2pcontrol and imagegen to gradle build
---
apps/i2pcontrol/build.gradle | 22 ++++++++++++++++++++++
apps/imagegen/build.gradle | 25 +++++++++++++++++++++++++
settings.gradle | 5 ++---
3 files changed, 49 insertions(+), 3 deletions(-)
create mode 100644 apps/i2pcontrol/build.gradle
create mode 100644 apps/imagegen/build.gradle
diff --git a/apps/i2pcontrol/build.gradle b/apps/i2pcontrol/build.gradle
new file mode 100644
index 0000000000..a8c1173e3f
--- /dev/null
+++ b/apps/i2pcontrol/build.gradle
@@ -0,0 +1,22 @@
+plugins {
+ id 'war'
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'java'
+ }
+ }
+}
+
+dependencies {
+ providedCompile project(':router')
+ providedCompile project(':apps:jetty')
+ providedCompile files('../../installer/lib/wrapper/all/wrapper.jar')
+}
+
+war {
+ archiveName 'jsonrpc.war'
+ webXml = file('web.xml')
+}
diff --git a/apps/imagegen/build.gradle b/apps/imagegen/build.gradle
new file mode 100644
index 0000000000..8ee45832a6
--- /dev/null
+++ b/apps/imagegen/build.gradle
@@ -0,0 +1,25 @@
+plugins {
+ id 'war'
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'identicon/core/src/main/java'
+ srcDir 'imagegen/webapp/src/main/java'
+ srcDir 'zxing/core/src/main/java'
+ srcDir 'zxing/javase/src/main/java'
+ }
+ }
+}
+
+dependencies {
+ compile project(':core')
+ providedCompile project(':apps:jetty')
+}
+
+war {
+ from 'imagegen/webapp/src/main/webapp/imagegen.css'
+ from 'imagegen/webapp/src/main/webapp/index.html'
+ webXml = file('imagegen/webapp/src/main/webapp/WEB-INF/web.xml')
+}
diff --git a/settings.gradle b/settings.gradle
index 1a12aa7001..281bf7e324 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,9 +12,8 @@ include 'apps:jrobin'
include 'apps:addressbook'
include 'apps:susidns'
include 'apps:susimail'
+include 'apps:i2pcontrol'
+include 'apps:imagegen'
include 'core'
include 'installer'
include 'router'
-// TODO
-//include 'apps:i2pcontrol'
-//include 'apps:imagegen'
--
GitLab