Commit Graph

68 Commits

Author SHA1 Message Date
Evgeny Gerashchenko e676bd841d Partial compilation of package (only functions supported).
Original commit: d62bc07437
2014-03-25 14:31:38 +04:00
Evgeny Gerashchenko cf1cf25cb4 Rendering class or package proto when JPS test fails.
Original commit: 5c8253c099
2014-03-25 14:26:48 +04:00
Evgeny Gerashchenko 02c0baf065 Checking class files contents after make and rebuild.
Original commit: e1a47deeae
2014-03-25 14:26:47 +04:00
Evgeny Gerashchenko 259d03198d Baby steps for incremental compilation.
Original commit: 5acd054c72
2014-03-25 14:26:47 +04:00
Evgeny Gerashchenko 7586056fed Moved general JPS test data to common directory.
Original commit: 9e22c29825
2014-03-25 14:26:47 +04:00
Alexander Udalov d17092b6e4 Move DebugProtoBuf to module "compiler-tests"
To help debug serialization-related code in compiler tests

Original commit: 64ac223895
2014-03-07 03:08:16 +04:00
Evgeny Gerashchenko a19d7c7542 Introduced protobuf generating script.
It generates two variants: lite (for runtime usage) and debug (for
tests).

Original commit: 846ee2c8ac
2014-02-13 20:46:28 +04:00
Andrey Breslav b1634905d4 Use Project SDK for jps-plugin
Original commit: 2c61ff9085
2014-01-20 20:12:17 +04:00
Andrey Breslav 1576c63073 Always use Project SDK
Original commit: 77c340d872
2014-01-20 20:08:28 +04:00
Andrey Breslav 27829c15e5 Fix for KT-4413 Do not add error types to supertype lists
The list is not filtered upon creation because it would force lazy types to compute

#KT-4413 Fixed

Original commit: 0155bf0189
2014-01-16 20:05:12 +04:00
Evgeny Gerashchenko b972ebe05b Got rid of "namespace" word in backend.
Original commit: 4239f5bb18
2014-01-14 18:06:47 +04:00
Zalim Bashorov f1af824e5d KotlinJpsBuildTestCase -> KotlinJpsBuildTest
Original commit: 8917bd0331
2013-11-12 20:34:23 +04:00
Zalim Bashorov c35258d34c JPS: add tests for: exclude in compiler settings, project with more then one file.
Original commit: 4fb995c50b
2013-11-12 20:33:05 +04:00
Zalim Bashorov 0ae7b9a6b0 JPS: ignore excluded directories and files in compilation.
#KT-4188 fixed

Original commit: b31e2d7421
2013-11-12 18:44:30 +04:00
Zalim Bashorov fcce7f25a7 JPS: revert KotlinBuilder changes for using dirty files, because it's wrong.
Original commit: 923fd74c0a
2013-11-12 18:44:30 +04:00
Zalim Bashorov a85a00f422 JPS: switched to use dirty files without incremental compilation (temporary hack for recompiling all).
Fixed compiling files from excluded directories.

Original commit: e5a58e0c70
2013-11-08 18:14:22 +04:00
Zalim Bashorov a5fbb9e61b Refresh FS after compilation for js and sourcemap files.
Original commit: 1409dd7812
2013-11-08 18:14:21 +04:00
Andrey Breslav 372c0e944b Do not use a method that is not present in some versions fo JPS
Original commit: b726b5070a
2013-10-31 18:31:00 +04:00
Zalim Bashorov 8489012277 Minor refactoring -- rename some classes and variables.
Original commit: da718af8b7
2013-10-24 19:06:07 +04:00
Zalim Bashorov 39172ceed6 Make private all fields in JpsKotlinCompilerSettings.
Original commit: 3f4cd455e2
2013-10-24 19:06:07 +04:00
Zalim Bashorov 107d804945 Added "Additional command line parameters" to the Kotlin Compiler Settings tab.
Original commit: faa82317b6
2013-10-24 18:37:00 +04:00
Zalim Bashorov bd486b1ac5 CLI & JPS: use List instead Set for libraries and decencies.
Original commit: 4d68262b7f
2013-10-24 18:36:59 +04:00
Andrey Breslav e77b4443b4 Ignore all output directories in a chunk
Otherwise the class files generated by previous builds for one of the targets in the chunk would interfere with source definitions, and we get overload resolution ambiguities and such

