Browse Source

Merge pull request #788 from shaddockh/TSH-ATOMIC-783

Fixes for combined d.ts generation
Shaddock Heath 9 years ago
parent
commit
f606fc60ec

+ 1 - 1
Build/CIScripts/GenEditorData.js

@@ -141,7 +141,7 @@ namespace('build', function() {
     cmds = [
     cmds = [
       atomicRoot + "Build/Mac/node/node " + tsc + " -p ./Script",
       atomicRoot + "Build/Mac/node/node " + tsc + " -p ./Script",
       atomicRoot + "Build/Mac/node/node " + tsc + " -p ./Script/AtomicWebViewEditor",
       atomicRoot + "Build/Mac/node/node " + tsc + " -p ./Script/AtomicWebViewEditor",
-      atomicRoot + "Build/Mac/node/node " + dtsGenerator + " --name Atomic --baseDir ./Script/TypeScript --file ./Script/TypeScript/*.d.ts --exclude ./Script/TypeScript/dist/*.d.ts --out ./Script/TypeScript/dist/Atomic.d.ts"
+      atomicRoot + "Build/Mac/node/node " + dtsGenerator + " --name Atomic --project ./Script/TypeScript --out ./Script/TypeScript/dist/Atomic.d.ts"
     ];
     ];
 
 
       // will be copied when editor resources are copied
       // will be copied when editor resources are copied

+ 1 - 1
Build/Scripts/BuildCommon.js

@@ -84,7 +84,7 @@ namespace('build', function() {
           cmds.push(node + " " + tsc + " -p ./Script/AtomicWebViewEditor");
           cmds.push(node + " " + tsc + " -p ./Script/AtomicWebViewEditor");
 
 
           // generate combined atomic.d.ts
           // generate combined atomic.d.ts
-          cmds.push(node + " " + dtsGenerator + " --name Atomic --baseDir ./Script/TypeScript --file ./Script/TypeScript/*.d.ts --exclude ./Script/TypeScript/dist/*.d.ts --out ./Script/TypeScript/dist/Atomic.d.ts");
+          cmds.push(node + " " + dtsGenerator + " --name Atomic --project ./Script/TypeScript --out ./Script/TypeScript/dist/Atomic.d.ts");
 
 
           var lintTask = jake.Task['build:lint_typescript'];
           var lintTask = jake.Task['build:lint_typescript'];
 
 

+ 4 - 0
Script/TypeScript/README.md

@@ -0,0 +1,4 @@
+## Typescript Definition Files
+* Most of These ```*.d.ts``` files are generated by the build process.  
+* The ```*Work.d.ts``` files are hand created.
+* The ```tsconfig.json``` file is used to generate the combined ```dist\Atomic.d.ts``` file.

+ 16 - 0
Script/TypeScript/tsconfig.json

@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "target": "es5",
+        "module": "commonjs",
+        "declaration": false,
+        "noImplicitAny": false,
+        "removeComments": false,
+        "noLib": false,
+        "moduleResolution": "classic",
+        "sourceMap": true,
+        "experimentalDecorators": true
+    },
+    "exclude": [
+      "dist/Atomic.d.ts"
+    ]
+}