azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS: rename "-library-files" argument to "-libraries" and change separator

Browse Source 
Use the system separator (':' or ';') instead of commas

 #KT-16083 Fixed
This commit is contained in:
Alexander Udalov
2017-01-30 18:54:24 +03:00
parent fd24031a69
commit 464820458e
30 changed files with 68 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/js/jsHelp.out
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ Usage: kotlinc-js <options> <source files>
where possible options include:
-output <path> Output file path
-no-stdlib Don't use bundled Kotlin stdlib
-library-files <path[,]> Path to zipped library sources or kotlin files separated by commas
-libraries <path> Paths to Kotlin libraries with .meta.js and .kjsm files, separated by system file separator
-source-map Generate source map
-meta-info Generate .meta.js and .kjsm files with metadata. Use to create a library
-target { v5 } Generate JS files for specific ECMA version
compiler/testData/cli/js/libraryDirNotFound.args
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
$TESTDATA_DIR$/withLib.kt
-library-files
-libraries
not/existing/path
-output
$TEMP_DIR$/out.js
compiler/testData/cli/js/notValidLibraryDir.args
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
$TESTDATA_DIR$/withLib.kt
-library-files
-libraries
compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib
-output
$TEMP_DIR$/out.js
compiler/testData/cli/js/withFolderAsLib.args
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
$TESTDATA_DIR$/withLib.kt
-library-files
-libraries
compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example
-output
$TEMP_DIR$/out.js
compiler/testData/cli/js/withLib.args
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
$TESTDATA_DIR$/withLib.kt
-library-files
-libraries
compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar
-output
$TEMP_DIR$/out.js
compiler/testData/cli/js/wrongAbiVersion.args
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
$TESTDATA_DIR$/simple2js.kt
-no-stdlib
-library-files
-libraries
$TESTDATA_DIR$/wrongAbiVersionLib/wrongAbiLib.meta.js
-output
$TEMP_DIR$/out.js
compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/build.xml
Vendored
+2 -2
View File
@@ -3,9 +3,9 @@
<property name="library.path" value="${test.data}/jslib-example.jar"/>
<target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<library>
<libraries>
<pathelement path="${library.path}"/>
</library>
</libraries>
</kotlin2js>
<unzip src="${library.path}" dest="${temp}">
<patternset>
compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/build.xml
Vendored
+2 -2
View File
@@ -3,9 +3,9 @@
<property name="library.path" value="${test.data}/jslib-example"/>
<target name="build">
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<library>
<libraries>
<pathelement path="${library.path}"/>
</library>
</libraries>
</kotlin2js>
<copy todir="${temp}">
<fileset dir="${library.path}">
compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib/build.xml
Vendored
+2 -2
View File
@@ -8,9 +8,9 @@
<kotlin2js src="${library.path}" output="${temp.library.path}/jslib-example.js" metaInfo="true"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<library>
<libraries>
<pathelement path="${temp.library.path}/jslib-example.meta.js"/>
</library>
</libraries>
</kotlin2js>
<copy todir="${temp}">
<fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/build.xml
Vendored
+2 -2
View File
@@ -8,9 +8,9 @@
<kotlin2js src="${library.path}" output="${temp.library.path}/jslib-example.js" metaInfo="true" moduleKind="umd"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call" moduleKind="amd">
<library>
<libraries>
<pathelement path="${temp.library.path}/jslib-example.meta.js"/>
</library>
</libraries>
</kotlin2js>
<copy todir="${temp}">
<fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithStdlibAndJsFilesWithTwoModulesAsLibrary/build.xml
Vendored
+4 -4
View File
@@ -8,9 +8,9 @@
<kotlin2js src="${library.path1}" output="${temp.library.path}/jslib-example1.js" metaInfo="true"/>
<kotlin2js src="${library.path2}" output="${temp.library.path}/jslib-example2.js" metaInfo="true">
<library>
<libraries>
<pathelement path="${temp.library.path}/jslib-example1.meta.js"/>
</library>
</libraries>
</kotlin2js>
<concat destfile="${temp.library.path}/jslib-example.js">
@@ -26,9 +26,9 @@
<delete file="${temp.library.path}/jslib-example2.meta.js"/>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<library>
<libraries>
<pathelement path="${temp.library.path}/jslib-example.js"/>
</library>
</libraries>
</kotlin2js>
<copy todir="${temp}">
<fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithStdlibAndTwoJsFilesAsLibraries/build.xml
Vendored
+4 -4
View File
@@ -8,16 +8,16 @@
<kotlin2js src="${library.path1}" output="${temp.library.path}/jslib-example1.js" metaInfo="true"/>
<kotlin2js src="${library.path2}" output="${temp.library.path}/jslib-example2.js" metaInfo="true">
<library>
<libraries>
<pathelement path="${temp.library.path}/jslib-example1.meta.js"/>
</library>
</libraries>
</kotlin2js>
<kotlin2js src="${test.data}/root1" output="${temp}/out.js" main="call">
<library>
<libraries>
<pathelement path="${temp.library.path}/jslib-example1.meta.js"/>
<pathelement path="${temp.library.path}/jslib-example2.meta.js"/>
</library>
</libraries>
</kotlin2js>
<copy todir="${temp}">
<fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithoutStdlibAndFolderAsAnotherLib/build.xml
Vendored
+2 -2
View File
@@ -8,9 +8,9 @@
<kotlin2js src="${library.path}" noStdlib="true" output="${temp.library.path}/jslib-example.js" metaInfo="true"/>
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call">
<library>
<libraries>
<pathelement path="${temp.library.path}"/>
</library>
</libraries>
</kotlin2js>
<copy todir="${temp}">
<fileset dir="${temp.library.path}">
compiler/testData/integration/ant/js/simpleWithoutStdlibAndJsFileAsAnotherLib/build.xml
Vendored
+2 -2
View File
@@ -8,9 +8,9 @@
<kotlin2js src="${library.path}" noStdlib="true" output="${temp.library.path}/jslib-example.js" metaInfo="true"/>
<kotlin2js src="${test.data}/root1" noStdlib="true" output="${temp}/out.js" main="call">
<library>
<libraries>
<pathelement path="${temp.library.path}/jslib-example.meta.js"/>
</library>
</libraries>
</kotlin2js>
<copy todir="${temp}">
<fileset dir="${temp.library.path}">