Commit Graph

22 Commits

Author SHA1 Message Date
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