Module annotations-ext removed. Annotations are moved to runtime

2013-11-20 14:03:16 +04:00
parent c7d5819ef2
commit 4ac7afbb9f
12 changed files with 3 additions and 111 deletions
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="annotations">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/ideaSDK/lib/annotations.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="kotlin-annotations-ext">
-    <CLASSES>
-      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-annotations-ext.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
@@ -4,7 +4,6 @@
    <modules>
      <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
      <module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/annotations-ext/annotations-ext.iml" filepath="$PROJECT_DIR$/compiler/annotations-ext/annotations-ext.iml" />
      <module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" />
      <module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" />
      <module fileurl="file://$PROJECT_DIR$/build-tools/build-tools.iml" filepath="$PROJECT_DIR$/build-tools/build-tools.iml" />
@@ -12,7 +12,6 @@
    <property name="bootstrap.home" value="dependencies/bootstrap-compiler"/>
    <property name="bootstrap.compiler.home" value="${bootstrap.home}/Kotlin/kotlinc"/>
    <property name="bootstrap.runtime" value="${bootstrap.compiler.home}/lib/kotlin-runtime.jar"/>
-    <property name="bootstrap.annotations.ext" value="${bootstrap.compiler.home}/lib/kotlin-annotations-ext.jar"/>

    <property name="output.relative" value="dist"/>
    <property name="output" value="${basedir}/${output.relative}"/>
@@ -29,7 +28,6 @@

    <path id="classpath">
        <file file="${bootstrap.runtime}"/>
-        <file file="${bootstrap.annotations.ext}"/>
        <fileset dir="${idea.sdk}" includes="core/*.jar"/>
        <fileset dir="${idea.sdk}" includes="lib/protobuf-2.5.0.jar"/>

@@ -377,7 +375,6 @@

                    -libraryjars '${rtjar}'
                    -libraryjars '${bootstrap.runtime}'
-                    -libraryjars '${bootstrap.annotations.ext}'

                    -target 1.6
                    -dontoptimize
@@ -509,27 +506,6 @@
        </sequential>
    </macrodef>

-    <target name="annotationsExt">
-        <cleandir dir="${output}/classes/annotations-ext"/>
-
-        <javac2 destdir="${output}/classes/annotations-ext" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}">
-            <src path="${basedir}/compiler/annotations-ext/src"/>
-        </javac2>
-
-        <jar destfile="${kotlin-home}/lib/kotlin-annotations-ext.jar">
-            <fileset dir="${output}/classes/annotations-ext"/>
-            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-
-            <manifest>
-                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
-
-                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.compiler.annotations.extended}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-            </manifest>
-        </jar>
-    </target>
-
    <target name="runtime">
        <cleandir dir="${output}/classes/runtime"/>
        <javac2 destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}">
@@ -609,11 +585,11 @@

    <!-- builds redistributables from sources -->
    <target name="dist"
-            depends="clean,init,prepareDist,preloader,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,annotationsExt,runtime,runtime_sources,jslib,j2kConverter"/>
+            depends="clean,init,prepareDist,preloader,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>

    <!-- builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc -->
    <target name="dist_quick"
-            depends="clean,init,prepareDist,preloader,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,annotationsExt,runtime,runtime_sources,jslib,j2kConverter"/>
+            depends="clean,init,prepareDist,preloader,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>

    <!-- builds compiler jar from project out dir -->
    <target name="dist_quick_compiler_only"
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.annotations;
-
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.PARAMETER})
-public @interface Mutable {
-}
@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.annotations;
-
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.PARAMETER})
-public @interface ReadOnly {
-}
@@ -9,10 +9,9 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="protobuf-java" level="project" />
-    <orderEntry type="library" name="annotations" level="project" />
    <orderEntry type="library" name="trove4j" level="project" />
    <orderEntry type="library" name="intellij-core" level="project" />
-    <orderEntry type="module" module-name="util.runtime" />
+    <orderEntry type="module" module-name="util.runtime" exported="" />
    <orderEntry type="module" module-name="descriptors" exported="" />
  </component>
 </module>
@@ -10,7 +10,6 @@
    <orderEntry type="module" module-name="serialization" />
    <orderEntry type="module" module-name="serialization.java" />
    <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="library" name="annotations" level="project" />
    <orderEntry type="module" module-name="util.runtime" />
    <orderEntry type="library" name="protobuf-java" level="project" />
  </component>
@@ -10,7 +10,6 @@
    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
    <orderEntry type="module" module-name="util.runtime" />
    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="library" name="kotlin-annotations-ext" level="project" />
  </component>
 </module>

@@ -9,7 +9,6 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" exported="" name="protobuf-java" level="project" />
    <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="library" name="annotations" level="project" />
  </component>
 </module>

@@ -9,7 +9,6 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" exported="" scope="PROVIDED" name="intellij-core" level="project" />
    <orderEntry type="library" exported="" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="annotations" level="project" />
  </component>
 </module>