implab/implabjs-core Commit - r92:a4a8e6f7b095

working on build.gradle

cin -

r92:a4a8e6f7b095 ts-plugin

parent child

Context file:

r92:a4a8e6f7b095

Collapse all files

build.gradle +78 -26

              plugins {
-               id "org.implab.gradle-typescript" version "1.0.1-rc1"
+               id "org.implab.gradle-typescript" version "1.0.1-rc2"
              }
              // если версия явно не заданы вычисляем ее из тэга ревизии v.{num}***
                  version += "-$versionSuffix"
              }
-             if(! jsmodule in ["amd", "commonjs", "system", "umd", "es6", "esnext"])
-                 throw new Exception("Invalid jsmodule specified: $jsmodule");
-             if(! target in ["es3", "es5", "es6", "es2016", "es2017", "esnext"])
-                 throw new Exception("Invalid target specified: $target")
              ext {
                  packageName = "@$npmScope/$npmName"
              }
-             def jstarget = target;
              sources {
                  amd {
                      typings {
              typescript {
                  compilerOptions {
-                     lib = [target, "dom", "scripthost"]
-                     if (jstarget in ["es5", "es3"])
-                         lib += ["es2015.promise", "es2015.symbol", "es2015.iterable"]
-                     target = jstarget
-                     module = jsmodule
                      types = []
                      declaration = true
                      listFiles = true
                  }
                  tscCmd = "$projectDir/node_modules/.bin/tsc"
                  tsLintCmd = "$projectDir/node_modules/.bin/tslint"
              	npmCmd = "npm"
              }
+             task prepare {
+             }
              task printVersion {
+                 dependsOn prepare
                  doLast {
-                     println "version: $version";
-                     println "tagDistance: $tagDistance";
-                     println "packageName: $packageName";
-                     println "target: $jstarget";
-                     println "module: $jsmodule";
+                     println "version: ${-> version}";
+                     println "tagDistance: ${-> tagDistance}";
+                     println "packageName: ${-> packageName}";
+                     println "target: ${-> typescript.compilerOptions.target}";
+                     println "module: ${-> typescript.compilerOptions.module}";
                  }
              }
                  }
              }
-             compileTsAmd {
+             configureTsCjs {
                  dependsOn sources.main.output
              }
              configureTsAmd {
+                 dependsOn sources.main.output
                  compilerOptions {
                      types += [ "requirejs", "dojo-typings" ]
                  }
                  commandLine "node", "tests/index.js"
              }
-             assembleTest {
-                 dependsOn sources.main.output
+             task assembleTestAmd {
                  dependsOn sources.amd.output
                  dependsOn sources.testAmd.output
+                 doLast {
+                     assembleTest {
+                         from(sources.amd.output.compiledDir)
+                         from(sources.testAmd.output.compiledDir)
+                     }
+                 }
+             }
+             assembleTest {
+                 mustRunAfter assembleTestAmd
+                 dependsOn sources.main.output
                  from(sources.main.output.compiledDir)
-                 from(sources.amd.output.compiledDir)
-                 from(sources.testAmd.output.compiledDir)
+             }
+             task prepareTargetEs5 {
+                 doLast {
+                     typescript {
+                         compilerOptions {
+                             target = "es5"
+                             lib = ["es5", "dom", "scripthost", "es2015.promise", "es2015.symbol", "es2015.iterable"]
+                         }
+                     }
+                 }
+             }
+             task prepareTargetEsNext {
+                 doLast {
+                     typescript {
+                         compilerOptions {
+                             target = "esnext"
+                             lib = ["esnext", "dom", "scripthost"]
+                         }
+                     }
+                 }
+             }
+             task prepareNode {
+                 dependsOn prepareTargetEsNext
+                 doLast {
+                     typescript {
+                         compilerOptions {
+                             target = "esnext"
+                             module = "commonjs"
+                         }
+                     }
+                 }
+             }
+             task prepareBrowser {
+                 dependsOn prepareTargetEs5
+                 doLast {
+                     typescript {
+                         compilerOptions {
+                             module = "requirejs"
+                         }
+                     }
+                 }
+             }
+             prepare {
+                 mustRunAfter prepareNode, prepareBrowser
              }
  No newline at end of file

gradle.properties 0 -2

              version=
              author=Implab team
-             jsmodule=amd
-             target=es5
              description=Dependency injection, logging, simple and fast text template engine
              license=BSD-2-Clause
              repository=https://bitbucket.org/implab/implabjs-core

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages