Skip to content

Commit ac0dc1d

Browse files
Plamen5kovPlamen5kov
committed
removed unnecessary logging and added gradle properties and settings
1 parent 3530bc0 commit ac0dc1d

File tree

4 files changed

+73
-67
lines changed

4 files changed

+73
-67
lines changed

‎build/project-template-gradle/build-tools/android-static-binding-generator/build.gradle‎

Lines changed: 58 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
* to run:
55
* gradle generatebindings -PjsCodeDir=[js_code_dir] -PjarsDir=[jars_dir] -PoutDir=[out_dir]
66
*/
7-
def distDir = "$rootDir/dist"
8-
def interfaceNameGeneratorDir = "$rootDir/interface-name-generator"
7+
def rDir = "$rootDir/build-tools/android-static-binding-generator/"
8+
def distDir = "$rDir/dist"
9+
def interfaceNameGeneratorDir = "$rDir/interface-name-generator"
910
def interfaceNameGeneratorLibsDir = "${interfaceNameGeneratorDir}/build/libs"
10-
def bindingGeneratorDir = "$rootDir/binding-generator"
11+
def bindingGeneratorDir = "$rDir/binding-generator"
1112
def bindingGeneratorLibsDir = "${bindingGeneratorDir}/build/libs"
12-
def astParserDir = "$rootDir/ast-parser"
13-
def defaultJarsDir = "$rootDir/jars"
13+
def astParserDir = "$rDir/ast-parser"
14+
def defaultJarsDir = "$rDir/jars"
15+
def jarsPath = ""
1416

1517
def pathToBindingsFile = "${astParserDir}/bindings.txt" //this file is generated by ast-parser
1618

@@ -20,16 +22,16 @@ def isJsCodePathPassed = project.hasProperty("jsCodeDir")
2022
def isJarsDirPassed = project.hasProperty("jarsDir")
2123
def isOutDirPassed = project.hasProperty("outDir")
2224

23-
if(!isJsCodePathPassed) {
24-
throw new GradleException("\n\t<< ERROR >>: Please pass 'jsCodeDir' property. Static binding generator needs to know where is the javascript code you want to generate bindings for. \n\t<<Example>>: -PjsCodeDir=[path_to_js_code_dir]\n")
25-
}
26-
if(!isJarsDirPassed) {
27-
throw new GradleException("\n\t<< ERROR >>: Please pass 'jarsDir' property. The static binding generator needs to know where are the jars you will use for your project, in order to generate bindings for them. Please specify a path to those jars. \n\t<<Example>>: -PjarsDir=[path_to_jars_dir]\n")
28-
}
25+
// if(!isJsCodePathPassed) {
26+
// throw new GradleException("\n\t<< ERROR >>: Please pass 'jsCodeDir' property. Static binding generator needs to know where is the javascript code you want to generate bindings for. \n\t<<Example>>: -PjsCodeDir=[path_to_js_code_dir]\n")
27+
// }
28+
// if(!isJarsDirPassed) {
29+
// throw new GradleException("\n\t<< ERROR >>: Please pass 'jarsDir' property. The static binding generator needs to know where are the jars you will use for your project, in order to generate bindings for them. Please specify a path to those jars. \n\t<<Example>>: -PjarsDir=[path_to_jars_dir]\n")
30+
// }
2931

30-
if(!isOutDirPassed) {
31-
throw new GradleException("\n\t<< ERROR >>: Please pass 'outDir' property. Static binding generator needs to know where do you want to put the bindings that will be generated. Please provide an out directory or specify one that will be created if missing. \n\t<<Example>>: -PoutDir=[path_to_output_dir]\n")
32-
}
32+
// if(!isOutDirPassed) {
33+
// throw new GradleException("\n\t<< ERROR >>: Please pass 'outDir' property. Static binding generator needs to know where do you want to put the bindings that will be generated. Please provide an out directory or specify one that will be created if missing. \n\t<<Example>>: -PoutDir=[path_to_output_dir]\n")
34+
// }
3335

