Skip to content

Commit 1bd2ff3

Browse files
committed
Make BOOT_EMIT_TARGET=no the default -- fixes #391
1 parent 350e54f commit 1bd2ff3

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

boot/core/src/boot/core.clj

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -932,15 +932,8 @@
932932
state, and runs the pipeline."
933933
[task-stack]
934934
(binding [*warnings* (atom 0)]
935-
(let [fs (commit! (reset-fileset))
936-
target? (not= "no" (boot.App/config "BOOT_EMIT_TARGET"))
937-
depr (delay (util/warn-deprecated "Implicit target dir is deprecated, please use the target task instead.\n")
938-
(util/warn-deprecated "Set BOOT_EMIT_TARGET=no to disable implicit target dir.\n"))
939-
sync! (if-not target?
940-
identity
941-
(comp (fn [_] @depr)
942-
(fileset-syncer [(get-env :target-path)] :clean true)))]
943-
((task-stack #(do (sync! %) (sync-user-dirs!) %)) fs))))
935+
(let [fs (commit! (reset-fileset))]
936+
((task-stack #(do (sync-user-dirs!) %)) fs))))
944937

945938
(defn boot
946939
"The REPL equivalent to the command line 'boot'. If all arguments are

boot/core/src/boot/main.clj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
["-s" "--source-paths PATH" "Add PATH to set of source directories."
3838
:assoc-fn #(update-in %1 [%2] (fnil conj #{}) %3)]
3939
["-t" "--target-path PATH" "Set the target directory to PATH."]
40-
["-T" "--no-target" "Don't automatically write files to the target directory."]
40+
["-T" "--no-target" "This option is ignored."]
4141
["-u" "--update" "Update boot to latest release version."]
4242
["-U" "--update-snapshot" "Update boot to latest snapshot version."]
4343
["-v" "--verbose" "More error info (-vv more verbose, etc.)"
@@ -140,9 +140,6 @@
140140
(util/exit-error
141141
(println (apply str (interpose "\n" errs)))))
142142

143-
(when (or (:no-target opts) (boot.App/isWindows))
144-
(System/setProperty "BOOT_EMIT_TARGET" "no"))
145-
146143
(when (:no-colors opts)
147144
(reset! util/*colorize?* false))
148145

boot/core/src/boot/task/built_in.clj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
["" "BOOT_CLOJURE_VERSION" "The version of Clojure boot will provide (1.8.0)."]
4242
["" "BOOT_CLOJURE_NAME" "The artifact name of Clojure boot will provide (org.clojure/clojure)."]
4343
["" "BOOT_COLOR" "Set to 'no' to turn colorized output off."]
44-
["" "BOOT_EMIT_TARGET" "Set to 'no' to disable automatic writing to target directory."]
4544
["" "BOOT_FILE" "Build script name (build.boot)."]
4645
["" "BOOT_GPG_COMMAND" "System gpg command (gpg)."]
4746
["" "BOOT_HOME" "Directory where boot stores global state (~/.boot)."]

0 commit comments

Comments
 (0)