2.0.7

Gruntfile.js

@@ -10,29 +10,46 @@ module.exports = (grunt) => {
             break;
         case 'win32':
             grunt.loadNpmTasks('grunt-electron-installer');
-            release_task = ['electron:win32', 'create-windows-installer:ia32', 'create-windows-installer:x64', 'copy:bundle-ia32', 'copy:bundle-x64', 'create-windows-installer:bundle-ia32', 'create-windows-installer:bundle-x64'];
+            release_task = ['electron:win32-ia32', 'electron:win32-x64', 'create-windows-installer:ia32', 'create-windows-installer:x64', 'copy:bundle-ia32', 'copy:bundle-x64', 'create-windows-installer:bundle-ia32', 'create-windows-installer:bundle-x64'];
             break;
     }
 
     grunt.initConfig({
         clean: ["build2", "build3", "build4-bundle"],
         copy: {
-            app: {
+            'app-ia32': {
                 expand: true,
                 options: {
                     timestamp: true
                 },
                 src: ['package.json', 'README.txt', 'LICENSE.txt', 'main.js', 'apps.js', 'index.html', 'css/**', 'font/**', 'js/**'],
-                dest: 'build2'
+                dest: 'build2/win32-ia32'
             },
-            node_modules: {
+            'app-x64': {
                 expand: true,
                 options: {
                     timestamp: true
                 },
-                cwd: 'build1',
+                src: ['package.json', 'README.txt', 'LICENSE.txt', 'main.js', 'apps.js', 'index.html', 'css/**', 'font/**', 'js/**'],
+                dest: 'build2/win32-x64'
+            },
+            'node_modules-ia32': {
+                expand: true,
+                options: {
+                    timestamp: true
+                },
+                cwd: 'build1/win32-ia32',
+                src: ['node_modules/**', 'bin/**'],
+                dest: 'build2/win32-ia32'
+            },
+            'node_modules-x64': {
+                expand: true,
+                options: {
+                    timestamp: true
+                },
+                cwd: 'build1/win32-x64',
                 src: ['node_modules/**', 'bin/**'],
-                dest: 'build2'
+                dest: 'build2/win32-x64'
             },
             'bundle-ia32': {
                 expand: true,
@@ -62,17 +79,27 @@ module.exports = (grunt) => {
                     out: 'build3',
                     platform: 'darwin',
                     arch: 'all',
-                    icon: 'resources/darwin/icon.icns'
+                    icon: 'resources/osx/icon.icns'
                 }
             },
-            win32: {
+            'win32-ia32': {
                 options: {
                     name: 'mycard',
-                    dir: 'build2',
+                    dir: 'build2/win32-ia32',
                     out: 'build3',
                     platform: 'win32',
-                    arch: 'all',
-                    icon: 'resources/win32/icon.ico'
+                    arch: 'ia32',
+                    icon: 'resources/win/icon.ico'
+                }
+            },
+            'win32-x64': {
+                options: {
+                    name: 'mycard',
+                    dir: 'build2/win32-x64',
+                    out: 'build3',
+                    platform: 'win32',
+                    arch: 'x64',
+                    icon: 'resources/win/icon.ico'
                 }
             }
         },
@@ -83,43 +110,43 @@ module.exports = (grunt) => {
                 outputDirectory: 'build4/win32-ia32',
                 authors: 'MyCard',
                 exe: 'mycard.exe',
-                setupIcon: 'resources/win32/icon.ico',
+                setupIcon: 'resources/win/icon.ico',
                 noMsi: true,
-                loadingGif: 'resources/win32/setup.gif'
+                loadingGif: 'resources/win/setup.gif'
             },
             x64: {
                 appDirectory: 'build3/mycard-win32-x64',
                 outputDirectory: 'build4/win32-x64',
                 authors: 'MyCard',
                 exe: 'mycard.exe',
-                setupIcon: 'resources/win32/icon.ico',
+                setupIcon: 'resources/win/icon.ico',
                 noMsi: true,
-                loadingGif: 'resources/win32/setup.gif'
+                loadingGif: 'resources/win/setup.gif'
             },
             'bundle-ia32': {
                 appDirectory: 'build3/mycard-win32-ia32',
                 outputDirectory: 'build4-bundle/win32-ia32',
                 authors: 'MyCard',
                 exe: 'mycard.exe',
-                setupIcon: 'resources/win32/icon.ico',
+                setupIcon: 'resources/win/icon.ico',
                 noMsi: true,
-                loadingGif: 'resources/win32/setup.gif'
+                loadingGif: 'resources/win/setup.gif'
             },
             'bundle-x64':{
                 appDirectory: 'build3/mycard-win32-x64',
                 outputDirectory: 'build4-bundle/win32-x64',
                 authors: 'MyCard',
                 exe: 'mycard.exe',
-                setupIcon: 'resources/win32/icon.ico',
+                setupIcon: 'resources/win/icon.ico',
                 noMsi: true,
-                loadingGif: 'resources/win32/setup.gif'
+                loadingGif: 'resources/win/setup.gif'
             }
         },
         appdmg: {
             options: {
                 title: 'MyCard',
-                icon: 'resources/darwin/icon.icns',
-                background: 'resources/darwin/TestBkg.png',
+                icon: 'resources/osx/icon.icns',
+                background: 'resources/osx/TestBkg.png',
                 'icon-size': 80,
                 contents: [
                     {
@@ -144,7 +171,7 @@ module.exports = (grunt) => {
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-electron');
 
-    grunt.registerTask('build', ['clean', 'copy:app', 'copy:node_modules']);
+    grunt.registerTask('build', ['clean', 'copy:app-ia32', 'copy:app-x64','copy:node_modules-ia32','copy:node_modules-x64']);
     grunt.registerTask('release', ['build'].concat(release_task));
     grunt.registerTask('default', ['release']);
 };
\ No newline at end of file

README.txt

 ## Build
 ### Windows
 ```bash
-npm install --prefix build1 --production glob ini mkdirp ws winreg windows-shortcuts
-robocopy resources\win32 build1\bin\ *.exe *.dll
+del /s /q build1
+npm install --prefix build1\win32-ia32 --production glob ini mkdirp ws aria2 winreg windows-shortcuts
+xcopy /S /Y /I build1\win32-ia32 build1\win32-x64
+robocopy resources\win build1\win32-ia32\bin\ *.exe *.dll
+robocopy resources\win build1\win32-x64\bin\ *.exe *.dll
+robocopy resources\win32 build1\win32-ia32\bin\ *.exe *.dll
+robocopy resources\win64 build1\win32-x64\bin\ *.exe *.dll
 grunt
 ```
 
 ### OSX
 ```bash
-npm install --prefix build1 --production glob ini mkdirp ws
+npm install --prefix build1 --production glob ini mkdirp ws aria2
 grunt
 ```
\ No newline at end of file

package.json

 {
   "name": "mycard",
   "description": "a game platform",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "main": "main.js",
   "license": "UNLICENSED",
   "repository": "github:mycard/mycard",