Merge pull request #29 from Bounz/V1.1.15

Fixing Windows installer issues
Bounz · Jan 20, 2018 · b32a10d · b32a10d
2 parents 042e840 + a268d1c
commit b32a10d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/HomeGenie_Linux/Packager/builddeb.ps1 b/HomeGenie_Linux/Packager/builddeb.ps1
@@ -42,4 +42,4 @@ Copy-Item -Path $checkoutFolder\HomeGenie_Linux\Packager\DEBIAN -Destination $ch
 Copy-Item -Path $checkoutFolder\HomeGenie_Linux\Packager\DEBIAN -Destination $checkoutFolder\release\usr\local\bin\homegenie -recurse -force
 
 # Call wpkg to create .deb package
-C:\WPKG\bin\wpkg.exe --build $checkoutFolder\release --output-dir $checkoutFolder\release --verbose
+. C:\WPKG\bin\wpkg.exe --build $checkoutFolder\release --output-dir $checkoutFolder\release --verbose
diff --git a/HomeGenie_Windows/Packager/setup.iss b/HomeGenie_Windows/Packager/setup.iss
@@ -4,10 +4,10 @@
 
 [Setup]
 AppName=HomeGenie
-AppVerName=HomeGenie 1.1 beta (r526)
+AppVerName=HomeGenie-BE V_version_
 AppPublisher=GenieLabs
 AppPublisherURL=http://www.homegenie.it
-AppVersion=1.1 beta (r526)
+AppVersion=V_version_
 DefaultDirName={pf}\HomeGenie
 DefaultGroupName=HomeGenie
 Compression=lzma
@@ -188,7 +188,6 @@ end;
 Source: ".\Drivers\USB_ActiveHome_Interface\*"; DestDir: "{app}\Drivers\LibUsb_MarmitekCM15Pro"; Flags: ignoreversion recursesubdirs
 Source: "..\..\HomeGenie\bin\Debug\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs
 Source: "..\..\HomeGenie\bin\Debug\HomeGenie.exe"; DestDir: "{app}"; Flags: ignoreversion replacesameversion
-Source: "..\..\HomeGenie\bin\Debug\README.TXT"; DestDir: "{app}"; Flags: ignoreversion replacesameversion
 
 [InstallDelete]
 Type: files; Name: "{app}\SQLite.Interop.dll";
@@ -198,9 +197,9 @@ Type: files; Name: "{app}\SQLite.Interop.dll";
 ;Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; 
 
 [Icons]
-Name: "{group}\HomeGenie 1.1 beta (r526)"; Filename: "{app}\HomeGenieManager.exe"
-Name: "{group}\Uninstall HomeGenie 1.1 beta (r526)"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\HomeGenie"; Filename: "{app}\HomeGenieManager.exe"
+Name: "{group}\HomeGenie-BE"; Filename: "{app}\HomeGenieManager.exe"
+Name: "{group}\Uninstall HomeGenie-BE"; Filename: "{uninstallexe}"
+Name: "{commondesktop}\HomeGenie-BE"; Filename: "{app}\HomeGenieManager.exe"
 
 [Run]
 ;Filename: "rundll32"; Parameters: "libusb0.dll,usb_touch_inf_file_np_rundll {win}\inf\input.inf"

diff --git a/appveyor.yml b/appveyor.yml
@@ -68,7 +68,8 @@ build_script:
 #  pre deployment configuration   #
 #---------------------------------#
 
-before_deploy:
+#before_deploy:
+after_build:
   - ps: . "$($env:APPVEYOR_BUILD_FOLDER)\HomeGenie_Linux\Packager\builddeb.ps1"
 
   # Call wpkg to create .deb package
@@ -84,6 +85,7 @@ before_deploy:
 # create windows setup (exe) file #
 #---------------------------------#
 
+  - ps: (Get-Content "c:\projects\HomeGenie\HomeGenie_Windows\Packager\setup.iss") -replace "_version_", "$($env:APPVEYOR_BUILD_VERSION)" | out-file "c:\projects\HomeGenie\HomeGenie_Windows\Packager\setup.iss" -encoding ASCII -force
   - iscc c:\projects\HomeGenie\HomeGenie_Windows\Packager\setup.iss /Oc:\projects\homegenie\release /Fhomegenie_%APPVEYOR_BUILD_VERSION%_all
 
 #---------------------------------#