azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:JetBrains/kotlin

Browse Source
This commit is contained in:
James Strachan
2012-03-08 08:11:34 +00:00
parent c68c298930 0a0cfcf6c5
commit bfce06cbb0
2 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/build.xml
+2 -2
View File
@@ -310,7 +310,7 @@
<then> <then>
<!-- Batch tests --> <!-- Batch tests -->
<if> <if>
<matches string="@{classpath}" pattern="/.jar$"/> <matches string="@{classpath}" pattern="\.jar$"/>
<then> <then>
<!-- Batch tests from a jar --> <!-- Batch tests from a jar -->
<echo>Running JUnit: classpath = "@{classpath}" (Jar)</echo> <echo>Running JUnit: classpath = "@{classpath}" (Jar)</echo>
@@ -488,7 +488,7 @@
<hello-tests/> <hello-tests/>
<longer-examples-tests/> <longer-examples-tests/>
<module-tests/> <module-tests/>
<testlib-tests/> <!--<testlib-tests/>-->
<compilation-fail-test/> <compilation-fail-test/>
</target> </target>
</project> </project>
libraries/pom.xml
+75 -15
View File
@@ -13,11 +13,16 @@
<properties> <properties>
<junit-version>4.9</junit-version> <junit-version>4.9</junit-version>
<kotlin-compiler.version>0.2.3.8</kotlin-compiler.version> <kotlin-compiler.version>0.2.3.8</kotlin-compiler.version>
<kotlin-maven-plugin.version>0.2.3.8-beta-7</kotlin-maven-plugin.version> <kotlin-maven-plugin.version>0.2.3.8-beta-8</kotlin-maven-plugin.version>
<kotlin-sdk>${project.basedir}/../../dist/kotlinc</kotlin-sdk>
<pegdown.version>1.1.0</pegdown.version>
<project-root>${project.basedir}/..</project-root> <project-root>${project.basedir}/..</project-root>
<kotlin-sdk>${project-root}/../dist/kotlinc</kotlin-sdk>
<pegdown.version>1.1.0</pegdown.version>
<surefire-version>2.5</surefire-version> <surefire-version>2.5</surefire-version>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Not to be used manually! Set to "true" by identically named profile, see below. -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<localKotlin>false</localKotlin>
</properties> </properties>
<repositories> <repositories>
@@ -35,15 +40,6 @@
</pluginRepositories> </pluginRepositories>
<dependencies> <dependencies>
<!-- TODO a dirty hack until we have the artifacts in a mvn repo -->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-compiler</artifactId>
<version>${kotlin-compiler.version}</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/kotlin-compiler.jar</systemPath>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
@@ -52,6 +48,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<modules> <modules>
<module>stdlib</module> <module>stdlib</module>
<module>kunit</module> <module>kunit</module>
@@ -77,13 +74,14 @@
</goals> </goals>
<phase>initialize</phase> <phase>initialize</phase>
<configuration> <configuration>
<runIf>{{ ! Boolean.valueOf( localKotlin ) }}</runIf>
<ivyconf>${project-root}/etc/ivyconf.xml</ivyconf> <ivyconf>${project-root}/etc/ivyconf.xml</ivyconf>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>ivy.org</groupId> <groupId>ivy.org</groupId>
<artifactId>bt343</artifactId> <artifactId>bt344</artifactId>
<version>latest.lastSuccessful</version> <version>latest.lastSuccessful</version>
<classifier>core/intellij-core</classifier> <classifier>kotlin-compiler</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ivy.org</groupId> <groupId>ivy.org</groupId>
@@ -91,6 +89,12 @@
<version>latest.lastSuccessful</version> <version>latest.lastSuccessful</version>
<classifier>kotlin-runtime</classifier> <classifier>kotlin-runtime</classifier>
</dependency> </dependency>
<dependency>
<groupId>ivy.org</groupId>
<artifactId>bt343</artifactId>
<version>latest.lastSuccessful</version>
<classifier>core/intellij-core</classifier>
</dependency>
</dependencies> </dependencies>
<scope>compile</scope> <scope>compile</scope>
<verbose>true</verbose> <verbose>true</verbose>
@@ -108,7 +112,7 @@
<id>compile-kotlin-sources</id> <id>compile-kotlin-sources</id>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
<goal>testCompile</goal> <!--<goal>testCompile</goal>-->
</goals> </goals>
</execution> </execution>
</executions> </executions>
@@ -135,4 +139,60 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>localKotlin</id>
<properties>
<localKotlin>true</localKotlin>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.goldin.plugins</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin-maven-plugin.version}</version>
<configuration>
<kotlinJars>
<jar>${kotlin-sdk}/lib/kotlin-build-tools.jar</jar>
<jar>${kotlin-sdk}/lib/kotlin-compiler.jar</jar>
<jar>${kotlin-sdk}/lib/kotlin-runtime.jar</jar>
<jar>${kotlin-sdk}/lib/intellij-core.jar</jar>
<jar>${kotlin-sdk}/lib/picocontainer.jar</jar>
<jar>${kotlin-sdk}/lib/trove4j.jar</jar>
</kotlinJars>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-compiler</artifactId>
<version>${kotlin-compiler.version}</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/kotlin-compiler.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>${kotlin-compiler.version}</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/kotlin-runtime.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>intellij-core</artifactId>
<version>${kotlin-compiler.version}</version>
<scope>system</scope>
<systemPath>${kotlin-sdk}/lib/intellij-core.jar</systemPath>
</dependency>
</dependencies>
</profile>
</profiles>
</project> </project>