Skip to content

Commit 241ae1c

Browse files
committed
fixed up gradle files to work with multiple jar pats instead of jar dir
1 parent 4153ee3 commit 241ae1c

File tree

3 files changed

+24
-19
lines changed

3 files changed

+24
-19
lines changed

build/project-template-gradle/build-tools/android-static-binding-generator/ast-parser/traverse_files.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if(arguments.length == 3) {
2828
return;
2929
}
3030
if(arguments.length == 4) {
31-
console.log('you can pass an out file name as a parameter! e.g. "node traverse_files.js [interface-names.txt] [dir_to_traverse] [out_dir_name]"');
31+
// console.log('you can pass an out file name as a parameter! e.g. "node traverse_files.js [interface-names.txt] [dir_to_traverse] [out_dir_name]"');
3232
outFile = 'bindings.txt';
3333
}
3434
else {
@@ -72,7 +72,7 @@ function traverseFolder(inputFolder){
7272
//TODO: think how to fix circular reference problem
7373
if(currentFileName.indexOf('easysax.js') == -1) { //exception because of maximum call stack exceeded (circular reference)
7474
filesToTraverse.push(currentFileName);
75-
console.log(currentFileName);
75+
// console.log(currentFileName);
7676
}
7777
}
7878
})
@@ -155,7 +155,7 @@ function checkPattern(node, fullFilename){
155155
className += customClassNameSeparator + customExtendClassName;
156156

157157
if(!nameContainsInvalidSymbols(customExtendClassName)) {
158-
console.log(className);
158+
// console.log(className);
159159
var lineToWrite = className + ' ' + overridenMethods.join();
160160
appendToFile(lineToWrite);
161161
return;
@@ -173,7 +173,7 @@ function checkPattern(node, fullFilename){
173173

174174
if(!nameContainsInvalidSymbols(customExtendClassName)) {// && className.indexOf('com.tns.tests') == -1) { //binding generator takes care of this
175175
var lineToWrite = className + ' ' + overridenMethods.join();
176-
console.log(className);
176+
// console.log(className);
177177
appendToFile(lineToWrite);
178178
return;
179179
}
@@ -231,7 +231,7 @@ function checkPattern(node, fullFilename){
231231
if(!nameContainsInvalidSymbols(customExtendClassName)) {
232232
if(customExtendClassName) {
233233
var lineToWrite = className + ' ' + overridenMethods.join();
234-
console.log(className);
234+
// console.log(className);
235235
appendToFile(lineToWrite);
236236
return;
237237
}

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ task generateInterfaceNamesList(type: JavaExec) {
5959

6060
main "-jar"
6161

62-
def sourceJarsDir = isJarsDirPassed ? jarsDir : defaultJarsDir
62+
jarsDir = jarsDir.toString().replaceAll(/[\[\]]/, "").split(", ")
63+
6364
def str = new LinkedList <String> ();
6465
str.add("${interfaceNameGeneratorDir}/build/libs/interface-name-generator.jar")
65-
str.add(sourceJarsDir)
66+
str.addAll(jarsDir)
6667

6768
args str.toArray()
6869
}
@@ -106,17 +107,19 @@ task generateBindings(type: JavaExec) {
106107
main "-jar"
107108

108109
def str = new LinkedList <String> ();
109-
str.add("binding-generator.jar")
110110

111-
//jar folder to run through
112-
str.add(jarsDir) //fix hardcoded path (will be passed as project parameter)
111+
str.add("binding-generator.jar")
113112

114113
//generated bindings names
115114
str.add(pathToBindingsFile)
116115

117116
//out dir (optional)
118117
str.add("$rootDir/${outDir}")
119118

119+
//jar folder to run through
120+
str.addAll(jarsDir) //fix hardcoded path (will be passed as project parameter)
121+
122+
120123
args str.toArray()
121124
}
122125

build/project-template-gradle/build.gradle

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -415,16 +415,18 @@ task deleteExplodedAarFolder (type: Delete) {
415415
////////////////////////////////////////////////////////////////////////////////////
416416

417417
task runBindingGenerator (type: Exec) {
418-
String jarsDir = "-PjarsDir=$rootDir/metadata/libs" //re-make to use intermediates folder
419-
String jsCodeToParse = "-PjsCodeDir=$rootDir/src/main/assets/app"
420-
String outDir = "-PoutDir=../../src/main/java"
418+
doFirst {
419+
String jarsDir = "-PjarsDir=" + allJarPaths
420+
String jsCodeToParse = "-PjsCodeDir=$rootDir/src/main/assets/app"
421+
String outDir = "-PoutDir=../../src/main/java"
421422

422-
workingDir "$rootDir/build-tools/android-static-binding-generator"
423-
if(isWinOs) {
424-
commandLine "cmd", "/c", "gradlew", "generatebindings", jarsDir, jsCodeToParse, outDir
425-
}
426-
else {
427-
commandLine "gradlew", "generatebindings", jarsDir, jsCodeToParse, outDir
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+
}
428430
}
429431
}
430432

0 commit comments

Comments
 (0)