From f72e4f4dc28d48345cdd0699d75775a0162b3ae4 Mon Sep 17 00:00:00 2001 From: Ghaz Triki Date: Thu, 24 Mar 2016 19:58:27 +0100 Subject: [PATCH 1/2] Compile the flex4 client using GradleFx --- clients/flash/build.gradle | 15 +++++++++++++++ clients/flash/common-library/build.gradle | 14 ++++++++++++++ clients/flash/settings.gradle | 1 + clients/flash/web-client/build.gradle | 16 ++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 clients/flash/build.gradle create mode 100644 clients/flash/common-library/build.gradle create mode 100644 clients/flash/settings.gradle create mode 100644 clients/flash/web-client/build.gradle diff --git a/clients/flash/build.gradle b/clients/flash/build.gradle new file mode 100644 index 000000000000..0aa1e0baa4eb --- /dev/null +++ b/clients/flash/build.gradle @@ -0,0 +1,15 @@ +buildscript { + repositories { + mavenLocal() + mavenCentral() + } + dependencies { + classpath group: 'org.gradlefx', name: 'gradlefx', version: '1.3.3' + } +} + +subprojects { + apply plugin: 'gradlefx' + + version = '0.1-SNAPSHOT' +} diff --git a/clients/flash/common-library/build.gradle b/clients/flash/common-library/build.gradle new file mode 100644 index 000000000000..16cc4e282b99 --- /dev/null +++ b/clients/flash/common-library/build.gradle @@ -0,0 +1,14 @@ +type = 'swc' + +srcDirs = ['/src'] + +additionalCompilerOptions = [ + "-target-player=11.2" +] + +dependencies { + merged files("libs/as3-signals-utilities-async-v0.9-BETA.swc") + merged files("libs/as3-signals-v0.9-BETA.swc") + merged files("libs/robotlegs-extensions-SignalCommandMap-v1.0.0b1.swc") + merged files("libs/robotlegs-framework-v2.0.0.swc") +} diff --git a/clients/flash/settings.gradle b/clients/flash/settings.gradle new file mode 100644 index 000000000000..d96334c678fe --- /dev/null +++ b/clients/flash/settings.gradle @@ -0,0 +1 @@ +include 'common-library', 'web-client' diff --git a/clients/flash/web-client/build.gradle b/clients/flash/web-client/build.gradle new file mode 100644 index 000000000000..ae20da3a30f6 --- /dev/null +++ b/clients/flash/web-client/build.gradle @@ -0,0 +1,16 @@ +type = 'swf' + +srcDirs = ['/src'] + +additionalCompilerOptions = [ + "-target-player=11.2" +] + +dependencies { + merged project(':common-library') + merged files("libs/as3-signals-utilities-async-v0.9-BETA.swc") + merged files("libs/as3-signals-v0.9-BETA.swc") + merged files("libs/localelib.swc") + merged files("libs/robotlegs-extensions-SignalCommandMap-v1.0.0b1.swc") + merged files("libs/robotlegs-framework-v2.0.0.swc") +} From 4905b188be0f632a0d03e61e2cfbd644d240d07b Mon Sep 17 00:00:00 2001 From: Ghaz Triki Date: Thu, 24 Mar 2016 20:00:52 +0100 Subject: [PATCH 2/2] Updated .gitignore by adding the Flex 4 client generated GradleFx directories. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 581eaa4b777f..2612523feed7 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ akka-bbb-apps/akka-bbb-apps*.log bigbluebutton-html5/log/development.log bigbluebutton-web/target-eclipse* record-and-playback/.loadpath +clients/flash/**/build +clients/flash/**/.gradle