Skip to content

Commit 6ff80dc

Browse files
author
dnolen
committed
move everything to conform to expected contrib pom structure,
update all scripts and files to account for reorg. update pom.template.xml with with bits copied from other AOTed contrib projects.
1 parent 9e46b35 commit 6ff80dc

Some content is hidden

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

102 files changed

+417
-250
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ builds
2424
.cljs*
2525
node_modules
2626
nashorn_code_cache
27-
src/cljs/cljs/core.aot.js
28-
src/cljs/cljs/core.aot.js.map
29-
src/cljs/cljs/core.cljs.cache.aot.edn
27+
src/main/cljs/cljs/core.aot.js
28+
src/main/cljs/cljs/core.aot.js.map
29+
src/main/cljs/cljs/core.cljs.cache.aot.edn

Clojurescript.iml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
<exclude-output />
77
<content url="file://$MODULE_DIR$">
88
<sourceFolder url="file://$MODULE_DIR$/dev-resources" isTestSource="false" />
9-
<sourceFolder url="file://$MODULE_DIR$/src/clj" isTestSource="false" />
10-
<sourceFolder url="file://$MODULE_DIR$/src/cljs" isTestSource="false" />
11-
<sourceFolder url="file://$MODULE_DIR$/test/clj" isTestSource="true" />
12-
<sourceFolder url="file://$MODULE_DIR$/test/cljs" isTestSource="true" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/main/clojure/clj" isTestSource="false" />
10+
<sourceFolder url="file://$MODULE_DIR$/src/main/cljs/cljs" isTestSource="false" />
11+
<sourceFolder url="file://$MODULE_DIR$/src/test/clojure/clj" isTestSource="true" />
12+
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
13+
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
1314
<excludeFolder url="file://$MODULE_DIR$/.cljs_nashorn_repl" />
1415
<excludeFolder url="file://$MODULE_DIR$/.cljs_node_repl" />
1516
<excludeFolder url="file://$MODULE_DIR$/.cljs_repl" />
@@ -22,25 +23,22 @@
2223
<excludeFolder url="file://$MODULE_DIR$/samples/repl/out" />
2324
<excludeFolder url="file://$MODULE_DIR$/target" />
2425
</content>
25-
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
26+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
2627
<orderEntry type="sourceFolder" forTests="false" />
2728
<orderEntry type="library" name="Leiningen: clojure-complete:0.2.3" level="project" />
28-
<orderEntry type="library" name="Leiningen: com.google.javascript/closure-compiler:v20150126" level="project" />
29-
<orderEntry type="library" name="Leiningen: org.clojure/clojure:1.7.0-beta1" level="project" />
29+
<orderEntry type="library" name="Leiningen: com.google.javascript/closure-compiler:v20150505" level="project" />
30+
<orderEntry type="library" name="Leiningen: org.clojure/clojure:1.7.0-beta2" level="project" />
3031
<orderEntry type="library" name="Leiningen: org.clojure/data.json:0.2.6" level="project" />
3132
<orderEntry type="library" name="Leiningen: org.clojure/google-closure-library:0.0-20140718-946a7d39" level="project" />
3233
<orderEntry type="library" name="Leiningen: org.clojure/tools.nrepl:0.2.6" level="project" />
33-
<orderEntry type="library" name="Leiningen: org.clojure/tools.reader:0.9.1" level="project" />
34+
<orderEntry type="library" name="Leiningen: org.clojure/tools.reader:0.9.2" level="project" />
3435
<orderEntry type="library" name="Leiningen: org.mozilla/rhino:1.7R5" level="project" />
3536
<orderEntry type="library" name="Leiningen: args4j:2.0.26" level="project" />
3637
<orderEntry type="library" name="Leiningen: com.google.code.findbugs/jsr305:1.3.9" level="project" />
3738
<orderEntry type="library" name="Leiningen: com.google.code.gson/gson:2.2.4" level="project" />
3839
<orderEntry type="library" name="Leiningen: com.google.guava/guava:18.0" level="project" />
39-
<orderEntry type="library" name="Leiningen: com.google.javascript/closure-compiler-externs:v20150126" level="project" />
40+
<orderEntry type="library" name="Leiningen: com.google.javascript/closure-compiler-externs:v20150505" level="project" />
4041
<orderEntry type="library" name="Leiningen: com.google.protobuf/protobuf-java:2.5.0" level="project" />
41-
<orderEntry type="library" name="Leiningen: com.google.truth/truth:0.24" level="project" />
42-
<orderEntry type="library" name="Leiningen: junit:4.10" level="project" />
43-
<orderEntry type="library" name="Leiningen: org.hamcrest/hamcrest-core:1.1" level="project" />
4442
<orderEntry type="library" name="Leiningen: org.clojure/google-closure-library-third-party:0.0-20140718-946a7d39" level="project" />
4543
</component>
4644
</module>

bin/cljsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [ "$CLOJURESCRIPT_HOME" = "" ]; then
88
fi
99

1010
CLJSC_CP=''
11-
for next in lib/*: src/clj: src/cljs: test/cljs; do
11+
for next in lib/*: src/main/clojure: src/main/cljs: src/test/cljs; do
1212
CLJSC_CP="${CLJSC_CP}${CLOJURESCRIPT_HOME}/${next}"
1313
done
1414

devnotes/day1.org

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@
189189
**** ...
190190
*** strategy for apply
191191
* What's where
192-
** src/clj/cljs/compiler.clj
192+
** src/main/clojure/cljs/compiler.clj
193193
*** the compiler
194-
** src/clj/cljs/core.clj
194+
** src/main/clojure/cljs/core.clj
195195
*** core macros
196-
** src/cljs/core.cljs
196+
** src/main/cljs/core.cljs
197197
*** core library
198198
* Todo
199199
** separate org file

0 commit comments

Comments
 (0)