diff --git a/README.md b/README.md index 764dab8..99c03a6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The following dependencies are required in order to publishing FLA document crea If you are trying to install with Adobe Animate CC 2015, you **cannot** install the ZXP with Adobe Extension Manager CC (this not longer is supported in CC 2015). There are two ways to install: * [Enable syncing](https://www.adobeexchange.com/resources/19) in your Adobe CC desktop application (**recommended**); or -* Use the [Manage Extension utility](http://blogs.adobe.com/animate/installing-zxp-extensions-using-the-manage-extensions-utility/) to manually install. +* Use [Anastasiy’s Extension Manager](https://install.anastasiy.com/) to manually install. ## Building @@ -52,13 +52,13 @@ gulp --install To build the extension in debug mode and allow for remote debugging, run this command. Navigate to http://localhost:8008 to get the DevTools for the Publish Settings dialog. ```bash -gulp --debug --install +gulp --buildDebug --install ``` To rebuild the C++ code on the current platform, use the `--plugin` flag. This will build the plugin for both debug and release. ```bash -gulp --debug --install --plugin +gulp --buildDebug --install --plugin ``` Or to ONLY build the plugin without building the rest of the extension. diff --git a/build/tasks/build-dialog.js b/build/tasks/build-dialog.js index a2b69be..8a38a77 100644 --- a/build/tasks/build-dialog.js +++ b/build/tasks/build-dialog.js @@ -4,7 +4,7 @@ module.exports = function(gulp, options, plugins) { gulp, options.buildDialog, plugins, - options.argv.debug + options.argv.buildDebug ); }); }; \ No newline at end of file diff --git a/build/tasks/build-preview-app.js b/build/tasks/build-preview-app.js index 59047e8..9ea7372 100644 --- a/build/tasks/build-preview-app.js +++ b/build/tasks/build-preview-app.js @@ -4,7 +4,7 @@ module.exports = function(gulp, options, plugins) { gulp, options.buildPreviewApp, plugins, - options.argv.debug + options.argv.buildDebug ); }); }; \ No newline at end of file diff --git a/build/tasks/build-preview.js b/build/tasks/build-preview.js index 805426f..a77bf51 100644 --- a/build/tasks/build-preview.js +++ b/build/tasks/build-preview.js @@ -4,7 +4,7 @@ module.exports = function(gulp, options, plugins) { gulp, options.buildPreview, plugins, - options.argv.debug + options.argv.buildDebug ); }); }; \ No newline at end of file diff --git a/build/tasks/build-publish.js b/build/tasks/build-publish.js index 79f8bdb..66e8c19 100644 --- a/build/tasks/build-publish.js +++ b/build/tasks/build-publish.js @@ -4,7 +4,7 @@ module.exports = function(gulp, options, plugins) { gulp, options.buildPublish, plugins, - options.argv.debug + options.argv.buildDebug ); }); }; \ No newline at end of file diff --git a/build/tasks/build-spritesheets.js b/build/tasks/build-spritesheets.js index f7f2cf7..2aed813 100644 --- a/build/tasks/build-spritesheets.js +++ b/build/tasks/build-spritesheets.js @@ -4,7 +4,7 @@ module.exports = function(gulp, options, plugins) { gulp, options.buildSpritesheets, plugins, - options.argv.debug + options.argv.buildDebug ); }); }; \ No newline at end of file diff --git a/build/tasks/clean.js b/build/tasks/clean.js index 582d7d1..9898ca5 100644 --- a/build/tasks/clean.js +++ b/build/tasks/clean.js @@ -1,6 +1,6 @@ module.exports = function(gulp, options, plugins) { gulp.task('clean', function(){ - var output = options.argv.debug ? + var output = options.argv.buildDebug ? options.outputDebugName : options.outputName; return plugins.del([ diff --git a/build/tasks/default.js b/build/tasks/default.js index 67dd94b..d6f2c92 100644 --- a/build/tasks/default.js +++ b/build/tasks/default.js @@ -1,7 +1,7 @@ module.exports = function(gulp, options, plugins) { gulp.task('default', function(done){ - var debug = options.argv.debug; + var debug = options.argv.buildDebug; var plugin = options.argv.plugin; var install = options.argv.install; diff --git a/build/tasks/install.js b/build/tasks/install.js index da0040c..a448157 100644 --- a/build/tasks/install.js +++ b/build/tasks/install.js @@ -1,5 +1,5 @@ module.exports = function(gulp, options, plugins) { - var output = options.argv.debug ? + var output = options.argv.buildDebug ? options.outputDebugName : options.outputName; @@ -8,6 +8,6 @@ module.exports = function(gulp, options, plugins) { .replace('${output}', output); gulp.task('install', plugins.shell.task([cmd], { - 'quiet': !options.argv.debug + 'quiet': !options.argv.buildDebug })); }; diff --git a/build/tasks/package.js b/build/tasks/package.js index c5f16f4..a373edf 100644 --- a/build/tasks/package.js +++ b/build/tasks/package.js @@ -1,5 +1,5 @@ module.exports = function(gulp, options, plugins) { - var output = options.argv.debug ? + var output = options.argv.buildDebug ? options.outputDebugName : options.outputName; var cmd = options.packager + ' -sign ' + diff --git a/build/tasks/plugin-copy-mac.js b/build/tasks/plugin-copy-mac.js index 4eb20c1..b628108 100644 --- a/build/tasks/plugin-copy-mac.js +++ b/build/tasks/plugin-copy-mac.js @@ -1,5 +1,5 @@ module.exports = function(gulp, options) { - var src = options.argv.debug ? + var src = options.argv.buildDebug ? options.mac.pluginTempDebug : options.mac.pluginTempRelease; diff --git a/build/tasks/plugin-copy-win.js b/build/tasks/plugin-copy-win.js index dca6db8..7d1862b 100644 --- a/build/tasks/plugin-copy-win.js +++ b/build/tasks/plugin-copy-win.js @@ -1,6 +1,6 @@ var path = require('path'); module.exports = function(gulp, options, plugins) { - var src = options.argv.debug ? + var src = options.argv.buildDebug ? options.win.pluginTempDebug : options.win.pluginTempRelease; diff --git a/build/tasks/watch.js b/build/tasks/watch.js index f35722b..06e3a5f 100644 --- a/build/tasks/watch.js +++ b/build/tasks/watch.js @@ -1,6 +1,6 @@ module.exports = function(gulp, options) { gulp.task('watch', ['default'], function(){ - options.argv.debug = true; + options.argv.buildDebug = true; return gulp.watch(options.watchFiles, ['default']); }); }; diff --git a/extension/CSXS/manifest.xml b/extension/CSXS/manifest.xml index 7fd4c62..cdf21d1 100755 --- a/extension/CSXS/manifest.xml +++ b/extension/CSXS/manifest.xml @@ -1,9 +1,9 @@ - - - + + diff --git a/package.json b/package.json index 0fb8eb8..0f9e71e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pixi-animate-extension", "private": true, - "version": "1.3.4", + "version": "1.4.0", "repository": { "url": "https://github.com/jiborobot/pixi-animate-extension", "type": "git" diff --git a/project/mac/lib/debug/PixiAnimate.fcm.plugin/Contents/MacOS/PixiAnimate b/project/mac/lib/debug/PixiAnimate.fcm.plugin/Contents/MacOS/PixiAnimate index 035e055..e2b600a 100755 Binary files a/project/mac/lib/debug/PixiAnimate.fcm.plugin/Contents/MacOS/PixiAnimate and b/project/mac/lib/debug/PixiAnimate.fcm.plugin/Contents/MacOS/PixiAnimate differ diff --git a/project/mac/lib/debug/PixiAnimate.fcm.plugin/Contents/Resources/include/Version.h b/project/mac/lib/debug/PixiAnimate.fcm.plugin/Contents/Resources/include/Version.h index 4df7e09..649f413 100644 --- a/project/mac/lib/debug/PixiAnimate.fcm.plugin/Contents/Resources/include/Version.h +++ b/project/mac/lib/debug/PixiAnimate.fcm.plugin/Contents/Resources/include/Version.h @@ -48,7 +48,7 @@ * * @brief Minor version of the plugin */ -#define PIXIJS_PLUGIN_VERSION_MINOR 0x03 +#define PIXIJS_PLUGIN_VERSION_MINOR 0x04 /** @@ -56,7 +56,7 @@ * * @brief Plugin version's maintenance number. */ -#define PIXIJS_PLUGIN_VERSION_MAINTENANCE 0x04 +#define PIXIJS_PLUGIN_VERSION_MAINTENANCE 0x00 /** diff --git a/project/mac/lib/release/PixiAnimate.fcm.plugin/Contents/MacOS/PixiAnimate b/project/mac/lib/release/PixiAnimate.fcm.plugin/Contents/MacOS/PixiAnimate index 61e973b..09030c0 100755 Binary files a/project/mac/lib/release/PixiAnimate.fcm.plugin/Contents/MacOS/PixiAnimate and b/project/mac/lib/release/PixiAnimate.fcm.plugin/Contents/MacOS/PixiAnimate differ diff --git a/project/win/pixi-animate-vs2015/x64/Debug/pixi-animate-vs2015.dll b/project/win/pixi-animate-vs2015/x64/Debug/pixi-animate-vs2015.dll index 6d0d932..7288368 100644 Binary files a/project/win/pixi-animate-vs2015/x64/Debug/pixi-animate-vs2015.dll and b/project/win/pixi-animate-vs2015/x64/Debug/pixi-animate-vs2015.dll differ diff --git a/project/win/pixi-animate-vs2015/x64/Release/pixi-animate-vs2015.dll b/project/win/pixi-animate-vs2015/x64/Release/pixi-animate-vs2015.dll index 0063462..4f645e1 100644 Binary files a/project/win/pixi-animate-vs2015/x64/Release/pixi-animate-vs2015.dll and b/project/win/pixi-animate-vs2015/x64/Release/pixi-animate-vs2015.dll differ diff --git a/src/PixiAnimate/include/Version.h b/src/PixiAnimate/include/Version.h index 4df7e09..649f413 100644 --- a/src/PixiAnimate/include/Version.h +++ b/src/PixiAnimate/include/Version.h @@ -48,7 +48,7 @@ * * @brief Minor version of the plugin */ -#define PIXIJS_PLUGIN_VERSION_MINOR 0x03 +#define PIXIJS_PLUGIN_VERSION_MINOR 0x04 /** @@ -56,7 +56,7 @@ * * @brief Plugin version's maintenance number. */ -#define PIXIJS_PLUGIN_VERSION_MAINTENANCE 0x04 +#define PIXIJS_PLUGIN_VERSION_MAINTENANCE 0x00 /**