taler-typescript-core

Wallet core logic and WebUIs for various components
Log | Files | Refs | Submodules | README | LICENSE

commit 23e72ce25cb5f7eede60281b499f527554db2185
parent 9e6c57daa5d75bcb1a703beceb03a53c05ada63f
Author: Florian Dold <florian.dold@gmail.com>
Date:   Sun, 18 Aug 2019 21:30:33 +0200

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

Diffstat:
M.gitignore | 1-
D.gitmodules | 4----
M.npmignore | 1-
Mgulpfile.js | 18++++++++----------
Apackages/idb-bridge/.gitignore | 1+
Msrc/crypto/nodeEmscriptenLoader.ts | 2+-
6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore @@ -1,6 +1,5 @@ .idea/ .nyc_output/ -build/ dist/ # Even though node_modules are tracked in git, diff --git a/.gitmodules b/.gitmodules @@ -1,4 +0,0 @@ -[submodule "web-common"] - path = web-common - url = git://taler.net/web-common - branch = master diff --git a/.npmignore b/.npmignore @@ -9,7 +9,6 @@ /selenium /*.json *.tsbuildinfo -/build /Makefile /*.js diff --git a/gulpfile.js b/gulpfile.js @@ -24,7 +24,7 @@ * - tsconfig: generate tsconfig.json file for * development * - package: create Chrome extension zip file in - * build/. + * dist/. * * @author Florian Dold */ @@ -144,7 +144,7 @@ function concatStreams (...streams) { function dist_prod() { return vfs.src(paths.dist, {base: ".", stripBOM: false}) - .pipe(gulp.dest("build/ext/")); + .pipe(gulp.dest("dist/ext/")); } function compile_prod(callback) { @@ -173,7 +173,7 @@ function manifest_stable() { data.name = "GNU Taler Wallet"; return data; }, 2)) - .pipe(gulp.dest("build/ext/")); + .pipe(gulp.dest("dist/ext/")); } @@ -183,7 +183,7 @@ function manifest_unstable() { data.name = "GNU Taler Wallet (unstable)"; return data; }, 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 zipname = basename + ".zip"; 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(gulp.dest("build/")); - //.pipe(symlink("build/" + xpiname, {relativeSymlinks: true, overwrite: true})); + .pipe(gulp.dest("dist/")); } function package_unstable () { let basename = String.prototype.concat("taler-wallet-unstable-", manifest.version_name, "-", manifest.version); let zipname = basename + ".zip"; 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(gulp.dest("build/")); - //.pipe(symlink("build/" + xpiname, {relativeSymlinks: true, overwrite: true})); + .pipe(gulp.dest("dist/")); } diff --git a/packages/idb-bridge/.gitignore b/packages/idb-bridge/.gitignore @@ -0,0 +1 @@ +/build diff --git a/src/crypto/nodeEmscriptenLoader.ts b/src/crypto/nodeEmscriptenLoader.ts @@ -77,7 +77,7 @@ export class NodeEmscriptenLoader { // @ts-ignore 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( "../../../emscripten/taler-emscripten-lib.js", );