diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | .npmignore | 1 | ||||
| -rw-r--r-- | gulpfile.js | 18 | ||||
| -rw-r--r-- | packages/idb-bridge/.gitignore | 1 | ||||
| -rw-r--r-- | src/crypto/nodeEmscriptenLoader.ts | 2 |
6 files changed, 10 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index 1d242cf3d..7f18bfd70 100644 --- 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 deleted file mode 100644 index f2656da2f..000000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "web-common"] - path = web-common - url = git://taler.net/web-common - branch = master diff --git a/.npmignore b/.npmignore index 169a8752d..7d33e2540 100644 --- a/.npmignore +++ b/.npmignore @@ -9,7 +9,6 @@ /selenium /*.json *.tsbuildinfo -/build /Makefile /*.js diff --git a/gulpfile.js b/gulpfile.js index 1ebeb2564..63965e7ea 100644 --- 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 new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/packages/idb-bridge/.gitignore @@ -0,0 +1 @@ +/build diff --git a/src/crypto/nodeEmscriptenLoader.ts b/src/crypto/nodeEmscriptenLoader.ts index 6d6a7306b..834e29bfc 100644 --- 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", ); |