[meshops] bugfix tangle export paths

thi-ng · May 25, 2015 · 73c034c · 73c034c
1 parent 127d83b
commit 73c034c
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/geom-meshops/src/csg.org b/geom-meshops/src/csg.org
@@ -70,7 +70,7 @@ meshes.
        (< d (- r)) (assoc state 3 (conj (state 3) poly))
        :default
        (let [[ptype types] (compute-split-types n w (.-vertices poly))]
-         (case ptype
+         (case (int ptype)
            ;; co-planar
            0 (if (pos? (g/dot n (:n (.-plane poly))))
                (assoc state 0 (conj (state 0) poly))
@@ -215,7 +215,7 @@ meshes.
 #+END_SRC
 
 ** Complete namespace definition
-#+BEGIN_SRC clojure :tangle ../babel/src/cljx/thi/ng/geom/mesh/csg.cljx :noweb yes :mkdirp yes :padline no
+#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/mesh/csg.cljc :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.mesh.csg
     #?(:cljs
        (:require-macros

diff --git a/geom-meshops/src/delaunay.org b/geom-meshops/src/delaunay.org
@@ -79,7 +79,7 @@ is to add additional point(s) in the center.
 
 ** Complete namespace definition
 
-#+BEGIN_SRC clojure :tangle ../babel/src/cljx/thi/ng/geom/mesh/delaunay.cljx :noweb yes :mkdirp yes :padline no
+#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/mesh/delaunay.cljc :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.mesh.delaunay
     #?(:cljs (:require-macros [thi.ng.math.macros :as mm]))
     (:require

diff --git a/geom-meshops/src/index.org b/geom-meshops/src/index.org
@@ -115,7 +115,7 @@ symbol =version= holding the version string defined above:
 
 *** Version namespace                                              :noexport:
 
-#+BEGIN_SRC clojure :tangle ../babel/src/cljx/thi/ng/geom/mesh/version.cljx :noweb yes :mkdirp yes :padline no
+#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/mesh/version.cljc :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.mesh.version)
   (def version "<<conf-version()>>")
 #+END_SRC

diff --git a/geom-meshops/src/meshio.org b/geom-meshops/src/meshio.org
@@ -174,7 +174,7 @@
 
 ** Complete namespace definition
 
-#+BEGIN_SRC clojure :tangle ../babel/src/cljx/thi/ng/geom/mesh/io.cljx :noweb yes :mkdirp yes :padline no
+#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/mesh/io.cljc :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.mesh.io
     (:require
      [thi.ng.geom.core :as g]

diff --git a/geom-meshops/src/meshops.org b/geom-meshops/src/meshops.org
@@ -120,7 +120,7 @@
 
 ** Namespace declaration
 
-#+BEGIN_SRC clojure :tangle ../babel/src/cljx/thi/ng/geom/mesh/ops.cljx :noweb yes :mkdirp yes :padline no
+#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/mesh/ops.cljc :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.mesh.ops
     (:require
      [thi.ng.math.core :as m]

diff --git a/geom-meshops/src/polyhedra.org b/geom-meshops/src/polyhedra.org
@@ -159,7 +159,7 @@ returns either a =BasicMesh= or =GMesh= instance.
 
 *** Complete namespace definition
 
-#+BEGIN_SRC clojure :tangle ../babel/src/cljx/thi/ng/geom/mesh/polyhedra.cljx :noweb yes :mkdirp yes :padline no
+#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/mesh/polyhedra.cljc :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.mesh.polyhedra
     #?(:cljs (:require-macros [thi.ng.math.macros :as mm]))
     (:require

diff --git a/geom-meshops/src/slicing.org b/geom-meshops/src/slicing.org
@@ -150,7 +150,7 @@
 ** Complete namespace
 
 #+BEGIN_SRC clojure
-  ;; :tangle ../babel/src/cljx/thi/ng/geom/mesh/slicing.clj :noweb yes :mkdirp yes :padline no
+  ;; :tangle ../babel/src/thi/ng/geom/mesh/slicing.clj :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.mesh.slicing
     (:require
      [thi.ng.geom.core :as g]

diff --git a/geom-meshops/src/subdivision.org b/geom-meshops/src/subdivision.org
@@ -237,7 +237,7 @@ you're not sure your mesh contains only triangles, pass it through
 
 ** Namespace declaration
 
-#+BEGIN_SRC clojure :tangle ../babel/src/cljx/thi/ng/geom/mesh/subdivision.cljx :noweb yes :mkdirp yes :padline no
+#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/mesh/subdivision.cljc :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.mesh.subdivision
     (:require
      [thi.ng.geom.core :as g]

diff --git a/geom-meshops/test/core.org b/geom-meshops/test/core.org
@@ -15,11 +15,11 @@
 #+END_SRC
 
 ** Namespace declaration
-#+BEGIN_SRC clojure :tangle ../babel/test/cljx/thi/ng/geom/mesh/test/core.cljx :noweb yes :mkdirp yes :padline no
+#+BEGIN_SRC clojure :tangle ../babel/test/thi/ng/geom/mesh/test/core.cljc :noweb yes :mkdirp yes :padline no
   (ns thi.ng.geom.mesh.test.core
-    ,#+cljs
-    (:require-macros
-     [cemerick.cljs.test :refer (is deftest with-test run-tests testing)])
+    #?(:cljs
+       (:require-macros
+        [cemerick.cljs.test :refer (is deftest with-test run-tests testing)]))
     (:require
      [thi.ng.geom.core :as g]
      [thi.ng.geom.core.vector :refer [vec2 vec3]]
@@ -30,9 +30,11 @@
      [thi.ng.geom.rect :as r]
      [thi.ng.geom.sphere :as s]
      [thi.ng.geom.triangle :as t]
-     [thi.ng.common.math.core :as m]
-     ,#+clj  [clojure.test :refer :all]
-     ,#+cljs [cemerick.cljs.test]))
+     [thi.ng.math.core :as m]
+     #?(:clj
+        [clojure.test :refer :all]
+        :cljs
+        [cemerick.cljs.test])))
 
   <<helpers>>