summaryrefslogtreecommitdiff
path: root/app/build.gradle
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-02-14 11:48:37 +0100
committerParménides GV <parmegv@sdf.org>2015-02-14 11:48:37 +0100
commitc198dbd9dd583d980ae7e70118f67d09bed8de55 (patch)
treec2863f28134af00f26299c97bb6a81ed0aa4ed96 /app/build.gradle
parent9d346be65e6808710b9e814d2899e5888984b4ab (diff)
parent4028c100a59c45913cb569c4967faaddc090b1f9 (diff)
Merge branch 'develop'0.9.2
Diffstat (limited to 'app/build.gradle')
-rw-r--r--app/build.gradle28
1 files changed, 13 insertions, 15 deletions
diff --git a/app/build.gradle b/app/build.gradle
index b5c50fa4..4d3c5b9c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,7 +53,7 @@ def processFileInplace(file, Closure processText) {
}
-task checkoutStrippedIcsOpenVPN ( type: Copy ) << {
+task checkoutStrippedIcsOpenVPN ( type: Copy ) {
println "checkoutStrippedIcsOpenVPN"
//FIXME Checkout ics-openvpn-stripped from branch "ics-openvpn-upstream"
//grgit = Grgit.open(project.file('../'))
@@ -62,11 +62,11 @@ task checkoutStrippedIcsOpenVPN ( type: Copy ) << {
into '../ics-openvpn-stripped'
}
-task copyIcsOpenVPNClasses( type: Copy ) << {
+task copyIcsOpenVPNClasses( type: Copy ) {
println "copyIcsOpenVPNClasses"
from ('../ics-openvpn-stripped/main/') {
include '**/*.java'
- include '**/*.aidl'
+
includeEmptyDirs = false
filter {
@@ -78,13 +78,10 @@ task copyIcsOpenVPNClasses( type: Copy ) << {
filter {
line -> line.replace('package de.blinkt.openvpn;', 'package de.blinkt.openvpn;\n\nimport se.leap.bitmaskclient.R;')
}
- filter {
- line -> line.replace('package de.blinkt.openvpn.fragments;', 'package de.blinkt.openvpn.fragments;\n\nimport se.leap.bitmaskclient.R;')
- }
} into '.'
}
-task copyIcsOpenVPNXml( type: Copy ) << {
+task copyIcsOpenVPNXml( type: Copy ) {
println "copyIcsOpenVPNXml"
from ('../ics-openvpn-stripped/main/') {
include '**/strings.xml'
@@ -105,7 +102,7 @@ task copyIcsOpenVPNXml( type: Copy ) << {
} into '.'
}
-task copyIcsOpenVPNImages( type: Copy ) << {
+task copyIcsOpenVPNImages( type: Copy ) {
println "copyIcsOpenVPNImages"
from ('../ics-openvpn-stripped/main/') {
include '**/ic_filter*.png'
@@ -113,12 +110,13 @@ task copyIcsOpenVPNImages( type: Copy ) << {
include '**/ic_share*.png'
include '**/ic_close*.png'
include '**/ic_edit*.png'
+ include '**/ic_check*.png'
includeEmptyDirs = false
} into '.'
}
-task copyIcsOpenVPNFiles( type: Copy, dependsOn: 'checkoutStrippedIcsOpenVPN' ) << {
+task copyIcsOpenVPNFiles( type: Copy, dependsOn: 'checkoutStrippedIcsOpenVPN' ) {
println "copyIcsOpenVPNFiles"
copyIcsOpenVPNClasses.execute()
copyIcsOpenVPNXml.execute()
@@ -126,9 +124,9 @@ task copyIcsOpenVPNFiles( type: Copy, dependsOn: 'checkoutStrippedIcsOpenVPN' )
}
// thanks to http://pleac.sourceforge.net/pleac_groovy/fileaccess.html
-task removeDuplicatedStrings( dependsOn: 'copyIcsOpenVPNFiles' ) << {
+task removeDuplicatedStrings( dependsOn: 'copyIcsOpenVPNFiles' ) {
println "removeDuplicatedStrings"
- new File('app').eachFileRecurse {
+ new File('.').eachFileRecurse {
if(it.name.equals('strings.xml')) {
def ics_openvpn_file = file(it.absolutePath.replace('strings.xml', 'strings-icsopenvpn.xml'))
if(ics_openvpn_file.exists()) {
@@ -145,7 +143,7 @@ task removeDuplicatedStrings( dependsOn: 'copyIcsOpenVPNFiles' ) << {
}
}
-task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') << {
+task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') {
println "mergeUntranslatable"
from ('../ics-openvpn-stripped/main/') {
include '**/untranslatable.xml'
@@ -178,8 +176,8 @@ task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') << {
delete ics_openvpn_untranslatable
}
-task updateIcsOpenVpn( type: Copy, dependsOn: 'mergeUntranslatable') << {
- from('../ics-openvpn-stripped/main/src/') {
+task updateIcsOpenVpn( type: Copy, dependsOn: 'mergeUntranslatable') {
+ from('../ics-openvpn-stripped/') {
include 'openvpn/**/*'
include 'openssl/**/*'
include 'lzo/**/**'
@@ -196,4 +194,4 @@ task buildNative ( type: Exec ) {
commandLine 'sh', 'misc/build-native.sh', 'USE_BREAKPAD=0', '-j 8'
}
-preBuild.dependsOn buildNative \ No newline at end of file
+preBuild.dependsOn buildNative