lukechilds
/
Agama
mirror of https://github.com/lukechilds/Agama.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of git://github.com/SuperNETorg/iguana

all-modes
Petr Balashov 8 years ago
parent
6dad869859 bcb6023ead
commit
b7aad69a4c
8 changed files with 58 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      README.md
  2. 32
      assets/BitRock Installer Files/IgaunaApp-Linux.xml
  3. 2
      assets/BitRock Installer Files/IgaunaApp-OSX.xml
  4. 40
      assets/BitRock Installer Files/IgaunaApp-Win.xml
  5. 2
      gui/EasyDEX-GUI
  6. 13
      main.js
  7. 2
      package.json
  8. 4
      routes/shepherd.js

14
README.md
View File

@ -1,31 +1,31 @@
# Iguana Desktop App
# Agama Desktop App
Desktop App for SuperNET DAPPs
#### For Developers
You must have `node.js` and `npm` installed on your machine.
Clone Iguana Desktop App with EasyDEX-GUI submodule
Clone Agama Desktop App with EasyDEX-GUI submodule
```shell
git clone --recursive https://github.com/SuperNETorg/iguana.git
git clone --recursive https://github.com/SuperNETorg/Agama.git
cd gui/EasyDEX-GUI/
git checkout master
git pull
cd ../../
```
Install Iguana App
Install Agama App
```shell
cd iguana
npm install
```
Then start Iguana App
Then start Agama App
```shell
npm start
```
#### For end users
The instructions to make production build of Iguana App will be updated soon.
The instructions to make production build of Agama App will be updated soon.
To build the production ready app, install `electron-packager` and `electron-prebuilt` packages from npm
```shell
@ -71,4 +71,4 @@ change architecture build parameter to ```--arch=x64``` for 64 bit build
### Windows DLL issues
On Windows it's noticed iguana.exe complains about `VCRUNTIME140D.DLL` and `ucrtbased.dll` file.
Please see **windeps** directory and README file for instructions to install the required DLL files on Windows, and then try again running Iguana App.
Please see **windeps** directory and README file for instructions to install the required DLL files on Windows, and then try again running Agama App.

32
assets/BitRock Installer Files/IgaunaApp-Linux.xml
View File

@ -39,52 +39,52 @@
<platforms>all</platforms>
<distributionFileList>
<distributionDirectory>
<origin>../../build/Iguana-linux-x64/locales</origin>
<origin>../../build/Agama-linux-x64/locales</origin>
</distributionDirectory>
<distributionDirectory>
<origin>../../build/Iguana-linux-x64/resources</origin>
<origin>../../build/Agama-linux-x64/resources</origin>
</distributionDirectory>
<distributionFile>
<origin>../../build/Iguana-linux-x64/version</origin>
<origin>../../build/Agama-linux-x64/version</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/content_resources_200_percent.pak</origin>
<origin>../../build/Agama-linux-x64/content_resources_200_percent.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/LICENSE</origin>
<origin>../../build/Agama-linux-x64/LICENSE</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/blink_image_resources_200_percent.pak</origin>
<origin>../../build/Agama-linux-x64/blink_image_resources_200_percent.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/views_resources_200_percent.pak</origin>
<origin>../../build/Agama-linux-x64/views_resources_200_percent.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/ui_resources_200_percent.pak</origin>
<origin>../../build/Agama-linux-x64/ui_resources_200_percent.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/natives_blob.bin</origin>
<origin>../../build/Agama-linux-x64/natives_blob.bin</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/snapshot_blob.bin</origin>
<origin>../../build/Agama-linux-x64/snapshot_blob.bin</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/LICENSES.chromium.html</origin>
<origin>../../build/Agama-linux-x64/LICENSES.chromium.html</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/libffmpeg.so</origin>
<origin>../../build/Agama-linux-x64/libffmpeg.so</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/content_shell.pak</origin>
<origin>../../build/Agama-linux-x64/content_shell.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/icudtl.dat</origin>
<origin>../../build/Agama-linux-x64/icudtl.dat</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/libnode.so</origin>
<origin>../../build/Agama-linux-x64/libnode.so</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-linux-x64/Iguana</origin>
<origin>../../build/Agama-linux-x64/Iguana</origin>
</distributionFile>
</distributionFileList>
</folder>

2
assets/BitRock Installer Files/IgaunaApp-OSX.xml
View File

@ -41,7 +41,7 @@
<platforms>osx</platforms>
<distributionFileList>
<distributionFile>
<origin>../../build/Iguana-darwin-x64/Iguana.app</origin>
<origin>../../build/Agama-darwin-x64/Agama.app</origin>
</distributionFile>
</distributionFileList>
</folder>

40
assets/BitRock Installer Files/IgaunaApp-Win.xml
View File

@ -67,64 +67,64 @@
<platforms>windows</platforms>
<distributionFileList>
<distributionDirectory>
<origin>../../build/Iguana-win32-x64/locales</origin>
<origin>../../build/Agama-win32-x64/locales</origin>
</distributionDirectory>
<distributionDirectory>
<origin>../../build/Iguana-win32-x64/resources</origin>
<origin>../../build/Agama-win32-x64/resources</origin>
</distributionDirectory>
<distributionFile>
<origin>../../build/Iguana-win32-x64/blink_image_resources_200_percent.pak</origin>
<origin>../../build/Agama-win32-x64/blink_image_resources_200_percent.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/content_resources_200_percent.pak</origin>
<origin>../../build/Agama-win32-x64/content_resources_200_percent.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/content_shell.pak</origin>
<origin>../../build/Agama-win32-x64/content_shell.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/ui_resources_200_percent.pak</origin>
<origin>../../build/Agama-win32-x64/ui_resources_200_percent.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/views_resources_200_percent.pak</origin>
<origin>../../build/Agama-win32-x64/views_resources_200_percent.pak</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/icudtl.dat</origin>
<origin>../../build/Agama-win32-x64/icudtl.dat</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/LICENSES.chromium.html</origin>
<origin>../../build/Agama-win32-x64/LICENSES.chromium.html</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/natives_blob.bin</origin>
<origin>../../build/Agama-win32-x64/natives_blob.bin</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/snapshot_blob.bin</origin>
<origin>../../build/Agama-win32-x64/snapshot_blob.bin</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/d3dcompiler_47.dll</origin>
<origin>../../build/Agama-win32-x64/d3dcompiler_47.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/ffmpeg.dll</origin>
<origin>../../build/Agama-win32-x64/ffmpeg.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/libEGL.dll</origin>
<origin>../../build/Agama-win32-x64/libEGL.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/libGLESv2.dll</origin>
<origin>../../build/Agama-win32-x64/libGLESv2.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/node.dll</origin>
<origin>../../build/Agama-win32-x64/node.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/xinput1_3.dll</origin>
<origin>../../build/Agama-win32-x64/xinput1_3.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/LICENSE</origin>
<origin>../../build/Agama-win32-x64/LICENSE</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/version</origin>
<origin>../../build/Agama-win32-x64/version</origin>
</distributionFile>
<distributionFile>
<origin>../../build/Iguana-win32-x64/Iguana.exe</origin>
<origin>../../build/Agama-win32-x64/Iguana.exe</origin>
</distributionFile>
</distributionFileList>
</folder>

2
gui/EasyDEX-GUI

@ -1 +1 @@
Subproject commit c8eec9cb3164e74d092b8f58a139de94907e5e4e
Subproject commit 3fbbb33437be0c7907d8f6ca818711223933a1e1

13
main.js
View File

@ -24,7 +24,8 @@ var express = require('express'),
Promise = require('bluebird');
app.setName('Iguana');
app.setName('Agama');
app.setVersion('0.1.5.6e-beta');
if (os.platform() === 'linux') {
process.env.ELECTRON_RUN_AS_NODE = true;
@ -55,6 +56,12 @@ process.once('loaded', () => {
if (os.platform() === 'darwin') {
process.setFdLimit(appConfig.maxDescriptors.darwin);
app.setAboutPanelOptions({
applicationName: app.getName(),
applicationVersion: app.getVersion(),
copyright: "Released under the MIT license",
credits: "SuperNET Team"
})
}
if (os.platform() === 'linux') {
process.setFdLimit(appConfig.maxDescriptors.linux);
@ -144,10 +151,10 @@ if (os.platform() === 'win32') {
*/
if (os.platform() === 'linux') {
var iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon_png/128x128.png');
var iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png');
}
if (os.platform() === 'win32') {
var iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon.ico');
var iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico');
}
//console.log(iguanaDir);

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "iguana_app",
"productName": "Agama",
"version": "0.1.0",
"version": "0.1.5",
"description": "iguana Desktop App",
"main": "main.js",
"scripts": {

4
routes/shepherd.js
View File

@ -48,7 +48,7 @@ if (os.platform() === 'linux') {
var iguanaBin = path.join(__dirname, '../assets/bin/linux64/iguana'),
iguanaDir = process.env.HOME + '/.iguana',
iguanaConfsDir = iguanaDir + '/confs',
iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon_png/128x128.png'),
iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png'),
komododBin = path.join(__dirname, '../assets/bin/linux64/komodod'),
komodocliBin = path.join(__dirname, '../assets/bin/linux64/komodo-cli'),
komodoDir = process.env.HOME + '/.komodo';
@ -61,7 +61,7 @@ if (os.platform() === 'win32') {
iguanaDir = path.normalize(iguanaDir);
iguanaConfsDir = process.env.APPDATA + '/iguana/confs';
iguanaConfsDir = path.normalize(iguanaConfsDir);
iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon.ico'),
iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico'),
iguanaConfsDirSrc = path.normalize(iguanaConfsDirSrc);
komododBin = path.join(__dirname, '../assets/bin/win64/komodod.exe'),

Write Preview
Loading…
Cancel
Save