implab/implabjs-core Commit - r97:8c240739e273

build.gradle cleanup and refactoring

cin -

r97:8c240739e273 ts-plugin

parent child

Context file:

r97:8c240739e273

Collapse all files

buildSrc/src/main/groovy/org/implab/gradle/hg/MercurialPlugin.groovy created 644 +32 0

			@@ -0,0 +1,32
		1	package org.implab.gradle.hg;
		2
		3	import org.gradle.api.Plugin;
		4	import org.gradle.api.Project;
		5
		6	public class MercurialPlugin implements Plugin<Project> {
		7	public void apply(Project project) {
		8	if (!project.version) {
		9
		10	def rev = ["hg", "log", "-r", ".", "--template", "{latesttag('re:^v') % '{tag}-{distance}'}"].execute().text.trim();
		11
		12	def tagVersion;
		13	def tagDistance;
		14
		15	def match = (rev =~ /^v(\d+\.\d+\.\d+).*-(\d+)$/);
		16
		17	if (match.size()) {
		18	tagVersion = match[0][1];
		19	tagDistance = match[0][2].toInteger();
		20	} else {
		21	throw new Exception("A version must be specied");
		22	}
		23
		24	project.version = tagVersion;
		25
		26	if (tagDistance > 0)
		27	project.version++;
		28	} else {
		29	println "explicit version: $project.version";
		30	}
		31	}
		32	} No newline at end of file

buildSrc/src/main/resources/META-INF/gradle-plugins/org.implab.gradle-hg.properties created 644 +1 0

			@@ -0,0 +1,1
		1	implementation-class=org.implab.gradle.hg.MercurialPlugin No newline at end of file

.hgignore +1 0

              build/
              node_modules/
              src/typings/
+             ivy-repo/

build.gradle +17 -104

              plugins {
                id "org.implab.gradle-typescript" version "1.0.1-rc3"
+               id "org.implab.gradle-hg"
                id "ivy-publish"
              }
                  lint = project.hasProperty('lint') ? lint : false
              }
-             if (!version) {
-                 def rev = ["hg", "log", "-r", ".", "--template", "{latesttag('re:^v') % '{tag}-{distance}'}"].execute().text.trim();
-                 def tagVersion;
-                 def match = (rev =~ /^v(\d+\.\d+\.\d+).*-(\d+)$/);
-                 if (match.size()) {
-                     tagVersion = match[0][1];
-                     tagDistance = match[0][2].toInteger();
-                 } else {
-                     throw new Exception("A version must be specied");
+                 }
-                 version = tagVersion;
-                 if (tagDistance > 0)
-                     version++;
-             } else {
-                 println "explicit version: $version";
+             }
-             if (hasProperty('versionSuffix') && versionSuffix) {
-                 version += "-$versionSuffix"
+             }
              configurations {
              }
                  doLast {
                      println "version: ${-> version}";
-                     println "tagDistance: ${-> tagDistance}";
                      println "packageName: ${-> packageName}";
                      println "target: ${-> typescript.compilerOptions.target}";
                      println "module: ${-> typescript.compilerOptions.module}";
                  commandLine "node", "tests/index.js"
              }
-             task assembleAmd {
-                 dependsOn sources.amd.output
-                 assemble.mustRunAfter it
-                 doLast {
-                     assemble {
-                         from(sources.amd.output.compiledDir)
+                     }
+                 }
+             }
-             task assembleCjs {
-                 dependsOn sources.cjs.output
-                 assemble.mustRunAfter it
-                 doLast {
-                     assemble {
-                         from(sources.cjs.output.compiledDir)
+                     }
+                 }
+             assemble {
+                 from sources.amd.output.compiledDir
+                 from sources.cjs.output.compiledDir
              }
-             task assembleTestAmd {
-                 dependsOn sources.amd.output
-                 dependsOn sources.testAmd.output
-                 assembleTest.mustRunAfter it
-                 doLast {
-                     assembleTest {
-                         from(sources.amd.output.compiledDir)
-                         from(sources.testAmd.output.compiledDir)
+                     }
+                 }
+             assembleTest {
+                 from sources.amd.output.compiledDir
+                 from sources.cjs.output.compiledDir
+                 from sources.testAmd.output.compiledDir
+                 from sources.testCjs.output.compiledDir
              }
-             task assembleTestCjs {
-                 dependsOn sources.cjs.output
-                 dependsOn sources.testCjs.output
-                 assembleTest.mustRunAfter it
-                 doLast {
-                     assembleTest {
-                         from(sources.cjs.output.compiledDir)
-                         from(sources.testCjs.output.compiledDir)
+                     }
+                 }
+             }
-             task prepareTargetEs5 {
+             task prepareNode {
                  prepare.mustRunAfter it
                  doLast {
                      typescript {
                          compilerOptions {
-                             target = "es5"
-                             lib = ["es5", "dom", "scripthost", "es2015.promise", "es2015.symbol", "es2015.iterable"]
+                         }
+                     }
+                 }
+             }
-             task prepareTargetEsNext {
-                 prepare.mustRunAfter it
-                 doLast {
-                     typescript {
-                         compilerOptions {
+                             module = "commonjs"
                              target = "es2017"
                              lib = ["es2017", "dom", "scripthost"]
                          }
                  }
              }
-             task prepareNode {
-                 dependsOn prepareTargetEsNext
-                 prepare.mustRunAfter it
-                 doLast {
-                     typescript {
-                         compilerOptions {
-                             module = "commonjs"
+                         }
+                     }
+                 }
+             }
              task prepareBrowser {
-                 dependsOn prepareTargetEs5
                  prepare.mustRunAfter it
                  doLast {
                      typescript {
                          compilerOptions {
                              module = "amd"
+                             target = "es5"
+                             lib = ["es5", "dom", "scripthost", "es2015.promise", "es2015.symbol", "es2015.iterable"]
                          }
                      }
                  }
              }
              task assembleBrowser {
-                 dependsOn prepareBrowser, assembleAmd, assemble
+                 dependsOn prepareBrowser, assemble, sources.amd.output
              }
              task assembleNode {
-                 dependsOn prepareNode, assembleCjs, assemble
+                 dependsOn prepareNode, assemble, sources.cjs.output
              }
              task testBrowser {
-                 dependsOn prepareBrowser, assembleTestAmd, test
+                 dependsOn prepareBrowser, test, sources.amd.output, sources.testAmd.output
              }
              task testNode {
-                 dependsOn prepareNode, assembleTestCjs, test
+                 dependsOn prepareNode, test, sources.cjs.output, sources.testCjs.output
              }
              task npmPackBrowser {

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