From b5aec2e890683d93764a00328144fd19cad5c242 Mon Sep 17 00:00:00 2001 From: Richard Newman Date: Fri, 9 Sep 2016 09:34:15 -0700 Subject: [PATCH] Move src-node and src-browser into subdirectories of src. --- project.clj | 11 ++++++----- {src-browser => src/browser}/datomish/core.cljs | 0 {src-browser => src/browser}/datomish/js_sqlite.cljs | 0 {src-browser => src/browser}/datomish/preload.cljs | 0 .../browser}/datomish/sqlitejsm_sqlite.cljs | 0 {src-browser => src/browser}/externs.js | 0 src/{ => common}/datomish/datom.cljc | 0 src/{ => common}/datomish/db.cljc | 0 src/{ => common}/datomish/db/debug.cljc | 0 src/{ => common}/datomish/db_factory.cljc | 0 src/{ => common}/datomish/jdbc_sqlite.clj | 0 src/{ => common}/datomish/js.cljs | 0 src/{ => common}/datomish/js_util.cljs | 0 src/{ => common}/datomish/pair_chan.cljc | 0 src/{ => common}/datomish/places/import.cljc | 0 src/{ => common}/datomish/query.cljc | 0 src/{ => common}/datomish/query/cc.cljc | 0 src/{ => common}/datomish/query/clauses.cljc | 0 src/{ => common}/datomish/query/context.cljc | 0 src/{ => common}/datomish/query/functions.cljc | 0 src/{ => common}/datomish/query/projection.cljc | 0 src/{ => common}/datomish/query/source.cljc | 0 src/{ => common}/datomish/query/transforms.cljc | 0 src/{ => common}/datomish/schema.cljc | 0 src/{ => common}/datomish/schema_changes.cljc | 0 src/{ => common}/datomish/sqlite.cljc | 0 src/{ => common}/datomish/sqlite_schema.cljc | 0 src/{ => common}/datomish/test_macros.cljc | 0 src/{ => common}/datomish/transact.cljc | 0 src/{ => common}/datomish/transact/bootstrap.cljc | 0 src/{ => common}/datomish/transact/explode.cljc | 0 src/{ => common}/datomish/util.cljc | 0 {src-node => src/node}/datomish/core.cljs | 0 {src-node => src/node}/datomish/js_sqlite.cljs | 0 {src-node => src/node}/datomish/node_tempfile.cljs | 0 .../node}/datomish/node_tempfile_macros.cljc | 0 {src-node => src/node}/datomish/promise_sqlite.cljs | 0 37 files changed, 6 insertions(+), 5 deletions(-) rename {src-browser => src/browser}/datomish/core.cljs (100%) rename {src-browser => src/browser}/datomish/js_sqlite.cljs (100%) rename {src-browser => src/browser}/datomish/preload.cljs (100%) rename {src-browser => src/browser}/datomish/sqlitejsm_sqlite.cljs (100%) rename {src-browser => src/browser}/externs.js (100%) rename src/{ => common}/datomish/datom.cljc (100%) rename src/{ => common}/datomish/db.cljc (100%) rename src/{ => common}/datomish/db/debug.cljc (100%) rename src/{ => common}/datomish/db_factory.cljc (100%) rename src/{ => common}/datomish/jdbc_sqlite.clj (100%) rename src/{ => common}/datomish/js.cljs (100%) rename src/{ => common}/datomish/js_util.cljs (100%) rename src/{ => common}/datomish/pair_chan.cljc (100%) rename src/{ => common}/datomish/places/import.cljc (100%) rename src/{ => common}/datomish/query.cljc (100%) rename src/{ => common}/datomish/query/cc.cljc (100%) rename src/{ => common}/datomish/query/clauses.cljc (100%) rename src/{ => common}/datomish/query/context.cljc (100%) rename src/{ => common}/datomish/query/functions.cljc (100%) rename src/{ => common}/datomish/query/projection.cljc (100%) rename src/{ => common}/datomish/query/source.cljc (100%) rename src/{ => common}/datomish/query/transforms.cljc (100%) rename src/{ => common}/datomish/schema.cljc (100%) rename src/{ => common}/datomish/schema_changes.cljc (100%) rename src/{ => common}/datomish/sqlite.cljc (100%) rename src/{ => common}/datomish/sqlite_schema.cljc (100%) rename src/{ => common}/datomish/test_macros.cljc (100%) rename src/{ => common}/datomish/transact.cljc (100%) rename src/{ => common}/datomish/transact/bootstrap.cljc (100%) rename src/{ => common}/datomish/transact/explode.cljc (100%) rename src/{ => common}/datomish/util.cljc (100%) rename {src-node => src/node}/datomish/core.cljs (100%) rename {src-node => src/node}/datomish/js_sqlite.cljs (100%) rename {src-node => src/node}/datomish/node_tempfile.cljs (100%) rename {src-node => src/node}/datomish/node_tempfile_macros.cljc (100%) rename {src-node => src/node}/datomish/promise_sqlite.cljs (100%) diff --git a/project.clj b/project.clj index 72b5b9c1..0d87a2f6 100644 --- a/project.clj +++ b/project.clj @@ -11,11 +11,12 @@ [com.taoensso/tufte "1.0.2"] [jamesmacaulay/cljs-promises "0.1.0"]] + :source-paths ["src/common"] :cljsbuild {:builds { :release-node { - :source-paths ["src-node" "src"] + :source-paths ["src/node" "src/common"] :assert false :compiler { @@ -43,12 +44,12 @@ ;; There's no point in generating a source map -- it'll be wrong ;; due to wrapping. { - :source-paths ["src-browser" "src"] + :source-paths ["src/browser" "src/common"] :assert false :compiler { :elide-asserts true - :externs ["src-browser/externs.js"] + :externs ["src/browser/externs.js"] :language-in :ecmascript5 :language-out :ecmascript5 :optimizations :advanced @@ -64,7 +65,7 @@ :notify-command ["release-browser/wrap_bare.sh"]} :advanced - {:source-paths ["src-node" "src"] + {:source-paths ["src/node" "src/common"] :compiler { :language-in :ecmascript5 @@ -80,7 +81,7 @@ :test { - :source-paths ["src-node" "src" "test"] + :source-paths ["src/node" "src/common" "test"] :compiler { :language-in :ecmascript5 diff --git a/src-browser/datomish/core.cljs b/src/browser/datomish/core.cljs similarity index 100% rename from src-browser/datomish/core.cljs rename to src/browser/datomish/core.cljs diff --git a/src-browser/datomish/js_sqlite.cljs b/src/browser/datomish/js_sqlite.cljs similarity index 100% rename from src-browser/datomish/js_sqlite.cljs rename to src/browser/datomish/js_sqlite.cljs diff --git a/src-browser/datomish/preload.cljs b/src/browser/datomish/preload.cljs similarity index 100% rename from src-browser/datomish/preload.cljs rename to src/browser/datomish/preload.cljs diff --git a/src-browser/datomish/sqlitejsm_sqlite.cljs b/src/browser/datomish/sqlitejsm_sqlite.cljs similarity index 100% rename from src-browser/datomish/sqlitejsm_sqlite.cljs rename to src/browser/datomish/sqlitejsm_sqlite.cljs diff --git a/src-browser/externs.js b/src/browser/externs.js similarity index 100% rename from src-browser/externs.js rename to src/browser/externs.js diff --git a/src/datomish/datom.cljc b/src/common/datomish/datom.cljc similarity index 100% rename from src/datomish/datom.cljc rename to src/common/datomish/datom.cljc diff --git a/src/datomish/db.cljc b/src/common/datomish/db.cljc similarity index 100% rename from src/datomish/db.cljc rename to src/common/datomish/db.cljc diff --git a/src/datomish/db/debug.cljc b/src/common/datomish/db/debug.cljc similarity index 100% rename from src/datomish/db/debug.cljc rename to src/common/datomish/db/debug.cljc diff --git a/src/datomish/db_factory.cljc b/src/common/datomish/db_factory.cljc similarity index 100% rename from src/datomish/db_factory.cljc rename to src/common/datomish/db_factory.cljc diff --git a/src/datomish/jdbc_sqlite.clj b/src/common/datomish/jdbc_sqlite.clj similarity index 100% rename from src/datomish/jdbc_sqlite.clj rename to src/common/datomish/jdbc_sqlite.clj diff --git a/src/datomish/js.cljs b/src/common/datomish/js.cljs similarity index 100% rename from src/datomish/js.cljs rename to src/common/datomish/js.cljs diff --git a/src/datomish/js_util.cljs b/src/common/datomish/js_util.cljs similarity index 100% rename from src/datomish/js_util.cljs rename to src/common/datomish/js_util.cljs diff --git a/src/datomish/pair_chan.cljc b/src/common/datomish/pair_chan.cljc similarity index 100% rename from src/datomish/pair_chan.cljc rename to src/common/datomish/pair_chan.cljc diff --git a/src/datomish/places/import.cljc b/src/common/datomish/places/import.cljc similarity index 100% rename from src/datomish/places/import.cljc rename to src/common/datomish/places/import.cljc diff --git a/src/datomish/query.cljc b/src/common/datomish/query.cljc similarity index 100% rename from src/datomish/query.cljc rename to src/common/datomish/query.cljc diff --git a/src/datomish/query/cc.cljc b/src/common/datomish/query/cc.cljc similarity index 100% rename from src/datomish/query/cc.cljc rename to src/common/datomish/query/cc.cljc diff --git a/src/datomish/query/clauses.cljc b/src/common/datomish/query/clauses.cljc similarity index 100% rename from src/datomish/query/clauses.cljc rename to src/common/datomish/query/clauses.cljc diff --git a/src/datomish/query/context.cljc b/src/common/datomish/query/context.cljc similarity index 100% rename from src/datomish/query/context.cljc rename to src/common/datomish/query/context.cljc diff --git a/src/datomish/query/functions.cljc b/src/common/datomish/query/functions.cljc similarity index 100% rename from src/datomish/query/functions.cljc rename to src/common/datomish/query/functions.cljc diff --git a/src/datomish/query/projection.cljc b/src/common/datomish/query/projection.cljc similarity index 100% rename from src/datomish/query/projection.cljc rename to src/common/datomish/query/projection.cljc diff --git a/src/datomish/query/source.cljc b/src/common/datomish/query/source.cljc similarity index 100% rename from src/datomish/query/source.cljc rename to src/common/datomish/query/source.cljc diff --git a/src/datomish/query/transforms.cljc b/src/common/datomish/query/transforms.cljc similarity index 100% rename from src/datomish/query/transforms.cljc rename to src/common/datomish/query/transforms.cljc diff --git a/src/datomish/schema.cljc b/src/common/datomish/schema.cljc similarity index 100% rename from src/datomish/schema.cljc rename to src/common/datomish/schema.cljc diff --git a/src/datomish/schema_changes.cljc b/src/common/datomish/schema_changes.cljc similarity index 100% rename from src/datomish/schema_changes.cljc rename to src/common/datomish/schema_changes.cljc diff --git a/src/datomish/sqlite.cljc b/src/common/datomish/sqlite.cljc similarity index 100% rename from src/datomish/sqlite.cljc rename to src/common/datomish/sqlite.cljc diff --git a/src/datomish/sqlite_schema.cljc b/src/common/datomish/sqlite_schema.cljc similarity index 100% rename from src/datomish/sqlite_schema.cljc rename to src/common/datomish/sqlite_schema.cljc diff --git a/src/datomish/test_macros.cljc b/src/common/datomish/test_macros.cljc similarity index 100% rename from src/datomish/test_macros.cljc rename to src/common/datomish/test_macros.cljc diff --git a/src/datomish/transact.cljc b/src/common/datomish/transact.cljc similarity index 100% rename from src/datomish/transact.cljc rename to src/common/datomish/transact.cljc diff --git a/src/datomish/transact/bootstrap.cljc b/src/common/datomish/transact/bootstrap.cljc similarity index 100% rename from src/datomish/transact/bootstrap.cljc rename to src/common/datomish/transact/bootstrap.cljc diff --git a/src/datomish/transact/explode.cljc b/src/common/datomish/transact/explode.cljc similarity index 100% rename from src/datomish/transact/explode.cljc rename to src/common/datomish/transact/explode.cljc diff --git a/src/datomish/util.cljc b/src/common/datomish/util.cljc similarity index 100% rename from src/datomish/util.cljc rename to src/common/datomish/util.cljc diff --git a/src-node/datomish/core.cljs b/src/node/datomish/core.cljs similarity index 100% rename from src-node/datomish/core.cljs rename to src/node/datomish/core.cljs diff --git a/src-node/datomish/js_sqlite.cljs b/src/node/datomish/js_sqlite.cljs similarity index 100% rename from src-node/datomish/js_sqlite.cljs rename to src/node/datomish/js_sqlite.cljs diff --git a/src-node/datomish/node_tempfile.cljs b/src/node/datomish/node_tempfile.cljs similarity index 100% rename from src-node/datomish/node_tempfile.cljs rename to src/node/datomish/node_tempfile.cljs diff --git a/src-node/datomish/node_tempfile_macros.cljc b/src/node/datomish/node_tempfile_macros.cljc similarity index 100% rename from src-node/datomish/node_tempfile_macros.cljc rename to src/node/datomish/node_tempfile_macros.cljc diff --git a/src-node/datomish/promise_sqlite.cljs b/src/node/datomish/promise_sqlite.cljs similarity index 100% rename from src-node/datomish/promise_sqlite.cljs rename to src/node/datomish/promise_sqlite.cljs