Original commit: aacf133ef6
2013-10-21 19:21:23 +04:00
Andrey Breslav 88c7255e2c Report correct build targets for outputs + tests on output removal
Original commit: 2a43d2adee
2013-10-21 19:21:23 +04:00
Andrey Breslav 5112c43501 Correctly report locations of output files
Original commit: c84e582397
2013-10-21 19:21:23 +04:00
Andrey Breslav 75f677e705 Check removed files as well as dirty ones
Original commit: 251c659e91
2013-10-21 19:21:22 +04:00
Andrey Breslav dd1dc67cfb Do not fail on bad Kotlin configuration if there are no Kotlin files
Original commit: 61270e8ee5
2013-10-18 12:23:07 +04:00
Zalim Bashorov 4e5b04ce1f CLI: drop CompilerArguments and unnecessary methods from *CompilerArguments classes
Original commit: 31a4d91122
2013-10-16 17:39:49 +04:00
Zalim Bashorov 06549c6413 JPS: switch to using *CompilerArgument classes(from IDEA Project Settings) in build.
Original commit: 5e0ef68d64
2013-10-16 17:39:49 +04:00
Zalim Bashorov 5a0c58b72b JPS: removed unnecessary code for running compiler out of process.
Original commit: 41d0a8be24
2013-10-16 17:39:48 +04:00
Zalim Bashorov 2485f201d4 JPS: transferring compiler settings to the JPS
Original commit: 1176d58f40
2013-10-16 17:39:48 +04:00
Andrey Breslav e4f4619080 Support circular dependencies
We generate a module script with information on all modules in the chunk, then build the whole chunk as "one big module"

Original commit: 60425b15e6
2013-10-14 14:42:24 +04:00
Andrey Breslav e3cba725c8 Each module carries its output directory
Original commit: d4a89d04d7
2013-10-10 17:49:17 +04:00
Zalim Bashorov 5938036801 JPS plugin: refactoring:
- extract utility methods from KotlinBuilder;
- use StringUtil#join instead for iteration;
- add private constructor to LibraryUtils.

Original commit: dd553ef671
2013-10-04 19:18:19 +04:00
Zalim Bashorov a048b51f4b JPS plugin: add support external compilation for JS modules.
Original commit: 2b9b563efb
2013-10-03 13:58:02 +04:00
Zalim Bashorov 7906832d75 JPS plugin: make the code more understandable -- added some comments and rename scriptFile to moduleFile.
Original commit: cfb7104ae9
2013-10-03 13:58:02 +04:00
Zalim Bashorov 81a216cb0e JPS plugin: remove unnecessary method KotlinSourceFileCollector#hasDirtyFiles.
Original commit: fc6b77366a
2013-10-03 13:48:38 +04:00
Natalia.Ukhorskaya a9f6f525a4 Missed sdk annotations for Android Sdk
#KT-3965 Fixed

Original commit: 188e8b983e
2013-09-12 11:38:46 +04:00
Andrey Breslav 1d3458ab99 Using annotations from reexported libraries
Original commit: 1e91fb8d27
2013-08-29 20:30:34 +04:00
Andrey Breslav e092d00c2e Support exported dependencies
Original commit: 5c58cb946c
2013-08-27 15:48:18 +04:00
Alexander Udalov f2ba3cf157 Rename package in JPS plugin tests
Package 'kotlin' is not supported until package views are implemented, because
its name clashes with the stdlib

Original commit: 2af8dd4298
2013-08-26 15:59:43 +04:00
Natalia.Ukhorskaya 160070be27 Implement method from super class
Original commit: aec1fa8697
2013-08-08 16:03:03 +04:00
Natalia.Ukhorskaya 48ac33d730 Check is JavaBuilder.IS_ENABLED public
Original commit: bc9af296a5
2013-08-08 16:02:58 +04:00
Natalia.Ukhorskaya cfa8694eb7 Disable kotlin-jps-plugin when java-jps-plugin is disabled
Original commit: 2cc4638b09
2013-08-08 14:07:50 +04:00
Andrey Breslav eba00a0cd9 Log version in JPS plugin
CompilerVersion.java is moved to cli-common (shared between compiler and JPS plugin) and renamed to KotlinVersion

This is needed because on TeamCity a JPS plugin is configured separately from the compiler, so it may happen that
JPS plugin version X tries to run compiler version X+100, and causes trouble.

Original commit: 387bf2601b
2013-07-25 20:18:03 +04:00
Erokhin Stanislav 30ce814129 Merge branch 'master' into idea13
Original commit: 79a9253b74
2013-07-09 19:52:06 +04:00
Andrey Breslav 9defbe0083 Path separator must be constant
TeamCity agents have different OS'es, but build parameters are fixed

Original commit: 7171cd4cc5
2013-06-10 15:33:44 +04:00
Natalia.Ukhorskaya 372ea911a5 Merge branch 'master' into idea13
Conflicts:
	idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
	idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
	libraries/stdlib/src/kotlin/properties/Properties.kt
	libraries/stdlib/test/properties/delegation/DelegationTest.kt
	libraries/stdlib/test/properties/delegation/MapDelegationTest.kt
	libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt
	update_dependencies.xml

Original commit: 8429162220
2013-06-04 13:14:08 +04:00
Andrey Breslav 005124ed27 Support custom JDK annotations path for TeamCity
Original commit: 6d6e627641
2013-05-31 20:35:32 +04:00
Andrey Breslav 8b0054af39 Do not fail on circular dependencies + better message
Original commit: a8267b370e
2013-05-30 13:07:50 +04:00