Commit Graph

229 Commits

Author SHA1 Message Date
Zalim Bashorov 909a30c279 Minor: added description for some(frequently used) ant targets to avoid hiding them in IDEA. 2014-07-07 15:50:31 +04:00
Evgeny Gerashchenko e01d80e830 Not building kotlin-for-upsource.jar on running 'dist' 2014-07-07 11:48:03 +04:00
Alexey Kudravtsev 28c29dbfde Build jar for upsource 2014-07-04 17:12:26 +04:00
Nikolay Krasko e7a1cba1eb Merge remote-tracking branch 'origin/master' into idea14
Conflicts:
	update_dependencies.xml
2014-06-27 14:44:05 +04:00
Alexander Udalov e09052bb1d Unmark dist/kotlinc/bin/*.bat as executable on Unix 2014-06-26 22:02:58 +04:00
Nikolay Krasko efa60fc1a4 Merge remote-tracking branch 'origin/HEAD' into idea14
Conflicts:
	idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java
	idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java
2014-06-26 16:46:09 +04:00
Alexander Udalov 3f51338320 Save executable flag of kotlinc-jvm and kotlinc-js after zip archiving 2014-06-25 22:32:16 +04:00
Nikolay Krasko a0e45e9a12 Merge master into idea14
Conflicts:
	.idea/runConfigurations/All_Tests.xml
	idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
	idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
	idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt
2014-06-25 16:26:01 +04:00
Evgeny Gerashchenko 1ce0e6cd3e Added exceptions for proguard: constants are used in JPS plugin. 2014-06-24 22:19:12 +04:00
Nikolay Krasko 4275912898 Update to Idea 138.693 2014-06-20 17:14:51 +04:00
Alexander Udalov 07378a74d3 Delete outdated directory creation in build.xml 2014-06-18 20:22:24 +04:00
Andrey Breslav 773cb9efbe Signature comparison used to find super functions in SignaturesPropagationData
#KT-4509 Fixed
2014-05-21 15:26:05 +04:00
Alexander Udalov 3dc92c209f Don't compile Java sources of built-ins
Module 'builtins' no longer has (and is not supposed to have) Java sources
2014-05-19 19:50:57 +04:00
Alexander Udalov c7a7f31e82 Introduce module 'reflection', move KFunctionN to it
Metadata for KFunction classes is now longer serialized along with built-in
classes. This effectively means that it's no longer possible to find KFunction
classes via dependency on built-ins. There should be a kotlin-runtime library
in the specified classpath for reflection types to be resolvable.

A lot of tests were moved and changed, because tests on callable references
require stdlib in classpath from now on
2014-05-19 19:50:57 +04:00
Alexander Udalov b7746cbee7 Move module 'serialization' to core/ 2014-05-05 20:43:34 +04:00
Nikolay Krasko 95fd870988 Update to idea 135.666 EAP with asm5 library 2014-04-01 02:55:00 +04:00
Alexander Udalov a78509432e Don't build j2k on 'ant dist'
It was only used in kotlin-web-demo some time ago
2014-03-24 16:40:07 +04:00
Zalim Bashorov 5f847bc7e7 JS backend: fixes after rename testFiles -> testData 2014-03-11 20:04:01 +04:00
Alexander Udalov e2f1e8a9c3 Revert "Rename "import jet.*" to "import kotlin.*" on ant dist"
This reverts commit 4a5823c5bb.
2014-03-02 21:35:01 +04:00
Alexander Udalov 4a5823c5bb Rename "import jet.*" to "import kotlin.*" on ant dist
Yet another hack for moving built-ins from package "jet" to "kotlin"
2014-03-02 19:55:24 +04:00
Alexander Udalov 6b0fce8cd5 Unsorted replacements "jet" -> "kotlin"
#KT-2896 Fixed
2014-03-02 19:55:15 +04:00
Alexander Udalov 0490d4c989 Rewrite ProgressionUtil to Kotlin, move to "kotlin.internal"
Use reflection in ProgressionUtilTest instead of calling methods on the class
from the class path, because in the latter case we were just testing
ProgressionUtil from bootstrap runtime (which, presumably, always works
correctly since it's a bootstrap distribution)

With this change, compilable built-ins (under core/builtins/src) are fully
written in Kotlin
2014-03-02 19:54:59 +04:00
Alexander Udalov be4a8764ff Delete unneeded classpath in 'ant builtins' target 2014-02-22 02:43:35 +04:00
Alexander Udalov 6e4c4f536c Delete outdated unused macro in ant buildfile 2014-02-21 20:49:13 +04:00
Andrey Breslav 5c28f672b2 Using Android annotations from KAnnotator 2014-02-21 19:23:42 +04:00
Andrey Breslav ff762a4467 Use JDK annotations downloaded from a KAnnotator build 2014-02-21 19:23:41 +04:00
Alexander Udalov 2d6cbc2ece Include bootstrap runtime in the intermediate kotlin-compiler.jar
This allows Kotlin compiler to be compatible only with the version of runtime
it was built against. This is currently done only on the first cycle of our
bootstrap process (the final released compiler is still supposed to work
against a separately shipped runtime)
2014-02-19 17:46:19 +04:00
Andrey Breslav 85e5b4e205 JDK layout fixed for Mac 2014-02-17 17:08:17 +04:00
Natalia Ukhorskaya 9f3b73986a Update to IDEA 13.1 (134.1007) 2014-02-17 10:45:48 +04:00
Alexander Udalov 540a06d45d Add -ea to java invocations in build.xml
Also fail if "builtins" target failed to complete successfully
2014-02-03 20:45:20 +04:00
Alexander Udalov 5e99b77de7 Compile built-ins with the new compiler in build.xml
Instead of nested "withKotlin" element in javac2 which launches
bootstrap-compiler, we launch K2JVMCompiler from the newly built compiler
directly
2014-01-27 20:36:07 +04:00
Alexander Udalov e46c54f514 Serialize built-ins on 'ant dist'
Don't store binary data in the repository anymore. From now on any test on the
compiler requires that 'ant dist' was executed at least once since the last
update of the built-ins
2014-01-27 18:33:49 +04:00
Alexander Udalov dc66561ca5 Create module 'builtins', move 'runtime' -> 'runtime.jvm'
'builtins' will be used for platform-independent core built-in definitions,
'runtime.jvm' for things that should be present at runtime in order for Kotlin
code to execute correctly on JVM

ProgressionUtil goes to 'builtins' right now because progression iterators
depend on it, but should be rewritten to Kotlin later
2014-01-27 18:33:47 +04:00
Alexander Udalov a59565bfa8 Rewrite PropertyMetadata to Kotlin 2014-01-27 18:33:44 +04:00
Erokhin Stanislav 93982265a6 Add js.dart-ast module & drop old lib 2014-01-27 17:28:49 +04:00
Alexander Udalov db9d0e381b Rework BuiltInsSerializer
BuiltInsSerializer will be distributed with Kotlin compiler from now on. This
will allow to serialize binary data of built-ins on 'ant dist', as opposed to
storing all *.kotlin_class files in the repository: ant dist will just invoke
this serializer from bootstrap-compiler.jar
2014-01-22 19:11:43 +04:00
Natalia Ukhorskaya f2f1a1313d Add jdk jars to kotlin classpath
#KT-4214 Fixed
2013-12-26 13:50:10 +04:00
Andrey Breslav 4ac7afbb9f Module annotations-ext removed. Annotations are moved to runtime 2013-11-21 20:47:48 +04:00
Andrey Breslav 6dde064791 Collections in interfaces marked @ReadOnly 2013-11-21 13:07:34 +04:00
Nikolay Krasko f8357aecc1 Assign annotation to intellij-core library 2013-11-15 19:41:20 +04:00
Zalim Bashorov 060d7c5345 Removed closure-compiler.jar from repository and js_test_libs.
Added closure-compiler.jar to third-party dependencies.
Switch to use closure-compiler ant task instead of java task.
2013-11-15 15:18:00 +04:00
Zalim Bashorov df4850c22f BuildTools: added ant task for Kotlin2Js compiler. 2013-11-15 15:17:59 +04:00
Andrey Breslav 9723106d95 Add missing module to quick compiler build 2013-11-14 19:29:05 +04:00
Alexander Udalov d044fbb4f1 Add "-source 1.6" to javac to prevent numerous warnings on JDK 7 2013-11-14 19:11:21 +04:00
Zalim Bashorov 5dd4eb780e Extracted OutputFileFactory interface. 2013-11-08 18:14:20 +04:00
Natalia Ukhorskaya cc948d88cc Build j2k using kotlinc in build.xml 2013-11-08 12:12:06 +04:00
Pavel V. Talanov 44ffe2905d Build: compile j2k module with Kotlin 2013-10-29 21:03:34 +04:00
Erokhin Stanislav 35bc3cd587 Move ant from dependencies/ant -> dependencies/ant-1.7 2013-10-28 16:07:01 +04:00
Andrey Breslav 5175b8444f Build a special compiler jar for maven that contains the runtime as well 2013-10-14 14:42:26 +04:00
Andrey Breslav 6d840d4b48 Rename 2013-10-14 14:42:25 +04:00