瀏覽代碼

Merge pull request #2325 from blink1073/rename-build-files

Clean up build files
Steven Silvester 8 年之前
父節點
當前提交
de19965508
共有 5 個文件被更改,包括 9 次插入10 次删除
  1. 2 3
      docs/extensions_dev.md
  2. 3 3
      jupyterlab/commands.py
  3. 0 0
      jupyterlab/index.app.js
  4. 4 4
      jupyterlab/make-release.js
  5. 0 0
      jupyterlab/package.app.json

+ 2 - 3
docs/extensions_dev.md

@@ -97,8 +97,8 @@ only copy the current contents of the source folder.
 
 Note that the application is built against **released** versions of the
 core JupyterLab extensions.  If your extension depends on JupyterLab
-extensions, it should be compatible with the versions used in the
-`jupyterlab/package.template.json` entry point file.  If you must
+packages, it should be compatible with the versions listed in the
+`jupyterlab/released_packages.txt` file.  If you must
 install a extension into a development branch of JupyterLab, you
 have to graft it into the source tree of JupyterLab itself.
 This may be done using the command
@@ -120,7 +120,6 @@ This will remove the package metadata from the source tree, but wil **not**
 remove any files added by the `addsibling` script, which should be removed
 manually.
 
-
 The package should export EMCAScript 5 compatible JavaScript.  It can 
 import CSS using the syntax `require('foo.css')`.  The CSS files
 can also import CSS from other packages using the syntax 

+ 3 - 3
jupyterlab/commands.py

@@ -326,12 +326,12 @@ def _ensure_package(app_dir, name=None, version=None):
     if not os.path.exists(staging):
         os.makedirs(staging)
 
-    for fname in ['index.template.js', 'webpack.config.js']:
-        dest = pjoin(staging, fname.replace('.template', ''))
+    for fname in ['index.app.js', 'webpack.config.js']:
+        dest = pjoin(staging, fname.replace('.app', ''))
         shutil.copy2(pjoin(here, fname), dest)
 
     # Template the package.json file.
-    pkg_path = pjoin(here, 'package.template.json')
+    pkg_path = pjoin(here, 'package.app.json')
     with open(pkg_path) as fid:
         data = json.load(fid)
 

+ 0 - 0
jupyterlab/index.template.js → jupyterlab/index.app.js


+ 4 - 4
jupyterlab/make-release.js

@@ -15,10 +15,10 @@ data['jupyterlab']['version'] = version;
 // Update our package.json files.
 var text = JSON.stringify(data, null, 2) + '\n';
 fs.writeFileSync('./package.json', text);
-fs.writeFileSync('./package.template.json', text);
+fs.writeFileSync('./package.app.json', text);
 
-// Update our template file.
-fs.copySync('./index.js', './index.template.js')
+// Update our app index file.
+fs.copySync('./index.js', './index.app.js')
 
 // Run a standard build.
 childProcess.execSync('npm run build');
@@ -30,4 +30,4 @@ fs.writeFileSync('./build/release_data.json', text);
 
 // Get the lerna package data.
 var lerna_info = childProcess.execSync('lerna ls', { cwd: cwd });
-fs.writeFileSync('./package_list.txt', lerna_info);
+fs.writeFileSync('./released_packages.txt', lerna_info);

+ 0 - 0
jupyterlab/package.template.json → jupyterlab/package.app.json