JS: simplify merging kotlin.js

2016-10-27 14:31:53 +03:00
parent ac4bfc645e
commit a452260da6
3 changed files with 25 additions and 25 deletions
@@ -375,6 +375,19 @@
                <file name="externs.js"/>
            </externs>
        </closure-compiler>
+
+        <replaceregexp file="${js.stdlib.output.dir}/kotlin.js"
+                       match="module.exports,\s*require\([^)]+\)"
+                       replace=""
+                       byline="true" encoding="UTF-8" />
+        <replaceregexp file="${js.stdlib.output.dir}/kotlin.js"
+                       match="function\s*\(_,\s*Kotlin\)"
+                       replace="function()"
+                       byline="true" encoding="UTF-8" />
+        <replaceregexp file="${js.stdlib.output.dir}/kotlin.js"
+                       match="return\s+_;"
+                       replace=""
+                       byline="true" encoding="UTF-8" />
    </target>

    <target name="js-stdlib">
@@ -401,15 +414,6 @@
        <move file="${js.stdlib.output.dir}/tmp/kotlin" todir="${js.stdlib.output.dir}" />
        <move file="${js.stdlib.output.dir}/tmp/${compiled.stdlib.meta.js}" tofile="${js.stdlib.output.dir}/${compiled.stdlib.meta.js}" />

-        <replaceregexp file="${js.stdlib.output.dir}/builtins.js"
-                       match="module.exports,\s*require\([^)]+\)"
-                       replace="Kotlin, Kotlin"
-                       byline="true" encoding="UTF-8" />
-        <replaceregexp file="${js.stdlib.output.dir}/${compiled.stdlib.js}"
-                       match="module.exports,\s*require\([^)]+\)"
-                       replace="Kotlin, Kotlin"
-                       byline="true" encoding="UTF-8" />
-
        <condition property="jdk17" value="${env.JDK_17}" else="${env.JAVA_HOME}">
            <isset property="env.JDK_17" />
        </condition>