get rid of web-common and build directory (in favor of just dist/)

This commit is contained in:
Florian Dold 2019-08-18 21:30:33 +02:00
parent 9e6c57daa5
commit 23e72ce25c
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
6 changed files with 10 additions and 17 deletions

1
.gitignore vendored
View File

@ -1,6 +1,5 @@
.idea/ .idea/
.nyc_output/ .nyc_output/
build/
dist/ dist/
# Even though node_modules are tracked in git, # Even though node_modules are tracked in git,

4
.gitmodules vendored
View File

@ -1,4 +0,0 @@
[submodule "web-common"]
path = web-common
url = git://taler.net/web-common
branch = master

View File

@ -9,7 +9,6 @@
/selenium /selenium
/*.json /*.json
*.tsbuildinfo *.tsbuildinfo
/build
/Makefile /Makefile
/*.js /*.js

View File

@ -24,7 +24,7 @@
* - tsconfig: generate tsconfig.json file for * - tsconfig: generate tsconfig.json file for
* development * development
* - package: create Chrome extension zip file in * - package: create Chrome extension zip file in
* build/. * dist/.
* *
* @author Florian Dold * @author Florian Dold
*/ */
@ -144,7 +144,7 @@ function concatStreams (...streams) {
function dist_prod() { function dist_prod() {
return vfs.src(paths.dist, {base: ".", stripBOM: false}) return vfs.src(paths.dist, {base: ".", stripBOM: false})
.pipe(gulp.dest("build/ext/")); .pipe(gulp.dest("dist/ext/"));
} }
function compile_prod(callback) { function compile_prod(callback) {
@ -173,7 +173,7 @@ function manifest_stable() {
data.name = "GNU Taler Wallet"; data.name = "GNU Taler Wallet";
return data; return data;
}, 2)) }, 2))
.pipe(gulp.dest("build/ext/")); .pipe(gulp.dest("dist/ext/"));
} }
@ -183,7 +183,7 @@ function manifest_unstable() {
data.name = "GNU Taler Wallet (unstable)"; data.name = "GNU Taler Wallet (unstable)";
return data; return data;
}, 2)) }, 2))
.pipe(gulp.dest("build/ext/")); .pipe(gulp.dest("dist/ext/"));
} }
@ -191,20 +191,18 @@ function package_stable () {
let basename = String.prototype.concat("taler-wallet-stable-", manifest.version_name, "-", manifest.version); let basename = String.prototype.concat("taler-wallet-stable-", manifest.version_name, "-", manifest.version);
let zipname = basename + ".zip"; let zipname = basename + ".zip";
let xpiname = basename + ".xpi"; let xpiname = basename + ".xpi";
return gulp.src("build/ext/**", {buffer: false, stripBOM: false}) return gulp.src("dist/ext/**", {buffer: false, stripBOM: false})
.pipe(zip(zipname)) .pipe(zip(zipname))
.pipe(gulp.dest("build/")); .pipe(gulp.dest("dist/"));
//.pipe(symlink("build/" + xpiname, {relativeSymlinks: true, overwrite: true}));
} }
function package_unstable () { function package_unstable () {
let basename = String.prototype.concat("taler-wallet-unstable-", manifest.version_name, "-", manifest.version); let basename = String.prototype.concat("taler-wallet-unstable-", manifest.version_name, "-", manifest.version);
let zipname = basename + ".zip"; let zipname = basename + ".zip";
let xpiname = basename + ".xpi"; let xpiname = basename + ".xpi";
return gulp.src("build/ext/**", {buffer: false, stripBOM: false}) return gulp.src("dist/ext/**", {buffer: false, stripBOM: false})
.pipe(zip(zipname)) .pipe(zip(zipname))
.pipe(gulp.dest("build/")); .pipe(gulp.dest("dist/"));
//.pipe(symlink("build/" + xpiname, {relativeSymlinks: true, overwrite: true}));
} }

1
packages/idb-bridge/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build

View File

@ -77,7 +77,7 @@ export class NodeEmscriptenLoader {
// @ts-ignore // @ts-ignore
delete g.crypto; delete g.crypto;
// Assume that the code is run from the build/ directory. // Assume that the code is run from the dist/ directory.
const libFn = indirectRequire( const libFn = indirectRequire(
"../../../emscripten/taler-emscripten-lib.js", "../../../emscripten/taler-emscripten-lib.js",
); );