Skip to content

Commit 0f15ae8

Browse files
committed
Move to more common "dist" and "test" folders
1 parent a615118 commit 0f15ae8

File tree

76 files changed

+13
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+13
-23
lines changed

.gitignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
*.tmp
33
*~
44
API.md
5-
out/browsers/combined/LICENSE
6-
out/browsers/combined/sodium.js
7-
out/modules/libsodium/LICENSE
8-
out/modules/sodium/LICENSE
9-
webtest/sodium.js
10-
webtest/sodium.min.js
5+
dist/browsers/combined/sodium.js
6+
test/browsers/sodium.js
7+
test/browsers/sodium.min.js

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#*#
2+
*.tmp
3+
*~

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

2-
OUT_DIR=./out
2+
OUT_DIR=./dist
33
MODULES_DIR=$(OUT_DIR)/modules
44
BROWSERS_DIR=$(OUT_DIR)/browsers
55
LIBSODIUM_DIR=./libsodium
66
LIBSODIUM_JS_DIR=$(LIBSODIUM_DIR)/libsodium-js
7-
WEBTEST_DIR=./webtest
7+
WEBTEST_DIR=./test/browsers
88

99
all: $(MODULES_DIR)/libsodium/libsodium.js $(MODULES_DIR)/sodium/sodium.js $(BROWSERS_DIR)/combined/sodium.min.js $(BROWSERS_DIR)/combined/sodium.min.js.gz webtest
1010
@echo
@@ -35,9 +35,9 @@ $(MODULES_DIR)/libsodium/libsodium.js: $(LIBSODIUM_DIR)/test/js.done
3535
mkdir -p $(MODULES_DIR)/libsodium
3636
cp $(LIBSODIUM_JS_DIR)/lib/libsodium.js $(MODULES_DIR)/libsodium
3737

38-
$(MODULES_DIR)/sodium/sodium.js: $(LIBSODIUM_DIR)/test/js.done js-build/build-wrapper.js js-build/build-doc.js js-build/wrap-template.js
38+
$(MODULES_DIR)/sodium/sodium.js: $(LIBSODIUM_DIR)/test/js.done wrapper/build-wrapper.js wrapper/build-doc.js wrapper/wrap-template.js
3939
mkdir -p $(MODULES_DIR)/sodium
40-
iojs js-build/build-wrapper.js || nodejs js-build/build-wrapper.js || node js-build/build-wrapper.js
40+
iojs wrapper/build-wrapper.js || nodejs wrapper/build-wrapper.js || node wrapper/build-wrapper.js
4141

4242
$(LIBSODIUM_DIR)/test/js.done: $(LIBSODIUM_DIR)/configure
4343
cd $(LIBSODIUM_DIR) && ./dist-build/emscripten.sh

README.md

Lines changed: 2 additions & 1 deletion
File renamed without changes.

package.json

Lines changed: 0 additions & 11 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)