implab/implabjs-core Commit - r47:4a34b9d6df70

working on multiplaftorm support (node, browser)

cin -

r47:4a34b9d6df70 di-typescript

parent child

Context file:

r47:4a34b9d6df70

Collapse all files

src/package.template.json created 644 +23 0

@@ -0,0 +1,23
	1	{
	2	"name": "${packageName}",
	3	"version": "${verstion}",
	4	"description": "${description}",
	5	"main": "main.js",
	6	"keywords": [
	7	"di",
	8	"ioc",
	9	"logging",
	10	"template engine",
	11	"dependency injection"
	12	],
	13	"author": "${author}",
	14	"license": "${license}",
	15	"repository": "$repository",
	16	"publishConfig": {
	17	"access": "public"
	18	},
	19	"peerDependencies": {
	20	"dojo": "^1.10.0"
	21	}
	22	}
	23	No newline at end of file

src/tsconfig.json created 644 +16 0

@@ -0,0 +1,16
	1	{
	2	"compilerOptions": {
	3	"target": "es3",
	4	"module": "amd",
	5	"sourceMap": true,
	6	"declaration": true,
	7	"lib": [
	8	"es5",
	9	"es2015.promise",
	10	"es2015.symbol"
	11	]
	12	},
	13	"include" : [
	14	"ts/*/.ts"
	15	]
	16	} No newline at end of file

test/tsconfig.json created 644 +14 0

@@ -0,0 +1,14
	1	{
	2	"compilerOptions": {
	3	"target": "es3",
	4	"module": "amd",
	5	"sourceMap": true,
	6	"moduleResolution": "node",
	7	"lib": [
	8	"es2015"
	9	]
	10	},
	11	"include" : [
	12	"ts/*/.ts"
	13	]
	14	} No newline at end of file

build.gradle +20 -9

                 version += "-$release"
             }
-            println "version: $version"
+            if(!npmName)
+                npmName = name;
+            ext.packageName="$npmScope/$npmName";
-            def distDir = "$buildDir/dist"
+            def packageDir = "$buildDir/dist"
-            def testDir = "$buildDir/test"
+            def distDir = "$packageDir/$platform"
+            def testDir = "$packageDir/$platform"
+            task printVersion {
+                println "version: $version"
+                println "packageName: $packageName"
+                println "platform: $platform"
+            }
             task clean {
                 doLast {
                     delete buildDir
-                    delete 'node_modules/@implab'
+                    delete "node_modules/$packageName"
                 }
             }
                 inputs.file('tsconfig.json')
                 outputs.dir(distDir)
-                commandLine 'node_modules/.bin/tsc', '-p', 'tsconfig.json'
+                commandLine 'node_modules/.bin/tsc', '-p', 'src/tsconfig.json', '--outDir', distDir
             }
             task _packageMeta(type: Copy) {
             task _localInstall(dependsOn: build, type: Exec) {
                 inputs.file("$distDir/package.json")
                 outputs.upToDateWhen {
-                    new File("$projectDir/node_modules/@implab/core").exists()
+                    new File("$projectDir/node_modules/$packageName").exists()
                 }
                 commandLine 'npm', 'install', '--no-save', '--force', distDir
             task buildTests(dependsOn: _localInstall, type: Exec) {
                 inputs.dir('test/ts')
-                inputs.file('tsconfig.test.json')
+                inputs.file('test/tsconfig.json')
                 outputs.dir(testDir)
-                commandLine 'node_modules/.bin/tsc', '-p', 'tsconfig.test.json'
+                commandLine 'node_modules/.bin/tsc', '-p', 'test/tsconfig.json', '--outDir', distDir
             }
             task test(dependsOn: [copyJsTests, buildTests], type: Exec) {

gradle.properties +7 -1

@@ -1,2 +1,8
1	version=1.2.0	1	version=1.2.0
2	release=rc No newline at end of file	2	release=rc
		3	platform=amd
		4	descriptrion=Dependency injection, logging, simple and fast text template engine
		5	license=BSD-2-Clause
		6	repository=https://bitbucket.org/implab/implabjs
		7	npmScope=@implab
		8	npmName=core No newline at end of file

settings.gradle +1 -1

@@ -12,4 +12,4
12		12
13	//include 'sub-project-name'	13	//include 'sub-project-name'
14		14
15	rootProject.name = '~~implab-~~core' No newline at end of file	15	rootProject.name = 'core' No newline at end of file

tsconfig.json removed 0 -17

NO CONTENT: file was removed

tsconfig.test.json removed 0 -15

NO CONTENT: file was removed

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