From 7231606eb21ef7ab591716f98fe7bc960113bd0a Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Wed, 13 Feb 2013 13:59:29 +0400 Subject: [PATCH] Make sure files don't get overwritten if someone mixes generated and normal stdlib sources in one folder during build. --- .../src/org/jetbrains/k2js/config/Config.java | 10 +++++----- .../stdlib/src/generated/{Arrays.kt => _Arrays.kt} | 0 .../{BooleanArrays.kt => _BooleanArrays.kt} | 0 .../src/generated/{ByteArrays.kt => _ByteArrays.kt} | 0 .../src/generated/{CharArrays.kt => _CharArrays.kt} | 0 .../generated/{Collections.kt => _Collections.kt} | 0 .../generated/{DoubleArrays.kt => _DoubleArrays.kt} | 0 .../stdlib/src/generated/{DownTo.kt => _DownTo.kt} | 0 .../generated/{FloatArrays.kt => _FloatArrays.kt} | 0 .../src/generated/{IntArrays.kt => _IntArrays.kt} | 0 .../src/generated/{Iterables.kt => _Iterables.kt} | 0 .../src/generated/{Iterators.kt => _Iterators.kt} | 0 .../{IteratorsCommon.kt => _IteratorsCommon.kt} | 0 .../src/generated/{LongArrays.kt => _LongArrays.kt} | 0 .../generated/{ShortArrays.kt => _ShortArrays.kt} | 0 .../src/generators/GenerateStandardLib.kt | 12 ++++++------ 16 files changed, 11 insertions(+), 11 deletions(-) rename libraries/stdlib/src/generated/{Arrays.kt => _Arrays.kt} (100%) rename libraries/stdlib/src/generated/{BooleanArrays.kt => _BooleanArrays.kt} (100%) rename libraries/stdlib/src/generated/{ByteArrays.kt => _ByteArrays.kt} (100%) rename libraries/stdlib/src/generated/{CharArrays.kt => _CharArrays.kt} (100%) rename libraries/stdlib/src/generated/{Collections.kt => _Collections.kt} (100%) rename libraries/stdlib/src/generated/{DoubleArrays.kt => _DoubleArrays.kt} (100%) rename libraries/stdlib/src/generated/{DownTo.kt => _DownTo.kt} (100%) rename libraries/stdlib/src/generated/{FloatArrays.kt => _FloatArrays.kt} (100%) rename libraries/stdlib/src/generated/{IntArrays.kt => _IntArrays.kt} (100%) rename libraries/stdlib/src/generated/{Iterables.kt => _Iterables.kt} (100%) rename libraries/stdlib/src/generated/{Iterators.kt => _Iterators.kt} (100%) rename libraries/stdlib/src/generated/{IteratorsCommon.kt => _IteratorsCommon.kt} (100%) rename libraries/stdlib/src/generated/{LongArrays.kt => _LongArrays.kt} (100%) rename libraries/stdlib/src/generated/{ShortArrays.kt => _ShortArrays.kt} (100%) diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java index 049ee62f297..8647b610972 100644 --- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java +++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java @@ -121,11 +121,11 @@ public abstract class Config { "/kotlin/Maps.kt", "/kotlin/Exceptions.kt", "/kotlin/IterablesSpecial.kt", - "/generated/Arrays.kt", - "/generated/Collections.kt", - "/generated/Iterables.kt", - "/generated/Iterators.kt", - "/generated/IteratorsCommon.kt", + "/generated/_Arrays.kt", + "/generated/_Collections.kt", + "/generated/_Iterables.kt", + "/generated/_Iterators.kt", + "/generated/_IteratorsCommon.kt", "/kotlin/support/AbstractIterator.kt", "/kotlin/Standard.kt", "/kotlin/Strings.kt", diff --git a/libraries/stdlib/src/generated/Arrays.kt b/libraries/stdlib/src/generated/_Arrays.kt similarity index 100% rename from libraries/stdlib/src/generated/Arrays.kt rename to libraries/stdlib/src/generated/_Arrays.kt diff --git a/libraries/stdlib/src/generated/BooleanArrays.kt b/libraries/stdlib/src/generated/_BooleanArrays.kt similarity index 100% rename from libraries/stdlib/src/generated/BooleanArrays.kt rename to libraries/stdlib/src/generated/_BooleanArrays.kt diff --git a/libraries/stdlib/src/generated/ByteArrays.kt b/libraries/stdlib/src/generated/_ByteArrays.kt similarity index 100% rename from libraries/stdlib/src/generated/ByteArrays.kt rename to libraries/stdlib/src/generated/_ByteArrays.kt diff --git a/libraries/stdlib/src/generated/CharArrays.kt b/libraries/stdlib/src/generated/_CharArrays.kt similarity index 100% rename from libraries/stdlib/src/generated/CharArrays.kt rename to libraries/stdlib/src/generated/_CharArrays.kt diff --git a/libraries/stdlib/src/generated/Collections.kt b/libraries/stdlib/src/generated/_Collections.kt similarity index 100% rename from libraries/stdlib/src/generated/Collections.kt rename to libraries/stdlib/src/generated/_Collections.kt diff --git a/libraries/stdlib/src/generated/DoubleArrays.kt b/libraries/stdlib/src/generated/_DoubleArrays.kt similarity index 100% rename from libraries/stdlib/src/generated/DoubleArrays.kt rename to libraries/stdlib/src/generated/_DoubleArrays.kt diff --git a/libraries/stdlib/src/generated/DownTo.kt b/libraries/stdlib/src/generated/_DownTo.kt similarity index 100% rename from libraries/stdlib/src/generated/DownTo.kt rename to libraries/stdlib/src/generated/_DownTo.kt diff --git a/libraries/stdlib/src/generated/FloatArrays.kt b/libraries/stdlib/src/generated/_FloatArrays.kt similarity index 100% rename from libraries/stdlib/src/generated/FloatArrays.kt rename to libraries/stdlib/src/generated/_FloatArrays.kt diff --git a/libraries/stdlib/src/generated/IntArrays.kt b/libraries/stdlib/src/generated/_IntArrays.kt similarity index 100% rename from libraries/stdlib/src/generated/IntArrays.kt rename to libraries/stdlib/src/generated/_IntArrays.kt diff --git a/libraries/stdlib/src/generated/Iterables.kt b/libraries/stdlib/src/generated/_Iterables.kt similarity index 100% rename from libraries/stdlib/src/generated/Iterables.kt rename to libraries/stdlib/src/generated/_Iterables.kt diff --git a/libraries/stdlib/src/generated/Iterators.kt b/libraries/stdlib/src/generated/_Iterators.kt similarity index 100% rename from libraries/stdlib/src/generated/Iterators.kt rename to libraries/stdlib/src/generated/_Iterators.kt diff --git a/libraries/stdlib/src/generated/IteratorsCommon.kt b/libraries/stdlib/src/generated/_IteratorsCommon.kt similarity index 100% rename from libraries/stdlib/src/generated/IteratorsCommon.kt rename to libraries/stdlib/src/generated/_IteratorsCommon.kt diff --git a/libraries/stdlib/src/generated/LongArrays.kt b/libraries/stdlib/src/generated/_LongArrays.kt similarity index 100% rename from libraries/stdlib/src/generated/LongArrays.kt rename to libraries/stdlib/src/generated/_LongArrays.kt diff --git a/libraries/stdlib/src/generated/ShortArrays.kt b/libraries/stdlib/src/generated/_ShortArrays.kt similarity index 100% rename from libraries/stdlib/src/generated/ShortArrays.kt rename to libraries/stdlib/src/generated/_ShortArrays.kt diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt index abc234b1b81..f3ac25b5a8d 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt @@ -84,29 +84,29 @@ fun main(args: Array) { templates.clear() collections() - templates.writeTo(File(outDir, "Arrays.kt")) { + templates.writeTo(File(outDir, "_Arrays.kt")) { buildFor(Arrays, "") } for (a in otherArrayNames) { - templates.writeTo(File(outDir, "${a}Arrays.kt")) { + templates.writeTo(File(outDir, "_${a}Arrays.kt")) { buildFor(PrimitiveArrays, a) } } - templates.writeTo(File(outDir, "Iterables.kt")) { + templates.writeTo(File(outDir, "_Iterables.kt")) { if (iteratorSignatures contains signature.flat()) "" else buildFor(Iterables, "") } - templates.writeTo(File(outDir, "IteratorsCommon.kt")) { + templates.writeTo(File(outDir, "_IteratorsCommon.kt")) { if (iteratorSignatures contains signature.flat()) "" else buildFor(Iterators, "") } - templates.writeTo(File(outDir, "Collections.kt")) { + templates.writeTo(File(outDir, "_Collections.kt")) { if (iteratorSignatures contains signature.flat()) buildFor(Collections, "") else "" } - generateDownTos(File(outDir, "DownTo.kt"), "package kotlin") + generateDownTos(File(outDir, "_DownTo.kt"), "package kotlin") } fun String.flat() = this.replaceAll(" ", "")