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

JS backend: maven projects: extract library js-files to target/js/lib, set scope=test for stdlib in browser-example*

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-12-01 19:07:15 +03:00
parent 85a16c3c51
commit b71101942e
7 changed files with 21 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/examples/browser-example-with-library/pom.xml
+4 -4
View File
@@ -26,13 +26,13 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- testing -->
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId> <artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope>
</dependency> </dependency>
<!-- testing -->
<dependency> <dependency>
<groupId>org.seleniumhq.selenium</groupId> <groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId> <artifactId>selenium-java</artifactId>
@@ -90,14 +90,14 @@
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId> <artifactId>kotlin-js-library</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<outputDirectory>${project.build.directory}/js</outputDirectory> <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
<includes>*.js</includes> <includes>*.js</includes>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library-example</artifactId> <artifactId>kotlin-js-library-example</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<outputDirectory>${project.build.directory}/js</outputDirectory> <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
<includes>*.js</includes> <includes>*.js</includes>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
libraries/examples/browser-example-with-library/sample.html
+2 -2
View File
@@ -9,8 +9,8 @@
</div> </div>
<script type="text/javascript" src="src/js/jquery.js"></script> <script type="text/javascript" src="src/js/jquery.js"></script>
<script src="target/js/kotlin.js"></script> <script src="target/js/lib/kotlin.js"></script>
<script src="target/js/kotlin-js-library-example.js"></script> <script src="target/js/lib/kotlin-js-library-example.js"></script>
<script type="text/javascript" src="target/js/browser-example-with-library.js"></script> <script type="text/javascript" src="target/js/browser-example-with-library.js"></script>
<!-- <!--
libraries/examples/browser-example/pom.xml
+8 -14
View File
@@ -17,11 +17,17 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId> <artifactId>kotlin-js-library</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- testing --> <!-- testing -->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.seleniumhq.selenium</groupId> <groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId> <artifactId>selenium-java</artifactId>
@@ -34,11 +40,6 @@
<version>${selenium.version}</version> <version>${selenium.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
@@ -58,13 +59,6 @@
<goal>js</goal> <goal>js</goal>
</goals> </goals>
</execution> </execution>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution> <execution>
<id>test-compile</id> <id>test-compile</id>
<phase>test-compile</phase> <phase>test-compile</phase>
@@ -91,7 +85,7 @@
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId> <artifactId>kotlin-js-library</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<outputDirectory>${project.build.directory}/js</outputDirectory> <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
<includes>*.js</includes> <includes>*.js</includes>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
libraries/examples/browser-example/sample.html
+1 -1
View File
@@ -9,7 +9,7 @@
</div> </div>
<script type="text/javascript" src="src/js/jquery.js"></script> <script type="text/javascript" src="src/js/jquery.js"></script>
<script src="target/js/kotlin.js"></script> <script src="target/js/lib/kotlin.js"></script>
<script type="text/javascript" src="target/js/browser-example.js"></script> <script type="text/javascript" src="target/js/browser-example.js"></script>
<!-- <!--
libraries/tools/kotlin-js-library/pom.xml
+3 -23
View File
@@ -29,6 +29,9 @@
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib.jar" <copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib.jar"
tofile="${basedir}/target/${project.artifactId}-${project.version}.jar" tofile="${basedir}/target/${project.artifactId}-${project.version}.jar"
overwrite="true" verbose="true"/> overwrite="true" verbose="true"/>
<copy file="${kotlin-dist}/kotlinc/lib/kotlin-jslib-sources.jar"
tofile="${basedir}/target/${project.artifactId}-${project.version}-sources.jar"
overwrite="true" verbose="true"/>
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>
@@ -37,29 +40,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version>
<executions>
<execution>
<id>install-library</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${kotlin-dist}/kotlinc/lib/kotlin-jslib-sources.jar</file>
<classifier>sources</classifier>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<packaging>jar</packaging>
<generatePom>false</generatePom>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
libraries/tools/kotlin-js-tests/pom.xml
+1 -1
View File
@@ -125,7 +125,7 @@
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-library</artifactId> <artifactId>kotlin-js-library</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<outputDirectory>${project.build.directory}/js</outputDirectory> <outputDirectory>${project.build.directory}/js/lib</outputDirectory>
<includes>*.js</includes> <includes>*.js</includes>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
libraries/tools/kotlin-js-tests/src/test/web/index.html
+2 -2
View File
@@ -7,8 +7,8 @@
<script src="qunit.js"></script> <script src="qunit.js"></script>
<script src="../../../target/js/kotlin.js"></script> <script src="../../../target/js/lib/kotlin.js"></script>
<script src="../../../target/js/kotlin-js-tests.js"></script> <script src="../../../target/js/lib/kotlin-js-tests.js"></script>
<script src="deepEqual.js"></script> <script src="deepEqual.js"></script>
<script src="swarminject.js"></script> <script src="swarminject.js"></script>