From df875b892fda9ee0add1ed6e470f5885f1696a65 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 17 Sep 2013 15:45:00 +0400
Subject: [PATCH] Move generators sources to generators/src/

---
 build.xml                                                     | 4 ++--
 generators/generators.iml                                     | 2 +-
 .../jetbrains/jet/generators/builtins/BuiltInsSerializer.java | 0
 .../jetbrains/jet/generators/injectors/GenerateInjectors.java | 0
 .../jet/generators/jvm/GenerateJavaToKotlinMethodMap.java     | 0
 .../org/jetbrains/jet/generators/mockJDK/GenerateMockJdk.java | 0
 .../jetbrains/jet/generators/runtime/GenerateFunctions.java   | 0
 .../org/jetbrains/jet/generators/runtime/GenerateRanges.java  | 0
 .../jet/generators/tests/GenerateRangesCodegenTestData.java   | 0
 .../org/jetbrains/jet/generators/tests/GenerateTests.java     | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename generators/{ => src}/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java (100%)
 rename generators/{ => src}/org/jetbrains/jet/generators/injectors/GenerateInjectors.java (100%)
 rename generators/{ => src}/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java (100%)
 rename generators/{ => src}/org/jetbrains/jet/generators/mockJDK/GenerateMockJdk.java (100%)
 rename generators/{ => src}/org/jetbrains/jet/generators/runtime/GenerateFunctions.java (100%)
 rename generators/{ => src}/org/jetbrains/jet/generators/runtime/GenerateRanges.java (100%)
 rename generators/{ => src}/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java (100%)
 rename generators/{ => src}/org/jetbrains/jet/generators/tests/GenerateTests.java (100%)

diff --git a/build.xml b/build.xml
index b0d3e9ae0f9..a9a08eb3f89 100644
--- a/build.xml
+++ b/build.xml
@@ -105,8 +105,8 @@
         <cleandir dir="${output}/classes/generators"/>
         <javac destdir="${output}/classes/generators" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false">
             <src path="injector-generator/src"/>
-            <src path="generators/org/jetbrains/jet/generators/injectors"/>
-            <src path="generators/org/jetbrains/jet/generators/jvm"/>
+            <src path="generators/src/org/jetbrains/jet/generators/injectors"/>
+            <src path="generators/src/org/jetbrains/jet/generators/jvm"/>
             <src refid="compilerSources.path"/>
             <classpath refid="classpath"/>
         </javac>
diff --git a/generators/generators.iml b/generators/generators.iml
index 3dcb254a678..5dff90c1d0a 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -3,7 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
     </content>
     <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java b/generators/src/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java
similarity index 100%
rename from generators/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java
rename to generators/src/org/jetbrains/jet/generators/builtins/BuiltInsSerializer.java
diff --git a/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java b/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.java
similarity index 100%
rename from generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java
rename to generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.java
diff --git a/generators/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java b/generators/src/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java
similarity index 100%
rename from generators/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java
rename to generators/src/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java
diff --git a/generators/org/jetbrains/jet/generators/mockJDK/GenerateMockJdk.java b/generators/src/org/jetbrains/jet/generators/mockJDK/GenerateMockJdk.java
similarity index 100%
rename from generators/org/jetbrains/jet/generators/mockJDK/GenerateMockJdk.java
rename to generators/src/org/jetbrains/jet/generators/mockJDK/GenerateMockJdk.java
diff --git a/generators/org/jetbrains/jet/generators/runtime/GenerateFunctions.java b/generators/src/org/jetbrains/jet/generators/runtime/GenerateFunctions.java
similarity index 100%
rename from generators/org/jetbrains/jet/generators/runtime/GenerateFunctions.java
rename to generators/src/org/jetbrains/jet/generators/runtime/GenerateFunctions.java
diff --git a/generators/org/jetbrains/jet/generators/runtime/GenerateRanges.java b/generators/src/org/jetbrains/jet/generators/runtime/GenerateRanges.java
similarity index 100%
rename from generators/org/jetbrains/jet/generators/runtime/GenerateRanges.java
rename to generators/src/org/jetbrains/jet/generators/runtime/GenerateRanges.java
diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java b/generators/src/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java
similarity index 100%
rename from generators/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java
rename to generators/src/org/jetbrains/jet/generators/tests/GenerateRangesCodegenTestData.java
diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java
similarity index 100%
rename from generators/org/jetbrains/jet/generators/tests/GenerateTests.java
rename to generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java