Changeset 32999 in osm for applications/editors/josm/plugins/mapillary/gradle

Timestamp:

2016-09-20T23:37:16+02:00 (8 years ago)

Author:

floscher

Message:

[mapillary] Fix Gradle task initJosmPrefs when run together with cleanJosm

Previously the decision if 'initJosmPrefs' should actually copy the preferences or do nothing was made in the initialization phase of Gradle.
Otherwise if e.g. 'cleanJosm' also runs, it's decided in the init-phase that the preferences are not copied, because there already is a preference file. But that file is deleted, when 'cleanJosm' is executed. When 'initJosmPrefs' is then executed, that file would not be restored, because the decision not to copy already has been made.

Because of that, this decision is now made in the execution phase.

File:

• applications/editors/josm/plugins/mapillary/gradle/josm-tasks.gradle (modified) (1 diff)

applications/editors/josm/plugins/mapillary/gradle/josm-tasks.gradle

@@ -12 +12 @@
  */
 task initJosmPrefs(type: Copy) {
-  if (!new File("$buildDir/.josm/preferences.xml").exists()) {
-    from "config/josm/preferences.xml"
-    into "$buildDir/.josm"
+  doFirst {
+    if (new File("$buildDir/.josm/preferences.xml").exists()) {
+      println "JOSM preferences not copied, file is already present.\nIf you want to replace it, run the task 'cleanJosm' additionally."
+      exclude '*'
+    }
   }
+  from "config/josm/preferences.xml"
+  into "$buildDir/.josm"
 }