Build 0.5.0

Signed-off-by: Martin Ribelotta <[email protected]>
martinribelotta · Aug 4, 2017 · 6edc276 · 6edc276
1 parent e9bd4a3
commit 6edc276
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 21 deletions.
diff --git 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
diff --git a/win32/installer/config/config.xml b/win32/installer/config/config.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>Embedded IDE</Name>
-    <Version>0.4.0</Version>
+    <Version>0.5.0</Version>
     <Title>Embedded IDE Installer</Title>
     <Publisher>Rusotech</Publisher>
     <StartMenuDir>Embedded IDE</StartMenuDir>
-    <TargetDir>@ApplicationsDir@/EmbeddedIDE</TargetDir>
+    <TargetDir>@RootDir@/EmbeddedIDE</TargetDir>
+    <RunProgram>@TargetDir@/embedded-ide/embedded-ide.exe</RunProgram>
+    <RunProgramDescription>EmbeddedIDE</RunProgramDescription>
+	<AllowSpaceInPath>false</AllowSpaceInPath>
 </Installer>
diff --git a/win32/installer/packages/org.gnu.gcc_arm_embedded/data/.gitignore b/win32/installer/packages/org.gnu.gcc_arm_embedded/data/.gitignore
@@ -0,0 +1 @@
+*.7z
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
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>GCC ARM Embedded</DisplayName>
     <Description>GNU Compiler Collection Bare Metal</Description>
-    <Version>5.4.2</Version>
-    <ReleaseDate>2016-09-28</ReleaseDate>
+    <Version>6.3.1</Version>
+    <ReleaseDate>2017-04-01</ReleaseDate>
     <Licenses>
         <License name="GNU GENERAL PUBLIC LICENSE Version 3" file="COPYING.GPLv3" />
     </Licenses>

diff --git a/win32/installer/packages/org.nongnu.openocd/data/.gitignore b/win32/installer/packages/org.nongnu.openocd/data/.gitignore
@@ -0,0 +1 @@
+*.7z
diff --git a/win32/installer/packages/org.nongnu.openocd/meta/package.xml b/win32/installer/packages/org.nongnu.openocd/meta/package.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Package>
     <DisplayName>OpenOCD 0.10.0-dev-00247-g73b676c</DisplayName>
-    <Description>Open on Chip Debugger. Dreddie Chopin Repackaged Version</Description>
+    <Description>Open on Chip Debugger. Freddie Chopin Repackaged Version</Description>
     <Version>0.10.0</Version>
     <ReleaseDate>2016-03-12</ReleaseDate>
     <Licenses>
         <License name="GNU GENERAL PUBLIC LICENSE Version 2" file="COPYING.GPLv2" />
     </Licenses>
     <Default>true</Default>
     <SortingPriority>300</SortingPriority>
+    <Script>zadig.qs</Script>
 </Package>
diff --git a/win32/installer/packages/org.nongnu.openocd/meta/zadig.qs 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
diff --git a/win32/installer/packages/org.rusotech.embedded_ide.msys/data/.gitignore b/win32/installer/packages/org.rusotech.embedded_ide.msys/data/.gitignore
@@ -0,0 +1 @@
+*.7z
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
@@ -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
@@ -0,0 +1 @@
+*.7z
diff --git a/...ch.embedded_ide.menu/meta/embedded_ide.qs → ...usotech.embedded_ide/meta/embedded_ide.qs b/...ch.embedded_ide.menu/meta/embedded_ide.qs → ...usotech.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
@@ -2,9 +2,10 @@
 <Package>
     <DisplayName>Embedded IDE</DisplayName>
     <Description>Core System for IDE</Description>
-    <Version>0.4.0</Version>
-    <ReleaseDate>2017-03-28</ReleaseDate>
+    <Version>0.5.0</Version>
+    <ReleaseDate>2017-08-04</ReleaseDate>
     <Default>true</Default>
-    <ForcedInstallation>true</ForcedInstallation>
     <SortingPriority>1000</SortingPriority>
+    <ForcedInstallation>true</ForcedInstallation>
+    <Script>embedded_ide.qs</Script>
 </Package>