diff --git a/win32/installer/build.bat b/win32/installer/build.bat index 353dc0d..4992c8c 100644 --- a/win32/installer/build.bat +++ b/win32/installer/build.bat @@ -1,2 +1,2 @@ -C:\Qt\QtIFW2.0.3\bin\binarycreator.exe -p packages -c config\config.xml -v embedded-ide-0.4.0.exe +C:\Qt\Tools\QtInstallerFramework\2.0\bin\binarycreator.exe -p packages -c config\config.xml -v embedded-ide-0.5.0.exe @pause \ No newline at end of file diff --git a/win32/installer/config/config.xml b/win32/installer/config/config.xml index 891238c..bbbcd32 100644 --- a/win32/installer/config/config.xml +++ b/win32/installer/config/config.xml @@ -1,9 +1,12 @@ Embedded IDE - 0.4.0 + 0.5.0 Embedded IDE Installer Rusotech Embedded IDE - @ApplicationsDir@/EmbeddedIDE + @RootDir@/EmbeddedIDE + @TargetDir@/embedded-ide/embedded-ide.exe + EmbeddedIDE + false diff --git a/win32/installer/packages/org.gnu.gcc_arm_embedded/data/.gitignore b/win32/installer/packages/org.gnu.gcc_arm_embedded/data/.gitignore new file mode 100644 index 0000000..afae770 --- /dev/null +++ b/win32/installer/packages/org.gnu.gcc_arm_embedded/data/.gitignore @@ -0,0 +1 @@ +*.7z \ No newline at end of file diff --git a/win32/installer/packages/org.gnu.gcc_arm_embedded/meta/package.xml b/win32/installer/packages/org.gnu.gcc_arm_embedded/meta/package.xml index 08e5a05..a724b4a 100644 --- a/win32/installer/packages/org.gnu.gcc_arm_embedded/meta/package.xml +++ b/win32/installer/packages/org.gnu.gcc_arm_embedded/meta/package.xml @@ -2,8 +2,8 @@ GCC ARM Embedded GNU Compiler Collection Bare Metal - 5.4.2 - 2016-09-28 + 6.3.1 + 2017-04-01 diff --git a/win32/installer/packages/org.nongnu.openocd/data/.gitignore b/win32/installer/packages/org.nongnu.openocd/data/.gitignore new file mode 100644 index 0000000..afae770 --- /dev/null +++ b/win32/installer/packages/org.nongnu.openocd/data/.gitignore @@ -0,0 +1 @@ +*.7z \ No newline at end of file diff --git a/win32/installer/packages/org.nongnu.openocd/meta/package.xml b/win32/installer/packages/org.nongnu.openocd/meta/package.xml index 77ee7ba..8bc3af0 100644 --- a/win32/installer/packages/org.nongnu.openocd/meta/package.xml +++ b/win32/installer/packages/org.nongnu.openocd/meta/package.xml @@ -1,7 +1,7 @@ OpenOCD 0.10.0-dev-00247-g73b676c - Open on Chip Debugger. Dreddie Chopin Repackaged Version + Open on Chip Debugger. Freddie Chopin Repackaged Version 0.10.0 2016-03-12 @@ -9,4 +9,5 @@ true 300 + diff --git a/win32/installer/packages/org.nongnu.openocd/meta/zadig.qs b/win32/installer/packages/org.nongnu.openocd/meta/zadig.qs new file mode 100644 index 0000000..60fd2db --- /dev/null +++ b/win32/installer/packages/org.nongnu.openocd/meta/zadig.qs @@ -0,0 +1,18 @@ +function Component() +{ +} + +Component.prototype.createOperations = function() +{ + component.createOperations(); + if (systemInfo.productType === "windows") { + component.addOperation("CreateShortcut", + "@TargetDir@/openocd/zadig_2.2.exe", + "@StartMenuDir@/Zadig Driver Manager.lnk", + "workingDirectory=@TargetDir@"); + component.addOperation("CreateShortcut", + "@TargetDir@/openocd/drivers/UsbDriverTool.exe", + "@StartMenuDir@/USB Driver Tool.lnk", + "workingDirectory=@TargetDir@"); + } +} diff --git a/win32/installer/packages/org.rusotech.embedded_ide.menu/meta/package.xml b/win32/installer/packages/org.rusotech.embedded_ide.menu/meta/package.xml deleted file mode 100644 index 93be25d..0000000 --- a/win32/installer/packages/org.rusotech.embedded_ide.menu/meta/package.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Embedded IDE Stand Alone Menu - Stand alone menu. Select it if you want to run IDE without Mingw32 - 0.2.0 - 2016-12-12 - - 1100 - diff --git a/win32/installer/packages/org.rusotech.embedded_ide.msys/data/.gitignore b/win32/installer/packages/org.rusotech.embedded_ide.msys/data/.gitignore new file mode 100644 index 0000000..afae770 --- /dev/null +++ b/win32/installer/packages/org.rusotech.embedded_ide.msys/data/.gitignore @@ -0,0 +1 @@ +*.7z \ No newline at end of file diff --git a/win32/installer/packages/org.rusotech.embedded_ide.msys/meta/msys.qs b/win32/installer/packages/org.rusotech.embedded_ide.msys/meta/msys.qs index 5d5d0ba..6e051b9 100644 --- a/win32/installer/packages/org.rusotech.embedded_ide.msys/meta/msys.qs +++ b/win32/installer/packages/org.rusotech.embedded_ide.msys/meta/msys.qs @@ -7,8 +7,8 @@ Component.prototype.createOperations = function() component.createOperations(); if (systemInfo.productType === "windows") { component.addOperation("CreateShortcut", - "@TargetDir@/start-ide.bat", - "@StartMenuDir@/Embedded IDE Workspace.lnk", + "@TargetDir@/msys/msys.bat", + "@StartMenuDir@/Embedded IDE Console.lnk", "workingDirectory=@TargetDir@", "iconPath=@TargetDir@/embedded-ide/embedded-ide.exe"); } diff --git a/win32/installer/packages/org.rusotech.embedded_ide/data/.gitignore b/win32/installer/packages/org.rusotech.embedded_ide/data/.gitignore new file mode 100644 index 0000000..afae770 --- /dev/null +++ b/win32/installer/packages/org.rusotech.embedded_ide/data/.gitignore @@ -0,0 +1 @@ +*.7z \ No newline at end of file diff --git a/win32/installer/packages/org.rusotech.embedded_ide.menu/meta/embedded_ide.qs b/win32/installer/packages/org.rusotech.embedded_ide/meta/embedded_ide.qs similarity index 57% rename from win32/installer/packages/org.rusotech.embedded_ide.menu/meta/embedded_ide.qs rename to win32/installer/packages/org.rusotech.embedded_ide/meta/embedded_ide.qs index ebe17a7..d4531cf 100644 --- a/win32/installer/packages/org.rusotech.embedded_ide.menu/meta/embedded_ide.qs +++ b/win32/installer/packages/org.rusotech.embedded_ide/meta/embedded_ide.qs @@ -8,7 +8,11 @@ Component.prototype.createOperations = function() if (systemInfo.productType === "windows") { component.addOperation("CreateShortcut", "@TargetDir@/embedded-ide/embedded-ide.exe", - "@StartMenuDir@/Embedded IDE Stand Alone.lnk", + "@StartMenuDir@/Embedded IDE.lnk", + "workingDirectory=@TargetDir@"); + component.addOperation("CreateShortcut", + "@TargetDir@/maintenancetool.exe", + "@StartMenuDir@/Uninstall.lnk", "workingDirectory=@TargetDir@"); } } diff --git a/win32/installer/packages/org.rusotech.embedded_ide/meta/package.xml b/win32/installer/packages/org.rusotech.embedded_ide/meta/package.xml index f3ecafb..9e209a2 100644 --- a/win32/installer/packages/org.rusotech.embedded_ide/meta/package.xml +++ b/win32/installer/packages/org.rusotech.embedded_ide/meta/package.xml @@ -2,9 +2,10 @@ Embedded IDE Core System for IDE - 0.4.0 - 2017-03-28 + 0.5.0 + 2017-08-04 true - true 1000 + true +