297 Commits

Author SHA1 Message Date
James Strachan 2d4354af6c fixed possible NPE 2012-05-31 09:32:03 +01:00
James Strachan 872f08303e allow the JS maven plugin to copy the kotlin JS library file - or append it 2012-05-30 16:43:33 +01:00
James Strachan e41f59779e avoid mandatory properties for optional things on the plugin 2012-05-30 16:43:04 +01:00
James Strachan 4cff5f9759 modified the JS compiler so that it can have definitions and library sources specified or discovered on the classpath; so for example we can then discover the kotlin standard library kotlin that needs to be compiled; plus the JS library definitions (which map to the kotlin-lib.js file) 2012-05-30 15:51:08 +01:00
James Strachan d7573b49a6 allow the JS compiler to take a list of files, verbose flag and a flag to indicate if a main call is required; plus added a test case to ensure we can compile some of the kotlin standard library using the K2JSCompiler directly 2012-05-30 11:31:35 +01:00
James Strachan 4921aeafc3 refactored the maven plugin to use the vanilla K2JSCompiler directly and avoid using the K2JVMCompiler when generating JS code; also included a default LibrarySourceConfig which detects JS library code on the classpath which works nicer in maven/ant style worlds where dependencies tend to be specified rather than file paths to zip files 2012-05-29 17:28:15 +01:00
James Strachan 2898abb245 simplified the kotlin-js-library source generation so we can selectively include some of the kotlin standard library for use in JS compilation 2012-05-29 08:49:36 +01:00
James Strachan 7f53b2f111 workaround for windows test failure 2012-05-28 19:50:22 +01:00
James Strachan 4d7ab80c3e workaround for windows test failure 2012-05-28 19:08:31 +01:00
James Strachan 6486023feb workaround for windows test failure 2012-05-28 18:48:53 +01:00
James Strachan ec1a7f44ae create a standard jar of the kotlin JS source that needs to be compiled when generating JS code so its easy to reuse using regular maven dependencies in build tools; updated the examples to reuse this so that its easy to build JS code without needing to know where on the file system a kotlin checkout lives 2012-05-28 17:16:12 +01:00
James Strachan 1254aa9e6f allow the JS compiler to reference the JS library source so that maven based JS compilation can work & use the new kotlin.browser API 2012-05-26 07:45:10 +01:00
Evgeny Gerashchenko 1ff9c86083 Reverted K2JVMCompilerArguments.altHeaders->jdkHeaders usage. 2012-05-23 17:52:16 +04:00
Evgeny Gerashchenko ea36cf9fb0 Reverted all changes related to renaming jdkHeaders to altHeaders. 2012-05-23 17:05:09 +04:00
pTalanov c8fe0080c7 Fix compilation for maven build 2012-05-16 17:43:12 +04:00
Leonid Shalupov c6223fc0c2 stream integration test logs 2012-05-15 20:09:40 +02:00
Leonid Shalupov c689840eee jdk -> alt 2012-05-15 18:21:35 +02:00
Leonid Shalupov 734b60bb67 Merge pull request #51 from detouched/maven-plugin-test
maven plugin: uncommented invoker plugin but commented phase binding.
2012-05-15 07:57:35 -07:00
Leonid Shalupov a8951284ac libraries: jdkHeaders -> altHeaders 2012-05-15 16:49:06 +02:00
Evgeny Gerashchenko 15f6e7403e Renamed jdkHeaders to altHeaders in all places where it makes sense. 2012-05-15 15:19:55 +04:00
Daniel Penkin 43d64f2265 Uncommented invoker plugin but commented phase binding.
Integration tests are not held during normal package but still available via "mvn integration-test" command.
2012-05-09 13:58:40 +04:00
Leonid Shalupov 9f13d3b263 commented out maven integrations tests for now 2012-05-09 04:25:30 +04:00
Daniel Penkin 422fc81e38 Removed unnecessary import statement 2012-05-08 23:15:27 +04:00
Daniel Penkin a2ee297db9 Removed unnecessary repository sections 2012-05-08 23:10:03 +04:00
Daniel Penkin 281e8e5a76 Temporarily removed settings.xml 2012-05-08 12:51:21 +04:00
Daniel Penkin d6e8b63dc3 Added simple kotlin-maven-plugin integration test 2012-05-08 12:51:20 +04:00
Daniel Penkin 1484e8852c Merged with upstream master 2012-05-08 12:08:37 +04:00
Pavel Talanov cd2783eac8 Try fix maven plugin compilation 2012-05-06 01:36:45 +04:00
pTalanov 9b0ef758fb Fix maven plugin compilation. 2012-05-05 20:35:52 +04:00
Leonid Shalupov 4eae229127 reworked kotlin compiler dist 2012-05-04 19:12:02 +04:00
pTalanov 7da1e31eca Merge remote-tracking branch 'origin/master'
Conflicts:
	build-tools/core/src/org/jetbrains/jet/buildtools/core/BytecodeCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentConfiguration.java
	compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
	compiler/tests/org/jetbrains/jet/JetTestUtils.java
	compiler/tests/org/jetbrains/jet/codegen/CompileTextTest.java
2012-05-02 13:39:36 +04:00
Leonid Shalupov 8e961e00cc delete obsolete readme on maven plugin 2012-04-30 22:52:21 +04:00
pTalanov cdfa0678cf Extract reusable functionality from K2JVMCompiler, K2JVMCompilerArguments, CompilerEnvironmentConfiguration. 2012-04-28 22:47:33 +04:00
pTalanov d0d5b147f2 Refactor cli: all the jvm stuff goes under org.jetbrains.jet.cli.jvm, common stuff under org.jetbrains.jet.cli.common 2012-04-25 20:19:15 +04:00
Leonid Shalupov 3813e0a886 maven version = 0.1-SNAPSHOT 2012-04-12 13:03:15 +04:00
Leonid Shalupov d1246abbf1 maven: get rid of intermediate poms: examples, docs, tools (artifacts garbage) 2012-04-12 09:33:48 +04:00
Leonid Shalupov 1ecb2fe7db maven plugin: include source roots to compiler classpath (enabled mixed compilation) 2012-04-11 21:32:50 +04:00
Leonid Shalupov 1752b6f13e maven plugin: disable runtime hiding from compiler classpath 2012-04-10 23:44:56 +04:00
Leonid Shalupov 8baf7f50c1 don't set empty classpath 2012-04-10 23:26:45 +04:00
Leonid Shalupov 1a63f91cc5 maven plugin: exclude kotlin-runtime jar from classpath passed to compiler 2012-04-10 22:39:11 +04:00
Leonid Shalupov 863042da27 maven artifacts: runtime, stdlib -> kotlin-runtime, kotlin-stdlib 2012-04-10 22:39:11 +04:00
Stepan Koltsov ff9af9b348 maven-plugin: log actual compiler arguments
mvn --debug prints compiler arguments
2012-04-10 22:08:47 +04:00
Leonid Shalupov ec15591208 maven plugin: bundle jdk headers 2012-04-10 15:44:07 +04:00
Stepan Koltsov a889e29147 else on the next line
as requested by http://confluence.jetbrains.net/display/JET/Code+Conventions+for+Java

(sed is your friend)
2012-04-10 00:03:13 +04:00
Leonid Shalupov d02928715b maven plugin: don't automatically include runtime 2012-04-09 22:51:06 +04:00
Leonid Shalupov 083ade9f68 compilation 2012-04-09 22:37:38 +04:00
James Strachan a40f9ee9b1 refactored the maven project structure so that things are in a simpler tree structure to avoid folks getting lost 2012-04-05 16:20:06 +01:00