Fixed windows installer

bbogush · Dec 22, 2020 · 392474b · 392474b
1 parent 8e155b9
commit 392474b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/windows/config/config.xml b/windows/config/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>NANDO</Name>
-    <Version>3.3.0</Version>
+    <Version>3.4.0</Version>
     <Title>NANDO Installer</Title>
     <Publisher>NANDO</Publisher>
     <StartMenuDir>NANDO</StartMenuDir>

diff --git a/windows/packages/com.nando.nando/meta/installscript.qs b/windows/packages/com.nando.nando/meta/installscript.qs
@@ -37,7 +37,7 @@ Component.prototype.createOperations = function()
 
     if (systemInfo.productType === "windows") {
         component.addOperation("CreateShortcut", "@TargetDir@/nando.exe", "@StartMenuDir@/nando.lnk",
-            "workingDirectory=@TargetDir@", "iconPath=%SystemRoot%/system32/SHELL32.dll",
-            "iconId=2", "description=NANDO");
+            "workingDirectory=@TargetDir@", "description=NANDO");
+		component.addOperation("Execute", "cacls", "@TargetDir@\\*.csv", "/e", "/p", "Users:f");
     }
 }
diff --git a/windows/packages/com.nando.nando/meta/package.xml b/windows/packages/com.nando.nando/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>NANDO</DisplayName>
     <Description>NANDO software.</Description>
-    <Version>2.2.0-1</Version>
-    <ReleaseDate>2019-04-28</ReleaseDate>
+    <Version>3.4.0-1</Version>
+    <ReleaseDate>2020-12-20</ReleaseDate>
     <Licenses>
         <License name="GNU General Public License" file="license.txt" />
     </Licenses>

diff --git a/windows/release.bat b/windows/release.bat
@@ -1,4 +1,7 @@
-del packages\com.nando.nando\data\*
+del /Q /S packages\com.nando.nando\data\*
+md packages\com.nando.nando\data\
 copy ..\bin\* packages\com.nando.nando\data\
-c:\Qt\5.12.3\mingw73_32\bin\windeployqt.exe packages\com.nando.nando\data\nando.exe
-c:\Qt\Tools\QtInstallerFramework\3.0\bin\binarycreator.exe -c config/config.xml -p packages NANDO_Installer.exe
+copy C:\boost\lib\libboost_thread-mgw8-mt-x64-1_75.dll packages\com.nando.nando\data\
+copy C:\boost\lib\libboost_system-mgw8-mt-x64-1_75.dll packages\com.nando.nando\data\
+c:\Qt\5.15.2\mingw81_64\bin\windeployqt.exe packages\com.nando.nando\data\nando.exe
+c:\Qt\QtIFW\bin\binarycreator.exe -c config/config.xml -p packages NANDO_Installer.exe