Fix export script.

Karl Rieb · Karl Rieb · commit 7ca71a3bbcbb · 2016-07-29T17:20:14.000-07:00
diff --git a/buildSrc/src/main/groovy/com/dropbox/stone/gradle/StoneConfig.groovy b/buildSrc/src/main/groovy/com/dropbox/stone/gradle/StoneConfig.groovy
@@ -22,7 +22,7 @@ class StoneConfig {
     /**
      * The base directory of generated files.
      *
-     * Default: "${project.buildDir}/generated/source/stone"
+     * Default: "${project.buildDir}/generated/stone"
      */
     private String generatedFilesBaseDir
 
@@ -53,7 +53,7 @@ class StoneConfig {
 
     public StoneConfig(Project project) {
         this.project = project
-        this.generatedFilesBaseDir = "${project.buildDir}/generated/source/stone"
+        this.generatedFilesBaseDir = "${project.buildDir}/generated/stone"
         this.stoneDir = "stone"
         this.generatorDir = "generator"
         this.keepUnused = false
diff --git a/buildSrc/src/main/groovy/com/dropbox/stone/gradle/StonePlugin.groovy b/buildSrc/src/main/groovy/com/dropbox/stone/gradle/StonePlugin.groovy
@@ -39,7 +39,7 @@ public class StonePlugin implements Plugin<Project> {
                 t.sourceSet sourceSet
                 t.stoneDir project.stone.stoneDir
                 t.generatorDir project.stone.generatorDir
-                t.outputBaseDir  "${project.stone.generatedFilesBaseDir}/${sourceSet.name}"
+                t.outputBaseDir  "${project.stone.generatedFilesBaseDir}"
             }
 
             sourceSet.java.srcDir task.outputDir
diff --git a/buildSrc/src/main/groovy/com/dropbox/stone/gradle/StoneTask.groovy b/buildSrc/src/main/groovy/com/dropbox/stone/gradle/StoneTask.groovy
@@ -215,7 +215,7 @@ public class StoneTask extends DefaultTask {
 
     @OutputDirectory
     public File getOutputDir() {
-        return new File(getOutputBaseDir(), "src")
+        return new File(getOutputBaseDir(), "src/${getSourceSet().name}/java")
     }
 
     public File getLogFile() {
diff --git a/scripts/export-generated b/scripts/export-generated
@@ -16,11 +16,11 @@ IGNORE_PATTERNS = [
     '/buildSrc', # stone gradle plugin
     '/stone',
     '/src/main/stone',
+    '/src/test/stone',
     '/.arcconfig',
-    '/export-generated',
+    '/scripts',
     '/generator',
     '.gitmodules',
-    '/diff-generated-sources',
     '/release.gradle', # public repo should not include signing and release information
     '/stone.gradle',
     '/stone_legacy.gradle', # required by dbapp-android integration until stone-gradle-plugin is public
@@ -161,13 +161,13 @@ def main():
 
     # Generate source files and copy across to the public repo.
     log('Regenerating source files')
-    subprocess.check_call(['rm', '-rf', 'build/generated-sources'], cwd=cwd)
-    subprocess.check_output(['./run-stone-codegen'])
+    subprocess.check_call(['rm', '-rf', 'build/generated'], cwd=cwd)
+    subprocess.check_output(['./gradlew', 'generateStone', 'generateTestStone'], cwd=cwd)
 
-    target_path = os.path.join(repo_path, 'src/main/java/com/')
+    target_path = os.path.join(repo_path, 'src/')
     log('Copying generated sources to ' + target_path)
     subprocess.check_call(['rsync', '-r',
-                           'build/generated-sources/stone/com/',
+                           'build/generated/stone/src/',
                            target_path], cwd=cwd)
 
     # Modify the gradle.build for the public repo
@@ -179,7 +179,7 @@ def main():
         # Check that the project compiles
         example_folder = os.path.join(repo_path, 'examples')
         log('Compiling the SDK.')
-        subprocess.check_output(['./gradlew', 'install',], cwd=repo_path)
+        subprocess.check_output(['./gradlew', 'check', 'install',], cwd=repo_path)
         log('Compiling the examples.')
         subprocess.check_output(['./gradlew', 'classes'], cwd=example_folder)
         log('Cleaning up')
diff --git a/stone_legacy.gradle b/stone_legacy.gradle
@@ -27,7 +27,7 @@ project.sourceSets.all { SourceSet sourceSet ->
             generatorDir = 'generator'
             stoneDir = 'stone'
             specDir = project.properties.get('com.dropbox.api.specDir', "src/${sourceSet.name}/stone")
-            outputDir = "${project.buildDir}/generated/source/stone/${sourceSet.name}"
+            outputDir = "${project.buildDir}/generated/stone"
         }
 
         def getSpecFiles = { fileTree(dir: specDir, include: '**/*.stone') }
@@ -39,7 +39,7 @@ project.sourceSets.all { SourceSet sourceSet ->
 
         doLast {
             def generatorFile = fileTree(dir: generatorDir, include: '**/*stoneg.py').getSingleFile()
-            def srcOutputDir = new File(outputDir, "src")
+            def srcOutputDir = new File(outputDir, "src/${sourceSet.name}/java")
             def logFile = new File(outputDir, "log/stone.log")
 
             srcOutputDir.mkdirs()

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public class StonePlugin implements Plugin<Project> {`
`39`	`39`	`t.sourceSet sourceSet`
`40`	`40`	`t.stoneDir project.stone.stoneDir`
`41`	`41`	`t.generatorDir project.stone.generatorDir`
`42`		`- t.outputBaseDir "${project.stone.generatedFilesBaseDir}/${sourceSet.name}"`
	`42`	`+ t.outputBaseDir "${project.stone.generatedFilesBaseDir}"`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`sourceSet.java.srcDir task.outputDir`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ public class StoneTask extends DefaultTask {`
`215`	`215`
`216`	`216`	`@OutputDirectory`
`217`	`217`	`public File getOutputDir() {`
`218`		`- return new File(getOutputBaseDir(), "src")`
	`218`	`+ return new File(getOutputBaseDir(), "src/${getSourceSet().name}/java")`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`public File getLogFile() {`