Merge pull request #1057 from NativeScript/tachev/fix-local-xxd-path

Dimitar Tachev · web-flow · commit c7fb1a02aad0 · 2019-09-27T14:16:59.000+03:00
fix-patch: fix xxd path for local snapshots generation
diff --git a/snapshot/android/snapshot-generator.js b/snapshot/android/snapshot-generator.js
@@ -247,9 +247,9 @@ SnapshotGenerator.prototype.getSnapshotToolCommand = function (snapshotToolPath,
     return `${snapshotToolPath} ${inputFilePath} --startup_blob ${join(outputPath, `${SNAPSHOT_BLOB_NAME}.blob`)} ${toolParams}`;
 }
 
-SnapshotGenerator.prototype.getXxdCommand = function (srcOutputDir) {
+SnapshotGenerator.prototype.getXxdCommand = function (srcOutputDir, xxdLocation) {
     // https://github.com/NativeScript/docker-images/tree/master/v8-snapshot/bin
-    return `/bin/xxd -i ${SNAPSHOT_BLOB_NAME}.blob > ${join(srcOutputDir, `${SNAPSHOT_BLOB_NAME}.c`)}`;
+    return `${xxdLocation || ""}xxd -i ${SNAPSHOT_BLOB_NAME}.blob > ${join(srcOutputDir, `${SNAPSHOT_BLOB_NAME}.c`)}`;
 }
 
 SnapshotGenerator.prototype.getPathInDocker = function (mappedLocalDir, mappedDockerDir, targetPath) {
@@ -309,7 +309,7 @@ SnapshotGenerator.prototype.buildCSource = function (androidArch, blobInputDir,
     if (snapshotInDocker) {
         const blobsInputInDocker = `/blobs/${androidArch}`
         const srcOutputDirInDocker = `/dist/src/${androidArch}`;
-        const buildCSourceCommand = this.getXxdCommand(srcOutputDirInDocker);
+        const buildCSourceCommand = this.getXxdCommand(srcOutputDirInDocker, "/bin/");
         command = `docker run --rm -v "${blobInputDir}:${blobsInputInDocker}" -v "${srcOutputDir}:${srcOutputDirInDocker}" ${SNAPSHOTS_DOCKER_IMAGE} /bin/sh -c "cd ${blobsInputInDocker} && ${buildCSourceCommand}"`;
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -247,9 +247,9 @@ SnapshotGenerator.prototype.getSnapshotToolCommand = function (snapshotToolPath,`
`247`	`247`	return `${snapshotToolPath} ${inputFilePath} --startup_blob ${join(outputPath, `${SNAPSHOT_BLOB_NAME}.blob`)} ${toolParams}`;
`248`	`248`	`}`
`249`	`249`
`250`		`-SnapshotGenerator.prototype.getXxdCommand = function (srcOutputDir) {`
	`250`	`+SnapshotGenerator.prototype.getXxdCommand = function (srcOutputDir, xxdLocation) {`
`251`	`251`	`// https://github.com/NativeScript/docker-images/tree/master/v8-snapshot/bin`
`252`		- return `/bin/xxd -i ${SNAPSHOT_BLOB_NAME}.blob > ${join(srcOutputDir, `${SNAPSHOT_BLOB_NAME}.c`)}`;
	`252`	+ return `${xxdLocation \|\| ""}xxd -i ${SNAPSHOT_BLOB_NAME}.blob > ${join(srcOutputDir, `${SNAPSHOT_BLOB_NAME}.c`)}`;
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`SnapshotGenerator.prototype.getPathInDocker = function (mappedLocalDir, mappedDockerDir, targetPath) {`
`@@ -309,7 +309,7 @@ SnapshotGenerator.prototype.buildCSource = function (androidArch, blobInputDir,`
`309`	`309`	`if (snapshotInDocker) {`
`310`	`310`	const blobsInputInDocker = `/blobs/${androidArch}`
`311`	`311`	const srcOutputDirInDocker = `/dist/src/${androidArch}`;
`312`		`- const buildCSourceCommand = this.getXxdCommand(srcOutputDirInDocker);`
	`312`	`+ const buildCSourceCommand = this.getXxdCommand(srcOutputDirInDocker, "/bin/");`
`313`	`313`	command = `docker run --rm -v "${blobInputDir}:${blobsInputInDocker}" -v "${srcOutputDir}:${srcOutputDirInDocker}" ${SNAPSHOTS_DOCKER_IMAGE} /bin/sh -c "cd ${blobsInputInDocker} && ${buildCSourceCommand}"`;
`314`	`314`	`}`
`315`	`315`	`else {`