3436
task cleanDist (type: Delete) {
3537
delete distDir
@@ -43,29 +45,33 @@ task mkDirDist {
4345
distFolder.mkdirs()
4446
}
4547

46-
task buildInterfaceGenerator (type: Exec) {
47-
workingDir interfaceNameGeneratorDir
48+
// task buildInterfaceGenerator (dependsOn: "ing:jar")
49+
// {
50+
// dependsOn "ing:jar"
51+
// workingDir interfaceNameGeneratorDir
4852

49-
if(isWinOs) {
50-
commandLine "cmd", "/c", "gradle", "jar"
51-
}
52-
else {
53-
commandLine "gradle", "jar"
54-
}
55-
}
53+
// if(isWinOs) {
54+
// commandLine "cmd", "/c", "gradle", "jar"
55+
// }
56+
// else {
57+
// commandLine "gradle", "jar"
58+
// }
59+
// }
5660

5761
task generateInterfaceNamesList(type: JavaExec) {
58-
workingDir interfaceNameGeneratorLibsDir
59-
60-
main "-jar"
61-
62-
jarsDir = jarsDir.toString().replaceAll(/[\[\]]/, "").split(", ")
63-
64-
def str = new LinkedList <String> ();
65-
str.add("${interfaceNameGeneratorDir}/build/libs/interface-name-generator.jar")
66-
str.addAll(jarsDir)
67-
68-
args str.toArray()
62+
doFirst {
63+
workingDir interfaceNameGeneratorLibsDir
64+
65+
main "-jar"
66+
67+
jarsPath = rootProject.jarsDir.toString().replaceAll(/[\[\]]/, "").split(", ")
68+
69+
def str = new LinkedList <String> ();
70+
str.add("${interfaceNameGeneratorDir}/build/libs/ing.jar")
71+
str.addAll(jarsPath)
72+
73+
args str.toArray()
74+
}
6975
}
7076

7177
task runNpmInstallForAstParser (type: Exec) {
@@ -90,51 +96,53 @@ task runAstParser (type: Exec) {
9096
}
9197
}
9298

93-
task buildBindingGenerator (type: Exec) {
94-
workingDir bindingGeneratorDir
99+
// task buildBindingGenerator (type: Exec) {
100+
// workingDir bindingGeneratorDir
95101

96-
if(isWinOs) {
97-
commandLine "cmd", "/c", "gradle", "jar"
98-
}
99-
else {
100-
commandLine "gradle", "jar"
101-
}
102-
}
102+
// if(isWinOs) {
103+
// commandLine "cmd", "/c", "gradle", "jar"
104+
// }
105+
// else {
106+
// commandLine "gradle", "jar"
107+
// }
108+
// }
103109

104110
task generateBindings(type: JavaExec) {
111+
doFirst {
105112
workingDir bindingGeneratorLibsDir
106113

107114
main "-jar"
108115

109116
def str = new LinkedList <String> ();
110117

111-
str.add("binding-generator.jar")
118+
str.add("bg.jar")
112119

113120
//generated bindings names
114121
str.add(pathToBindingsFile)
115122

116123
//out dir (optional)
117-
str.add("$rootDir/${outDir}")
124+
str.add("$rDir/${outDir}")
118125

119126
//jar folder to run through
120-
str.addAll(jarsDir) //fix hardcoded path (will be passed as project parameter)
127+
str.addAll(jarsPath) //fix hardcoded path (will be passed as project parameter)
121128

122129

123130
args str.toArray()
131+
}
124132
}
125133

126134
mkDirDist.dependsOn(cleanDist)
127135

128136
// run interface names generator
129-
buildInterfaceGenerator.dependsOn(mkDirDist)
130-
generateInterfaceNamesList.dependsOn(buildInterfaceGenerator)
137+
// buildInterfaceGenerator.dependsOn(mkDirDist)
138+
generateInterfaceNamesList.dependsOn(mkDirDist)
131139

132140
//run ast parser
133141
runNpmInstallForAstParser.dependsOn(generateInterfaceNamesList)
134142
runAstParser.dependsOn(runNpmInstallForAstParser)
135143

136-
buildBindingGenerator.dependsOn(runAstParser)
137-
generateBindings.dependsOn(buildBindingGenerator)
144+
// buildBindingGenerator.dependsOn(runAstParser)
145+
generateBindings.dependsOn(runAstParser)
138146

139147
task generatebindings {
140148
dependsOn generateBindings

‎build/project-template-gradle/build.gradle‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ android {
132132
def mergeAssetsTask = variant.mergeAssets
133133
if(project.hasProperty("runSBGenerator")) {
134134
runBindingGenerator.dependsOn(copyMetadata)
135-
mergeAssetsTask.dependsOn(runBindingGenerator)
135+
rbg.dependsOn(runBindingGenerator)
136+
mergeAssetsTask.dependsOn(rbg)
136137
}
137138
else {
138139
mergeAssetsTask.dependsOn(copyMetadata)
@@ -413,22 +414,12 @@ task deleteExplodedAarFolder (type: Delete) {
413414
////////////////////////////////////////////////////////////////////////////////////
414415
////////////////////////////// OPTIONAL TASKS //////////////////////////////////////
415416
////////////////////////////////////////////////////////////////////////////////////
416-
417-
task runBindingGenerator (type: Exec) {
418-
doFirst {
419-
String jarsDir = "-PjarsDir=" + allJarPaths
420-
String jsCodeToParse = "-PjsCodeDir=$rootDir/src/main/assets/app"
421-
String outDir = "-PoutDir=../../src/main/java"
422-
423-
workingDir "$rootDir/build-tools/android-static-binding-generator"
424-
if(isWinOs) {
425-
commandLine "cmd", "/c", "gradle", "generatebindings", jsCodeToParse, outDir, jarsDir
426-
}
427-
else {
428-
commandLine "gradle", "generatebindings", jsCodeToParse, outDir, jarsDir
429-
}
430-
}
417+
task runBindingGenerator(dependsOn: "ing:jar") {
418+
rootProject.jarsDir = allJarPaths
431419
}
420+
runBindingGenerator.dependsOn("bg:jar")
421+
422+
task rbg (dependsOn: "asbg:generatebindings")
432423

433424

434425
////////////////////////////////////////////////////////////////////////////////////

‎build/project-template-gradle/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
jsCodeDir="../../../src/main/assets/app"
2+
outDir="../../src/main/java"
3+
jarsDir=""

‎build/project-template-gradle/settings.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
rootProject.name = "__PROJECT_NAME__"
1+
rootProject.name = "__PROJECT_NAME__"
2+
include "asbg", "ing", "bg"
3+
project(":asbg").projectDir = file("build-tools/android-static-binding-generator")
4+
project(":ing").projectDir = file("build-tools/android-static-binding-generator/interface-name-generator")
5+
project(":bg").projectDir = file("build-tools/android-static-binding-generator/binding-generator")

0 commit comments

Comments
 (0)