Commit Graph

129 Commits

Author SHA1 Message Date
Andrey Breslav 9125d3ed7a jet.src is gone 2012-10-17 14:39:52 +04:00
Andrey Breslav 4fc4a11fa2 Adding TuplesCode to kotlin-jslib.jar 2012-09-10 11:56:02 +04:00
Pavel V. Talanov b22513b59f Add maps.js to be packaged in kotlinEcma*.js. 2012-08-14 19:16:22 +04:00
Pavel V. Talanov 2eca6c836e Rename kotlinLib.js to kotlinEcma3.js and update build.xml accordingly.
Update paths to js-tests-lib in build.xml.

Adapted from https://github.com/develar/kotlin/commit/d3521123a6e4d551b30743b68b6bb23b9678553b.
2012-08-08 15:43:18 +04:00
Nikolay Krasko 8839630ef7 Move to 120.286 build on local build server 2012-07-31 17:18:56 +04:00
Andrey Breslav 6b4aa26122 Main part of ASM 4.0 with renamed packages is now taken directly from IDEA distribution 2012-07-25 12:07:20 +04:00
Andrey Breslav 839c39c70d Migrate build and project configuration to IntelliJ IDEA 12 (Leda) EAP
Major changes: ASM is switched from vanilla 3.3 to a 4.0 with renamed packages,
because this is done inside IDEA and we depend on that transitively.
Thus the jarjar renaming in build.xml, old library binaries deleted.

Also we now depend on exact IDEA build (EAP), not "last successful".
2012-07-25 12:07:19 +04:00
Evgeny Goldin 9eab2c92c8 Added META-INF/build.txt to Kotlin archives so that build number becomes visible in Maven artifacts as well 2012-07-23 20:42:01 +02:00
Evgeny Gerashchenko fb8d5d3903 Putting kotlin-jdk-annotations.jar into lib directory instead of lib/alt. 2012-07-23 17:24:05 +04:00
Dmitry Jemerov e5be4c8e63 publish plugin dist before test run is completed 2012-07-13 16:49:36 +02:00
Leonid Shalupov 9493dfdbe9 fix build 2012-07-11 19:30:35 +04:00
Leonid Shalupov 41cbdd754c fix build 2012-07-11 19:27:09 +04:00
Evgeny Gerashchenko a02658b1a6 Removed obsolete -mode CLI parameter. 2012-07-07 23:07:19 +04:00
Evgeny Gerashchenko 531167bcee Added -builtins CLI option. Using it instead of "-mode stdlib" to enable special frontend and backend modes. 2012-07-07 23:07:19 +04:00
Evgeny Gerashchenko 60ecd1d394 Added -noStdlib/noJdk/noJdkAnnotations command line arguments where CLI is invoked. 2012-07-07 20:33:23 +04:00
Pavel V. Talanov 92231d2eae Merge remote-tracking branch 'origin/master'
Conflicts:
	js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java
	js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java
2012-07-04 18:32:24 +04:00
Pavel V. Talanov 165c70c34c Generate kotlinLib.js using closure compiler 2012-07-04 18:22:07 +04:00
Evgeny Gerashchenko 77df57c150 Replaced jdk-headers with jdk-annotations everywhere. 2012-07-03 13:36:58 +04:00
Stepan Koltsov 4ebefd756d Revert "do not rename classes when -Dshrink=false"
It didn't work because KDoc explicitly uses renamed classes like
org.jetbrains.jet.internal.com.intellij.psi.PsiFile

This reverts commit eeac9a8afe.
2012-06-14 21:28:50 +04:00
Stepan Koltsov eeac9a8afe do not rename classes when -Dshrink=false
(need for debugging)
2012-06-14 21:14:25 +04:00
Stepan Koltsov c30c3df95e vim conf 2012-06-14 21:14:18 +04:00
pTalanov a14dffb362 Do not package the whole js.libraries/src folder into plugin. Package only those that are used in examples.
# KT-2273 Fixed
2012-06-14 14:30:55 +04:00
Stepan Koltsov dda30fcb82 fix build (add missing dependency) 2012-06-09 01:30:26 +04:00
Stepan Koltsov 8c7a879e65 jline for repl 2012-06-09 00:28:17 +04:00
Leonid Shalupov 90a8aa334c compiler sources dist: include j2k 2012-06-08 14:58:05 +04:00
Leonid Shalupov d20063a16a compiler dist: include j2k 2012-06-08 14:55:50 +04:00
pTalanov 42c29da718 Revert unwanted changes to build.xml 2012-06-05 20:12:32 +04:00
pTalanov 95e3080cc7 Manually assemble kotlinLib.js from ecma version independent and dependent parts and it to dist 2012-06-05 19:29:24 +04:00
pTalanov 959233acd1 Build: use copy instead of deprecated copyfile 2012-05-31 20:45:48 +04:00
Evgeny Gerashchenko ea36cf9fb0 Reverted all changes related to renaming jdkHeaders to altHeaders. 2012-05-23 17:05:09 +04:00
pTalanov 6a24d0cf6d Package .js library file into plugin 2012-05-22 17:20:50 +04:00
pTalanov c7c4a4bd39 SetUpJsModuleAction -> JsModuleSetUp and no longer is an action.
Fix spacing in build.xml
2012-05-22 16:29:01 +04:00
pTalanov 67491a224d Include packaging jslib into build 2012-05-22 13:49:15 +04:00
Stepan Koltsov 67b19c1881 fix generate.javadoc property 2012-05-15 22:45:11 +04:00
Leonid Shalupov 81d20dcf4b build.xml: make it green 2012-05-15 16:27:05 +02:00
Evgeny Gerashchenko 15f6e7403e Renamed jdkHeaders to altHeaders in all places where it makes sense. 2012-05-15 15:19:55 +04:00
Andrey Breslav 8297d83063 Wrong condition fixed 2012-05-10 20:31:38 +04:00
Andrey Breslav 711e61cd06 Added a property to disable compiler's javadoc generation
Run Ant with -Dgenerate.javadoc=false -Dshrink=false for a faster build
2012-05-10 17:16:04 +04:00
Leonid Shalupov 68d3795513 add manifest to runtime & jdk-headers jars 2012-05-07 23:07:14 +04:00
Leonid Shalupov a5a2bd9220 run proguard by default 2012-05-07 19:59:10 +04:00
Leonid Shalupov 0e435d5274 pack compiler sources and javadoc 2012-05-07 19:06:59 +04:00
Leonid Shalupov 58c0ad3c46 ant task fixes + first integration test 2012-05-07 18:12:06 +04:00
Leonid Shalupov 81a33bd7e8 build: more rules for jarjar 2012-05-04 23:06:17 +04:00
Leonid Shalupov 80b96dc949 shrink option in build.xml. specify -Dshrink=false to speed up the build 2012-05-04 22:50:19 +04:00
Leonid Shalupov e6418598d1 fix linux build 2012-05-04 19:43:37 +04:00
Leonid Shalupov 4eae229127 reworked kotlin compiler dist 2012-05-04 19:12:02 +04:00
Stepan Koltsov 15cc3b7d78 make jarjar and proguard optional for faster ant dist 2012-05-04 19:06:51 +04:00
Leonid Shalupov 6626086abf fix standalone compiler build 2012-05-02 23:04:21 +04:00
pTalanov 893fb1ffb7 Exclude proguard from build temporarily. 2012-05-02 15:53:34 +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