Skip to content

Commit 18d4c67

Browse files
committedNov 6, 2021
Use custom quickjs repo
1 parent 99fcb18 commit 18d4c67

File tree

8 files changed

+5
-50
lines changed

8 files changed

+5
-50
lines changed
 

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "quickjs/quickjs"]
22
path = quickjs/quickjs
3-
url = https://github.com/bellard/quickjs.git
3+
url = https://github.com/seven332/quickjs.git

‎android-test/build.gradle

+1-25
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import java.util.regex.Pattern
1817
import java.util.zip.CRC32
19-
import org.ajoberstar.grgit.Grgit
2018

2119
apply plugin: 'com.android.application'
2220
apply plugin: 'kotlin-android'
@@ -75,35 +73,13 @@ android {
7573
}
7674
}
7775

78-
void cloneTest262(String name, String dirname) {
79-
println("Start cloning $name")
80-
def text = new File("${rootProject.projectDir}/quickjs/quickjs/TODO").readLines().join(" ")
81-
def pattern = Pattern.compile("$name commit: ([0-9a-f]+)")
82-
def matcher = pattern.matcher(text)
83-
matcher.find()
84-
def commit = matcher.group(1)
85-
def dir = "$buildDir/test262/$dirname"
86-
def grgit
87-
try {
88-
grgit = Grgit.open(dir: dir)
89-
} catch (ignored) {
90-
delete(dir)
91-
grgit = Grgit.clone(dir: dir, uri: 'https://github.com/tc39/test262.git')
92-
}
93-
grgit.checkout(branch: commit)
94-
println("End cloning $name")
95-
}
96-
9776
task bundleTestAssets(type: Zip) {
9877
doFirst {
9978
delete "${projectDir}/testassets"
10079
file("${projectDir}/testassets").mkdirs()
101-
102-
cloneTest262("Test262o", "test262o")
103-
cloneTest262("Test262", "test262")
10480
}
10581

106-
from "${rootProject.projectDir}/quickjs/quickjs", "$buildDir/test262"
82+
from "${rootProject.projectDir}/quickjs/quickjs"
10783
exclude '**/*.c', '**/*.h'
10884
archiveName "testassets.zip"
10985
destinationDir file("${projectDir}/testassets")

‎build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ buildscript {
2626
classpath 'com.android.tools.build:gradle:7.0.3'
2727
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2828
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
29-
classpath 'org.ajoberstar.grgit:grgit-gradle:4.1.0'
3029
}
3130
}
3231

‎library/src/main/c/quickjs-jni.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <jni.h>
2-
#include <quickjs-patch.h>
2+
#include <quickjs.h>
33
#include <string.h>
44
#include <malloc.h>
55

‎quickjs/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ endif()
1717
set(COMMON_FLAGS -D_GNU_SOURCE -DCONFIG_VERSION=\"${CONFIG_VERSION}\" -DCONFIG_CC=\"${CONFIG_CC}\" -DCONFIG_PREFIX=\"/usr/local\" -DCONFIG_BIGNUM)
1818

1919
set(QUICKJS_LIB_SOURCES
20-
quickjs-patch.c
20+
quickjs/quickjs.c
2121
quickjs/libregexp.c
2222
quickjs/libunicode.c
2323
quickjs/libbf.c

‎quickjs/quickjs

‎quickjs/quickjs-patch.c

-12
This file was deleted.

‎quickjs/quickjs-patch.h

-8
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.