From 4055ba6e3412beb79fa4f61b279e61686125d824 Mon Sep 17 00:00:00 2001 From: michal maxian Date: Fri, 24 Mar 2017 09:44:31 +0100 Subject: [PATCH 1/7] IGUANA_VERSION changed to AGAMA_VERSION --- buildscripts/electron-build-all.sh | 8 ++++---- buildscripts/electron-build-linux.sh | 8 ++++---- buildscripts/electron-build-osx.sh | 6 +++--- buildscripts/electron-build-win.sh | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/buildscripts/electron-build-all.sh b/buildscripts/electron-build-all.sh index ff95080..7dd1357 100755 --- a/buildscripts/electron-build-all.sh +++ b/buildscripts/electron-build-all.sh @@ -2,16 +2,16 @@ ### Build script for Iguana application for Linux x32 and x64 platform. ### Created by mmaxian, 3/2017 -[ -z $IGUANA_VERSION ] && echo "IGUANA_VERSION variable is not set." && exit 0 +[ -z $AGAMA_VERSION ] && echo "AGAMA_VERSION variable is not set." && exit 0 -echo "Preparing electron package $IGUANA_VERSION for Linux." +echo "Preparing electron package $AGAMA_VERSION for Linux." ./buildscripts/electron-build-linux.sh echo -echo "Preparing electron package $IGUANA_VERSION for Windows." +echo "Preparing electron package $AGAMA_VERSION for Windows." ./buildscripts/electron-build-win.sh echo -echo "Preparing electron package $IGUANA_VERSION for MacOS." +echo "Preparing electron package $AGAMA_VERSION for MacOS." ./buildscripts/electron-build-osx.sh echo \ No newline at end of file diff --git a/buildscripts/electron-build-linux.sh b/buildscripts/electron-build-linux.sh index 8189ca1..7d530d8 100755 --- a/buildscripts/electron-build-linux.sh +++ b/buildscripts/electron-build-linux.sh @@ -2,15 +2,15 @@ ### Build script for Iguana application for Linux x32 and x64 platform. ### Created by mmaxian, 3/2017 -[ -z $IGUANA_VERSION ] && echo "IGUANA_VERSION variable is not set." && exit 0 +[ -z $AGAMA_VERSION ] && echo "AGAMA_VERSION variable is not set." && exit 0 echo "Build script for Iguana application for Linux x32 and x64 platform." -echo "Preparing electron package $IGUANA_VERSION" +echo "Preparing electron package $AGAMA_VERSION" electron-packager . --platform=linux --arch=ia32 \ --icon=assets/icons/iguana_app_icon_png/128x128.png \ - --out=build/ --buildVersion=$IGUANA_VERSION \ + --out=build/ --buildVersion=$AGAMA_VERSION \ --ignore=assets/bin/win64 --ignore=assets/bin/osx --overwrite electron-packager . --platform=linux --arch=x64 \ --icon=assets/icons/iguana_app_icon_png/128x128.png \ - --out=build/ --buildVersion=$IGUANA_VERSION \ + --out=build/ --buildVersion=$AGAMA_VERSION \ --ignore=assets/bin/win64 --ignore=assets/bin/osx --overwrite \ No newline at end of file diff --git a/buildscripts/electron-build-osx.sh b/buildscripts/electron-build-osx.sh index b92f5ae..208e7de 100755 --- a/buildscripts/electron-build-osx.sh +++ b/buildscripts/electron-build-osx.sh @@ -2,11 +2,11 @@ ### Build script for Iguana application for MacOS platform. ### Created by mmaxian, 3/2017 -[ -z $IGUANA_VERSION ] && echo "IGUANA_VERSION variable is not set." && exit 0 +[ -z $AGAMA_VERSION ] && echo "AGAMA_VERSION variable is not set." && exit 0 echo "Build script for Iguana application for MacOS platform." -echo "Preparing electron package $IGUANA_VERSION" +echo "Preparing electron package $AGAMA_VERSION" electron-packager . --platform=darwin --arch=x64 \ --icon=assets/icons/iguana_app_icon.icns \ - --out=build/ --buildVersion=$IGUANA_VERSION \ + --out=build/ --buildVersion=$AGAMA_VERSION \ --ignore=assets/bin/win64 --ignore=assets/bin/linux64 --overwrite \ No newline at end of file diff --git a/buildscripts/electron-build-win.sh b/buildscripts/electron-build-win.sh index 0e1e22a..14917c2 100755 --- a/buildscripts/electron-build-win.sh +++ b/buildscripts/electron-build-win.sh @@ -2,17 +2,17 @@ ### Build script for Iguana application for Windows ia32 and x64 platform. ### Created by mmaxian, 3/2017 -[ -z $IGUANA_VERSION ] && echo "IGUANA_VERSION variable is not set." && exit 0 +[ -z $AGAMA_VERSION ] && echo "AGAMA_VERSION variable is not set." && exit 0 echo "Build script for Iguana application for Windows ia32 and x64 platform." -echo "Preparing electron package $IGUANA_VERSION" +echo "Preparing electron package $AGAMA_VERSION" electron-packager . --platform=win32 --arch=x64 \ --icon=assets/icons/iguana_app_icon.ico \ - --out=build/ --buildVersion=$IGUANA_VERSION \ + --out=build/ --buildVersion=$AGAMA_VERSION \ --ignore=assets/bin/osx --ignore=assets/bin/linux64 --overwrite electron-packager . --platform=win32 --arch=ia32 \ --icon=assets/icons/iguana_app_icon.ico \ - --out=build/ --buildVersion=$IGUANA_VERSION \ + --out=build/ --buildVersion=$AGAMA_VERSION \ --ignore=assets/bin/osx --ignore=assets/bin/linux64 --overwrite \ No newline at end of file From 1902717d97ad38828d78ddf4603299bc3e44098f Mon Sep 17 00:00:00 2001 From: michal maxian Date: Fri, 24 Mar 2017 10:12:27 +0100 Subject: [PATCH 2/7] added .electron cache to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 6291be8..c87c8f8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,9 @@ jspm_packages # Optional npm cache directory .npm +# electron cache directory +.electron + # Optional REPL history .node_repl_history From 3f99df9384805e6a0377d30f9c61dc4d7b3492ae Mon Sep 17 00:00:00 2001 From: michal maxian Date: Fri, 24 Mar 2017 10:13:19 +0100 Subject: [PATCH 3/7] renamed longname with spaces to computer friendly dir --- .../IgaunaApp-Linux.xml => bitrock_installer/AgamaApp-linux.xml} | 0 .../IgaunaApp-OSX.xml => bitrock_installer/AgamaApp-osx.xml} | 0 .../IgaunaApp-Win.xml => bitrock_installer/AgamaApp-windows.xml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename assets/{BitRock Installer Files/IgaunaApp-Linux.xml => bitrock_installer/AgamaApp-linux.xml} (100%) rename assets/{BitRock Installer Files/IgaunaApp-OSX.xml => bitrock_installer/AgamaApp-osx.xml} (100%) rename assets/{BitRock Installer Files/IgaunaApp-Win.xml => bitrock_installer/AgamaApp-windows.xml} (100%) diff --git a/assets/BitRock Installer Files/IgaunaApp-Linux.xml b/assets/bitrock_installer/AgamaApp-linux.xml similarity index 100% rename from assets/BitRock Installer Files/IgaunaApp-Linux.xml rename to assets/bitrock_installer/AgamaApp-linux.xml diff --git a/assets/BitRock Installer Files/IgaunaApp-OSX.xml b/assets/bitrock_installer/AgamaApp-osx.xml similarity index 100% rename from assets/BitRock Installer Files/IgaunaApp-OSX.xml rename to assets/bitrock_installer/AgamaApp-osx.xml diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/bitrock_installer/AgamaApp-windows.xml similarity index 100% rename from assets/BitRock Installer Files/IgaunaApp-Win.xml rename to assets/bitrock_installer/AgamaApp-windows.xml From bdad84efd8a61d67d5338a282527ee14d67de08f Mon Sep 17 00:00:00 2001 From: michal maxian Date: Fri, 24 Mar 2017 10:29:25 +0100 Subject: [PATCH 4/7] changed name for electron build script to full windows name --- buildscripts/{electron-build-win.sh => electron-build-windows.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename buildscripts/{electron-build-win.sh => electron-build-windows.sh} (100%) diff --git a/buildscripts/electron-build-win.sh b/buildscripts/electron-build-windows.sh similarity index 100% rename from buildscripts/electron-build-win.sh rename to buildscripts/electron-build-windows.sh From b0e94d6b9bd5589a10e6aaa0d519f6187a659435 Mon Sep 17 00:00:00 2001 From: michal maxian Date: Fri, 24 Mar 2017 11:20:42 +0100 Subject: [PATCH 5/7] Added PKG_VERSION variable to bitrock installer scripts --- assets/bitrock_installer/AgamaApp-linux.xml | 2 +- assets/bitrock_installer/AgamaApp-osx.xml | 2 +- assets/bitrock_installer/AgamaApp-windows.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/bitrock_installer/AgamaApp-linux.xml b/assets/bitrock_installer/AgamaApp-linux.xml index 0a0fe2a..4a50288 100644 --- a/assets/bitrock_installer/AgamaApp-linux.xml +++ b/assets/bitrock_installer/AgamaApp-linux.xml @@ -1,7 +1,7 @@ AgamaApp iguana - 0.1.6.1e-beta + ${PKG_VERSION} ../../LICENSE ../installer_imgs/Agama_installer_wizard_image.png ../installer_imgs/supernet-agama-logo.png diff --git a/assets/bitrock_installer/AgamaApp-osx.xml b/assets/bitrock_installer/AgamaApp-osx.xml index 6b6e958..ed5f454 100644 --- a/assets/bitrock_installer/AgamaApp-osx.xml +++ b/assets/bitrock_installer/AgamaApp-osx.xml @@ -1,7 +1,7 @@ AgamaApp iguana - 0.1.6.0e-beta + ${PKG_VERSION} ../../LICENSE ../installer_imgs/Agama_installer_wizard_image.png ../installer_imgs/supernet-agama-logo.png diff --git a/assets/bitrock_installer/AgamaApp-windows.xml b/assets/bitrock_installer/AgamaApp-windows.xml index 73ec0da..fc82253 100644 --- a/assets/bitrock_installer/AgamaApp-windows.xml +++ b/assets/bitrock_installer/AgamaApp-windows.xml @@ -1,7 +1,7 @@ AgamaApp iguana - 0.1.6e-beta + ${PKG_VERSION} ../../LICENSE ../installer_imgs/Agama_installer_wizard_image.png ../installer_imgs/supernet-agama-logo.png From 23e3d39b49af5ef3ac905e29e1d6f1841615f1b5 Mon Sep 17 00:00:00 2001 From: michal maxian Date: Fri, 24 Mar 2017 22:23:19 +0100 Subject: [PATCH 6/7] 32bit builds removed from buildscripts --- buildscripts/electron-build-linux.sh | 5 +---- buildscripts/electron-build-windows.sh | 7 +------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/buildscripts/electron-build-linux.sh b/buildscripts/electron-build-linux.sh index 7d530d8..e67e938 100755 --- a/buildscripts/electron-build-linux.sh +++ b/buildscripts/electron-build-linux.sh @@ -6,10 +6,7 @@ echo "Build script for Iguana application for Linux x32 and x64 platform." echo "Preparing electron package $AGAMA_VERSION" -electron-packager . --platform=linux --arch=ia32 \ - --icon=assets/icons/iguana_app_icon_png/128x128.png \ - --out=build/ --buildVersion=$AGAMA_VERSION \ - --ignore=assets/bin/win64 --ignore=assets/bin/osx --overwrite + electron-packager . --platform=linux --arch=x64 \ --icon=assets/icons/iguana_app_icon_png/128x128.png \ --out=build/ --buildVersion=$AGAMA_VERSION \ diff --git a/buildscripts/electron-build-windows.sh b/buildscripts/electron-build-windows.sh index 14917c2..6bb9e32 100755 --- a/buildscripts/electron-build-windows.sh +++ b/buildscripts/electron-build-windows.sh @@ -10,9 +10,4 @@ echo "Preparing electron package $AGAMA_VERSION" electron-packager . --platform=win32 --arch=x64 \ --icon=assets/icons/iguana_app_icon.ico \ --out=build/ --buildVersion=$AGAMA_VERSION \ - --ignore=assets/bin/osx --ignore=assets/bin/linux64 --overwrite - -electron-packager . --platform=win32 --arch=ia32 \ - --icon=assets/icons/iguana_app_icon.ico \ - --out=build/ --buildVersion=$AGAMA_VERSION \ - --ignore=assets/bin/osx --ignore=assets/bin/linux64 --overwrite \ No newline at end of file + --ignore=assets/bin/osx --ignore=assets/bin/linux64 --overwrite \ No newline at end of file From 6df96cd204ee5913a2d481b820e5e32c51e4fdab Mon Sep 17 00:00:00 2001 From: michal maxian Date: Fri, 24 Mar 2017 23:00:57 +0100 Subject: [PATCH 7/7] 32-bit removed from notes and comments --- buildscripts/electron-build-linux.sh | 4 ++-- buildscripts/electron-build-windows.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildscripts/electron-build-linux.sh b/buildscripts/electron-build-linux.sh index e67e938..23f5f89 100755 --- a/buildscripts/electron-build-linux.sh +++ b/buildscripts/electron-build-linux.sh @@ -1,10 +1,10 @@ #!/bin/bash -### Build script for Iguana application for Linux x32 and x64 platform. +### Build script for Iguana application for Linux x64 platform. ### Created by mmaxian, 3/2017 [ -z $AGAMA_VERSION ] && echo "AGAMA_VERSION variable is not set." && exit 0 -echo "Build script for Iguana application for Linux x32 and x64 platform." +echo "Build script for Iguana application for Linux x64 platform." echo "Preparing electron package $AGAMA_VERSION" electron-packager . --platform=linux --arch=x64 \ diff --git a/buildscripts/electron-build-windows.sh b/buildscripts/electron-build-windows.sh index 6bb9e32..b066f96 100755 --- a/buildscripts/electron-build-windows.sh +++ b/buildscripts/electron-build-windows.sh @@ -1,10 +1,10 @@ #!/bin/bash -### Build script for Iguana application for Windows ia32 and x64 platform. +### Build script for Iguana application for Windows x64 platform. ### Created by mmaxian, 3/2017 [ -z $AGAMA_VERSION ] && echo "AGAMA_VERSION variable is not set." && exit 0 -echo "Build script for Iguana application for Windows ia32 and x64 platform." +echo "Build script for Iguana application for Windows x64 platform." echo "Preparing electron package $AGAMA_VERSION" electron-packager . --platform=win32 --arch=x64 \