From b71675585cb605e2cc707b3410e47c4d8fccf44a Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Sun, 3 Jan 2021 14:52:17 -0600 Subject: [PATCH] Update path to uhabits-core-legacy --- uhabits-web/Makefile | 9 +++++---- uhabits-web/src/test/index.js | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/uhabits-web/Makefile b/uhabits-web/Makefile index a005b14f4..69e7fb257 100644 --- a/uhabits-web/Makefile +++ b/uhabits-web/Makefile @@ -1,5 +1,6 @@ test_bundle := build/test.js node_modules := node_modules/.bin/mocha +core_dir := ../uhabits-core-legacy all: $(test_bundle) @@ -7,11 +8,11 @@ $(node_modules): npm install core: - cd ../core; ./gradlew --quiet jsMainClasses jsTestClasses - cp ../core/build/classes/kotlin/js/*/*.js node_modules/ + cd $(core_dir); ./gradlew --quiet jsMainClasses jsTestClasses + cp $(core_dir)/build/classes/kotlin/js/*/*.js node_modules/ mkdir -p build/assets - rsync -a ../core/assets/main/ build/assets/ - rsync -a ../core/assets/test/ build/assets/ + rsync -a $(core_dir)/assets/main/ build/assets/ + rsync -a $(core_dir)/assets/test/ build/assets/ $(test_bundle): src/test/index.js core mkdir -p build/lib build/test build/css diff --git a/uhabits-web/src/test/index.js b/uhabits-web/src/test/index.js index 3b911c6bb..c9f32ca2f 100644 --- a/uhabits-web/src/test/index.js +++ b/uhabits-web/src/test/index.js @@ -1,3 +1,3 @@ let assert = require('assert'); -let coreTest = require('core_test'); -document.coreTest = coreTest; \ No newline at end of file +let coreTest = require('uhabits-core-legacy_test'); +document.coreTest = coreTest;